Merge branch 'zz-test' into master

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

@@ -7,6 +7,7 @@
 				</li>
 				<div>{{ item.jzdx}}</div>
 			</ul>
+			<!-- <img class="imgs" src="../../../assets/images/nulls.png" alt=""> -->
 		</div>
 	</div>
 </template>
@@ -61,4 +62,8 @@
 			}
 		}
 	}
+	.imgs{
+		width: 50px;
+		height: 60px;
+	}
 </style>

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

@@ -38,7 +38,7 @@
       class="warp"
     >
       <ul class="item">
-        <li class="row" v-for="(item, index) in dataList" :key="index">
+        <li class="row" v-for="(item, index) in dataList" :key="index" @click="TounitInfo(item)">
           <span class="type">{{ index + 1 }}</span>
           <span class="count">{{ item.gcjzmc }}</span>
           <span class="time">{{ item.gd }}</span>
@@ -137,6 +137,9 @@ export default {
       this.dataList = null;
       this.dataList = dataList;
     },
+    TounitInfo(node){
+      window.location.href = `/detail?id=${node.jzid}`;
+    }
   },
 };
 </script>

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

@@ -77,7 +77,7 @@ export default {
           right: "10px",
         },
         xAxis: {
-          data: x,
+          data: ["30m及以下",'30~50m(含)','50~80m(含)','80~100m(含)','100m以上'],
           //坐标轴
           axisLine: {
             lineStyle: {
@@ -93,6 +93,7 @@ export default {
             show: true,
             textStyle: {
               color: "#fff",
+              fontSize:9,
             },
           },
         },

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

@@ -11,7 +11,7 @@
       <ul class="item">
         <li class="row" :class="{
           active: item.isActive
-        }" v-for="(item, index) in dataList" :key="index">
+        }" v-for="(item, index) in dataList" :key="index"  @click="showModul(item.qx)">
           <span class="type">{{ index + 1 }}</span>
           <span class="count">{{ item.qx }}</span>
           <span class="time">{{ item.zs }}</span>
@@ -20,15 +20,21 @@
         </li>
       </ul>
     </VueSeamlessScroll>
+    <!-- 区域分布弹窗 -->
+		<basic-modal top="120px" ref="basicInfo" name="基础信息">
+      <BasicInfoModalContent :qy="name" />
+    </basic-modal>
   </div>
 </template>
 
 <script>
 import VueSeamlessScroll from "vue-seamless-scroll";
+import BasicInfoModalContent from "../../Home/components/BasicInfoModalContent.vue";
 export default {
   name: "RegionalComp",
   components: {
     VueSeamlessScroll,
+    BasicInfoModalContent
   },
   props: {
     list: {
@@ -40,7 +46,8 @@ export default {
   data() {
 	return {
 		dataList: [],
-    reload: true
+    reload: true,
+    name:''
 	}
   },
   watch:{
@@ -64,6 +71,13 @@ export default {
       };
     },
   },
+  methods:{
+    	//区域分布弹窗
+			showModul(val){
+        this.name=val
+				this.showModal("basicInfo");
+			}
+  }
 };
 </script>
 <style scoped lang="less">

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

@@ -231,7 +231,7 @@ 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="qx" label="高层建筑(栋)" show-overflow-tooltip>
+        <el-table-column prop="高层建筑" label="高层建筑(栋)" show-overflow-tooltip>
         </el-table-column>
         <el-table-column
           prop="超高层建筑"

app/src/views/Basic/index.vue

@@ -36,6 +36,7 @@
 		<basic-modal top="120px" ref="basicInfoModal" name="高层基础信息">
 			<jcxxCont :qy="qy" :flagVal="flagVal" />
 		</basic-modal>
+		
 	</div>
 </template>
 <script>
@@ -47,6 +48,7 @@
 	import MapCharts from "../Home/components/MapCharts.vue";
 	import SearchBox from "@/components/SearchBox.vue";
 	import jcxxCont from "./components/jcxxCont.vue";
+
 	import {
 		toFirst
 	} from '../../utils'
@@ -67,7 +69,8 @@
 			ChronologicDistributionStatistics,
 			MapCharts,
 			SearchBox,
-			jcxxCont
+			jcxxCont,
+		
 		},
 		data() {
 			return {
@@ -122,7 +125,17 @@
 					...this.params,
 					qx: this.qy === "重庆市" ? "" : this.qy,
 				}).then((res) => {
-					this.gcjztjList = res.data.rows;
+					let lists=res.data.rows
+					if(lists.length>0){
+						const temp = {
+							jzdx:'高层建筑总数',
+								qx: this.qy,
+							sl: lists.reduce((a,b) => a + b.sl, 0)
+						}
+						lists.unshift(temp)
+					}
+					this.gcjztjList = lists
+
 				});
 				getGdfbtj({
 					...this.params,
@@ -132,6 +145,7 @@
 					this.gdfbtjList = res.data.rows;
 				});
 			},
+		
 		},
 		created() {
 			this.getList();

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

@@ -229,7 +229,7 @@ export default {
       <el-table-column prop="djsj" label="登记时间" show-overflow-tooltip> </el-table-column>
       <el-table-column prop="sftxdw" label="是否提醒单位" show-overflow-tooltip> </el-table-column>
       <el-table-column
-        prop="jcnd"
+        prop="sfts"
         label="是否推送乡镇街道、公安派出所或者行业部门"
         show-overflow-tooltip
       >

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

@@ -355,11 +355,13 @@ export default {
         <el-table-column
           prop="hzzdbjxt"
           label="火灾自动报警系统（个）"
+          width="190px"
           show-overflow-tooltip
         >
         </el-table-column>
         <el-table-column
           prop="jxfpyxt"
+          width="190px"
           label="机械防、排烟系统（个）"
           show-overflow-tooltip
         >
@@ -367,12 +369,14 @@ export default {
         <el-table-column
           prop="snxhsxt"
           label="室内消火栓系统（个）"
+          width="190px"
           show-overflow-tooltip
         >
         </el-table-column>
         <el-table-column
           prop="zdpsmhxt"
           label="自动喷水灭火系统（个）"
+          width="190px"
           show-overflow-tooltip
         >
         </el-table-column>
@@ -403,16 +407,18 @@ export default {
         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 prop="qx" label="区县" show-overflow-tooltip >
         </el-table-column>
         <el-table-column
           prop="xfctdczdszyqk"
           label="消防车通道存在堵塞、占用情况（个）"
+ 
           show-overflow-tooltip
         >
         </el-table-column>
         <el-table-column
           prop="xfcdxfcjycdwszbzbpshbx"
+          width="440px"
           label="消防车道、消防车救援场地未设置标志标牌、施划标线（个）"
           show-overflow-tooltip
         >