安保调整

src/components/mixins/map-data1.js

@@ -802,8 +802,8 @@ export default {
                                 type == "高风险" ? this.stores.sadianIcon.gfx : type == "较高风险" ? this.stores.sadianIcon.jgfx : type == "一般风险" ? this.stores.sadianIcon.ybfx : type == "低风险" ? this.stores.sadianIcon.dfx :
 
                                 type == "单位巡检" ? this.stores.sadianIcon.dwxj : type == "物联网设备" ? this.stores.sadianIcon.dwxj : type == "监控视频" ? this.stores.sadianIcon.ssjq : type == "监督检查" ? this.stores.sadianIcon.jdjc :
-                                type == "养老机构安全隐患清单" ?  this.stores.sadianIcon.xfdjl :
-                                type == "医疗机构安全隐患清单" ?  this.stores.sadianIcon.zzd :
+                                type == "养老机构" ?  this.stores.sadianIcon.xfdjl :
+                                type == "医疗机构" ?  this.stores.sadianIcon.zzd :
 
                                 this.stores.sadianIcon.trsy,
 
@@ -1192,12 +1192,11 @@ export default {
                                 }, ];
                                 this.popup(val._attrbutes, arrayList, true)
                             }
-                            if (type == "养老机构安全隐患清单") {
-                                console.log(val.attrbutes)
+                            if (type == "养老机构") {
                                 let arrayList = [{
-                                    title: ["养老机构安全隐患清单", true],
+                                    title: [type, true],
                                     children: [
-                                        ["设施名称：", val.attrbutes.facilityName, 24],
+                                        ["单位名称：", val.attrbutes.facilityName, 24],
                                         // ["设施类型：", val.attrbutes.facilityType, 24],
                                         ["地址：", val.attrbutes.address, 24],
                                         ["所属街镇：", val.attrbutes.streetTown, 24],
@@ -1205,12 +1204,12 @@ export default {
                                 }, ];
                                 this.popup(val._attrbutes, arrayList, true)
                             }
-                            if (type == "医疗机构安全隐患清单") {
+                            if (type == "医疗机构") {
                                 console.log(val.attrbutes)
                                 let arrayList = [{
-                                    title: ["医疗机构安全隐患清单", true],
+                                    title: [type, true],
                                     children: [
-                                        ["设施名称：", val.attrbutes.facilityName, 24],
+                                        ["单位名称：", val.attrbutes.facilityName, 24],
                                         // ["设施类型：", val.attrbutes.facilityType, 24],
                                         ["地址：", val.attrbutes.address, 24],
                                         ["所属街镇：", val.attrbutes.streetTown, 24],

src/views/security-plan.vue

@@ -148,7 +148,7 @@
                         <el-row>
                             <el-col :span="5"  style="border: 1px solid rgba(48, 207, 255, 0.6); margin: .25rem .08rem .125rem .16rem; box-shadow: inset 0 0 0.07rem 0.04rem rgb(115 251 253 / 40%); box-sizing: border-box"
                               v-for="(item,index) in staticData.array1" :key="index" @click="goPoints(item.facilityType)">
-                                <div style="padding: 0.2rem 0; text-align: center">
+                                <div style="padding: 0.2rem 0; text-align: center;user-select:none !important">
                                     <span style="display: block">
                                         <Strong :style="{ color: item.color, fontSize: '0.3rem'}" >
                                             <CountTo :startVal='0' :endVal='item.count || 0' :duration='3000'>{{ item.count || 0 }}</CountTo>
@@ -366,76 +366,76 @@
                 <div class="rightTop1">
                     <h4 style="display: flex">疏导区网格检查情况</h4>
                     <div class="girdCheckItem">
-                        <p>大网格<span>&nbsp;&nbsp;&nbsp;街镇分管领导：10&nbsp;&nbsp;城运中心主任：10&nbsp;&nbsp;安监所所长：10&nbsp;&nbsp;支队外参谋：10</span></p>
+                        <p>大网格<span>&nbsp;&nbsp;&nbsp;街镇分管领导：4&nbsp;&nbsp;城运中心主任：4&nbsp;&nbsp;安监所所长：4&nbsp;&nbsp;支队外勤参谋：8</span></p>
                         <div class="row_g">
                             <div >累计:</div>
-                            <div >检查家数<br>100（家/次）</div>
-                            <div >发现隐患数<br>20（处）</div>
-                            <div >整改隐患<br>20（处）</div>
-                            <div >处罚金额<br>20（万元）</div>
-                            <div >三停<br>20（万元）</div>
-                            <div >查封<br>4（处）</div>
+                            <div >检查家数<br>176（家次）</div>
+                            <div >发现隐患数<br>51（处）</div>
+                            <div >整改隐患<br>48（处）</div>
+                            <div >处罚金额<br>0.5（万元）</div>
+                            <div >三停<br>0（家次）</div>
+                            <div >查封<br>0（处）</div>
                         </div>
                     
                         <div class="row_g">
                             <div >今日:</div>
-                            <div >100（家/次）</div>
-                            <div >20（处）</div>
-                            <div >20（处）</div>
-                            <div >20（万元）</div>
-                            <div >20（万元）</div>
-                            <div >4（处）</div>
+                            <div >15（家次）</div>
+                            <div >0（处）</div>
+                            <div >0（处）</div>
+                            <div >0（万元）</div>
+                            <div >0（家次）</div>
+                            <div >0（处）</div>
                         </div>
                         <div class="row_g2">
                             <div >消防安全重点单位四色分级情况</div>
-                            <div style="color:red">高风险<br>100（家）</div>
-                            <div style="color:orange">较高风险<br>20（家）</div>
-                            <div style="color:yellow">一般风险<br>20（家）</div>
-                            <div style="color:green">低风险<br>20（家）</div>
+                            <div style="color:red">高风险<br>0（家）</div>
+                            <div style="color:orange">较高风险<br>3（家）</div>
+                            <div style="color:yellow">一般风险<br>15（家）</div>
+                            <div style="color:green">低风险<br>158（家）</div>
                         </div>
                     </div>
                     <div class="girdCheckItem">
-                        <p>中网格<span>&nbsp;&nbsp;&nbsp;安监所人员: 10&nbsp;&nbsp;城运中心人员：10&nbsp;&nbsp;消防助理员：10</span></p>
+                        <p>中网格<span>&nbsp;&nbsp;&nbsp;安监所人员: 14&nbsp;&nbsp;城运中心人员：14&nbsp;&nbsp;消防助理员：24</span></p>
                         <div class="row_g3">
                             <div >累计:</div>
-                            <div >检查家数<br>100（家/次）</div>
-                            <div >发现隐患数<br>20（处）</div>
-                            <div >整改隐患<br>20（处）</div>
-                            <div >签约承诺书<br>20（份）</div>
-                            <div >检查覆盖率<br>100%</div>
+                            <div >检查家数<br>4569（家次）</div>
+                            <div >发现隐患数<br>751（处）</div>
+                            <div >整改隐患<br>722（处）</div>
+                            <div >签约承诺书<br>4569（份）</div>
+                            <div >检查覆盖率<br>95%</div>
                         </div>
                         <div class="row_g3">
                             <div >今日:</div>
-                            <div >100（家/次）</div>
-                            <div >20（处）</div>
-                            <div >20（处）</div>
+                            <div >127（家次）</div>
+                            <div >17（处）</div>
+                            <div >16（处）</div>
                         </div>
                     
                         <div class="row_g2">
                             <div >九小场所四色分级情况</div>
-                            <div style="color:red">高风险<br>100（家）</div>
-                            <div style="color:orange">较高风险<br>20（家）</div>
-                            <div style="color:yellow">一般风险<br>20（家）</div>
-                            <div style="color:green">低风险<br>20（家）</div>
+                            <div style="color:red">高风险<br>151（家）</div>
+                            <div style="color:orange">较高风险<br>278（家）</div>
+                            <div style="color:yellow">一般风险<br>114（家）</div>
+                            <div style="color:green">低风险<br>4026（家）</div>
                         </div>
 
                     </div>
                     <div class="girdCheckItem">
-                        <p>小网格<span>&nbsp;&nbsp;&nbsp;安网格长: 10&nbsp;&nbsp;网格人员：10</span></p>
+                        <p>小网格<span>&nbsp;&nbsp;&nbsp;小网格长: 103&nbsp;&nbsp;网格人员：161</span></p>
                         <div class="row_g">
                             <div >累计:</div>
-                            <div >主动发现<br>100（起）</div>
-                            <div >被动处置<br>100（起）</div>
-                            <div >隐患整改<br>100（起）</div>
-                            <div >派发<br>20（起）</div>
-                            <div >完成<br>20（起）</div>
+                            <div >主动发现<br>45（起）</div>
+                            <div >被动处置<br>67（起）</div>
+                            <div >隐患整改<br>112（起）</div>
+                            <div >派发<br>112（起）</div>
+                            <div >完成<br>112（起）</div>
                             <div >处置率<br>100%</div>
                         </div>
                         <div class="row_g">
                             <div >累计:</div>
-                            <div >100（起）</div>
-                            <div >20（起）</div>
-                            <div >20（起）</div>
+                            <div >0（起）</div>
+                            <div >0（起）</div>
+                            <div >0（起）</div>
                         </div>
 
                     </div>
@@ -1027,7 +1027,7 @@ export default {
         line3Array:[
                 {
                     "name": "大型综合体",
-                    "count": 4,
+                    "count": 21,
                 },
                 {
                     "name": "重点单位",
@@ -1035,14 +1035,14 @@ export default {
                 },
                 {
                     "name": "酒店/宾馆",
-                    "count": 11,
+                    "count": 110,
                 },
                 {
                     "name": "高层建筑",
-                    "count": 14,
+                    "count": 839,
                 },{
                     "name": "厂房/仓库",
-                    "count": 11,
+                    "count": 131,
                 },
                 {
                     "name": "商市场",
@@ -1050,36 +1050,36 @@ export default {
                 },
                 {
                     "name": "公共娱乐场所",
-                    "count": 11,
+                    "count": 38,
                 },
                 {
                     "name": "医疗机构",
-                    "count": 103,
+                    "count": 12,
                     "value":30
                 },{
                     "name": "养老机构",
-                    "count": 11,
+                    "count": 5,
                     "value":29
                 },
                 
                 {
                     "name": "规模租赁",
-                    "count": 103,
+                    "count": 67,
                 },
                 {
                     "name": "办公楼宇",
-                    "count": 103,
+                    "count": 52,
                 },
                 {
                     "name": "在建工地",
-                    "count": 11,
+                    "count": 6,
                 },
                 {
                     "name": "居民小区",
-                    "count": 4,
+                    "count": 199,
                 },{
                     "name": "沿街门面",
-                    "count": 20,
+                    "count": 3080,
                 },
                 {
                     "name": "宗教场所",
@@ -1087,18 +1087,16 @@ export default {
                 },
                 {
                     "name": "学校",
-                    "count": 20,
+                    "count": 23,
                 },
                 {
                     "name": "加油（汽）站",
-                    "count": 20,
+                    "count": 10,
                 },{
                     "name": "地铁站",
-                    "count": 11,
-                },{
-                    "name": "街镇消防力量",
-                    "count": 7,
+                    "count": 4,
                 }
+                
             ],
         staticData:{
             array:[],
@@ -1117,7 +1115,7 @@ export default {
                     "facilityType":34
                 },
                 {
-                    "streetTown": "流动消防站（二级",
+                    "streetTown": "流动消防站（二级）",
                     "count": 5,
                     "color": "#73FBFD",
                     "facilityType":35
@@ -1136,11 +1134,11 @@ export default {
         selectVideoData: [],
             tabsArea: "fx", //切换
             diversionArea: [
-                { name: "疏导区总面积", value: 61.46, unit: "km²", color: "#7DD807" },
+                { name: "疏导区总面积", value: 57.41, unit: "km²", color: "#7DD807" },
                 { name: "华漕镇", value: 28.2, unit: "km²", color: "#01C3B4" },
                 { name: "新虹街道", value: 19.26, unit: "km²", color: "#01C3B4" },
-                { name: "七宝镇", value: 7, unit: "㎡", color: "#01C3B4" },
-                { name: "虹桥镇", value: 7, unit: "km²", color: "#01C3B4" },
+                { name: "七宝镇", value: 7, unit: "k㎡", color: "#01C3B4" },
+                { name: "虹桥镇", value: 2.95, unit: "km²", color: "#01C3B4" },
                 
                 { name: "分管领导", value: 20, unit: "人", color: "#058DFE" },
                 { name: "增援干部", value: 11, unit: "人", color: "#058DD1" },
@@ -1502,14 +1500,40 @@ export default {
         // this.sadianSelect(this.checkedArray.checkedData[0]);  //撒点
         this.getStaticData(this.value111)   //疏导区社会单位情况统计
         this.getZQStaticData()  //执勤战备力量部署
+        // this.llbutj()//力量部署统计
     },
     methods: {
+        /**
+         * 力量部署统计
+         */
+        llbutj(){
+            this.$axios.post(this.$api.water.baseGgpFacilityStatistic,{
+                    "facilityType": [33,34,35,36] ,
+                    "statisticType":"facilityType",
+            }).then((res) => {
+                console.log(2222,res)
+                for(let i =0;i<res.data.length;i++){
+                    if(res.data[i].facilityType == "33"){
+                        this.staticData.array1[0].count = res.data[i].count
+                    }
+                    if(res.data[i].facilityType == "34"){
+                        this.staticData.array1[1].count = res.data[i].count
+                    }
+                    if(res.data[i].facilityType == "35"){
+                        this.staticData.array1[2].count = res.data[i].count
+                    }
+                    if(res.data[i].facilityType == "36"){
+                        this.staticData.array1[3].count = res.data[i].count
+                    }
+                }
+            })
+        },
         goPoints(type){
             // alert(type)
             this.$axios.post(this.$api.water.baseGgpFacilityList,{
                                 "facilityType": [type ] 
                         }).then((res) => {
-                            console.log(res)
+                            console.log(123,res)
                                 let arr = []
                                 if(res.data.length>0){
                                         arr = res.data;
@@ -1540,9 +1564,9 @@ export default {
                                         arr = res.data;
                                         this.arrayData= res.data;
                                         if(type=='29'){
-                                            this.addMarker(arr, "security-plan", "养老机构安全隐患清单")
+                                            this.addMarker(arr, "security-plan", "养老机构")
                                         }else if(type=='30'){
-                                            this.addMarker(arr, "security-plan", "医疗机构安全隐患清单")
+                                            this.addMarker(arr, "security-plan", "医疗机构")
                                         }
                                 }  
                         });