夜仔 3 лет назад
Родитель
Сommit
954a61da05
4 измененных файлов с 24 добавлено и 20 удалено
  1. 2 1
      proxy-dev.js
  2. 2 0
      src/views/fire-data-analysis.vue
  3. 6 8
      src/views/fire-signs.vue
  4. 14 11
      src/views/self-management.vue

+ 2 - 1
proxy-dev.js

@@ -4,7 +4,8 @@ module.exports = {
     table: {
         '/': {
             // target: 'http://172.200.50.17:8083',
-            target: 'http://172.16.120.104:8083',
+            target: 'http://120.55.70.156/api',
+            // target: 'http://172.16.120.104:8083',
             ws: true, // 代理websockets
             changeOrigin: true,
             pathRewrite: { '': '/' } // '^/api' 是一个正则表达式,作用:将 /api 提换成为 /

+ 2 - 0
src/views/fire-data-analysis.vue

@@ -137,7 +137,9 @@ export default {
         { prop: "deathToll", name: "死亡人数(人)" },
         { prop: "nonFatal", name: "受伤人数(人)" },
         { prop: "disasterHome", name: "受灾户(户)" },
+        { prop: "nature", name: "场所性质" },
         { prop: "fireCause", name: "火灾原因" },
+        { prop: "fireGoodsOne", name: "起火物" },
       ],
       fireAddressList: [],
       fireTypeList: [],

+ 6 - 8
src/views/fire-signs.vue

@@ -148,14 +148,12 @@ export default {
       fireAddressList: [],
       fireTypeList: [],
       complaintList: [
-        { name: "出文情况", value: 341 },
-        { name: "接警处", value: 155 },
-        { name: "检查数量", value: 156 },
-        { name: "处罚情况", value: 118 },
-        { name: "设施设备", value: 322 },
-        { name: "消防隐患", value: 156 },
-        { name: "整改情况", value: 156 },
-        { name: "查封情况", value: 156 },
+        { name: "区域设施状况", value: 341 },
+        { name: "区域历史火灾", value: 155 },
+        { name: "区域隐患状态", value: 156 },
+        { name: "区域建筑整体风险", value: 118 },
+        { name: "区域执法监管安全", value: 322 },
+        { name: "区域场所行业风险", value: 156 },
       ],
       reportComplaintList:[],
       fireCauseRatioList: [

+ 14 - 11
src/views/self-management.vue

@@ -10,19 +10,19 @@
                 <el-row class="rightTopChart">
                   <gauge ref="gauge1" :dataMap="0.2" :dataNumber="20" color="#F68E6A"></gauge>
                 </el-row>
-                <el-row class="rightTopNumber">消防微站数</el-row>
+                <el-row class="rightTopNumber">消防重点企业数量</el-row>
               </el-row>
               <el-row>
                 <el-row class="rightTopChart">
                   <gauge ref="gauge2" :dataMap="0.3" :dataNumber="30" color="#06B1B9"></gauge>
                 </el-row>
-                <el-row class="rightTopNumber">消防持证人数</el-row>
+                <el-row class="rightTopNumber">火灾高危企业数量</el-row>
               </el-row>
               <el-row>
                 <el-row class="rightTopChart">
                   <gauge ref="gauge3" :dataMap="0.5"  :dataNumber="50" color="#E4951E"></gauge>
                 </el-row>
-                <el-row class="rightTopNumber">培训合格率</el-row>
+                <el-row class="rightTopNumber">一般企业数量</el-row>
               </el-row>
             </div>
           </el-row>
@@ -161,21 +161,24 @@ export default {
         { prop: "property", name: "烟感设备" },
         { prop: "deathTol", name: "温感设备" },
         { prop: "nonFatal", name: "水压设备" },
+        { prop: "nonFatal", name: "其他物联设施" },
       ],
       fireAddressList: [],
       fireTypeList: [],
       complaintList: [
-           {name: "消防体征指数",value: 341},
-           {name: "健康指数",value: 155},
-           {name: "设施设备",value: 156},
-           {name: "处罚情况",value: 118},
-           {name: "隐患情况",value: 322},
-           {name: "投诉情况",value: 156},
-           {name: "火灾情况",value: 156},
-           {name: "自主管理情况",value: 156},
+           {name: "设施状况指数",value: 341},
+           {name: "自主管理指数",value: 155},
+           {name: "隐患状态指数",value: 156},
+           {name: "建筑整体指数",value: 118},
+           {name: "执法监管指数",value: 322},
       ],
     };
   },
+
+
+
+
+
   created() {
     // this.getData();
   },