更新

src/views/security-plan.vue

@@ -460,17 +460,17 @@
                     
                         <el-row class="row_g2">
                             <el-col :span="8">消防安全重点单位</el-col>
-                            <el-col :span="4" style="color:red">高风险<br>2（家）</el-col>
-                            <el-col :span="4" style="color:orange">较高风险<br>1（家）</el-col>
-                            <el-col :span="4" style="color:yellow">一般风险<br>3（家）</el-col>
-                            <el-col :span="4" style="color:green">低风险<br>170（家）</el-col>
+                            <el-col :span="4" style="color:red">高风险<br>0（家）</el-col>
+                            <el-col :span="4" style="color:orange">较高风险<br>9（家）</el-col>
+                            <el-col :span="4" style="color:yellow">一般风险<br>15（家）</el-col>
+                            <el-col :span="4" style="color:green">低风险<br>152（家）</el-col>
                         </el-row>
                         <el-row class="row_g2">
                             <el-col :span="8">九小场所</el-col>
-                            <el-col :span="4"  style="color:red" @click="basicStaticsData(39,'高风险')" >高风险<br>151（家）</el-col>
-                            <el-col :span="4" style="color:orange" @click="basicStaticsData(39,'较高风险')" >较高风险<br>278（家）</el-col>
-                            <el-col :span="4" style="color:yellow" @click="basicStaticsData(39,'一般风险')">一般风险<br>114（家）</el-col>
-                            <el-col :span="4" style="color:green" @click="basicStaticsData(39,'低风险')">低风险<br>4026（家）</el-col>
+                            <el-col :span="4"  style="color:red" @click="basicStaticsData(39,'高风险')" >高风险<br>{{jxcstj[0]}}（家）</el-col>
+                            <el-col :span="4" style="color:orange" @click="basicStaticsData(39,'较高风险')" >较高风险<br>{{jxcstj[1]}}（家）</el-col>
+                            <el-col :span="4" style="color:yellow" @click="basicStaticsData(39,'一般风险')">一般风险<br>{{jxcstj[2]}}（家）</el-col>
+                            <el-col :span="4" style="color:green" @click="basicStaticsData(39,'低风险')">低风险<br>{{jxcstj[3]}}（家）</el-col>
                         </el-row>
 
                     </div>
@@ -832,7 +832,7 @@
                         <div class="list" :offset="2">
                             <el-select
                                 v-model="zfjly2"
-                                placeholder="请选择监控视频"
+                                placeholder="请选择执法记录仪"
                                 class="videoSelect"
                             >
                                 <el-option
@@ -952,6 +952,7 @@ export default {
     components: { category, gauge, CountTo,unitBox ,Vue3SeamlessScroll },
     data() {
         return {
+            jxcstj:[0,0,0,0],//九小场所统计
             check: 1,
             dialogTableVisible:false,
             pdfUrl:'',
@@ -1648,7 +1649,8 @@ export default {
         // this.sadianSelect(this.checkedArray.checkedData[0]);  //撒点
         this.getStaticData(this.value111)   //疏导区社会单位情况统计
         this.getZQStaticData()  //执勤战备力量部署
-        this.anbaoSDUWG()//疏导区网格
+        this.anbaoSDUWG2()//疏导区网格
+        this.basicStaticsData(39)
         // this.llbutj()//力量部署统计
 
         
@@ -1700,8 +1702,8 @@ export default {
                         type: "wgmc_qb",
                     },
                     {
-                        gisX: 121.379764,
-                        gisY: 31.186605,
+                        gisX: 121.357666,
+                        gisY: 31.165440,
                         type: "wgmc_hq",
                     },
                     {
@@ -1795,18 +1797,41 @@ export default {
                                         };
                                         arr.push(data)
                                         let dataOther = []
-                                        if(type == 39){
-                                                for(let i=0;i<1300;i++){
-                                                        if(arr[i].extendData){
-                                                                // console.log(i,JSON.parse(arr[i].extendData).test112,name)
-                                                                if(name == JSON.parse(arr[i].extendData).test112){
-                                                                        dataOther.push(arr[i])
+                                        if(type == 39){ //九小场所
+                                                if(name){
+                                                        // console.log(arr)
+                                                        for(let i=0;i<arr.length;i++){
+                                                        // for(let i=0;i<1300;i++){
+                                                                if(arr[i].extendData){
+                                                                        // console.log(i,arr[i],JSON.parse(arr[i].extendData).test112,name)
+                                                                        if(name == JSON.parse(arr[i].extendData).test112){
+                                                                                dataOther.push(arr[i])
+                                                                        }
+                                                                }
+                                                                
+                                                        }
+                                                        this.addMarker(dataOther, "security-plan", name)
+                                                }else{
+                                                        this.jxcstj = [0,0,0,0]
+                                                        for(let i=0;i<arr.length;i++){
+                                                                if(arr[i].extendData && JSON.parse(arr[i].extendData)){
+                                                                        if(JSON.parse(arr[i].extendData).test112 == "高风险"){
+                                                                                this.jxcstj[0] ++
+                                                                        }
+                                                                        if(JSON.parse(arr[i].extendData).test112 == "较高风险"){
+                                                                                this.jxcstj[1] ++
+                                                                        }
+                                                                        if(JSON.parse(arr[i].extendData).test112 == "一般风险"){
+                                                                                this.jxcstj[2] ++
+                                                                        }
+                                                                        if(JSON.parse(arr[i].extendData).test112 == "低风险"){
+                                                                                this.jxcstj[3] ++
+                                                                        }
                                                                 }
                                                         }
-                                                        
+                                                       
                                                 }
-                                                // console.log(dataOther,name)
-                                                this.addMarker(dataOther, "security-plan", name)
+                                                
                                         }else{
                                                 this.addMarker(arr, "security-plan", name)
                                         }
@@ -2271,7 +2296,7 @@ export default {
                 this.gridStatus = id;
                 this.anbao(1, 3);
                 this.dwgjcmcAndhzzx()
-                this.anbaoSDUWG()//疏导区网格
+                this.anbaoSDUWG2()//疏导区网格
             } else if (id == 20) {
                 this.gridStatus = id;
                 this.selectVideo(1)