sk 1 год назад
Родитель
Сommit
06b7180d9f

+ 0 - 1
app/src/views/PoliceSituation/components/Alarm.vue

@@ -182,7 +182,6 @@
 					type: this.type
 				}
 				getBjxx(params).then(res => {
-					console.log(res, '报警信息');
 					this.czztList = res.data.rows
 				})
 			},

+ 55 - 55
app/src/views/PoliceSituation/components/UnitInformation.vue

@@ -8,108 +8,108 @@
 			</div>
 		</div>
 		<div v-if="activeTab == 1">
-			<div v-if="jzxxList && jzxxList.length > 0">
-				<div class="plate">{{jzxxList.gcjzmc || '-'}}</div>
+			<div v-if="jzxxList">
+				<div class="plate">{{jzxxList.gcjzmc || ''}}</div>
 				<div style="height: 235px; margin: 0 20px;">
 					<div class="pCont">
 						<div class="pCOntent on">
 							<div class="PTxt">建筑年代:</div>
-							<div class="Ptext">{{jzxxList.jcnd || '-'}}</div>
+							<div class="Ptext">{{jzxxList.jcnd || ''}}</div>
 						</div>
 						<div class="pCOntent">
 							<div class="PTxt">建筑类型:</div>
-							<div class="Ptext">{{jzxxList.jzdx || '-'}}</div>
+							<div class="Ptext">{{jzxxList.jzdx || ''}}</div>
 						</div>
 					</div>
 					<div class="pCont">
 						<div class="pCOntent on">
 							<div class="PTxt">建筑地址:</div>
-							<div class="Ptext">{{jzxxList.jzdz || '-'}}</div>
+							<div class="Ptext">{{jzxxList.jzdz || ''}}</div>
 						</div>
 						<div class="pCOntent">
 							<div class="PTxt">总楼层:</div>
-							<div class="Ptext">{{jzxxList.dslc || '-'}}</div>
+							<div class="Ptext">{{jzxxList.dslc || ''}}</div>
 						</div>
 					</div>
 					<div class="pCont">
 						<div class="pCOntent on">
 							<div class="PTxt">建筑结构:</div>
-							<div class="Ptext">{{jzxxList.jzdx || '-'}}</div>
+							<div class="Ptext">{{jzxxList.jzdx || ''}}</div>
 						</div>
 						<div class="pCOntent">
 							<div class="PTxt">建筑用途:</div>
-							<div class="Ptext">{{jzxxList.jznsygn || '-'}}</div>
+							<div class="Ptext">{{jzxxList.jznsygn || ''}}</div>
 						</div>
 					</div>
 					<div class="pCont">
 						<div class="pCOntent on">
 							<div class="PTxt">占地面积:</div>
-							<div class="Ptext">{{jzxxList.jzmj || '-'}}</div>
+							<div class="Ptext">{{jzxxList.jzmj || ''}}</div>
 						</div>
 						<div class="pCOntent">
 							<div class="PTxt">建筑面积:</div>
-							<div class="Ptext">{{jzxxList.jzmj || '-'}}</div>
+							<div class="Ptext">{{jzxxList.jzmj || ''}}</div>
 						</div>
 					</div>
 					<div class="pCont">
 						<div class="pCOntent on">
 							<div class="PTxt">管理单位:</div>
-							<div class="Ptext">{{jzxxList.glzthztjzd || '-'}}</div>
+							<div class="Ptext">{{jzxxList.glzthztjzd || ''}}</div>
 						</div>
 						<div class="pCOntent">
 							<div class="PTxt">消防控制室:</div>
-							<div class="Ptext">{{jzxxList.xfaqglxs || '-'}}</div>
+							<div class="Ptext">{{jzxxList.xfaqglxs || ''}}</div>
 						</div>
 					</div>
 					<div class="pCont">
 						<div class="pCOntent on">
 							<div class="PTxt">消防安全责任人:</div>
-							<div class="Ptext">{{jzxxList.xfaqzrr || '-'}}</div>
+							<div class="Ptext">{{jzxxList.xfaqzrr || ''}}</div>
 						</div>
 						<div class="pCOntent">
 							<div class="PTxt">联系方式:</div>
-							<div class="Ptext">{{jzxxList.xfaqzrrlxdh || '-'}}</div>
+							<div class="Ptext">{{jzxxList.xfaqzrrlxdh || ''}}</div>
 						</div>
 					</div>
 					<div class="pCont">
 						<div class="pCOntent on">
 							<div class="PTxt">消防安全管理人:</div>
-							<div class="Ptext">{{jzxxList.xfaqlxr || '-'}}</div>
+							<div class="Ptext">{{jzxxList.xfaqlxr || ''}}</div>
 						</div>
 						<div class="pCOntent">
 							<div class="PTxt">联系方式:</div>
-							<div class="Ptext">{{jzxxList.xfaqlxrlxdh || '-'}}</div>
+							<div class="Ptext">{{jzxxList.xfaqlxrlxdh || ''}}</div>
 						</div>
 					</div>
 					<div class="pCont">
 						<div class="pCOntent on">
 							<div class="PTxt">消防安全联系人:</div>
-							<div class="Ptext">{{jzxxList.xfaqzbr || '-'}}</div>
+							<div class="Ptext">{{jzxxList.xfaqzbr || ''}}</div>
 						</div>
 						<div class="pCOntent">
 							<div class="PTxt">联系方式:</div>
-							<div class="Ptext">{{jzxxList.xfaqzbrlxdh || '-'}}</div>
+							<div class="Ptext">{{jzxxList.xfaqzbrlxdh || ''}}</div>
 						</div>
 					</div>
 					<div class="pCont">
 						<div class="pCOntent on">
 							<div class="PTxt">消防室值班人员:</div>
-							<div class="Ptext">{{jzxxList.xfaqzbr || '-'}}</div>
+							<div class="Ptext">{{jzxxList.xfaqzbr || ''}}</div>
 						</div>
 						<div class="pCOntent">
 							<div class="PTxt">联系方式:</div>
-							<div class="Ptext">{{jzxxList.xfaqzbrlxdh || '-'}}</div>
+							<div class="Ptext">{{jzxxList.xfaqzbrlxdh || ''}}</div>
 						</div>
 					</div>
 					<div class="pCont">
 						<div class="pCOntent on">
 							<div class="PTxt">风险等级:</div>
-							<div class="Ptext">{{jzxxList.fxdj || '-'}}</div>
+							<div class="Ptext">{{jzxxList.fxdj || ''}}</div>
 						</div>
 					</div>
 				</div>
 				<div class="att">建筑附件:</div>
-				<div style="display: flex;margin: 0 20px;margin-top: 10px;" v-if="jzxxList.jzzp">
+				<div style="display: flex;margin: 0 20px;margin-top: 5px;" v-if="jzxxList && jzxxList.length > 0">
 					<el-image style="width: 75px; height: 51px;margin-right: 29px;" :src="jzxxList.jzzp"
 						:preview-src-list="srcList">
 					</el-image>
@@ -130,93 +130,93 @@
 			<div v-else class="wsj"></div>
 		</div>
 		<div v-if="activeTab == 2">
-			<div v-if="jzxxList && jzxxList.length > 0">
-				<div class="plate" v-if="ajxxList">{{ajxxList.zhcs || '-'}}</div>
+			<div v-if="jzxxList">
+				<div class="plate" v-if="ajxxList">{{ajxxList.zhcs || ''}}</div>
 				<div style="height: 235px; margin: 0 20px;">
 					<div class="pCont">
 						<div class="pCOntent on">
 							<div class="PTxt">报警电话:</div>
-							<div class="Ptext" v-if="ajxxList">{{ajxxList.bjdh || '-'}}</div>
+							<div class="Ptext" v-if="ajxxList">{{ajxxList.bjdh || ''}}</div>
 						</div>
 					</div>
 					<div class="pCont">
 						<div class="pCOntent on">
 							<div class="PTxt">案件类型:</div>
-							<div class="Ptext" v-if="ajxxList">{{ajxxList.ajlx ||'-'}}</div>
+							<div class="Ptext" v-if="ajxxList">{{ajxxList.ajlx ||''}}</div>
 						</div>
 						<div class="pCOntent">
 							<div class="PTxt">案件等级:</div>
-							<div class="Ptext" v-if="ajxxList">{{ajxxList.ajdj ||'-'}}</div>
+							<div class="Ptext" v-if="ajxxList">{{ajxxList.ajdj ||''}}</div>
 						</div>
 					</div>
 					<div class="pCont">
 						<div class="pCOntent on">
 							<div class="PTxt">案发时间:</div>
-							<div class="Ptext" v-if="ajxxList">{{ajxxList.afsj ||'-'}}</a></div>
+							<div class="Ptext" v-if="ajxxList">{{ajxxList.afsj ||''}}</a></div>
 						</div>
 						<div class="pCOntent">
 							<div class="PTxt">失踪人数:</div>
-							<div class="Ptext" v-if="ajxxList">{{ajxxList.szrs ||'-' }}</div>
+							<div class="Ptext" v-if="ajxxList">{{ajxxList.szrs ||'' }}</div>
 						</div>
 					</div>
 					<div class="pCont">
 						<div class="pCOntent on">
 							<div class="PTxt">案发地址:</div>
-							<div class="Ptext" v-if="ajxxList">{{ajxxList.afdz ||'-'}}</div>
+							<div class="Ptext" v-if="ajxxList">{{ajxxList.afdz ||''}}</div>
 						</div>
 						<div class="pCOntent">
 							<div class="PTxt">被困人数:</div>
-							<div class="Ptext" v-if="ajxxList">{{ajxxList.bkrs || '-'}}</div>
+							<div class="Ptext" v-if="ajxxList">{{ajxxList.bkrs || ''}}</div>
 						</div>
 					</div>
 					<div class="pCont">
 						<div class="pCOntent on">
 							<div class="PTxt">主管机构:</div>
-							<div class="Ptext" v-if="ajxxList">{{ajxxList.zgjg || '-'}}</div>
+							<div class="Ptext" v-if="ajxxList">{{ajxxList.zgjg || ''}}</div>
 						</div>
 						<div class="pCOntent">
 							<div class="PTxt">死亡人数:</div>
-							<div class="Ptext" v-if="ajxxList">{{ajxxList.swss || '-'}}</div>
+							<div class="Ptext" v-if="ajxxList">{{ajxxList.swss || ''}}</div>
 						</div>
 					</div>
 					<div class="pCont">
 						<div class="pCOntent on">
 							<div class="PTxt">案件描述:</div>
-							<div class="Ptext" v-if="ajxxList">{{ajxxList.ajms || '-'}}</div>
+							<div class="Ptext" v-if="ajxxList">{{ajxxList.ajms || ''}}</div>
 						</div>
 						<div class="pCOntent">
 							<div class="PTxt">受伤人数:</div>
-							<div class="Ptext" v-if="ajxxList">{{ajxxList.ssrs || '-'}}</div>
+							<div class="Ptext" v-if="ajxxList">{{ajxxList.ssrs || ''}}</div>
 						</div>
 					</div>
 					<div class="pCont">
 						<div class="pCOntent on">
 							<div class="PTxt">建筑结构:</div>
-							<div class="Ptext" v-if="ajxxList">{{ajxxList.jzjg ||'-'}}</div>
+							<div class="Ptext" v-if="ajxxList">{{ajxxList.jzjg ||''}}</div>
 						</div>
 						<div class="pCOntent">
 							<div class="PTxt">烟雾情况:</div>
-							<div class="Ptext" v-if="ajxxList">{{ajxxList.ywqk ||'-'}}</div>
+							<div class="Ptext" v-if="ajxxList">{{ajxxList.ywqk ||''}}</div>
 						</div>
 					</div>
 					<div class="pCont">
 						<div class="pCOntent on">
 							<div class="PTxt">楼房层数:</div>
-							<div class="Ptext" v-if="ajxxList">{{ajxxList.lfcs ||'-'}}</div>
+							<div class="Ptext" v-if="ajxxList">{{ajxxList.lfcs ||''}}</div>
 						</div>
 						<div class="pCOntent">
 							<div class="PTxt">燃烧楼层:</div>
-							<div class="Ptext" v-if="ajxxList">{{ajxxList.rslc ||'-'}}</div>
+							<div class="Ptext" v-if="ajxxList">{{ajxxList.rslc ||''}}</div>
 						</div>
 					</div>
 					<div class="pCont">
 						<div class="pCOntent on">
 							<div class="PTxt">燃烧对象:</div>
-							<div class="Ptext" v-if="ajxxList">{{ajxxList.rsdx ||'-'}}</div>
+							<div class="Ptext" v-if="ajxxList">{{ajxxList.rsdx ||''}}</div>
 						</div>
 						<div class="pCOntent">
 							<div class="PTxt">燃烧面积:</div>
-							<div class="Ptext" v-if="ajxxList">{{ajxxList.rsmj ||'-'}}</div>
+							<div class="Ptext" v-if="ajxxList">{{ajxxList.rsmj ||''}}</div>
 						</div>
 					</div>
 				</div>
@@ -225,18 +225,18 @@
 		</div>
 		<div v-if="activeTab == 3">
 			<div class="maintenance-supervision">
-				<div v-if="wlwsb && wlwsb.length > 0">
-				<div class="maintenance-supervision_header" style="display: flex;justify-content: space-between;">
-					<el-select style="width: 220px;" v-model="value" placeholder="选择设备类型">
-						<el-option v-for="item in opti" :key="item.value" :label="item.label" :value="item.value">
-						</el-option>
-					</el-select>
-					</el-select>
-					<div class="btn-item">
-						<el-button @click="searchTab">搜索</el-button>
-						<el-button @click="resetForm">重置</el-button>
+				<div v-if="wlwsb">
+					<div class="maintenance-supervision_header" style="display: flex;justify-content: space-between;">
+						<el-select style="width: 220px;" v-model="value" placeholder="选择设备类型">
+							<el-option v-for="item in opti" :key="item.value" :label="item.label" :value="item.value">
+							</el-option>
+						</el-select>
+						</el-select>
+						<div class="btn-item">
+							<el-button @click="searchTab">搜索</el-button>
+							<el-button @click="resetForm">重置</el-button>
+						</div>
 					</div>
-				</div>
 					<div>
 						<div class="row header">
 							<span class="time">设备类型</span>
@@ -252,7 +252,7 @@
 										style="width: 110px;overflow: hidden;height: 40px;">{{item.sblx}}</span>
 									<span class="person"
 										style="width: 110px;overflow: hidden;height: 40px;">{{item.wz}}</span>
-									<span class="result">{{item.jkz ||'-'}}</span>
+									<span class="result">{{item.jkz ||''}}</span>
 									<span class="result1"
 										style="width: 100px;overflow: hidden;height: 40px;text-align: right;">{{item.zt}}</span>
 								</li>
@@ -283,8 +283,8 @@
 						label: "水压监测终端",
 					},
 					{
-						value: "电气火灾监测",
-						label: "电气火灾监测",
+						value: "电气火灾终端",
+						label: "电气火灾终端",
 					},
 					{
 						value: "生命通道监测",

+ 5 - 2
app/src/views/PoliceSituation/index.vue

@@ -23,7 +23,7 @@
 		</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="480px" width="540px" style="margin-bottom: 6px" :headerType="3" title="风险隐患信息">
 				<UnitInfo :fxxxList="fxxxList" :lshzList="lshzList" />
@@ -60,6 +60,7 @@
 		},
 		data() {
 			return {
+				jzImg:'',
 				gxsj1: null,
 				pId: null,
 				params: {
@@ -165,7 +166,9 @@
 					ajid: this.params.id,
 				};
 				getJzxx(jzxxid).then((res) => {
-					this.jzxxList = res.data.rows;
+					this.jzxxList = res.data.rows[0];
+					this.jzImg = this.jzxxList. jzzp1
+					console.log(this.jzxxList.jzzp1,'建筑信息');
 				});
 				// 风险隐患信息
 				const fxyhId = {