Merge branch 'zz-test' into master

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

app/src/mixin/unit.js

@@ -101,11 +101,11 @@ const punishmentMixin = {
 					label: "50-80米（含）",
 				},
 				{
-					value: "80-100米含）",
-					label: "80-100米",
+					value: "80-100米（含）",
+					label: "80-100米（含）",
 				},
 				{
-					value: "100米以上含）",
+					value: "100米以上",
 					label: "100米以上",
 				},
 			],

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

@@ -151,10 +151,10 @@ export default {
 .basic-info {
   padding: 4px;
   display: flex;
-  // .__left {
-  //   display: flex;
-  //   justify-content: space-around;
-  // }
+  .__left {
+    display: flex;
+   flex-direction: column;
+  }
   .__right {
     margin-top: 20px;
     margin-left: 5px;

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

@@ -89,6 +89,33 @@ export default {
       // this.$router.push(`/detail?id=${val.id}`);
       window.location.href = `/detail?id=${val.id}`;
     },
+    secrhList(title){
+      if(title=='高层建筑总数（栋）'){
+        this.funUnitList()
+      }
+      if(title=='超高层建筑总数（栋）'){
+        this.params.gd='100米以上'
+        this.funUnitList()
+      }
+      if(title=='2000年底前老旧住宅建筑总数（栋）'){
+        this.params.jcnd='2000年前'
+        this.params.dl='居民建筑'
+        this.funUnitList()
+      }
+      if(title=='2000年底前老旧商业混合体建筑总数（栋）'){
+        this.params.jcnd='2000年前'
+        this.params.dl='公共建筑'
+        this.funUnitList()
+      }
+      if(title=='公共建筑总数（栋）'){
+        this.params.dl='公共建筑'
+        this.funUnitList()
+      }
+      if(title=='工业建筑总数（栋）'){
+        this.params.dl='公业建筑'
+        this.funUnitList()
+      }
+    },
     funUnitList() {
       getJdjcUnit({
         ...this.params,
@@ -148,13 +175,6 @@ export default {
         pageSize: 10,
         pageNum: 1,
       }),
-        // this.params.Unittype = ""; // 建筑分类
-        // this.params.year = ""; // 年代
-        // this.params.hnum = ""; //高度
-        // this.params.management = ""; //管理形式
-        // this.params.subject = ""; //管理主体
-        // this.params.maintenance = ""; //维保形式
-        // this.params.risklevel = ""; //风险等级
         this.funUnitList();
     },
   },
@@ -188,11 +208,8 @@ export default {
   <div>
     <!-- 建筑数 -->
     <div class="unit-bulid">
-      <div class="unit-num" v-for="(item, index) in unitList" :key="index">
-        <span
-          style="display: inline-block; margin: 10px 5px 15px 5px; height: 40px"
-          >{{ item.title }}</span
-        >
+      <div class="unit-num" v-for="(item, index) in unitList" :key="index" @click="secrhList(item.title)" style="cursor: pointer;">
+        <span style="display: inline-block; margin: 10px 5px 15px 5px; height: 40px;">{{ item.title }}</span>
         <!-- <span class="build-num">{{ item.unitNum }}</span> -->
         <LinearText
           style="display: inline-block"