fix(ZGPT-068): 下钻，右侧高层建筑数据未加载

app/src/components/YlycModalHeader.vue

@@ -12,7 +12,7 @@ export default {
 
 <template >
   <div class="el-dialog__title" >
-    <span>“一楼一策”隐患整治清单111</span>
+    <span>“一楼一策”隐患整治清单</span>
     <img class="imgs" src="@/assets/images/dd_wh.png" alt="" @click="getShoeInfo('whFxModal')">
       <!-- 风险问号弹窗 -->
     <basic-modal :modal="false" top="30px" ref="whFxModal" name="高层建筑消防安全风险分级分色判定标准" width="90%">

app/src/views/Home/components/AlarmingSituationDynamics/ModalContent.vue

@@ -15,9 +15,9 @@
 		</div>
 		<div>
 			<border-panel height="469px" width="540px" style="margin-bottom: 6px" :headerType="3" title="事故单位信息">
-				<UnitInformation :ajxxList="ajxxList" :jzxxList="jzxxList" :wlwsb="wlwsb" />
+				<UnitInformation :ajxxList="ajxxList" :jzxxList="jzxxList" :wlwsb="wlwsb" :jzImg="jzImg" />
 			</border-panel>
-			<border-panel height="475px" width="540px" style="margin-bottom: 6px" :headerType="3" title="风险隐患信息">
+			<border-panel height="480px" width="540px" style="margin-bottom: 6px" :headerType="3" title="风险隐患信息">
 				<UnitInfo :fxxxList="fxxxList" :lshzList="lshzList" />
 			</border-panel>
 		</div>
@@ -29,6 +29,7 @@
 	import UnitInformation from "@/views/PoliceSituation/components/UnitInformation.vue";
 	import UnitInfo from "@/views/PoliceSituation/components/UnitInfo.vue";
 	import Map from "@/components/Map.vue";
+    import moment from "moment";
 	import {
 		geTzl,
 		getCdllxx,
@@ -59,6 +60,8 @@
 		},
 		data() {
 			return {
+				jzImg:'',
+				gxsj1: null,
 				pId: null,
 				params: {
 					pageSize: 100,
@@ -69,7 +72,7 @@
 				ajid: "",
 				bjxxList: [], //报警信息
 				cdxxList: [], //出动信息列表
-				zlxx: "", //出动信息总览
+				zlxx: [], //出动信息总览
 				hcws: [], //火场文书
         hcws1: [],
 				ajxxList: [],
@@ -78,9 +81,18 @@
 				lshzList: [],
 				wlwsb: [],
 				mapData: null,
+				middleType: "map",
 			};
 		},
 		methods: {
+			changeMiddleType() {
+				if (this.middleType === "720") {
+					this.getMapData();
+					this.middleType = "map";
+				} else {
+					this.middleType = "720";
+				}
+			},
 			getMapData() {
 				// console.log(this.params.id);
 				this.mapData = null;
@@ -146,12 +158,18 @@
 					jqTywysbm: this.params.id,
 				};
 				getHcws(hcwsId).then((res) => {
-					this.hcws1 = res.data.rows[0]
-					let i = res.data.rows
+					this.hcws1 = res.data.rows[0];
+					let i = res.data.rows;
 					let i2 = i.filter((item, index) => {
-						return index
-					})
-					this.hcws = i2;
+						return index;
+					});
+					this.hcws = i2.map((i) => {
+						return {
+							...i,
+							gxsj: moment(i.gxsj).format("yyyy-MM-DD"),
+						};
+					});
+					this.hcws1.gxsj = moment(this.hcws1.gxsj).format("yyyy-MM-DD");
 				});
 				// 事故单位信息-案件信息列表
 				getAjxx(this.params).then((res) => {
@@ -162,7 +180,8 @@
 					ajid: this.params.id,
 				};
 				getJzxx(jzxxid).then((res) => {
-					this.jzxxList = res.data.rows;
+					this.jzxxList = res.data.rows[0];
+					this.jzImg = this.jzxxList.jzzp1
 				});
 				// 风险隐患信息
 				const fxyhId = {
@@ -204,4 +223,24 @@
 	};
 </script>
 
-<style scoped lang="less"></style>
+<style scoped lang="less">
+	.m-btn {
+		width: 78px;
+		height: 72px;
+		position: absolute;
+		right: 20px;
+		top: 30px;
+		z-index: 99;
+		cursor: pointer;
+	}
+
+	.m-btn.d {
+		background: url("../../assets/images/dd-change-720.png") center center no-repeat;
+		background-size: 78px 72px;
+	}
+
+	.m-btn.map {
+		background: url("../../assets/images/dd-change-map.png") center center no-repeat;
+		background-size: 78px 72px;
+	}
+</style>

app/src/views/PoliceSituation/index.vue

@@ -231,4 +231,4 @@
 		background: url("../../assets/images/dd-change-map.png") center center no-repeat;
 		background-size: 78px 72px;
 	}
-</style>
+</style>