Merge branch 'zz-test' into master

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

@@ -1,7 +1,7 @@
 <template>
   <div>
-    <div class="unit">
-      <span class="unit-c" @click="showHunit">管理主体</span>
+    <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
@@ -25,13 +25,13 @@
         <div>重点单位</div>
       </div> -->
     </div>
-    <div class="unit-echats">
+    <div class="unit-echats" @click="showHunit(1)">
       <div class="unit-g">
         管理形式
         <unit3D :fierList="fierList" />
       </div>
     </div>
-    <div class="unit maintenance">
+    <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>
@@ -67,9 +67,10 @@
         <div>无维保</div>
       </div> -->
     </div>
+    
     <!-- 弹窗 -->
     <basic-modal top="120px" ref="higthModal" name="高层建筑管理">
-      <higthList  />
+      <higthList :flag="flag" :qx="qx" />
     </basic-modal>
   </div>
 </template>
@@ -93,6 +94,7 @@ export default {
         pageSize: 100,
         pageNum: 1
       },
+      flag:1
     };
   },
   watch: {
@@ -112,8 +114,10 @@ export default {
       });
     },
     // 弹窗
-    showHunit(){
+    showHunit(val){
+      this.flag=val
       this.showModal("higthModal");
+
     }
   },
   created() {

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

@@ -5,6 +5,26 @@ import punishmentMixin from "@/mixin/unit.js";
 export default {
   name: "BasicInfoModalContent",
   mixins: [punishmentMixin],
+  props: {
+    flag: String,
+    qx:String
+  },
+  watch: {
+    flag: {
+      handler(val) {
+        this.showFlag = val;
+      },
+      immediate: true,
+      deep: true,
+    },
+    qx: {
+        handler(val) {
+          this.value = val;
+        },
+        immediate: true,
+        deep: true,
+      },
+  },
   data() {
     return {
       options: [],
@@ -28,20 +48,6 @@ export default {
       // risklevel: "", //风险等级
     };
   },
-  //   props: {
-  //     qy: String,
-  //   },
-  //   watch: {
-  //     qy: {
-  //       handler(val) {
-  //         this.value = val;
-  //         this.funUnitList();
-  //         this.handUnitList();
-  //       },
-  //       immediate: true,
-  //       deep: true,
-  //     },
-  //   },
   methods: {
     rowClickHandler(val) {
       this.$router.push(`/detail?id=${val.id}`);

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

@@ -265,7 +265,7 @@ export default {
       <!-- 新增 -->
       <el-table-column
         prop="jzdx"
-        label="建筑分类"
+        label="建筑定性"
         width="140"
         show-overflow-tooltip
       >