Merge branch 'zz-test' into master

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

@@ -8,7 +8,7 @@
 		</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 class="unit-num" v-for="(item,index) in glztList" :key="index" @click="showTab(item)">
 				<div>
 					<LinearText style="display: inline-block" :text="item.sl" fontSize="28px"></LinearText>
 					<span>家</span>
@@ -65,7 +65,7 @@
 			<higthList :flag="flag" :qx="qx" />
 		</basic-modal>
 		<basic-modal top="120px" ref="HistoryModal" name="管理单位查询">
-			<GldwModalContent :flag="flag" :qx="qx" />
+			<GldwModalContent :flag="flag" :qx="qx" :static="static" />
 		</basic-modal>
 	</div>
 </template>
@@ -96,7 +96,8 @@
 					pageSize: 100,
 					pageNum: 1,
 				},
-				flag: 1
+				flag: 1,
+				static:''
 			};
 		},
 		watch: {
@@ -125,7 +126,8 @@
 				this.showModal("higthModal");
 
 			},
-			showTab() {
+			showTab(val) {
+				this.static=val.sfzddw
 				this.showModal("HistoryModal");
 
 			}

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

@@ -27,7 +27,8 @@
 		props: {
 			qy: String,
 			default: Object,
-			unitName: String
+			unitName: String,
+			static:String
 		},
 		watch: {
 			default: {
@@ -50,13 +51,22 @@
 				immediate: true,
 				deep: true,
 			},
+			static: {
+				handler(val) {
+					if (val) {
+						this.params.sfzddw = val
+						this.funRzdwList();
+					}
+				},
+				immediate: true,
+				deep: true,
+			},
 		},
 		methods: {
 			funRzdwList() {
 				getRzdw({
 					...this.params,
 				}).then((res) => {
-			       console.log(res,987);
 					this.tableData = res.data.rows;
 					this.total = res.data.total;
 				});

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

@@ -105,7 +105,7 @@ export default {
           },
           data: this.legend,
         },
-        color: ["#00a2ff", "#4605ff", "#61d266", "#15a3e0", "#15e0d4"],
+        color: ["#00a2ff", "#6421BA", "#61d266", "#F4D156", "#15e0d4"],
         series: [
           // 数据展示层
           {

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

@@ -29,7 +29,12 @@ export default {
   },
   computed: {
     legend() {
-      return this.data.map((item) => item.name);
+      const temp = this.data.map((item) => item.name);
+      const idx = temp.findIndex(item => item === '其他')
+      if (idx < 0) return temp;
+      const qt = temp[idx]
+      temp.splice(idx, 1);
+      return [...temp, qt]
     },
   },
   created() {
@@ -253,7 +258,6 @@ export default {
       }).then((res) => {
        let list=res.data.rows
        if(list.length >0){
-        console.log('----------33333',list);
         this.data = list.map((item) => ({
           name: item.qhyy1,
           value: item.sl,

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

@@ -15,6 +15,7 @@ export default {
     return {
       list: [],
       BasicLsit: [],
+      listGids:null,
       // 传参
       params: {
         pageSize: 100,
@@ -44,6 +45,8 @@ export default {
               this.unitjNum = item.ljgcszhht;
               this.allNum = item.gyjz + item.zzjz + item.ggjz;
             });
+            this.listGids=res.data.rows[0]
+       
           }
         }
       );
@@ -65,7 +68,7 @@ export default {
   <div class="basic-info">
     <div class="__left">
       <FirstHight :BasicLsit="BasicLsit" :allNum="allNum" />
-      <ul style="display: flex">
+      <ul style="display: flex; flex-wrap: wrap; justify-content: space-between; font-size: 14px;">
         <li @click="showModlus('居民建筑')">
           <span
             style="
@@ -76,9 +79,9 @@ export default {
               margin: 0 4px;
             "
           ></span>
-          <span>居民建筑</span>
+          <span>居民建筑({{ listGids.zzjz }})</span>
         </li>
-        <li @click="showModlus('公共建筑')">
+        <li @click="showModlus('公共建筑')" >
           <span
             style="
               display: inline-block;
@@ -88,9 +91,9 @@ export default {
               margin: 0 4px;
             "
           ></span>
-          <span>公共建筑</span>
+          <span>公共建筑({{ listGids.ggjz }})</span>
         </li>
-        <li @click="showModlus('工业建筑')">
+        <li @click="showModlus('工业建筑')" style="margin-top: 8px;">
           <span
             style="
               display: inline-block;
@@ -100,7 +103,7 @@ export default {
               margin: 0 4px;
             "
           ></span>
-          <span>工业建筑</span>
+          <span>工业建筑({{ listGids.gyjz }})</span>
         </li>
       </ul>
     </div>

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

@@ -1,7 +1,7 @@
 <template>
- <div>
-  <div ref="chart" class="item" style="width: 220px; height: 200px" />
- </div>
+  <div>
+    <div ref="chart" class="item" style="width: 220px; height: 200px" />
+  </div>
 </template>
 
 <script>
@@ -44,7 +44,7 @@ export default {
       const option = {
         title: [
           {
-            text: this.allNum ,
+            text: this.allNum,
             top: "40%",
             textAlign: "center",
             left: "49%",
@@ -77,7 +77,12 @@ export default {
         // },
         tooltip: {
           show: true,
-          extraCssText: "z-index: 1000;"
+          extraCssText: "z-index: 1000;",
+          backgroundColor: "rgba(0,224,255,0.46)",
+          borderColor: "rgba(0,213,255, .6)",
+          textStyle: {
+            color: "#fff",
+          },
         },
         series: [
           // 最外层圆
@@ -87,12 +92,11 @@ export default {
             center: ["50%", "50%"],
             hoverAnimation: false,
             data: [
-             
               {
                 value: data.map((item) => {
                   return item.gyjz;
                 }),
-                name: '居民建筑',
+                name: "居民建筑",
                 itemStyle: {
                   normal: {
                     color: {
@@ -115,7 +119,7 @@ export default {
                 value: data.map((item) => {
                   return item.ggjz;
                 }),
-                  name: '公共建筑',
+                name: "公共建筑",
                 itemStyle: {
                   normal: {
                     color: {
@@ -138,7 +142,7 @@ export default {
                 value: data.map((item) => {
                   return item.zzjz;
                 }),
-                name: '工业建筑',
+                name: "工业建筑",
                 itemStyle: {
                   normal: {
                     color: {
@@ -161,7 +165,10 @@ export default {
             label: {
               show: true,
               position: "outside",
-              formatter: "{d}%",
+              // formatter: "{d}%",
+              formatter: (params) => {
+                return `${params.value}\n ${params.percent}%`;
+              },
               color: "#FFFFFF",
             },
             labelLine: {

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

@@ -5,9 +5,9 @@
       <span>单位：条</span>
     </div>
     <div style="cursor: pointer">
-      <div ref="chart" class="item" style="width: 230px; height: 221px" />
-      <ul style="display: flex; flex-wrap: wrap; justify-content: space-between; width: 160px; margin: auto; margin-bottom: 30px; font-size: 14px;">
-        <li @click="showModlus('消防设施')" style="margin-bottom: 5px;">
+      <div ref="chart" class="item" style="width: 240px; height: 211px" />
+      <ul style="display: flex; flex-wrap: wrap;   margin: auto; margin-bottom: 30px; font-size: 13px;">
+        <li @click="showModlus('消防设施')" style="margin-bottom: 5px; margin-right: 5px;">
           <span
             style="
               display: inline-block;
@@ -17,7 +17,7 @@
               margin: 0 4px;
             "
           ></span>
-          <span>消防设施</span>
+          <span>消防设施({{ yhType[0].value }})</span>
         </li>
         <li @click="showModlus('生命通道')">
           <span
@@ -29,9 +29,9 @@
               margin: 0 4px;
             "
           ></span>
-          <span>生命通道</span>
+          <span>生命通道({{ yhType[1].value }})</span>
         </li>
-        <li @click="showModlus('用电用气')">
+        <li @click="showModlus('用电用气')" style="margin-right: 5px;" >
           <span
             style="
               display: inline-block;
@@ -41,7 +41,7 @@
               margin: 0 4px;
             "
           ></span>
-          <span>用电用气</span>
+          <span>用电用气({{ yhType[2].value }})</span>
         </li>
         <li @click="showModlus('消防管理')">
           <span
@@ -53,7 +53,7 @@
               margin: 0 4px;
             "
           ></span>
-          <span>消防管理</span>
+          <span>消防管理({{ yhType[3].value }})</span>
         </li>
       </ul>
     </div>
@@ -84,6 +84,7 @@ export default {
   watch: {
     yhType: {
       handler(val) {
+        console.log('----隐患排序',val);
         if (val.length > 0) {
           this.$nextTick(() => {
             // 获取dom容器
@@ -148,8 +149,9 @@ export default {
                 show: true,
                 position: "outside",
                 formatter: (params) => {
-                  return `{value|${params.value}}`;
+                  return `{value|${params.value}}\n ${params.percent}%`;
                 },
+                // formatter: "{d}%",
                 padding: [0, -90],
                 align: "center",
                 rich: {

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

@@ -12,7 +12,7 @@
             margin: 0 4px;
           "
         ></span>
-        <span>重大风险</span>
+        <span>重大风险({{ riskList[3].sl }})</span>
       </li>
       <li @click="showStice('较大风险')" style="margin-bottom: 12px;">
         <span
@@ -24,7 +24,7 @@
             margin: 0 4px;
           "
         ></span>
-        <span>较大风险</span>
+        <span>较大风险({{ riskList[2].sl }})</span>
       </li>
       <li @click="showStice('一般风险')" style="margin-bottom: 12px;">
         <span
@@ -36,7 +36,7 @@
             margin: 0 4px;
           "
         ></span>
-        <span>一般风险</span>
+        <span>一般风险({{ riskList[0].sl }})</span>
       </li>
       <li @click="showStice('低风险')">
         <span
@@ -48,7 +48,7 @@
             margin: 0 4px;
           "
         ></span>
-        <span>低风险</span>
+        <span>低风险({{ riskList[1].sl }})</span>
       </li>
     </ul>
   </div>

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

@@ -20,7 +20,7 @@
 					<span class="online line">在线</span>
 				</div>
 				<div>
-					<span class="offline line">离线</span>
+					<span class="offline line">告警</span>
 				</div>
 			</div>
 		</div>
@@ -30,17 +30,17 @@
 					<img :src="item.imgs" alt="" />
 					<div style="width: 90%">
 						<div class="inline-bor">
-							<span style="font-size: 14px">{{ item.text }}</span>
+							<span style="font-size: 12px">{{ item.text }}</span>
 							<span class="calc-percent">{{ item.allnum }}/{{ item.average }}</span>个/栋
 						</div>
 						<div class="on-line">
 							<div>
 								<span class="online lines"></span>
-								<span style="font-size: 16px">{{ item.line }}/{{ item.linelds }}</span>(个/栋)
+								<span style="font-size: 14px">{{ item.line }}/{{ item.linelds }}</span>(个/栋)
 							</div>
 							<div>
 								<span class="offline lines"></span>
-								<span style="font-size: 16px">{{ item.offNum }}/{{ item.offNumlds }}</span>(个/栋)
+								<span style="font-size: 14px">{{ item.offNum }}/{{ item.offNumlds }}</span>(个/栋)
 							</div>
 						</div>
 					</div>
@@ -85,13 +85,13 @@
 				return {
 					设备总数: "#FFD74B",
 					在线: "#00FF66",
-					报警: "#FF4B23",
+					告警: "#FF4B23",
 				} [text];
 			},
 			dealData() {
 				this.list = [{
 						num: this.data.wlwlds || 0,
-						title: "已完成物联网建筑数(栋)",
+						title: "已接入物联网建筑数(栋)",
 						text: "设备总数",
 						allNum: this.data.jrsbzs || 0,
 					},