From dd777eb698f7cd9b0e2fc0f29c631d036d462a6d Mon Sep 17 00:00:00 2001
From: tianq <tianq@hgzp.com.cn>
Date: Wed, 29 Mar 2023 15:35:21 +0800
Subject: [PATCH] =?UTF-8?q?=E9=A1=B5=E9=9D=A2=E8=B0=83=E6=95=B4?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../tuceng/anquan/anquanxuncha/record.vue          |  4 ++--
 .../shequzhili/tuceng/anquan/shebei/record.vue     |  8 ++++----
 .../shequzhili/tuceng/chengshiguanli/addForm.vue   |  2 +-
 .../shequzhili/tuceng/chengshiguanli/record.vue    |  4 ++--
 .../modules/shequzhili/tuceng/gonggong/addForm.vue |  2 +-
 .../modules/shequzhili/tuceng/gonggong/record.vue  |  4 ++--
 .../shequzhili/tuceng/gonggongfuwu/addForm.vue     |  4 ++--
 .../shequzhili/tuceng/yingji/changsuo/index.vue    |  1 +
 .../shequzhili/tuceng/yingji/changsuo/record.vue   | 14 ++++++++------
 .../shequzhili/tuceng/yingji/wuzi/addForm.vue      |  2 +-
 .../shequzhili/tuceng/yingji/wuzi/record.vue       | 11 ++++++-----
 11 files changed, 30 insertions(+), 26 deletions(-)

diff --git a/src/views/modules/shequzhili/tuceng/anquan/anquanxuncha/record.vue b/src/views/modules/shequzhili/tuceng/anquan/anquanxuncha/record.vue
index a8c81b530..3ec3d877b 100644
--- a/src/views/modules/shequzhili/tuceng/anquan/anquanxuncha/record.vue
+++ b/src/views/modules/shequzhili/tuceng/anquan/anquanxuncha/record.vue
@@ -184,11 +184,11 @@ export default {
 
 			optionResult: [
 				{
-					label: '合格',
+					label: '异常',
 					value: '0'
 				},
 				{
-					label: '不合格',
+					label: '正常',
 					value: '1'
 				}
 			],
diff --git a/src/views/modules/shequzhili/tuceng/anquan/shebei/record.vue b/src/views/modules/shequzhili/tuceng/anquan/shebei/record.vue
index 0538b2db5..84da350d8 100644
--- a/src/views/modules/shequzhili/tuceng/anquan/shebei/record.vue
+++ b/src/views/modules/shequzhili/tuceng/anquan/shebei/record.vue
@@ -193,12 +193,12 @@ export default {
 
 			optionResult: [
 				{
-					label: '合格',
-					value: '1'
+					label: '异常',
+					value: '0'
 				},
 				{
-					label: '不合格',
-					value: '0'
+					label: '正常',
+					value: '1'
 				}
 			],
 			optionStaff: [
diff --git a/src/views/modules/shequzhili/tuceng/chengshiguanli/addForm.vue b/src/views/modules/shequzhili/tuceng/chengshiguanli/addForm.vue
index dc2d74214..2a7d49fea 100644
--- a/src/views/modules/shequzhili/tuceng/chengshiguanli/addForm.vue
+++ b/src/views/modules/shequzhili/tuceng/chengshiguanli/addForm.vue
@@ -23,7 +23,7 @@
 						<el-form-item label="场所地址" prop="address" style="display: block">
 							<el-select
 								v-model="formData.address"
-								style="width: 200px;"
+								style="width: 500px;"
 								:disabled="disabled"
 								filterable
 								remote
diff --git a/src/views/modules/shequzhili/tuceng/chengshiguanli/record.vue b/src/views/modules/shequzhili/tuceng/chengshiguanli/record.vue
index f9bc6dca6..ffa70108a 100644
--- a/src/views/modules/shequzhili/tuceng/chengshiguanli/record.vue
+++ b/src/views/modules/shequzhili/tuceng/chengshiguanli/record.vue
@@ -192,11 +192,11 @@ export default {
 
 			optionResult: [
 				{
-					label: '合格',
+					label: '异常',
 					value: '0'
 				},
 				{
-					label: '不合格',
+					label: '正常',
 					value: '1'
 				}
 			],
diff --git a/src/views/modules/shequzhili/tuceng/gonggong/addForm.vue b/src/views/modules/shequzhili/tuceng/gonggong/addForm.vue
index 5627ecd67..4750e8f07 100644
--- a/src/views/modules/shequzhili/tuceng/gonggong/addForm.vue
+++ b/src/views/modules/shequzhili/tuceng/gonggong/addForm.vue
@@ -27,7 +27,7 @@
 						<el-form-item label="所处位置" prop="location" style="display: block">
 							<el-select
 								v-model="formData.location"
-								style="width: 200px;"
+								style="width: 500px;"
 								:disabled="disabled"
 								filterable
 								remote
diff --git a/src/views/modules/shequzhili/tuceng/gonggong/record.vue b/src/views/modules/shequzhili/tuceng/gonggong/record.vue
index a0bb8938a..1e561ce19 100644
--- a/src/views/modules/shequzhili/tuceng/gonggong/record.vue
+++ b/src/views/modules/shequzhili/tuceng/gonggong/record.vue
@@ -193,11 +193,11 @@ export default {
 
 			optionResult: [
 				{
-					label: '合格',
+					label: '异常',
 					value: '0'
 				},
 				{
-					label: '不合格',
+					label: '正常',
 					value: '1'
 				}
 			],
diff --git a/src/views/modules/shequzhili/tuceng/gonggongfuwu/addForm.vue b/src/views/modules/shequzhili/tuceng/gonggongfuwu/addForm.vue
index b93076cf0..a045005d0 100644
--- a/src/views/modules/shequzhili/tuceng/gonggongfuwu/addForm.vue
+++ b/src/views/modules/shequzhili/tuceng/gonggongfuwu/addForm.vue
@@ -28,7 +28,7 @@
 							<!-- <el-input v-model="formData.location" :disabled="disabled" class="u-item-width-normal" size="small" clearable placeholder="请输入"></el-input> -->
 							<el-select
 								v-model="formData.location"
-								style="width: 200px;"
+								style="width: 500px;"
 								:disabled="disabled"
 								filterable
 								remote
@@ -134,7 +134,7 @@ export default {
 			gridList: [], //所属网格list--场所区域
 			placeTypeList: [], //场所类型
 			resultArray: [{ value: '0', label: '合格' }, { value: '1', label: '不合格' }],
-			equipmentCategoryCodeArray: [{ value: '0', label: '九小场所' }, { value: '1', label: '企事业单位' }],
+			equipmentCategoryCodeArray: [],
 			list: {},
 			formData: {
 				equipmentName: '',
diff --git a/src/views/modules/shequzhili/tuceng/yingji/changsuo/index.vue b/src/views/modules/shequzhili/tuceng/yingji/changsuo/index.vue
index c928ee11c..f3d891db1 100644
--- a/src/views/modules/shequzhili/tuceng/yingji/changsuo/index.vue
+++ b/src/views/modules/shequzhili/tuceng/yingji/changsuo/index.vue
@@ -284,6 +284,7 @@ export default {
 				...formData
 			});
 			if (code === 0) {
+				console.log("shuju ",data)
 				this.total = data.total || 0;
 				this.tableData = data.list
 					? data.list.map(item => {
diff --git a/src/views/modules/shequzhili/tuceng/yingji/changsuo/record.vue b/src/views/modules/shequzhili/tuceng/yingji/changsuo/record.vue
index d485ee4a8..f4b611aeb 100644
--- a/src/views/modules/shequzhili/tuceng/yingji/changsuo/record.vue
+++ b/src/views/modules/shequzhili/tuceng/yingji/changsuo/record.vue
@@ -193,12 +193,12 @@ export default {
 
 			optionResult: [
 				{
-					label: '合格',
-					value: '1'
+					label: '异常',
+					value: '0'
 				},
 				{
-					label: '不合格',
-					value: '0'
+					label: '正常',
+					value: '1'
 				}
 			],
 			optionStaff: [
@@ -383,8 +383,10 @@ export default {
 		},
 
 		async del(row) {
-			const url = `/actual/base/safetyEquipmentInspectRecord/delete/${this.id}`;
-			const { data, code, msg } = await requestPost(url);
+			let arr=[row.id]
+			// const url = `/actual/base/emergencyEquipment/inspect-delete`;
+			const url = `/actual/base/safetyEquipmentInspectRecord/delete`;
+			const { data, code, msg } = await requestPost(url,arr);
 
 			if (code === 0) {
 				this.$message.success('删除成功');
diff --git a/src/views/modules/shequzhili/tuceng/yingji/wuzi/addForm.vue b/src/views/modules/shequzhili/tuceng/yingji/wuzi/addForm.vue
index 2623056da..8bd37b13a 100644
--- a/src/views/modules/shequzhili/tuceng/yingji/wuzi/addForm.vue
+++ b/src/views/modules/shequzhili/tuceng/yingji/wuzi/addForm.vue
@@ -388,7 +388,7 @@ export default {
 			map.setMarker(lonlat[1], lonlat[0]);
 			this.formData.latitude = lonlat[1];
 			this.formData.longitude = lonlat[0];
-			this.formData.address = selPosition.address + selPosition.name;
+			this.formData.location = selPosition.address + selPosition.name;
 		}
 	}
 };
diff --git a/src/views/modules/shequzhili/tuceng/yingji/wuzi/record.vue b/src/views/modules/shequzhili/tuceng/yingji/wuzi/record.vue
index f8254474e..e715871cd 100644
--- a/src/views/modules/shequzhili/tuceng/yingji/wuzi/record.vue
+++ b/src/views/modules/shequzhili/tuceng/yingji/wuzi/record.vue
@@ -95,7 +95,7 @@
 									:data="{ customerId: customerId }"
 									:show-file-list="true"
 									:limit="3"
-									:file-list="scope.row.imgShowList"
+									:file-list="scope.row.imgList"
 									:on-success="res => handleImgSuccess(res, scope.row)"
 									:on-remove="res => handleImgRemove(res, scope.row)"
 									list-type="picture"
@@ -193,11 +193,11 @@ export default {
 
 			optionResult: [
 				{
-					label: '合格',
+					label: '异常',
 					value: '0'
 				},
 				{
-					label: '不合格',
+					label: '正常',
 					value: '1'
 				}
 			],
@@ -382,8 +382,9 @@ export default {
 		},
 
 		async del(row) {
-			const url = `/actual/base/emergencyEquipment/inspect-delete/${this.id}`;
-			const { data, code, msg } = await requestPost(url);
+			let arr=[row.id]
+			const url = `/actual/base/emergencyEquipment/inspect-delete`;
+			const { data, code, msg } = await requestPost(url,arr);
 
 			if (code === 0) {
 				this.$message.success('删除成功');