1

.gitignore

@@ -1,7 +1,7 @@
 .DS_Store
 node_modules
 /dist
-
+MH*
 
 # local env files
 .env.local

src/components/funnel/index.vue

@@ -31,14 +31,15 @@ export default {
           "rgba(255,199,6,1)",
           "rgba(11,255,109,1)",
           "rgba(10,218,255,1)",
+          "rgba(12,210,0,1)",
         ],
         series: [
           {
             zlevel: 1,
             name: "漏斗图",
             type: "funnel",
-            right: 0,
-            top: 20,
+            left: 30,
+            top: 0,
             bottom: 0,
             width: "100%",
             min: 0,
@@ -62,7 +63,7 @@ export default {
             },
             labelLine: {
               show: true,
-              length: 80,
+              length: 50,
               lineStyle: {
                 width: 1,
                 type: "solid",

src/components/mixins/map-data.js

@@ -107,7 +107,7 @@ export default {
                             id: val.attributes.code,
                             position: { x: Number(val.attributes.center_x), y: Number(val.attributes.center_y), z: 0 },
                             element: `<div class='ysc-dynamic-layer ys-css3-box' onclick="vue.clickFlag(${val.attributes.code})"><div class='biaozhu'>${val.attributes.name}   ${val.attributes.code}</div></div>`
-                        }, { isZoom: false,})
+                        }, { isZoom: false, })
                     });
                 }
             })
@@ -172,11 +172,7 @@ export default {
                 !item.some(val => val.addressId === next.addressId) && item.push(next)
                 return item
             }, []);
-            console.log(target)
-            console.log(Math.floor(target.length / 100))
             for (let item = 0; item < Math.floor(target.length / 100); item++) {
-                console.log(item)
-                console.log(target.slice(item * 100, (item + 1) * 100).map(val => val.addressId).join())
                 setTimeout(() => {
                     window.jMap.locateMph(
                         target.slice(item * 100, (item + 1) * 100).map(val => val.addressId).join(), {

src/views/comprehensive-disposal.vue

@@ -225,7 +225,7 @@ export default {
         // { prop: "bcxx", name: "原因" },
         { prop: "czdx", name: "处置对象" },
         { prop: "zhongdui", name: "所属中队" },
-        // { prop: "ajzt", name: "状况" },
+        { prop: "ajzt", name: "状态" },
       ],
       isVideo:false,
       playerOptions: {

src/views/fire-signs.vue

@@ -8,28 +8,28 @@
             <div class="flexBoxE">
               <el-row>
                 <el-col>
-                  <span>挂牌督办</span>
+                  <span>一级数量</span>
                   <el-progress  :text-inside="true" :percentage="20"  :stroke-width="25" color="#eb6262">
                     <span>40家</span>
                     <div class="totle"> 20%</div>
                   </el-progress>
                 </el-col>
                 <el-col>
-                  <span>存在隐患</span>
+                  <span>二级数量</span>
                   <el-progress :text-inside="true" :percentage="40"  :stroke-width="25" color="#eecd2d">
                      <span>40家</span>
                     <div class="totle"> 40%</div>
                   </el-progress>
                 </el-col>
                 <el-col>
-                  <span>加强管理</span>
+                  <span>三级数量</span>
                   <el-progress :text-inside="true" :percentage="80"  :stroke-width="25" color="#7689d6">
                     <span>40家</span>
                     <div class="totle"> 80%</div>
                   </el-progress>
                 </el-col>
                 <el-col>
-                  <span>相对安全</span>
+                  <span>四级数量</span>
                   <el-progress  :text-inside="true" :percentage="60"  :stroke-width="25" color="#20c098">
                      <span>40家</span>
                     <div class="totle"> 60%</div>

src/views/head.vue

@@ -97,7 +97,7 @@ export default {
         (day.getDate() < 10 ? "0" + day.getDate() : day.getDate()) +
         "日" +
         "星期" +
-        this.dataWeekList[day.getDay()];
+        this.dataWeekList[day.getDay()-1];
       this.dataTime =
         (day.getHours() < 10 ? "0" + day.getHours() : day.getHours()) +
         ":" +

src/views/self-management.vue

@@ -28,7 +28,7 @@
           </el-row>
         </el-col>
         <el-col class="leftBot">
-          <h4>维保记录</h4>
+          <h4>单位自主巡检情况</h4>
             <se-table
               ref="seTable"
               :dataMap="tableData"
@@ -142,11 +142,15 @@ export default {
         {address:'2020-01-01',burnedArea:'某某单位',propertyLoss:'查看',deathToll:'张三',nonFatal:'13000000729',disasterHome:'拆除'},
       ],
       headerData: [
-        { prop: "address", name: "维保时间" },
-        { prop: "burnedArea", name: "维保单位" },
-        { prop: "propertyLoss", name: "维保点位" },
-        { prop: "deathToll", name: "相关责任人" },
-        { prop: "nonFatal", name: "联系电话" },
+        { prop: "address", name: "巡查时间" },
+        { prop: "burnedArea", name: "巡查区域" },
+        { prop: "propertyLoss", name: "巡查人员" },
+        { prop: "deathToll", name: "巡查情况" },
+        { prop: "nonFatal", name: "隐患发现情况" },
+        { prop: "nonFatal", name: "隐患整改情况" },
+        { prop: "nonFatal", name: "预计整改完成时间" },
+        { prop: "nonFatal", name: "复检情况" },
+        { prop: "nonFatal", name: "阶段性巡检报告" },
       ],
       tableData1: [
         {address:'数量',burnedArea:100,property:200,deathTol:100,nonFatal:100,},

src/views/water-sources.vue

@@ -207,7 +207,8 @@ export default {
         funnelList:[
           {data:0,reaVal:0,value:20},
           {data:0,reaVal:0,value:40},
-          {data:0,reaVal:0,value:60}
+          {data:0,reaVal:0,value:60},
+          {data:0,reaVal:0,value:80}
         ]
       },
     };
@@ -309,6 +310,7 @@ export default {
           {name:'市政水源',reaVal:(this.fireWaterStatisticsObj.municipalWater/total).toFixed(2) * 100,data:this.fireWaterStatisticsObj.municipalWater},
           {name:'居民水源',reaVal:(this.fireWaterStatisticsObj.residentWater/total).toFixed(2) * 100,data:this.fireWaterStatisticsObj.residentWater},
           {name:'单位水源',reaVal:(this.fireWaterStatisticsObj.unitWater/total).toFixed(2) * 100,data:this.fireWaterStatisticsObj.unitWater},
+          {name:'天然水源',reaVal:(this.fireWaterStatisticsObj.unitWater/total).toFixed(2) * 100,data:this.fireWaterStatisticsObj.unitWater},
         ].sort((a,b)=>{
           return a.data - b.data
         })
@@ -555,16 +557,18 @@ export default {
           flex: 1;
           width: 100%;
           box-sizing: border-box;
-          padding-bottom: 0.25rem;
+          padding: .125rem 0;
           & > .el-col:last-child {
             height: 100%;
             display: flex;
+            flex-direction: column;
             justify-content: space-between;
             align-items: center;
             flex-wrap: wrap;
             & > .el-col {
               width: 100%;
               height: 0.625rem;
+              flex: none;
               background-image: linear-gradient(
                 90deg,
                 transparent 0%,
@@ -602,6 +606,11 @@ export default {
                 color: #00d4ff;
               }
             }
+            & > .el-col:nth-child(4) {
+              & > span:last-child {
+                color: rgba(12,210,0,1);
+              }
+            }
           }
         }
         .gaugeCon {