Merge branch 'zz-test' into master

# Conflicts:
#	app/src/views/FireCondition/components/hzfxCont.vue

app/src/views/Fire/components/Management.vue

@@ -13,7 +13,7 @@
         </button-group-item>
       </button-group>
     </div>
-    <div v-if="checked === 0">
+    <div v-if="checked === 0" @click="open">
       <div class="row header">
         <span class="num">序号</span>
         <span class="time">管理单位名称</span>
@@ -25,7 +25,7 @@
         class="warp"
       >
         <ul class="item">
-          <li class="row" v-for="(item, index) in gldListL" :key="index" @click="ToUnitInfo(item)">
+          <li class="row" v-for="(item, index) in gldListL" :key="index" >
             <span class="num">{{ index + 1 }}</span>
             <span class="time">{{ item.glzthztjzd }}</span>
             <span class="person">{{ item.gljzs }}</span>
@@ -40,7 +40,7 @@
       </VueSeamlessScroll>
     </div>
 
-    <div v-if="checked === 1">
+    <div v-if="checked === 1" @click="open">
       <div class="row header">
         <span class="num">序号</span>
         <span class="time">维保单位名称</span>
@@ -79,7 +79,7 @@
         class="warp"
       >
         <ul class="item">
-          <li class="row" v-for="(item, index) in JzrzdList" :key="index">
+          <li class="row" v-for="(item, index) in JzrzdList" :key="index" @click="ToUnitInfo(item)">
             <span class="num">{{ index + 1 }}</span>
             <span class="time">{{ item.gcjzmc }}</span>
             <span
@@ -93,11 +93,15 @@
         </ul>
       </VueSeamlessScroll>
     </div>
+     <!-- 管理单位弹窗 -->
+     <basic-modal top="120px" ref="gldwModal" name="管理单位" width="90%">
+      <GldwModalContent :default="gldwModal" />
+    </basic-modal>
   </div>
 </template>
 <script>
 import VueSeamlessScroll from "vue-seamless-scroll";
-
+import GldwModalContent from "../../Detail/components/GldwModalContent.vue";
 export default {
   name: "MaintenanceSupervision",
   props: {
@@ -108,10 +112,12 @@ export default {
   data() {
     return {
       checked: 0,
+      gldwModal:{}
     };
   },
   components: {
     VueSeamlessScroll,
+    GldwModalContent
   },
   computed: {
     classOption() {
@@ -132,11 +138,14 @@ export default {
         否: "#df575b",
       }[text];
     },
-    // 跳转独栋
+    // 跳转独栋(目前未加ID)
     ToUnitInfo(item){
       console.log('-----建筑ID',item);
       return
       this.$router.push(`/detail?id=${item.id}`);
+    },
+    open(){
+      this.showModal('gldwModal')
     }
   },
 };

app/src/views/FireCondition/components/FireHistory.vue

@@ -10,7 +10,12 @@
     </div>
     <VueSeamlessScroll :data="list" :class-option="classOption" class="warp">
       <ul class="item">
-        <li class="row" v-for="(item, index) in list" :key="index">
+        <li
+          class="row"
+          v-for="(item, index) in list"
+          :key="index"
+          @click="ToUnitInfo(item)"
+        >
           <span class="idx">{{ index + 1 }}</span>
           <span class="time">{{ item.zqsj }}</span>
           <span class="name">{{ item.zqdd }}</span>
@@ -24,7 +29,7 @@
 </template>
 
 <script>
-import { historyData } from '@/api/hzfx'
+import { historyData } from "@/api/hzfx";
 import VueSeamlessScroll from "vue-seamless-scroll";
 export default {
   name: "RegionalComp",
@@ -32,7 +37,7 @@ export default {
     VueSeamlessScroll,
   },
   props: {
-    qx: String
+    qx: String,
   },
   data() {
     return {
@@ -40,22 +45,25 @@ export default {
     };
   },
   created() {
-    this.loadData()
+    this.loadData();
   },
   watch: {
     qx() {
       this.loadData();
-    }
+    },
   },
   methods: {
     loadData() {
       historyData({
         pageSize: 100,
-        qx: (this.qx === '重庆市' ? '' : this.qx)
-      }).then(res => {
-        this.list = res.data.rows
-      })
-    }
+        qx: this.qx === "重庆市" ? "" : this.qx,
+      }).then((res) => {
+        this.list = res.data.rows;
+      });
+    },
+    ToUnitInfo(item) {
+      window.location.href = `/detail?id=${item.jzid}`;
+    },
   },
   computed: {
     classOption() {
@@ -80,7 +88,7 @@ export default {
 }
 
 .header {
-  color: #61DBFF !important;
+  color: #61dbff !important;
   height: 38px !important;
   background-color: rgba(0, 163, 255, 0.3) !important;
   margin-top: 2px;
@@ -128,7 +136,7 @@ a {
   }
 
   .idx {
-    flex: .1;
+    flex: 0.1;
   }
 
   .time {
@@ -138,10 +146,10 @@ a {
     flex: 0.2;
     font-size: 12px;
     text-align: center;
-      display: inline-block;
-      overflow: hidden;
-      text-overflow: ellipsis !important; // 超出隐藏
-      white-space: nowrap;
+    display: inline-block;
+    overflow: hidden;
+    text-overflow: ellipsis !important; // 超出隐藏
+    white-space: nowrap;
   }
   .count {
     flex: 0.2;

app/src/views/FireCondition/components/hzfxCont.vue

@@ -20,6 +20,9 @@
 				options: [],
 				options1: [],
 				options2: [],
+				tableData: [],
+				tableData1: [],
+				tableData2: [],
 				unitList: [],
 				value: "全市",
 				params: {

app/src/views/FireCondition/index.vue

@@ -21,8 +21,8 @@
 				</div>
 			</div>
 			<div class="center-box">
-				<border-panel class="fire-time" :header-type="3" height="313px" width="955px" style="margin: 7px"
-					title="火灾时段（24时）">
+				<border-panel class="fire-time" :header-type="3" height="313px" width="955px" style="margin: 7px;cursor: pointer;"
+					title="火灾时段（24时）" @click="opemFries">
 					<FireTime :qx="qx" :type="type" />
 					<template #ext-header>
 						<button-block :items="['本年', '近5年', '季节']" @select-item="selectItemHandler" />
@@ -41,6 +41,9 @@
 		<basic-modal top="120px" ref="basicInfoModal" name="火灾分析">
 			<hzfxCont :qx="qx" /> 
 		</basic-modal>
+		<basic-modal top="120px" ref="HistoryModal" name="历史火灾查询">
+      <hzfbCont :qy="qx" />
+    </basic-modal>
 	</div>
 </template>
 <script>
@@ -52,7 +55,8 @@
 	import FireTime from './components/FireTime.vue'
 	import SearchBox from '@/components/SearchBox.vue';
 	import MapCharts from "../Home/components/MapCharts.vue";
-	import hzfxCont from './components/hzfxCont.vue';
+	import hzfxCont from "./components/hzfxCont.vue";
+	import hzfbCont from "./components/hzfbCont.vue";
 	import { fireDistribution } from '@/api/hzfx'
 	import {
 		formatCityData
@@ -69,6 +73,7 @@
 			SearchBox,
 			MapCharts,
 			hzfxCont,	
+			hzfbCont
 		},
 		data() {
 			return {
@@ -106,6 +111,9 @@
 						value: item.bnhzqs
 					})))
 				})
+			},
+			opemFries(){
+				this.showModal('HistoryModal')
 			}
 		}
 	};

app/src/views/Risk/components/RiskDanger.vue

@@ -12,7 +12,7 @@
           class="warp"
         >
           <ul class="item">
-          <li class="row" v-for="(item, index) in list" :key="index">
+          <li class="row" v-for="(item, index) in list" :key="index" @click="open(item)">
               <span class="type">{{ index+1 }}</span>
               <span class="count">{{ item.gcjzmc }}</span>
               <span
@@ -77,6 +77,10 @@
           }).then(res => {
             this.list = res.data.rows
           })
+        },
+        // 跳转独栋(ID)
+        open(item){
+          console.log(item);
         }
       }
     };