页面调整

src/views/modules/shequzhili/tuceng/anquan/anquanxuncha/addForm.vue

@@ -47,7 +47,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

src/views/modules/shequzhili/tuceng/anquan/shebei/addForm.vue

@@ -25,7 +25,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
@@ -137,8 +137,7 @@ export default {
 				equipmentCategoryCode: '',
 				principalName: '',
 				location: '',
-				contactNum: '',
-				
+				contactNum: ''
 			},
 			dataRule: {
 				equipmentName: [{ required: true, message: '设备名称不能为空', trigger: 'bulr' }],
@@ -174,7 +173,6 @@ export default {
 	},
 
 	methods: {
-		
 		async loadCategory() {
 			const url = '/sys/dict/data/dictlist';
 
@@ -270,9 +268,8 @@ export default {
 			const { data, code, msg } = await requestPost(url, params);
 			if (code === 0) {
 				this.$message.success('操作成功');
-				
-				// this.handleCancle();
-			
+
+				this.handleCancle();
 			} else if (code >= 8000) {
 				this.$message.error(msg);
 			}
@@ -301,7 +298,7 @@ export default {
 		}, // 地图初始化函数，本例取名为init，开发者可根据实际情况定义
 		initMap() {
 			let { latitude, longitude } = this.$store.state.user;
-		
+
 			if (this.formData.latitude && this.formData.longitude) {
 				latitude = this.formData.latitude;
 				longitude = this.formData.longitude;
@@ -310,7 +307,7 @@ export default {
 				latitude = 39.9088810666821;
 				longitude = 116.39743841556731;
 			}
-		
+
 			this.$nextTick(() => {
 				map = new daiMap(
 					document.getElementById('app_event'),
@@ -325,7 +322,7 @@ export default {
 				map.on('dragend', e => {
 					this.handleMoveCenter(e);
 				});
-		
+
 				map.setCenter(latitude, longitude);
 				if (this.formData.latitude) {
 					map.setMarker(latitude, longitude);
@@ -357,7 +354,7 @@ export default {
 					if (data.resultList && data.resultList.length > 0) {
 						this.resultList = data.resultList;
 						this.searchOptions = this.resultList.map(item => {
-							return { value: `${item.hotPointID}`, label: `${item.address + item.name}` };
+							return { value: `${item.id}`, label: `${item.address + item.name}` };
 						});
 					}
 				} else {

src/views/modules/shequzhili/tuceng/anquan/shebei/record.vue

@@ -382,8 +382,9 @@ 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/safetyEquipmentInspectRecord/delete`;
+			const { data, code, msg } = await requestPost(url,arr);
 
 			if (code === 0) {
 				this.$message.success('删除成功');

src/views/modules/shequzhili/tuceng/anquan/yinhuan/addForm.vue

@@ -132,7 +132,7 @@
 			<!-- <el-button size="small" @click="resetData" v-if="pageType != 'view'">重置</el-button> -->
 			<el-button size="small" type="primary" :disabled="btnDisable" @click="handleComfirm" v-if="pageType != 'view'">确 定</el-button>
 		</div>
-		<!-- <div style="margin-top: 30px;"><record v-if="pageType != 'add' && detailId" :formType="pageType" :id="detailId" :info="{ agencyId: agencyId }"></record></div> -->
+		<div style="margin-top: 30px;"><record v-if="pageType != 'add' && detailId" :formType="pageType" :id="detailId" :info="{ agencyId: agencyId }"></record></div>
 	</el-card>
 </template>
 

src/views/modules/shequzhili/tuceng/anquan/yinhuan/record.vue

@@ -106,7 +106,7 @@ export default {
 			isEdit: false,
 			tableData: [],
 			tempRow: {},
-
+			
 			optionResult: [
 				{
 					label: '待处理',
@@ -250,22 +250,17 @@ export default {
 
 			const item = {
 				isEdit: true,
-				id: this.id,
-				inspectTime: '',
-				inspectStaffId: '',
-				inspectStaffName: '',
-				inspectStaffMobile: '',
-				inspectResult: '',
-				imgList: [],
-				nextInspectTime: ''
+				hiddenDangerRecordId: this.id,
+				remark: '',
+				handleState: '',
+				handleTime: ''
 			};
-			this.computeImgShowList(item);
+			// this.computeImgShowList(item);
 			this.tableData.push(item);
 		},
 
 		async save(row) {
 			const params = {
-				hiddenDangerRecordId: this.id,
 				...row
 			};
 			const url = `/actual/base/hiddenDangerRecord/saveProcess`;
@@ -298,8 +293,9 @@ export default {
 		},
 
 		async del(row) {
-			const url = `/actual/base/hiddenDangerRecord/deleteProcess/${row.hiddenDangerRecordId}`;
-			const { data, code, msg } = await requestPost(url);
+			const url = `/actual/base/hiddenDangerRecord/deleteProcess`;
+			let arr=[row.id]
+			const { data, code, msg } = await requestPost(url,arr);
 
 			if (code === 0) {
 				this.$message.success('删除成功');
@@ -311,14 +307,16 @@ export default {
 
 		async getList() {
 			const params = {
-				hiddenDangerRecordId: this.id
+				hiddenDangerRecordId: this.id,
+				pageNo: 1,
+				pageSize: 10000
 			};
 			const url = `/actual/base/hiddenDangerRecord/queryProcess`;
 			const { data, code, msg } = await requestPost(url, params);
 
 			if (code === 0) {
 				this.tableData = data.list.map(item => {
-					this.computeImgShowList(item);
+					// this.computeImgShowList(item);
 					return {
 						...item,
 						isEdit: false