Merge branch 'zz-test' into master

app/src/mixin/unit.js

@@ -183,6 +183,37 @@ const punishmentMixin = {
 					value: "自燃",
 					label: "自燃",
 				}
+			],
+			jzdxLists:[
+				{
+					value: "超高层居住建筑",
+					label: "超高层居住建筑",
+				},
+				{
+					value: "超高层公共建筑",
+					label: "超高层公共建筑",
+				},
+				{
+					value: "高层工业建筑",
+					label: "高层工业建筑",
+				},
+				{
+					value: "一类高层公共建筑",
+					label: "一类高层公共建筑",
+				},
+				{
+					value: "一类高层居住建筑",
+					label: "一类高层居住建筑",
+				},
+				{
+					value: "二类高层居住建筑",
+					label: "二类高层居住建筑",
+				},
+				{
+					value: "二类高层公共建筑",
+					label: "二类高层公共建筑",
+				},
+				
 			]
 		};
 	},

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

@@ -254,6 +254,18 @@ export default {
             >
             </el-option>
           </el-select>
+        </div>
+              <!-- 建筑定性 -->
+              <div>
+          <el-select v-model="params.jzdx" placeholder="建筑定性">
+            <el-option
+              :value="item.value"
+              :label="item.label"
+              v-for="(item, index) in jzdxLists"
+              :key="index"
+            >
+            </el-option>
+          </el-select>
         </div>
         <!-- 年代 -->
         <div>

app/src/views/Home/index.vue

@@ -48,6 +48,9 @@
         @click-header="openBasicModal"
       >
         <RiskWarning :riskList="riskList" @showFxyj="showFxyj" :qy="qy" />
+        <template #ext-header>
+          <img src="../../assets/images/dd_wh.png" alt="" @click="getShoeInfo('whFxModal')">
+        </template>
       </border-panel>
       <border-panel
         height="331px"
@@ -74,6 +77,12 @@
       :queryParams="queryParams"
       :qy="qy" />
     </basic-modal>
+      <!-- 风险问号弹窗 -->
+      <basic-modal top="30px" ref="whFxModal" name="安全风险分级规则" width="90%">
+      <div style="display: flex; justify-content: center">
+        <img src="../../assets/images/dd-exp-fx.png" />
+      </div>
+    </basic-modal>
   </div>
 </template>
 <script>
@@ -236,6 +245,9 @@ export default {
       this.defaultModel = params
       this.showModal("basicInfoModal");
     },
+    getShoeInfo(name){
+      this.showModal(name);
+    },
     // 风险预警
     getList(){
       totaldata({...this.params,qy:this.qy==="重庆市"?"":this.qy}).then(res=>{