Merge branch 'zz-test' into master

# Conflicts:
#	app/src/views/Fire/components/Construction.vue
#	app/src/views/Fire/components/UnitInfo.vue
#	app/src/views/FireCondition/index.vue

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

@@ -1,42 +1,56 @@
 <template>
-	<div>
-		<div class="unit-echats" @click="showHunit(1)">
-			<div class="unit-g">
-				管理形式
-				<unit3D :fierList="fierList" />
-			</div>
-		</div>
-		<div class="unit maintenance">
-			<span class="unit-c">管理主体</span>
-			<div class="unit-num" v-for="(item,index) in glztList" :key="index" @click="showTab">
-				<div>
-					<LinearText style="display: inline-block" :text="item.sl" fontSize="28px"></LinearText>
-					<span>家</span>
-				</div>
-				<div>{{ item.sfzddw}}</div>
-			</div>
-			<!-- <div class="unit-num">
-		  <div>
-		    <LinearText
-		      style="display: inline-block"
-		      text="1223"
-		      fontSize="32px"
-		    ></LinearText>
-		    <span>家</span>
-		  </div>
-		  <div>重点单位</div>
-		</div> -->
-		</div>
-		<div class="unit" @click="showHunit(2)">
-			<span class="unit-w">消防设施维保形式</span>
-			<div class="unit-num" v-for="(item,index) in wbxsList" :key="index">
-				<div>
-					<LinearText style="display: inline-block" :text="item.sl" fontSize="28px"></LinearText>
-					<span>家</span>
-				</div>
-				<div>{{ item.wbxs }}</div>
-			</div>
-			<!-- <div class="unit-num">
+  <div>
+    <div class="unit" @click="showHunit(3)">
+      <span class="unit-c">管理主体</span>
+      <div
+        class="unit-num"
+        v-for="(item, index) in glztList"
+        :key="index"
+        @click="showHunit"
+      >
+        <div>
+          <LinearText
+            style="display: inline-block"
+            :text="item.sl"
+            fontSize="28px"
+          ></LinearText>
+          <span>家</span>
+        </div>
+        <div>重点单位</div>
+      </div>
+      
+      <!-- <div class="unit-num">
+        <div>
+          <LinearText
+            style="display: inline-block"
+            text="1223"
+            fontSize="32px"
+          ></LinearText>
+          <span>家</span>
+        </div>
+        <div>重点单位</div>
+      </div> -->
+    </div>
+    <div class="unit-echats" @click="showHunit(1)">
+      <div class="unit-g">
+        管理形式
+        <unit3D :fierList="fierList" />
+      </div>
+    </div>
+    <div class="unit maintenance" @click="showHunit(2)">
+      <span class="unit-w">维保形式</span>
+      <div class="unit-num" v-for="(item, index) in wbxsList" :key="index">
+        <div>
+          <LinearText
+            style="display: inline-block"
+            :text="item.sl"
+            fontSize="28px"
+          ></LinearText>
+          <span>家</span>
+        </div>
+        <div>{{ item.wbxs }}</div>
+      </div>
+      <!-- <div class="unit-num">
         <div>
           <LinearText
             style="display: inline-block"
@@ -58,136 +72,112 @@
         </div>
         <div>无维保</div>
       </div> -->
-		</div>
+    </div>
 
-		<!-- 弹窗 -->
-		<basic-modal top="120px" ref="higthModal" name="高层建筑管理">
-			<higthList :flag="flag" :qx="qx" />
-		</basic-modal>
-		<basic-modal top="120px" ref="HistoryModal" name="管理单位查询">
-			<GldwModalContent :flag="flag" :qx="qx" />
-		</basic-modal>
-	</div>
+    <!-- 弹窗 -->
+    <basic-modal top="120px" ref="higthModal" name="高层建筑管理">
+      <higthList :flag="flag" :qx="qx" />
+    </basic-modal>
+  </div>
 </template>
 
 <script>
-	import unit3D from "@/components/unit3D.vue";
-	import {
-		gettotalGlxx
-	} from "@/api/management.js";
-	import higthList from "./higthList.vue";
-	import GldwModalContent from "./GldwModalContent.vue";
-	export default {
-		components: {
-			unit3D,
-			higthList,
-			GldwModalContent
-		},
-		props: {
-			qx: String,
-			glztList: Array,
-			wbxsList: Array,
-
-		},
-		data() {
-			return {
-				fierList: [],
-				params: {
-					pageSize: 100,
-					pageNum: 1,
-				},
-				flag: 1
-			};
-		},
-		watch: {
-			qx() {
-				this.manageList()
-			}
-		},
-		methods: {
-			manageList() {
-				gettotalGlxx({
-					...this.params,
-					qx: this.qx === '重庆市' ? "" : this.qx
-				}).then((res) => {
-					this.fierList = res.data.rows.map((item) => {
-						return {
-							name: item.xfaqglxs,
-							value: item.sl,
-						};
-					});
-				});
-			},
-
-			// 弹窗
-			showHunit(val) {
-				this.flag = val
-				this.showModal("higthModal");
-
-			},
-			showTab() {
-				this.showModal("HistoryModal");
+import unit3D from "@/components/unit3D.vue";
+import { gettotalGlxx } from "@/api/management.js";
+import higthList from "./higthList.vue";
+export default {
+  components: { unit3D, higthList },
+  props: {
+    qx: String,
+    glztList: Array,
+    wbxsList: Array,
+  },
+  data() {
+    return {
+      fierList: [],
+      params: {
+        pageSize: 100,
+        pageNum: 1,
+      },
+      flag: 1,
+    };
+  },
+  watch: {
+    qx() {
+      this.manageList();
+    },
+  },
+  methods: {
+    manageList() {
+      gettotalGlxx({
+        ...this.params,
+        qx: this.qx === "重庆市" ? "" : this.qx,
+      }).then((res) => {
+        this.fierList = res.data.rows.map((item) => {
+          return {
+            name: item.xfaqglxs,
+            value: item.sl,
+          };
+        });
+      });
+    },
 
-			}
-		},
-		created() {
-			this.manageList();
-		},
-	};
+    // 弹窗
+    showHunit(val) {
+      this.flag = val;
+      this.showModal("higthModal");
+    },
+  },
+  created() {
+    this.manageList();
+  },
+};
 </script>
 
 <style lang="less" scoped>
-	.unit {
-		display: flex;
-		margin: 5px 0 5px 10px;
-		font-size: 18px;
-
-		.unit-c {
-			display: inline-block;
-			margin: 25px 18px 0 0;
-		}
-
-		.unit-num {
-			width: 146px;
-			height: 72px;
-			margin: 10px 10px;
-			letter-spacing: 1px;
-			padding: 5px 0 0 0;
-			background-color: rgba(0, 163, 255, 0.3);
-			color: #fff;
-			text-align: center;
-			font-size: 16px;
-			line-height: 30px;
-			padding-top: 10px;
-			// 渐变
-			// .num {
-			//   font-size: 32px;
-			//   font-weight: 600;
-			//   color: rgb(105, 193, 208);
-			// }
-		}
-	}
-
-	.unit-echats {
-		height: 150px;
-	}
-
-	.unit-w {
-		width: 136px;
-
-	}
-
-	.unit-g {
-		font-size: 18px;
-		margin-left: 10px;
-		padding-top: 10px;
-	}
-
-	.maintenance {
-		margin-top: 37px;
-
-		// .unit-num {
-		// 	width: 180px !important;
-		// }
-	}
-</style>
+.unit {
+  display: flex;
+  margin: 5px 0 10px 10px;
+  font-size: 18px;
+  .unit-c {
+    display: inline-block;
+    margin: 25px 18px 0 0;
+  }
+  .unit-num {
+    width: 146px;
+    height: 72px;
+    margin: 10px 10px;
+    letter-spacing: 1px;
+    padding: 5px 0 0 0;
+    background-color: rgba(0, 163, 255, 0.3);
+    color: #fff;
+    text-align: center;
+    font-size: 16px;
+    line-height: 30px;
+    padding-top: 10px;
+    // 渐变
+    // .num {
+    //   font-size: 32px;
+    //   font-weight: 600;
+    //   color: rgb(105, 193, 208);
+    // }
+  }
+}
+.unit-echats {
+  height: 150px;
+}
+.unit-w {
+  width: 136px;
+}
+.unit-g {
+  font-size: 18px;
+  margin-left: 10px;
+  padding-top: 10px;
+}
+.maintenance {
+  margin-top: 30px;
+  .unit-num {
+    width: 180px !important;
+  }
+}
+</style>

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

@@ -88,104 +88,101 @@
 	</div>
 </template>
 <script>
-	import VueSeamlessScroll from "vue-seamless-scroll";
-	import {
-		getZjgldwxx
-	} from "@/api/management.js";
-	export default {
-		name: "MaintenanceSupervision",
-		data() {
-			return {
-				ZjglList: [],
-				search: "",
-				options: [{
-						value: "有管理单位（物业）",
-						label: "有管理单位 （物业）",
-					},
-					{
-						value: "有管理单位（非物业）",
-						label: "有管理单位 （非物业）",
-					},
-					{
-						value: "居民自主管理",
-						label: "居民自主管理",
-					},
-					{
-						value: "街道社区代表",
-						label: "街道社区代表",
-					},
-					{
-						value: "其他",
-						label: "其他",
-					},
-					{
-						value: "无管理主体",
-						label: "无管理主体",
-					},
-				],
-				value: "",
-				checked: 0,
-			};
-		},
-		props: {
-			qx: String,
-		},
-		components: {
-			VueSeamlessScroll,
-		},
-		computed: {
-			classOption() {
-				return {
-					singleHeight: 43,
-				};
-			},
-		},
-		watch: {
-			qx() {
-				this.getZjglList();
-			},
-		},
-		methods: {
-			colos() {
-				this.search = "";
-				this.value = "";
-				this.getZjglList();
-			},
-			change(idx) {
-				this.checked = idx;
-			},
-			resultType(text) {
-				return {
-					合格: "#23f59d",
-					不合格: "#df575b",
-					是: "#23f59d",
-					否: "#df575b",
-				} [text];
-			},
-			// 管理单位信息
-			getZjglList() {
-				const params = {
-					pageSize: 100,
-					pageNum: 1,
-					qx: this.qx === "重庆市" ? "" : this.qx,
-					gcjzmc: this.search,
-					xfaqglxs: this.value,
-				};
-				getZjgldwxx(params).then((res) => {
-					this.ZjglList = res.data.rows;
-				});
-			},
-			// 跳转独栋(目前未加ID)
-			ToUnitInfo(item) {
-				console.log(item);
-				return;
-				this.$router.push(`/detail?id=${item.jzid}`);
-			},
-		},
-		created() {
-			this.getZjglList();
-		},
-	};
+import VueSeamlessScroll from "vue-seamless-scroll";
+import { getZjgldwxx } from "@/api/management.js";
+export default {
+  name: "MaintenanceSupervision",
+  data() {
+    return {
+      ZjglList: [],
+      search: "",
+      options: [
+        {
+          value: "有管理单位（物业）",
+          label: "有管理单位 （物业）",
+        },
+        {
+          value: "有管理单位（非物业）",
+          label: "有管理单位 （非物业）",
+        },
+        {
+          value: "居民自主管理",
+          label: "居民自主管理",
+        },
+        {
+          value: "街道社区代表",
+          label: "街道社区代表",
+        },
+        {
+          value: "其他",
+          label: "其他",
+        },
+        {
+          value: "无管理主体",
+          label: "无管理主体",
+        },
+      ],
+      value: "",
+      checked: 0,
+    };
+  },
+  props: {
+    qx: String,
+  },
+  components: {
+    VueSeamlessScroll,
+  },
+  computed: {
+    classOption() {
+      return {
+        singleHeight: 43,
+      };
+    },
+  },
+  watch: {
+    qx() {
+      this.getZjglList();
+    },
+  },
+  methods: {
+    colos() {
+      this.search = "";
+      this.value = "";
+      this.getZjglList();
+    },
+    change(idx) {
+      this.checked = idx;
+    },
+    resultType(text) {
+      return {
+        合格: "#23f59d",
+        不合格: "#df575b",
+        是: "#23f59d",
+        否: "#df575b",
+      }[text];
+    },
+    // 管理单位信息
+    getZjglList() {
+      const params = {
+        pageSize: 100,
+        pageNum: 1,
+        qx: this.qx === "重庆市" ? "" : this.qx,
+        gcjzmc: this.search,
+        xfaqglxs: this.value,
+      };
+      getZjgldwxx(params).then((res) => {
+        this.ZjglList = res.data.rows;
+      });
+    },
+    // 跳转独栋(目前未加ID)
+    ToUnitInfo(item) {
+      this.$router.push(`/detail?id=${item.jzid}`);
+    },
+  },
+  created() {
+    this.getZjglList();
+  },
+};
 </script>
 
 <style scoped lang="less">

app/src/views/Fire/index.vue

@@ -89,7 +89,23 @@
 					pageNum: 1,
 					jzszqx: (this.qx === '重庆市' ? '' : this.qx),
 				}).then((res) => {
-					this.glztList = res.data.rows;
+					let data=res.data.rows
+					if(data.length<1){
+						this.glztList=[{
+							jzszqx:this.qx,
+							sfzddw:'重点单位',
+							sl:0
+						},
+						{
+							jzszqx:this.qx,
+							sfzddw:'一般单位',
+							sl:0
+						}]
+					}else{
+						this.glztList = res.data.rows;
+					}
+					
+
 				});
 			},
 			// 维保形式

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

@@ -27,10 +27,14 @@
     </div>
     <div style="display: flex; justify-content: center">
       <div
+      v-show="data.length > 0"
         ref="fireAddressType"
         class="pie-chart"
-        style="width: 100%; height: 240px"
+        style="width: 443px; height: 240px"
       ></div>
+      <div style="margin-left: 20px" v-show="data.length == 0">
+      <img src="../../../assets/images/null2.png" alt="">
+    </div>
     </div>
   </div>
 </template>

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

@@ -9,7 +9,7 @@
       <span class="reason">起火原因</span>
     </div>
     <VueSeamlessScroll :data="list" :class-option="classOption" class="warp">
-      <ul class="item">
+      <ul class="item" v-show="list.length > 0">
         <li
           class="row"
           v-for="(item, index) in list"
@@ -24,6 +24,12 @@
           <span class="reason">{{ item.qhyy1 }}</span>
         </li>
       </ul>
+      <div
+        style="margin-top: 30px; margin-left: 70px"
+        v-show="list.length == 0"
+      >
+        <img src="../../../assets/images/null2.png" alt="" />
+      </div>
     </VueSeamlessScroll>
   </div>
 </template>

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

@@ -1,6 +1,9 @@
 <template >
-  <div style="display: flex; justify-content: center">
-    <div ref="fireReason" style="width: 100%; height: 287px"></div>
+  <div style="display: flex; justify-content: center;width: 100%;" >
+     <div ref="fireReason" style="width: 443px; height: 287px"  v-show="data.length > 0"></div>
+    <div style="margin-top: 20px; margin-left: 20px" v-show="data.length == 0">
+      <img src="../../../assets/images/null2.png" alt="">
+    </div>
   </div>
 </template>
 
@@ -22,6 +25,7 @@ export default {
   mounted() {
     // 初始化起火原因
     this.init();
+    console.log(this.data);
   },
   computed: {
     legend() {
@@ -247,10 +251,17 @@ export default {
         qx: this.qx === "重庆市" ? "" : this.qx,
         qhsj: "2023",
       }).then((res) => {
-        this.data = res.data.rows.map((item) => ({
+       let list=res.data.rows
+       if(list.length >0){
+        console.log('----------33333',list);
+        this.data = list.map((item) => ({
           name: item.qhyy1,
           value: item.sl,
         }));
+       }else{
+        this.data=[]
+       }
+        
       });
     },
   },

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

@@ -1,5 +1,10 @@
 <template>
-  <div style="height: 260px" ref="fireTime"></div>
+  <div>
+    <div style="height: 260px; width: 955px;" ref="fireTime" v-show="notEmpty"></div>
+  <div style="margin-top: 20px; margin-left: 320px" v-show="!notEmpty">
+    <img src="../../../assets/images/null2.png" alt="" />
+  </div>
+  </div>
 </template>
 
 <script>
@@ -44,7 +49,8 @@ export default {
         "22",
         "23",
       ],
-      option: []
+      option: [],
+      notEmpty: true
     };
   },
   mounted() {
@@ -75,8 +81,10 @@ export default {
       }).then((res) => {
         if (this.modeType === 1 || this.modeType === 2) {
           this.list = res.data.year;
+          this.notEmpty = this.list.length > 0
         } else if (this.modeType === 3) {
           this.list = res.data;
+          this.notEmpty = this.list.autum.length > 0 ||  this.list.winter.length > 0 || this.list.summer.length > 0 || this.list.spring.length > 0
         }
         this.reload();
       });
@@ -232,7 +240,7 @@ export default {
                 color: "#35709caa",
               },
             },
-            data: this.hours.map(item => `${item}:00`)
+            data: this.hours.map((item) => `${item}:00`),
           },
         ],
         yAxis: {
@@ -254,7 +262,7 @@ export default {
       };
       this.chart.setOption(this.option, true);
     },
-  }
+  },
 };
 </script>
 

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

@@ -40,6 +40,7 @@ export default {
     // 维保形式
     getMounList(){
       getWbxs({...this.params,qy:this.qy==="重庆市"?"":this.qy}).then(res=>{
+        console.log('=========形式',res.data.rows);
         this.wbxsList=res.data.rows.map(item=>{
           return{
             name:item.wbxs,

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

@@ -10,12 +10,18 @@
     <div class="hidden-danger-detection_bottom">
       <div class="item">
         <!-- <Rectification :ScheduletList="ScheduletList"/> -->
-        <pcNum :ScheduletList="ScheduletList" :list="list" :allNum="allNum" :pcdsNum="pcdsNum" />
+        <pcNum
+          :ScheduletList="ScheduletList"
+          :list="list"
+          :allNum="allNum"
+          :pcdsNum="pcdsNum"
+          :wzgsNum="wzgsNum"
+          :yzgsNum="yzgsNum"
+        />
       </div>
       <div class="item">
         <HiddenDangerType :yhType="yhType" />
       </div>
-    
     </div>
   </div>
 </template>
@@ -44,7 +50,9 @@ export default {
      yhType:[],
       ypclds:'',
       pcdsNum:'',
+      yzgsNum:'',
       allNum:'',
+      wzgsNum:'',
       list:{},
       ScheduletList:{},
            // 传参
@@ -72,13 +80,16 @@ export default {
         this.list=res.data.rows[0]
         this.allNum=this.list.yhds+'/'+this.list.yhgs
         this.pcdsNum=this.list.ypclds+'/'+this.list.ypcldcs
-        console.log('------list',this.list);
+        this.yzgsNum=this.list.yzgyhlds+'/'+this.list.yzgyhs
+        this.wzgsNum=this.list.wzgyhlds+'/'+this.list.wzgyhs
+        console.log('------list66666',this.list);
       })
     },
     // 隐患类型
     getType(){
       getYhlx({...this.params,qy:this.qy==='重庆市'?'':this.qy}).then(res=>{
         const data = res.data.rows[0];
+
         if (data) {
           this.yhType= [
              {
@@ -109,8 +120,6 @@ export default {
          this.ScheduletList.noUnm=data.djh+data.dzg
          this.ScheduletList=data
         }
-        
-        console.log('=======《《进度',this.ScheduletList);
     })
     }
   },

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

@@ -14,11 +14,11 @@
         </div>
         <div class="hidden-danger-detection_top_inner">
           <span>已整改数</span>
-          <hidden-danger-total number="1000/100" label="" unit="栋/条" />
+          <hidden-danger-total :number="yzgsNum" label="" unit="栋/条" />
         </div>
         <div class="hidden-danger-detection_top_inner">
-          <span>未改数</span>
-          <hidden-danger-total number="1000/100" label="" unit="栋/条" />
+          <span>未整改数</span>
+          <hidden-danger-total :number="wzgsNum" label="" unit="栋/条" />
         </div>
       </div>
     </div>
@@ -33,7 +33,9 @@ export default {
     ScheduletList:Object,
     list:Object,
     pcdsNum:String,
-    allNum:String
+    allNum:String,
+    yzgsNum:String,
+    wzgsNum:String
   },
   
 };

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

@@ -80,7 +80,7 @@
         },
         // 跳转独栋(ID)
         open(item){
-          console.log(item);
+          window.location.href = `/detail?id=${item.jzid}`;
         }
       }
     };