优化

app/src/views/FireCondition/components/hzfxCont.vue

@@ -175,7 +175,7 @@
 				</el-table-column>
 				<el-table-column prop="xxdz" label="同比（%）" show-overflow-tooltip>
 				</el-table-column>
-				<el-table-column prop="zjccss" label="直接经济损失（万元）" show-overflow-tooltip>
+				<el-table-column prop="zjccss" label="直接经济损失（万元）" width="250px" show-overflow-tooltip>
 				</el-table-column>
 				<el-table-column prop="zjccsstb" label="同比（%）" show-overflow-tooltip>
 				</el-table-column>

app/src/views/FireCondition/index.vue

@@ -1,19 +1,18 @@
 <template>
 	<div style="padding: 0px 35px; display: flex; justify-content: space-between">
 		<div>
-			<border-panel height="301px" style="margin-bottom: 2px"  title="关键指标" header-cursor="pointer"  @click-header="openBasicModal(1)">
-				<FireIndex :type="fireIndexType" :qx="qx" @open="openBasicModal(1)"  />
+			<border-panel height="301px" style="margin-bottom: 2px" title="关键指标"  @click-header="openBasicModal(1)">
+				<FireIndex />
 				<template #ext-header>
-					<button-block :items="['月', '年']" @select-item="selectFireIndexItemHandler" />
+					<button-block :items="['月', '年']" @select-item="selectItemHandler" />
 				</template>
 			</border-panel>
-			<border-panel height="337px" style="margin-bottom: 2px" title="起火原因" @click="openBasicModal(2)">
+			<border-panel height="337px" style="margin-bottom: 2px" title="起火原因" @click-header="openBasicModal(2)">
 				<FireReason :qx="qx" />
 			</border-panel>
-			<border-panel height="313px" title="起火场所（类型）">
+			<border-panel height="313px" title="起火场所（类型）"  @click-header="openBasicModal(3)">
 				<FireAddressType :qx="qx" />
 				<template>
-					<div class="tabCak" @click="openBasicModal(3)"></div>
 				</template>
 			</border-panel>
 		</div>
@@ -28,7 +27,7 @@
 			</div>
 			<div class="center-box">
 				<border-panel class="fire-time" header-cursor="pointer" :header-type="3" height="313px" width="955px"
-					style="margin: 7px;cursor: pointer;" title="火灾时段（24时）" @click-header="openFire">
+					style="margin: 7px;cursor: pointer;" title="火灾时段（24时）" @click-header="opemFries">
 					<FireTime :qx="qx" :type="type" />
 					<template #ext-header>
 						<button-block :items="['本年', '近5年', '季节']" @select-item="selectItemHandler" />
@@ -47,7 +46,7 @@
 		<basic-modal top="120px" ref="basicInfoModal" name="火灾分析">
 			<hzfxCont :qx="qx" :idx="valNum" @callback="callback" />
 		</basic-modal>
-		<basic-modal top="120px" ref="historyModal" name="历史火灾查询">
+		<basic-modal top="120px" ref="HistoryModal" name="历史火灾查询">
 			<hzfbCont :qy="qx" />
 		</basic-modal>
 	</div>
@@ -67,8 +66,7 @@
 		fireDistribution
 	} from '@/api/hzfx'
 	import {
-		formatCityData,
-		createMapChartWindowInfo
+		formatCityData
 	} from '../../utils'
 	export default {
 		name: "FireCondition",
@@ -83,14 +81,14 @@
 			MapCharts,
 			hzfxCont,
 			hzfbCont,
+			fireIndexType: 0,
 		},
 		data() {
 			return {
 				valNum: 1,
 				qx: '重庆市',
 				type: 1,
-				heatMap: [],
-			fireIndexType: 0,
+				heatMap: []
 			}
 		},
 		created() {
@@ -100,8 +98,13 @@
 			callback(val) {
 				this.valNum = val
 			},
+			selectItemHandler(idx) {
+				this.fireIndexType = idx
+			},
 			showLabel(params) {
-				return createMapChartWindowInfo({ title: params.name }, () => `本年火灾起数 <span style="font-size: 24px;color:red;font-weight:bold;">${params.value}</span>起`);
+				let res = params.name + "<br/>";
+				res += `本年火灾起数<span style="font-size: 24px;color:red;font-weight:bold;">${params.value}</span>个`;
+				return res;
 			},
 			change(e) {
 				this.qx = e.target.value
@@ -109,9 +112,6 @@
 			selectItemHandler(idx) {
 				this.type = (idx + 1)
 			},
-			selectFireIndexItemHandler(idx) {
-				this.fireIndexType = idx
-			},
 			openBasicModal(val) {
 				this.valNum = val;
 				this.showModal("basicInfoModal");
@@ -128,23 +128,15 @@
 					})))
 				})
 			},
-			openFire() {
-				this.showModal('historyModal')
+			opemFries() {
+				this.showModal('HistoryModal')
 			}
 		}
 	};
 </script>
 
 <style scoped lang="less">
-	.tabCak {
-		width: 350px;
-		height: 45px;
-		position: absolute;
-		left: 0;
-		top: 0;
-	}
-
 	.center-box {
 		// margin-top: 602px;
 	}
-</style>
+</style>

app/src/views/PoliceSituation/components/MobilizeStrength.vue

@@ -36,13 +36,13 @@ white-space: nowrap;">{{ item.yjddsj || '-'}}</span>
 				<img src="../../../assets/images/img14.png" />
 			</div>
 			<div class="content">
-				<div style="height: 100px;">
+				<div>
 					<div style="" v-if="hcws1">
-						<div class="contFlex">
+						<div class="contFlex" style="margin: 5px 0;">
 							<div class="contType">{{hcws1.jqzt}}</div>
 							<div class="conTime">{{hcws1.gxsj}}</div>
 						</div>
-						<div class="contBox">{{hcws1.wsnrJyqk}}</div>
+						<div class="contBox" style="margin: 1px 0 ;">{{hcws1.wsnrJyqk}}</div>
 						<div class="contText">{{hcws1.fkjgDwmc}}</div>
 					</div>
 				</div>
@@ -55,7 +55,7 @@ white-space: nowrap;">{{ item.yjddsj || '-'}}</span>
 			</div>
 			<div class="content on">
 				<div v-for="(item,index) in hcws" :key="index">
-					<div style="">
+					<div style="" style="background: rgba(21, 64, 98);">
 						<div class="contFlex">
 							<div class="contType">{{item.jqzt}}</div>
 							<div class="conTime">{{item.gxsj}}</div>
@@ -159,7 +159,7 @@ white-space: nowrap;">{{ item.yjddsj || '-'}}</span>
 	}
 
 	.content.on {
-		height: 100px;
+		height: 110px;
 		overflow: auto;
 	}
 
@@ -303,4 +303,4 @@ white-space: nowrap;">{{ item.yjddsj || '-'}}</span>
 			}
 		}
 	}
-</style>
+</style>

app/src/views/PoliceSituation/components/UnitInfo.vue

@@ -14,26 +14,26 @@
 		</div>
 		<div class="paet">隐患部位</div>
 		<div class="paetCont">
-			<div class="paetBox" v-if="fxxxList">
+			<div class="paetBox">
 				<div class="pael">
 					<div class="wier">1</div>
 					<div class="hidTxt">隐患部位：</div>
-					<div class="hidTxt on">{{fxxxList.yhbw || '-'}}</div>
+					<div class="hidTxt on" v-if="fxxxList">{{fxxxList.yhbw || '-'}}</div>
 				</div>
 				<div class="paer">
 					<div class="hidTxt">隐患原因：</div>
-					<div class="hidTxt on">{{fxxxList.yhyy1 || '-'}}</div>
+					<div class="hidTxt on" v-if="fxxxList">{{fxxxList.yhyy1 || '-'}}</div>
 				</div>
 			</div>
-			<div class="paetBox" v-if="fxxxList">
+			<div class="paetBox">
 				<div class="paer">
 					<div class="wier">2</div>
 					<div class="hidTxt">位置：</div>
-					<div class="hidTxt on">{{fxxxList.wz ||'-'}}</div>
+					<div class="hidTxt on"  v-if="fxxxList">{{fxxxList.wz ||'-'}}</div>
 				</div>
 				<div class="paer">
 					<div class="hidTxt">隐患原因：</div>
-					<div class="hidTxt on">{{fxxxList.yhyy2 || '-'}}</div>
+					<div class="hidTxt on"  v-if="fxxxList">{{fxxxList.yhyy2 || '-'}}</div>
 				</div>
 			</div>
 		</div>

app/src/views/PoliceSituation/components/UnitInformation.vue

@@ -253,6 +253,7 @@
 	export default {
 		data() {
 			return {
+				id:null,
 				value: "",
 				activeTab: 1,
 				tabPosition: 'left',

app/src/views/PoliceSituation/index.vue

@@ -4,8 +4,8 @@
 			<border-panel height="350px" width="540px" style="margin-bottom: 6px" :headerType="3" title="报警信息">
 				<Alaem :list="bjxxList" v-if="bjxxList && bjxxList.length > 0" @callback="callback" :pId="pId" />
 			</border-panel>
-			<border-panel height="620px" width="540px" style="margin-bottom: 6px" :headerType="3" title="出动力量">
-				<MobilizeStrength :list="cdxxList" :zlxx="zlxx" :hcws="hcws"  />
+			<border-panel height="600px" width="540px" style="margin-bottom: 6px" :headerType="3" title="出动力量">
+				<MobilizeStrength :list="cdxxList" :zlxx="zlxx" :hcws="hcws" :hcws1="hcws1" />
 			</border-panel>
 		</div>
 		<div style="width: 1000px; padding-bottom: 6px;">
@@ -15,7 +15,7 @@
 			<border-panel height="469px" width="540px" style="margin-bottom: 6px" :headerType="3" title="事故单位信息">
 				<UnitInformation :ajxxList="ajxxList" :jzxxList="jzxxList" :wlwsb="wlwsb" />
 			</border-panel>
-			<border-panel height="495px" 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>
@@ -180,4 +180,4 @@
 	};
 </script>
 
-<style scoped lang="less"></style>
+<style scoped lang="less"></style>