Sfoglia il codice sorgente

feat:首页地图增加感叹号

LAPTOP-U5GOA5HA\zz 1 anno fa
parent
commit
8ea503b9a6

BIN
app/src/assets/images/gcjz-wh.jpg


BIN
app/src/assets/images/gcjz-wh2.png


+ 1 - 0
app/src/views/Home/components/FireIndex/Chart.vue

@@ -169,6 +169,7 @@ export default {
     },
     reload() {
       // 重载数据
+      console.log('=============',this.items);
       if (this.chart) {
         const max = this.items
           .map((item) => parseInt(item.value || 0))

+ 2 - 2
app/src/views/Home/components/NewMapChartsCategory.vue

@@ -1,10 +1,10 @@
 <template>
   <div style="position: relative; width: 100%; height: 632px;">
     <div class="map-box" ref="map"></div>
-    <basic-modal top="30px" ref="whFxModal" name="区域高层建筑消防安全风险分色判定标准" width="90%">
+    <basic-modal top="30px" ref="whFxModal" name="全市区域高层消防安全风险评估指标体系" width="90%">
 
         <div style="display: flex; justify-content: center;">
-          <img  src="../../../assets/images/map-tip.png" />
+          <img  src="../../../assets/images/gcjz-wh2.png" />
         </div>
         <!-- <div v-html="textInfo"></div> -->
     </basic-modal>

+ 56 - 42
app/src/views/Home/components/UnitInformation.vue

@@ -31,8 +31,8 @@ export default {
       unitList: [],
       value: "重庆市",
       params: {
-        pageSize: 10,
         pageNum: 1,
+        pageSize: 10,
       },
       total: 0,
       times: [],
@@ -41,41 +41,25 @@ export default {
   watch: {
     qy: {
       handler(val) {
+        console.log(val);
         this.value = val;
         this.funUnitList();
       },
       immediate: true,
     },
-    default: {
-      handler() {
-        let params = {};
-        if (this.default) {
-          Object.assign(params, this.default);
-        }
-        this.params = params;
-        this.funUnitList();
-      },
-      immediate: true,
-      deep: true,
-    },
   },
   methods: {
     rowClickHandler(val) {
       // this.$router.push(`/detail?id=${val.id}`);
     },
     funUnitList() {
-      getQyrs({
-        ...this.params,
+        const params={
+        pageNum:this.params.pageNum,
+        pageSize:this.params.pageSize,
         qx: this.value === "重庆市" ? "" : this.value,
-      }).then((res) => {
+      }
+      getQyrs(params).then((res) => {
         let list = res.data.rows;
-        console.log('--------->>.',list);
-        list.map((item) => {
-          if (item.zjccss) {
-            // item.zjccss
-            item.zjccss = (item.zjccss / 10000).toFixed(2);
-          }
-        });
         this.tableData = list;
         this.total = res.data.total;
       });
@@ -88,24 +72,12 @@ export default {
       this.params.pageNum = val;
       this.funUnitList();
     },
-    resetForm() {
-      this.qhyy1 = "";
-      this.zqsj = "";
-      this.sw = "";
+    resetForm() {  
       this.value = "";
-      this.search = "";
-      this.qhsd = null;
       (this.params = {
         pageSize: 10,
         pageNum: 1,
       }),
-        // this.params.Unittype = ""; // 建筑分类
-        // this.params.year = ""; // 年代
-        // this.params.hnum = ""; //高度
-        // this.params.management = ""; //管理形式
-        // this.params.subject = ""; //管理主体
-        // this.params.maintenance = ""; //维保形式
-        // this.params.risklevel = ""; //风险等级
         this.funUnitList();
     },
   },
@@ -157,17 +129,59 @@ export default {
       <el-table-column type="index" label="序号"> </el-table-column>
       <el-table-column prop="qx" label="区县" show-overflow-tooltip>
       </el-table-column>
-      <el-table-column prop="zqdd" label="高层建筑名称" show-overflow-tooltip>
+      <el-table-column prop="人口密度" label="人口密度" show-overflow-tooltip>
+      </el-table-column>
+      <el-table-column prop="人口密度排名" label="人口密度排名" show-overflow-tooltip>
+      </el-table-column>
+      <el-table-column prop="公众消防安全常识知晓率" label="公众消防安全常识知晓率" show-overflow-tooltip>
+      </el-table-column>
+      <el-table-column prop="公众消防安全常识知晓率排名" label="公众消防安全常识知晓率排名" show-overflow-tooltip>
+      </el-table-column>
+      <el-table-column prop="大型商业综合体数量" label="大型商业综合体数量">
+      </el-table-column>
+      <el-table-column prop="大型商业综合体数量排名" label="大型商业综合体数量排名" show-overflow-tooltip>
+      </el-table-column>
+      <el-table-column prop="消防远程监控系统覆盖率" label="消防远程监控系统覆盖率" show-overflow-tooltip>
+      </el-table-column>
+      <el-table-column prop="消防远程监控系统覆盖率排名" label="消防远程监控系统覆盖率排名">
+      </el-table-column>
+      <el-table-column prop="火灾亡人数" label="火灾亡人数" show-overflow-tooltip>
+      </el-table-column>
+      <el-table-column prop="火灾亡人数排名" label="火灾亡人数排名" show-overflow-tooltip>
+      </el-table-column>
+      <el-table-column prop="火灾直接财产损失数" label="火灾直接财产损失数" show-overflow-tooltip>
+      </el-table-column>
+      <el-table-column prop="火灾直接财产损失数排名" label="火灾直接财产损失数排名" show-overflow-tooltip>
+      </el-table-column>
+      <el-table-column prop="火灾起数" label="火灾起数" show-overflow-tooltip>
+      </el-table-column>
+      <el-table-column prop="火灾起数排名" label="火灾起数排名" show-overflow-tooltip>
+      </el-table-column>
+      <el-table-column prop="百栋高层建筑消防站拥有率" label="百栋高层建筑消防站拥有率" show-overflow-tooltip>
+      </el-table-column>
+      <el-table-column prop="百栋高层建筑消防站拥有率排名" label="百栋高层建筑消防站拥有率排名" show-overflow-tooltip>
+      </el-table-column>
+      <el-table-column prop="百栋高层建筑高技术性能消防车拥有率" label="百栋高层建筑高技术性能消防车拥有率" show-overflow-tooltip>
+      </el-table-column>
+      <el-table-column prop="百栋高层建筑高技术性能消防车拥有率排名" label="百栋高层建筑高技术性能消防车拥有率排名" show-overflow-tooltip>
+      </el-table-column>
+      <el-table-column prop="超高层建筑数量" label="超高层建筑数量" show-overflow-tooltip>
+      </el-table-column>
+      <el-table-column prop="超高层建筑数量排名" label="超高层建筑数量排名" show-overflow-tooltip>
+      </el-table-column>
+      <el-table-column prop="重大火灾隐患数" label="重大火灾隐患数" show-overflow-tooltip>
+      </el-table-column>
+      <el-table-column prop="重大火灾隐患数排名" label="重大火灾隐患数排名" show-overflow-tooltip>
       </el-table-column>
-      <el-table-column prop="zqsj" label="起火时间" show-overflow-tooltip>
+      <el-table-column prop="高层建筑密度排名" label="高层建筑密度排名" show-overflow-tooltip>
       </el-table-column>
-      <el-table-column prop="rysws" label="亡人数(人)" show-overflow-tooltip>
+      <el-table-column prop="高层建筑面积密度" label="高层建筑面积密度" show-overflow-tooltip>
       </el-table-column>
-      <el-table-column prop="srs" label="伤人数(人)" show-overflow-tooltip>
+      <el-table-column prop="高层建筑风险预警指数" label="高层建筑风险预警指数" show-overflow-tooltip>
       </el-table-column>
-      <el-table-column prop="zjccss" label="直接经济损失(万元)">
+      <el-table-column prop="高层建筑风险预警指数排名" label="高层建筑风险预警指数排名" show-overflow-tooltip>
       </el-table-column>
-      <el-table-column prop="qhyy1" label="起火原因" show-overflow-tooltip>
+      <el-table-column prop="综合得分" label="综合得分" show-overflow-tooltip>
       </el-table-column>
     </basic-table>
     <br />

+ 2 - 2
utils/request.js

@@ -2,8 +2,8 @@ import axios from 'axios'
 
 // 创建一个axios实例
 const instance = axios.create({
-  // baseURL: 'http://183.66.101.53:8787/api'
-  baseURL: 'http://172.20.16.134:8080'
+  baseURL: 'http://183.66.101.53:8787/api'
+  // baseURL: 'http://172.20.16.134:8080'
   // baseURL: '/api'
 })