Merge branch 'zz-test' into master

# Conflicts:
#	app/src/views/Home/components/MapCharts.vue

app/src/views/Basic/components/ChronologicDistributionStatistics.vue

@@ -153,7 +153,7 @@ export default {
       window.onresize = this.chart.resize;
 
       // 自动轮播
-      toolUtils.autoHover(this.chart, option, data.length, 2000);
+      toolUtils.autoHover(this.chart, option, data.length, 5000);
     },
   },
 };

app/src/views/Basic/components/HeightDistribution.vue

@@ -171,7 +171,7 @@ export default {
 
       // 自动轮播
       console.log(data);
-      toolUtils.autoHover(this.chart, option, data.length, 2000);
+      toolUtils.autoHover(this.chart, option, data.length, 5000);
     },
     openBasicModal() {
       this.showModal("basicInfoModal");

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

@@ -169,7 +169,7 @@ export default {
       this.chart.setOption(option);
 
       // 自动轮播
-      toolUtils.autoHover(this.chart, option, this.legend.length, 2000);
+      toolUtils.autoHover(this.chart, option, this.legend.length, 5000);
     },
     clickItemHandler(index) {
       this.activeIndex = index;

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

@@ -238,7 +238,7 @@ export default {
       };
       this.chart.setOption(option);
       // 自动轮播
-      toolUtils.autoHover(this.chart, option, this.legend.length, 2000);
+      toolUtils.autoHover(this.chart, option, this.legend.length, 5000);
       // console.log(this.legend);
     },
     loadData() {

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

@@ -50,7 +50,7 @@ export default {
   mounted() {
     this.reload();
     // 自动轮播
-    toolUtils.autoHover(this.chart, this.option, 24, 2000);
+    toolUtils.autoHover(this.chart, this.option, 24, 5000);
   },
   watch: {
     qx: {

app/src/views/FireCondition/components/KeyIndex/KeyChart.vue

@@ -127,7 +127,7 @@ export default {
       this.chart.setOption(option);
       this.chart;
       // 自动轮播
-      toolUtils.autoHover(this.chart, option, 12, 2000);
+      toolUtils.autoHover(this.chart, option, 12, 5000);
     },
     reload() {
       // 重载数据

app/src/views/Home/components/FirstHight.vue

@@ -406,7 +406,7 @@ export default {
       //自适应图表
       window.onresize = this.chart.resize;
       // 自动轮播
-      toolUtils.autoHover(this.chart, option, 3, 2000);
+      toolUtils.autoHover(this.chart, option, 3, 5000);
     },
   },
 };

app/src/views/Home/components/HiddenDangerDetection/HiddenDangerType.vue

@@ -178,7 +178,7 @@ export default {
           },
         ],
       };
-      toolUtils.autoHover(this.chart, option, 4, 2000);
+      toolUtils.autoHover(this.chart, option, 4, 5000);
       this.chart.setOption(option);
       //自适应图表
       window.onresize = this.chart.resize;

app/src/views/Home/components/HiddenDangerDetection/RectificationChart.vue

@@ -175,7 +175,7 @@ export default {
           },
         ],
       };
-      toolUtils.autoHover(this.chart, option, 3, 2000);
+      toolUtils.autoHover(this.chart, option, 3, 5000);
       this.chart.setOption(option);
       //自适应图表
       window.onresize = this.chart.resize;

app/src/views/Home/components/MapCharts.vue

@@ -591,7 +591,7 @@ export default {
       };
       this.mapChart = echarts.init(mapChart, "light");
       this.mapChart.setOption(option);
-    // toolUtils.autoHover(this.mapChart, option, 24, 2000);
+    toolUtils.autoHover(this.mapChart, option, 24, 5000);
       // 图表对象响应式设置
       window.addEventListener("resize", () => {
         this.mapChart.resize();

app/src/views/Home/components/WisdomFire.vue

@@ -8,7 +8,7 @@
             ><img src="@/assets/images/Vector (3).png" alt="" />
             <span>已接入物联网建筑数</span>
           </span>
-          <span class="num">{{ iotList.wlwlds }}</span>
+          <span class="num">{{ iotList?.wlwlds }}</span>
           <span class="build-line">栋</span>
         </div>
       </div>
@@ -19,16 +19,16 @@
           <div class="build">
             <span
               >设备总数
-              <span class="num">{{ iotList.jrsbzs }}</span> 个
+              <span class="num">{{ iotList?.jrsbzs }}</span> 个
             </span>
             <span
               >在线
-              <span class="online">{{ iotList.jrsbzxs }}</span>个
+              <span class="online">{{ iotList?.jrsbzxs }}</span>个
             </span>
             <span
               >警告
               <span class="warning">{{
-                iotList.gjlds ? iotList.gjlds : 0
+                iotList?.gjlds ? iotList?.gjlds : 0
               }}</span>个
             </span>
           </div>

app/src/views/Home/index.vue

@@ -52,10 +52,10 @@
       <BasicInfoModalContent :qy="qy" />
     </basic-modal>
     <basic-modal top="120px" ref="feirModal1" name="智慧消防">
-      <fxfbCont :qx="qy" />
+      <fxfbCont :qy="qy" />
     </basic-modal>
     <basic-modal top="120px" ref="autoManageModal"  name="自主管理">
-      <zzglModul :qx="qy" />
+      <zzglModul :qy="qy" />
     </basic-modal>
   </div>
 </template>

app/src/views/Iot/components/fxfbCont.vue

@@ -53,6 +53,7 @@
 		watch: {
 			qy: {
 				handler(val) {
+					console.log('-----',val);
 					this.value = val;
 					this.funUnitList();
 					this.handUnitList();
@@ -74,7 +75,7 @@
 					...this.params,
 					
 				}).then((res) => {
-					this.options = res.data.rows;
+					this.tableData = res.data.rows;
 					this.total = res.data.total;
 				});
 			},
@@ -92,27 +93,6 @@
 					qy: this.value === "重庆市" ? "" : this.value,
 				}).then((res) => {
 					const list = res.data.rows[0];
-					// this.unitList = [{
-					// 		title: "高层建筑总数(栋)",
-					// 		unitNum: list.ggjz + list.gyjz + list.zzjz,
-					// 	},
-					// 	{
-					// 		title: "超高层建筑总数(栋)",
-					// 		unitNum: list.cggjz,
-					// 	},
-					// 	{
-					// 		title: "老旧高层建筑总数(栋)",
-					// 		unitNum: list.ljzzgc,
-					// 	},
-					// 	{
-					// 		title: "公共建筑总数(栋)",
-					// 		unitNum: list.ggjz,
-					// 	},
-					// 	{
-					// 		title: "住宅建筑总数(栋)",
-					// 		unitNum: list.zzjz,
-					// 	},
-					// ];
 				});
 			},
 			resetForm() {
@@ -148,7 +128,7 @@
 			<div class="maintenance-supervision_header">
 				<div class="select-item">
 					<el-select v-model="value" placeholder="请选择">
-						<el-option :value="item.qx" :label="item.qx" v-for="(item, index) in options"
+						<el-option :value="item.areaTitle" :label="item.areaTitle" v-for="(item, index) in options"
 							:key="index">
 						</el-option>
 					</el-select>
@@ -177,7 +157,7 @@
 			</div>
 		</div>
 
-		<basic-table :data="options" @row-click="rowClickHandler" style="text-align: center">
+		<basic-table :data="tableData" @row-click="rowClickHandler" style="text-align: center">
 			<el-table-column type="index" label="序号"> </el-table-column>
 			<el-table-column prop="qx" label="区域" show-overflow-tooltip>
 			</el-table-column>