sk 1 gadu atpakaļ
vecāks
revīzija
ad4af2d4e8

+ 24 - 0
app/src/api/hzfx.js

@@ -94,4 +94,28 @@ export function hzfxLsit(params) {
     method: 'GET',
     params
   })
+}
+// 获取火灾分析-关键指标弹窗
+export function hzfGjzb(params) {
+  return request({
+    url: '/system/hzfx/gjzb/myhzs/translate',
+    method: 'GET',
+    params
+  })
+}
+// 获取火灾分析-关键指标-起火原因弹窗
+export function hzfxQhyy(params) {
+  return request({
+    url: '/system/hzfx/gjzb/qhyy/translate',
+    method: 'GET',
+    params
+  })
+}
+// 获取火灾分析-起火场所弹窗
+export function hzfxQhcs(params) {
+  return request({
+    url: '/system/hzfx/qhcs/translate',
+    method: 'GET',
+    params
+  })
 }

+ 88 - 79
app/src/views/FireCondition/components/hzfxCont.vue

@@ -6,6 +6,11 @@
 	import {
 		area
 	} from "@/api/area";
+	import {
+		hzfGjzb,
+		hzfxQhyy,
+		hzfxQhcs
+	} from "@/api/hzfx.js";
 	import punishmentMixin from "@/mixin/unit.js";
 	export default {
 		name: "BasicInfoModalContent",
@@ -13,8 +18,9 @@
 		data() {
 			return {
 				options: [],
-				fxdjList: [],
 				tableData: [],
+				tableData1: [],
+				// tableData2: [],
 				unitList: [],
 				value: "全市",
 				params: {
@@ -33,32 +39,42 @@
 				// risklevel: "", //风险等级
 			};
 		},
-		//   props: {
-		//     qy: String,
-		//   },
-		//   watch: {
-		//     qy: {
-		//       handler(val) {
-		//         this.value = val;
-		//         this.funUnitList();
-		//         this.handUnitList();
-		//       },
-		//       immediate: true,
-		//       deep: true,
-		//     },
-		//   },
+		  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}`);
 			},
 			funUnitList() {
-				getJdjcUnit({
+				hzfGjzb({
+					...this.params,
+					qx: this.qy === "重庆市" ? "" : this.qy,
+				}).then((res) => {
+					this.options = [res.data];
+				});
+				hzfxQhyy({
+					...this.params,
+					qx: this.qy === "重庆市" ? "" : this.qy,
+				}).then((res) => {
+					this.options1 =  [res.data];
+				});
+				hzfxQhcs({
 					...this.params,
-					qx: this.value === "重庆市" ? "" : this.value,
-					gcjzmc: this.search,
+					qx: this.qy === "重庆市" ? "" : this.qy,
 				}).then((res) => {
-					this.tableData = res.data.rows;
-					this.total = res.data.total;
+					this.options2 =  [res.data];
 				});
 			},
 			handleSizeChange(val) {
@@ -68,13 +84,13 @@
 			handleCurrentChange(val) {
 				this.params.pageNum = val;
 				this.funUnitList();
-			},
+			}, 
 			handUnitList() {
-				getGcjztjUnit({
+				hzfGjzb({
 					...this.params,
 					qy: this.value === "重庆市" ? "" : this.value,
 				}).then((res) => {
-					const list = res.data.rows[0];
+					// const list = res.data.rows[0];
 					// this.unitList = [{
 					// 		title: "高层建筑总数(栋)",
 					// 		unitNum: list.ggjz + list.gyjz + list.zzjz,
@@ -105,13 +121,6 @@
 					pageSize: 10,
 					pageNum: 1,
 				}),
-				// this.params.Unittype = ""; // 建筑分类
-				// this.params.year = ""; // 年代
-				// this.params.hnum = ""; //高度
-				// this.params.management = ""; //管理形式
-				// this.params.subject = ""; //管理主体
-				// this.params.maintenance = ""; //维保形式
-				// this.params.risklevel = ""; //风险等级
 				this.funUnitList();
 			},
 			changeList(val) {
@@ -152,10 +161,10 @@
 					</el-select>
 				</div>
 			</div>
-			<!-- <div class="btn-item">
-        <el-button @click="funUnitList">搜索</el-button>
-        <el-button @click="resetForm">重置</el-button>
-      </div> -->
+			<div class="btn-item">
+				<el-button @click="funUnitList">搜索</el-button>
+				<el-button @click="resetForm">重置</el-button>
+			</div>
 		</div>
 		<div v-if="showFlag===1">
 			<basic-table :data="tableData" @row-click="rowClickHandler" style="text-align: center">
@@ -163,113 +172,113 @@
 				</el-table-column>
 				<el-table-column prop="qx" label="区县" show-overflow-tooltip>
 				</el-table-column>
-				<el-table-column prop="gcjzmc" label="火灾总数(起)" show-overflow-tooltip>
+				<el-table-column prop="hzzs" label="火灾总数(起)" show-overflow-tooltip>
 				</el-table-column>
-				<el-table-column prop="xxdz" label="同比(%)" show-overflow-tooltip>
+				<el-table-column prop="wrstb" label="同比(%)" show-overflow-tooltip>
 				</el-table-column>
-				<el-table-column prop="xxdz" label="亡人(人)" show-overflow-tooltip>
+				<el-table-column prop="wrs" label="亡人(人)" show-overflow-tooltip>
 				</el-table-column>
-				<el-table-column prop="xxdz" label="同比(%)" show-overflow-tooltip>
+				<el-table-column prop="ssstb" label="同比(%)" show-overflow-tooltip>
 				</el-table-column>
-				<el-table-column prop="xxdz" label="伤人(人)" show-overflow-tooltip>
+				<el-table-column prop="sss" label="伤人(人)" show-overflow-tooltip>
 				</el-table-column>
 				<el-table-column prop="xxdz" label="同比(%)" show-overflow-tooltip>
 				</el-table-column>
-				<el-table-column prop="xxdz" label="直接经济损失(万元)" show-overflow-tooltip>
+				<el-table-column prop="zjccss" label="直接经济损失(万元)" show-overflow-tooltip>
 				</el-table-column>
-				<el-table-column prop="xxdz" label="同比(%)" show-overflow-tooltip>
+				<el-table-column prop="zjccsstb" label="同比(%)" show-overflow-tooltip>
 				</el-table-column>
 			</basic-table>
 		</div>
 		<div v-if="showFlag===2">
-			<basic-table :data="tableData" @row-click="rowClickHandler" style="text-align: center">
+			<basic-table :data="tableData1" @row-click="rowClickHandler" style="text-align: center">
 				<el-table-column type="index" label="序号">
 				</el-table-column>
 				<el-table-column prop="qx" label="区县" show-overflow-tooltip>
 				</el-table-column>
-				<el-table-column prop="gcjzmc" label="电气火灾(起)"  width="150" show-overflow-tooltip>
+				<el-table-column prop="dqhz" label="电气火灾(起)" width="150" show-overflow-tooltip>
 				</el-table-column>
-				<el-table-column prop="xxdz" label="放火(起)" show-overflow-tooltip>
+				<el-table-column prop="fh" label="放火(起)" show-overflow-tooltip>
 				</el-table-column>
-				<el-table-column prop="xxdz" label="静电(起)" show-overflow-tooltip>
+				<el-table-column prop="jd" label="静电(起)" show-overflow-tooltip>
 				</el-table-column>
-				<el-table-column prop="xxdz" label="雷击(起)" show-overflow-tooltip>
+				<el-table-column prop="lj" label="雷击(起)" show-overflow-tooltip>
 				</el-table-column>
-				<el-table-column prop="xxdz" label="燃放烟花爆竹(起)"  width="150" show-overflow-tooltip>
+				<el-table-column prop="rfyhbz" label="燃放烟花爆竹(起)" width="150" show-overflow-tooltip>
 				</el-table-column>
-				<el-table-column prop="xxdz" label="生产作业(起)"  width="150" show-overflow-tooltip>
+				<el-table-column prop="sczy" label="生产作业(起)" width="150" show-overflow-tooltip>
 				</el-table-column>
-				<el-table-column prop="xxdz" label="玩火(起)" show-overflow-tooltip>
+				<el-table-column prop="wh" label="玩火(起)" show-overflow-tooltip>
 				</el-table-column>
-				<el-table-column prop="xxdz" label="吸烟(起)" show-overflow-tooltip>
+				<el-table-column prop="xy" label="吸烟(起)" show-overflow-tooltip>
 				</el-table-column>
-				<el-table-column prop="xxdz" label="遗留火种(起)" show-overflow-tooltip>
+				<el-table-column prop="ylhz" label="遗留火种(起)" show-overflow-tooltip>
 				</el-table-column>
-				<el-table-column prop="xxdz" label="用火不慎(起)" show-overflow-tooltip>
+				<el-table-column prop="yhbs" label="用火不慎(起)" show-overflow-tooltip>
 				</el-table-column>
-				<el-table-column prop="xxdz" label="自燃(起)" show-overflow-tooltip>
+				<el-table-column prop="zr" label="自燃(起)" show-overflow-tooltip>
 				</el-table-column>
-				<el-table-column prop="xxdz" label="不排除原因(起)" show-overflow-tooltip>
+				<el-table-column prop="bpcyy" label="不排除原因(起)" show-overflow-tooltip>
 				</el-table-column>
 				<el-table-column prop="xxdz" label="其他(起)" show-overflow-tooltip>
 				</el-table-column>
 			</basic-table>
 		</div>
 		<div v-if="showFlag===3">
-			<basic-table :data="tableData" @row-click="rowClickHandler" style="text-align: center">
+			<basic-table :data="tableData2" @row-click="rowClickHandler" style="text-align: center">
 				<el-table-column type="index" label="序号">
 				</el-table-column>
 				<el-table-column prop="qx" label="办公场所" show-overflow-tooltip>
 				</el-table-column>
 				<el-table-column prop="gcjzmc" label="宾馆、饭店、招待所" width="150" show-overflow-tooltip>
 				</el-table-column>
-				<el-table-column prop="xxdz" label="厂房" show-overflow-tooltip>
+				<el-table-column prop="cf" label="厂房" show-overflow-tooltip>
 				</el-table-column>
-				<el-table-column prop="xxdz" label="纯餐饮场所"  width="150" show-overflow-tooltip>
+				<el-table-column prop="cy" label="纯餐饮场所" width="150" show-overflow-tooltip>
 				</el-table-column>
-				<el-table-column prop="xxdz" label="福利院" show-overflow-tooltip>
+				<el-table-column prop="fly" label="福利院" show-overflow-tooltip>
 				</el-table-column>
-				<el-table-column prop="xxdz" label="工地" show-overflow-tooltip>
+				<el-table-column prop="gd" label="工地" show-overflow-tooltip>
 				</el-table-column>
-				<el-table-column prop="xxdz" label="公共娱乐设施"  width="150" show-overflow-tooltip>
+				<el-table-column prop="ggylcs" label="公共娱乐设施" width="150" show-overflow-tooltip>
 				</el-table-column>
-				<el-table-column prop="xxdz" label="广播电视中心"  width="150" show-overflow-tooltip>
+				<el-table-column prop="gbdszx" label="广播电视中心" width="150" show-overflow-tooltip>
 				</el-table-column>
-				<el-table-column prop="xxdz" label="会议、展览中心"  width="150" show-overflow-tooltip>
+				<el-table-column prop="hy" label="会议、展览中心" width="150" show-overflow-tooltip>
 				</el-table-column>
-				<el-table-column prop="xxdz" label="加油加气站充电"   width="150"show-overflow-tooltip>
+				<el-table-column prop="jyjq" label="加油加气站充电" width="150" show-overflow-tooltip>
 				</el-table-column>
-				<el-table-column prop="xxdz" label="交通枢纽站"  width="150" show-overflow-tooltip>
+				<el-table-column prop="jtsn" label="交通枢纽站" width="150" show-overflow-tooltip>
 				</el-table-column>
-				<el-table-column prop="xxdz" label="金融交易场所"  width="150" show-overflow-tooltip>
+				<el-table-column prop="jrjycs" label="金融交易场所" width="150" show-overflow-tooltip>
 				</el-table-column>
-				<el-table-column prop="xxdz" label="居住场所" show-overflow-tooltip>
+				<el-table-column prop="jzcs" label="居住场所" show-overflow-tooltip>
 				</el-table-column>
-				<el-table-column prop="xxdz" label="汽车库" show-overflow-tooltip>
+				<el-table-column prop="qck" label="汽车库" show-overflow-tooltip>
 				</el-table-column>
-				<el-table-column prop="xxdz" label="商业场所" show-overflow-tooltip>
+				<el-table-column prop="sy" label="商业场所" show-overflow-tooltip>
 				</el-table-column>
-				<el-table-column prop="xxdz" label="石油化工企业"  width="150" show-overflow-tooltip>
+				<el-table-column prop="syhgqy" label="石油化工企业" width="150" show-overflow-tooltip>
 				</el-table-column>
-				<el-table-column prop="xxdz" label="室内农副业场所"  width="150" show-overflow-tooltip>
+				<el-table-column prop="snnfycs" label="室内农副业场所" width="150" show-overflow-tooltip>
 				</el-table-column>
-				<el-table-column prop="xxdz" label="体育场馆" show-overflow-tooltip>
+				<el-table-column prop="tycg" label="体育场馆" show-overflow-tooltip>
 				</el-table-column>
-				<el-table-column prop="xxdz" label="通信场所" show-overflow-tooltip>
+				<el-table-column prop="txcs" label="通信场所" show-overflow-tooltip>
 				</el-table-column>
-				<el-table-column prop="xxdz" label="文博馆(图书馆、博物馆、档案馆等)"  width="250" show-overflow-tooltip>
+				<el-table-column prop="wbg" label="文博馆(图书馆、博物馆、档案馆等)" width="250" show-overflow-tooltip>
 				</el-table-column>
-				<el-table-column prop="xxdz" label="文物古建筑"  width="150" show-overflow-tooltip>
+				<el-table-column prop="wwgjz" label="文物古建筑" width="150" show-overflow-tooltip>
 				</el-table-column>
-				<el-table-column prop="xxdz" label="物资仓储场所"  width="150" show-overflow-tooltip>
+				<el-table-column prop="wzcccs" label="物资仓储场所" width="150" show-overflow-tooltip>
 				</el-table-column>
-				<el-table-column prop="xxdz" label="学校" show-overflow-tooltip>
+				<el-table-column prop="xx" label="学校" show-overflow-tooltip>
 				</el-table-column>
-				<el-table-column prop="xxdz" label="养老院" show-overflow-tooltip>
+				<el-table-column prop="yly" label="养老院" show-overflow-tooltip>
 				</el-table-column>
-				<el-table-column prop="xxdz" label="医疗机构" show-overflow-tooltip>
+				<el-table-column prop="yljg" label="医疗机构" show-overflow-tooltip>
 				</el-table-column>
-				<el-table-column prop="xxdz" label="宗教场所" show-overflow-tooltip>
+				<el-table-column prop="zjcs" label="宗教场所" show-overflow-tooltip>
 				</el-table-column>
 			</basic-table>
 		</div>

+ 22 - 22
app/src/views/Iot/components/xfwlw.vue

@@ -6,9 +6,9 @@
 	import {
 		area
 	} from "@/api/area";
-		import {
-			getXfwlw
-		} from "@/api/iot.js";
+	import {
+		getXfwlw
+	} from "@/api/iot.js";
 	import punishmentMixin from "@/mixin/unit.js";
 	export default {
 		name: "BasicInfoModalContent",
@@ -28,20 +28,20 @@
 				showFlag: 1
 			};
 		},
-		  props: {
-		    qy: String,
-		  },
-		  watch: {
-		    qy: {
-		      handler(val) {
-		        this.value = val;
-		        this.funUnitList();
-		        this.handUnitList();
-		      },
-		      immediate: true,
-		      deep: true,
-		    },
-		  },
+		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}`);
@@ -139,15 +139,15 @@
 				</div>
 			</div>
 			<div class="btn-item">
-        <el-button @click="funUnitList">搜索</el-button>
-        <el-button @click="resetForm">重置</el-button>
-      </div>
+				<el-button @click="funUnitList">搜索</el-button>
+				<el-button @click="resetForm">重置</el-button>
+			</div>
 		</div>
 		<div>
 			<basic-table :data="tableData" @row-click="rowClickHandler" style="text-align: center">
 				<el-table-column type="index" label="序号">
 				</el-table-column>
-				<el-table-column prop="qx" label="区域"  show-overflow-tooltip>
+				<el-table-column prop="qx" label="区域" show-overflow-tooltip>
 				</el-table-column>
 				<el-table-column prop="ywcwlwjzs" label="已完成物联网建筑数(栋)" width="200" show-overflow-tooltip>
 				</el-table-column>
@@ -343,4 +343,4 @@
 		margin-right: 15px;
 		margin-bottom: 15px;
 	}
-</style>
+</style>