From 73f0ccfc4af9742cd45c0b47f32df6c96d841232 Mon Sep 17 00:00:00 2001
From: tianq <tianq@hgzp.com.cn>
Date: Thu, 30 Mar 2023 16:14:13 +0800
Subject: [PATCH] =?UTF-8?q?=E5=BC=B9=E5=87=BA=E6=A1=86=E5=90=8D=E5=AD=97?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../tuceng/anquan/anquanxuncha/addForm.vue    |   8 +-
 .../tuceng/anquan/shebei/addForm.vue          | 814 +++++++++---------
 .../shequzhili/tuceng/anquan/shebei/index.vue |   4 +-
 .../tuceng/anquan/shebei/record.vue           |   2 +-
 .../tuceng/anquan/yinhuan/addForm.vue         |  12 +-
 .../tuceng/chengshiguanli/addForm.vue         |  10 +-
 .../tuceng/gonggongfuwu/addForm.vue           |  10 +-
 .../tuceng/yingji/changsuo/addForm.vue        |  10 +-
 .../shequzhili/tuceng/yingji/wuzi/addForm.vue |   8 +-
 .../residentCategoryComponents/addForm.vue    |   7 +-
 .../serviceMattersComponents/addForm.vue      |   7 +-
 11 files changed, 469 insertions(+), 423 deletions(-)

diff --git a/src/views/modules/shequzhili/tuceng/anquan/anquanxuncha/addForm.vue b/src/views/modules/shequzhili/tuceng/anquan/anquanxuncha/addForm.vue
index 19ca8c901..6a75267fc 100644
--- a/src/views/modules/shequzhili/tuceng/anquan/anquanxuncha/addForm.vue
+++ b/src/views/modules/shequzhili/tuceng/anquan/anquanxuncha/addForm.vue
@@ -1,5 +1,10 @@
 <template>
-	<el-dialog title="提示" :visible.sync="dialogVisible" width="1370px" :before-close="handleCancle">
+	<el-dialog  :visible.sync="dialogVisible" width="1370px" :before-close="handleCancle">
+		<span slot="title">
+			<span v-if="pageType=='add'">新增</span>
+			<span v-if="pageType=='edit'">修改</span>
+			<span v-if="pageType=='view'">查看</span>
+		</span>
 		<div>
 			<div class="dialog-h-content scroll-h">
 				<el-form :inline="true" :model="formData" ref="form" :rules="dataRule" :label-width="'90px'" v-if="pageType != 'view'">
@@ -122,6 +127,7 @@
 			</div>
 			<div style="margin-top: 30px;"><record v-if="pageType != 'add' && detailId" :formType="pageType" :id="detailId" :info="{ agencyId: agencyId }"></record></div>
 		</div>
+		
 		<span slot="footer" class="dialog-footer">
 			<el-button @click="handleCancle">关 闭</el-button>
 			<!-- <el-button type="primary" @click="handleComfirm">确 定</el-button> -->
diff --git a/src/views/modules/shequzhili/tuceng/anquan/shebei/addForm.vue b/src/views/modules/shequzhili/tuceng/anquan/shebei/addForm.vue
index bc604671b..9c7f459f7 100644
--- a/src/views/modules/shequzhili/tuceng/anquan/shebei/addForm.vue
+++ b/src/views/modules/shequzhili/tuceng/anquan/shebei/addForm.vue
@@ -1,403 +1,411 @@
-<template>
-	<el-dialog title="提示" :visible.sync="dialogVisible" width="1370px" :before-close="handleCancle">
-		<div>
-			<div class="dialog-h-content scroll-h">
-				<el-form :inline="true" :model="formData" ref="form" :rules="dataRule" :label-width="'90px'" v-if="pageType != 'view'">
-					<el-row>
-						<el-col :span="6">
-							<el-form-item label="设备名称" prop="equipmentName">
-								<el-input v-model="formData.equipmentName" :disabled="disabled" class="u-item-width-normal" size="small" clearable placeholder="请输入"></el-input>
-							</el-form-item>
-						</el-col>
-						<el-col :span="6">
-							<el-form-item label="设备类型" prop="equipmentCategoryCode">
-								<el-select v-model="formData.equipmentCategoryCode" :disabled="disabled" placeholder="请选择" size="small" clearable class="u-item-width-normal">
-									<el-option v-for="item in equipmentCategoryCodeArray" :key="item.value" :label="item.label" :value="item.value"></el-option>
-								</el-select>
-							</el-form-item>
-						</el-col>
-						<el-col :span="6">
-							<el-form-item label="负责人" prop="principalName">
-								<el-input v-model="formData.principalName" :disabled="disabled" class="u-item-width-normal" size="small" clearable placeholder="请输入"></el-input>
-							</el-form-item>
-						</el-col>
-						<el-col :span="6">
-							<el-form-item label="联系电话" prop="contactNum">
-								<el-input v-model="formData.contactNum" :disabled="disabled" class="u-item-width-normal" size="small" clearable placeholder="请输入"></el-input>
-							</el-form-item>
-						</el-col>
-						<el-col :span="6">
-							<el-form-item label="所处位置" prop="location" style="display: block">
-								<el-select
-									v-model="formData.location"
-									:disabled="disabled"
-									filterable
-									remote
-									:reserve-keyword="true"
-									placeholder="请输入关键词"
-									:remote-method="remoteMethod"
-									:loading="loading"
-								>
-									<el-option
-										v-for="(item, index) in searchOptions"
-										@click.native="handleClickKey(index)"
-										:key="item.value"
-										:label="item.label"
-										:value="item.value"
-									></el-option>
-								</el-select>
-							</el-form-item>
-						</el-col>
-					</el-row>
-					<div id="app_event" class="div_map"></div>
-				</el-form>
-				<el-form :inline="false" :model="formData" ref="form" :label-width="'90px'" v-if="pageType == 'view'">
-					<el-row>
-						<el-col :span="6">
-							<el-form-item label="设备名称" prop="equipmentName">{{ formData.equipmentName }}</el-form-item></el-col>
						<el-col :span="6">
-							<el-form-item label="设备类型" prop="equipmentCategoryCode">{{ formData.equipmentCategoryName }}</el-form-item></el-col>
						<el-col :span="6">
-							<el-form-item label="负责人" prop="principalName">{{ formData.principalName }}</el-form-item></el-col>
						<el-col :span="6">
-							<el-form-item label="联系电话" prop="contactNum">{{ formData.contactNum }}</el-form-item>
-						</el-col>
-						<el-col :span="6">
-							<el-form-item label="场所地址" prop="location" style="display: block">
-								{{ formData.location }}
-								
-							</el-form-item>
-						</el-col>
-					</el-row><div id="app_event" class="div_map"></div>
-				</el-form>
-			</div>
-			<div class="div_btn" v-if="pageType != 'view'">
-				<el-button size="small" @click="handleCancle">取 消</el-button>
-				<!-- <el-button size="small" @click="resetData" v-if="pageType != 'view'">重置</el-button> -->
-				<el-button size="small" type="primary" :disabled="btnDisable" @click="handleComfirm" >确 定</el-button>
-			</div>
-			<div style="margin-top: 30px;"><record v-if="pageType != 'add' && detailId" :formType="pageType" :id="detailId" :info="{ agencyId: agencyId }"></record></div>
-		</div>
-		<span slot="footer" class="dialog-footer">
-			<el-button @click="handleCancle">关 闭</el-button>
-			<!-- <el-button type="primary" @click="handleComfirm">确 定</el-button> -->
-		</span>
-	</el-dialog>
-</template>
-
-<script>
-import { isMobile } from '@/utils/validate';
-import { mapGetters } from 'vuex';
-import { Loading } from 'element-ui'; // 引入Loading服务
-import { requestPost, requestGet } from '@/js/dai/request';
-import daiMap from '@/utils/dai-map';
-import nextTick from 'dai-js/tools/nextTick';
-import record from './record';
-let loading; // 加载动画
-let map;
-var search;
-var markers;
-var infoWindowList;
-var geocoder; // 新建一个正逆地址解析类
-
-export default {
-	props: {
-		dialogVisible: {
-			type: Boolean,
-			default: ''
-		},
-		defaultData: {
-			type: Object,
-			default: null
-		},
-		pageType: {
-			type: String,
-			default: ''
-		},
-		detailId: {
-			type: String,
-			default: ''
-		},
-		detailData: {
-			type: Object,
-			default: null
-		},
-		disabled: {
-			type: Boolean,
-			default: false
-		}
-	},
-
-	data() {
-		let checkMObile = (rule, value, callback) => {
-			if (value === '') {
-				callback(new Error('请输入手机号'));
-			} else {
-				if (!isMobile(value)) {
-					callback(new Error('手机号格式不正确'));
-				}
-				callback();
-			}
-		};
-		return {
-			btnDisable: false,
-			user: '',
-			agencyId: '',
-			gridList: [], //所属网格list--场所区域
-			placeTypeList: [], //场所类型
-			resultArray: [{ value: '0', label: '合格' }, { value: '1', label: '不合格' }],
-			equipmentCategoryCodeArray: [],
-			list: {},
-			formData: {
-				equipmentName: '',
-				equipmentCategoryCode: '',
-				principalName: '',
-				location: '',
-				contactNum: ''
-			},
-			dataRule: {
-				equipmentName: [{ required: true, message: '设备名称不能为空', trigger: 'bulr' }],
-				equipmentCategoryCode: [{ required: true, message: '设备类型不能为空', trigger: 'bulr' }],
-				principalName: [{ required: true, message: '负责人不能为空', trigger: 'bulr' }],
-				contactNum: [{ required: true, validator: checkMObile, trigger: 'blur' }],
-				location: [{ required: true, message: '所处位置不能为空', trigger: 'blur' }]
-			},
-			//地图
-			loading: false,
-			searchValue: '',
-			searchOptions: []
-		};
-	},
-	watch: {},
-	components: { record },
-	created() {},
-	async mounted() {
-		console.log('detailId', this.detailId);
-		this.user = this.$store.state.user;
-		this.agencyId = this.user.agencyId;
-		this.startLoading();
-		this.loadCategory();
-		// this.loadGrid();
-		// this.loadplaceType();
-		if (this.pageType != 'add') {
-			this.getDetail();
-		} else {
-			this.initMap();
-		}
-		await this.endLoading();
-		this.endLoading();
-	},
-
-	methods: {
-		async loadCategory() {
-			const url = '/sys/dict/data/dictlist';
-
-			let params = {
-				dictType: 'safety_equipment_category'
-			};
-
-			const { data, code, msg } = await requestPost(url, params);
-			if (code === 0) {
-				this.equipmentCategoryCodeArray = data;
-			} else {
-				this.$message.error(msg);
-			}
-		},
-		async loadGrid() {
-			const url = '/gov/org/customergrid/gridoption';
-			let params = {
-				agencyId: this.agencyId,
-				purpose: 'query'
-			};
-			const { data, code, msg } = await requestPost(url, params);
-			if (code === 0) {
-				this.gridList = data;
-			} else {
-				this.$message.error(msg);
-			}
-		},
-		//场所类型
-		async loadplaceType() {
-			const url = '/gov/org/coverage/dict-select-list/enterprise_patrol';
-			let params = {
-				// agencyId: this.agencyId,
-				// purpose: 'query'
-			};
-			const { data, code, msg } = await requestPost(url, params);
-			if (code === 0) {
-				this.placeTypeList = data;
-			} else {
-				this.$message.error(msg);
-			}
-		},
-		async getDetail() {
-			const url = `/actual/base/safetyEquipment/detail/${this.detailId}`;
-			const { data, code, msg } = await requestPost(url);
-			if (code === 0) {
-				console.log('详情数据', data);
-				this.formData = { ...data };
-				this.initMap();
-			} else {
-				this.$message.error(msg);
-			}
-		},
-
-		handleComfirm() {
-			this.save();
-		},
-		async handleAdd() {
-			// this.btnDisable = true;
-			// setTimeout(() => {
-			// 	this.btnDisable = false;
-			// }, 10000);
-			// nextTick(1000);
-			// const form = new Promise((resolve, reject) => {
-			// 	this.$refs['form'].validate(valid => {
-			// 		if (valid) resolve();
-			// 	});
-			// });
-			// const form1 = new Promise((resolve, reject) => {
-			// 	this.$refs['form1'].validate(valid => {
-			// 		if (valid) resolve();
-			// 	});
-			// });
-			// Promise.all([form1, form])
-			// 	.then(() => {
-			// 		this.addFuwu();
-			// 	})
-			// 	.catch(() => {
-			// 		app.util.validateRule(messageObj);
-			// 		this.btnDisable = false;
-			// 	});
-		},
-
-		async save() {
-			console.log('this.formData', this.formData);
-			var url = '';
-			var params = {};
-			if (this.pageType == 'add') {
-				url = '/actual/base/safetyEquipment/save';
-			} else {
-				url = '/actual/base/safetyEquipment/update';
-			}
-			params = { ...this.formData };
-			const { data, code, msg } = await requestPost(url, params);
-			if (code === 0) {
-				this.$message.success('操作成功');
-
-				this.handleCancle();
-			} else if (code >= 8000) {
-				this.$message.error(msg);
-			}
-		},
-		handleCancle() {
-			this.resetData();
-			this.$emit('handleClose');
-		},
-		resetData() {
-			this.$refs.form.resetFields();
-		},
-		// 开启加载动画
-		startLoading() {
-			loading = Loading.service({
-				lock: true, // 是否锁定
-				text: '正在加载……', // 加载中需要显示的文字
-				background: 'rgba(0,0,0,.7)' // 背景颜色
-			});
-		},
-		// 结束加载动画
-		endLoading() {
-			// clearTimeout(timer);
-			if (loading) {
-				loading.close();
-			}
-		}, // 地图初始化函数，本例取名为init，开发者可根据实际情况定义
-		initMap() {
-			let { latitude, longitude } = this.$store.state.user;
-
-			if (this.formData.latitude && this.formData.longitude) {
-				latitude = this.formData.latitude;
-				longitude = this.formData.longitude;
-			}
-			if (!latitude || latitude == '' || latitude == '0') {
-				latitude = 39.9088810666821;
-				longitude = 116.39743841556731;
-			}
-
-			this.$nextTick(() => {
-				map = new daiMap(
-					document.getElementById('app_event'),
-					{ latitude, longitude },
-					{
-						zoom: 16.2, // 设置地图缩放级别
-						pitch: 43.5, // 设置俯仰角
-						rotation: 45 // 设置地图旋转角度
-					}
-				);
-				// 监听地图平移结束
-				map.on('dragend', e => {
-					this.handleMoveCenter(e);
-				});
-
-				map.setCenter(latitude, longitude);
-				if (this.formData.latitude) {
-					map.setMarker(latitude, longitude);
-				}
-			});
-		},
-		async handleMoveCenter() {
-			//修改地图中心点
-			const { lat, lng } = map.getCenter();
-			this.formData.latitude = lat;
-			this.formData.longitude = lng;
-			map.setMarker(lat, lng);
-
-			let { msg, data } = await map.getAddress(lat, lng);
-			if (msg == 'success') {
-				this.formData.location = data.address;
-				this.searchValue = data.address;
-				this.searchOptions = [];
-			}
-		},
-		async remoteMethod(query) {
-			if (query !== '') {
-				this.loading = true;
-				const { msg, data } = await map.searchNearby(query);
-				this.loading = false;
-				this.resultList = [];
-
-				if (msg == 'success' && data.resultList && data.resultList.length > 0) {
-					if (data.resultList && data.resultList.length > 0) {
-						this.resultList = data.resultList;
-						this.searchOptions = this.resultList.map(item => {
-							return { value: `${item.id}`, label: `${item.address + item.name}` };
-						});
-					}
-				} else {
-					this.searchOptions = [
-						{
-							value: '0',
-							label: '未检索到结果'
-						}
-					];
-				}
-			} else {
-				this.searchOptions = [];
-			}
-		},
-		handleClickKey(index) {
-			let selPosition = this.resultList[index];
-			let lonlat = selPosition.lonlat.split(' ');
-			map.setCenter(lonlat[1], lonlat[0]);
-			map.setMarker(lonlat[1], lonlat[0]);
-			this.formData.latitude = lonlat[1];
-			this.formData.longitude = lonlat[0];
-			this.formData.location = selPosition.address + selPosition.name;
-		}
-	}
-};
-</script>
-
-<style lang="scss" scoped>
-@import '@/assets/scss/modules/management/form-main.scss';
-@import '@/assets/scss/modules/management/form.scss';
-@import '@/assets/scss/modules/visual/a_customize.scss';
-
-</style>
\ No newline at end of file
+<template>
+	<el-dialog title="提示" :visible.sync="dialogVisible" width="1370px" :before-close="handleCancle">
+		<span slot="title">
+			<span v-if="pageType == 'add'">新增</span>
+			<span v-if="pageType == 'edit'">修改</span>
+			<span v-if="pageType == 'view'">查看</span>
+		</span>
+		<div>
+			<div class="dialog-h-content scroll-h">
+				<el-form :inline="true" :model="formData" ref="form" :rules="dataRule" :label-width="'90px'" v-if="pageType != 'view'">
+					<el-row>
+						<el-col :span="6">
+							<el-form-item label="设备名称" prop="equipmentName">
+								<el-input v-model="formData.equipmentName" :disabled="disabled" class="u-item-width-normal" size="small" clearable placeholder="请输入"></el-input>
+							</el-form-item>
+						</el-col>
+						<el-col :span="6">
+							<el-form-item label="设备类型" prop="equipmentCategoryCode">
+								<el-select v-model="formData.equipmentCategoryCode" :disabled="disabled" placeholder="请选择" size="small" clearable class="u-item-width-normal">
+									<el-option v-for="item in equipmentCategoryCodeArray" :key="item.value" :label="item.label" :value="item.value"></el-option>
+								</el-select>
+							</el-form-item>
+						</el-col>
+						<el-col :span="6">
+							<el-form-item label="负责人" prop="principalName">
+								<el-input v-model="formData.principalName" :disabled="disabled" class="u-item-width-normal" size="small" clearable placeholder="请输入"></el-input>
+							</el-form-item>
+						</el-col>
+						<el-col :span="6">
+							<el-form-item label="联系电话" prop="contactNum">
+								<el-input v-model="formData.contactNum" :disabled="disabled" class="u-item-width-normal" size="small" clearable placeholder="请输入"></el-input>
+							</el-form-item>
+						</el-col>
+						<el-col :span="6">
+							<el-form-item label="所处位置" prop="location" style="display: block">
+								<el-select
+									v-model="formData.location"
+									:disabled="disabled"
+									filterable
+									remote
+									:reserve-keyword="true"
+									placeholder="请输入关键词"
+									:remote-method="remoteMethod"
+									:loading="loading"
+								>
+									<el-option
+										v-for="(item, index) in searchOptions"
+										@click.native="handleClickKey(index)"
+										:key="item.value"
+										:label="item.label"
+										:value="item.value"
+									></el-option>
+								</el-select>
+							</el-form-item>
+						</el-col>
+					</el-row>
+					<div id="app_event" class="div_map"></div>
+				</el-form>
+				<el-form :inline="false" :model="formData" ref="form" :label-width="'90px'" v-if="pageType == 'view'">
+					<el-row>
+						<el-col :span="6">
+							<el-form-item label="设备名称" prop="equipmentName">{{ formData.equipmentName }}</el-form-item>
+						</el-col>
+						<el-col :span="6">
+							<el-form-item label="设备类型" prop="equipmentCategoryCode">{{ formData.equipmentCategoryName }}</el-form-item>
+						</el-col>
+						<el-col :span="6">
+							<el-form-item label="负责人" prop="principalName">{{ formData.principalName }}</el-form-item>
+						</el-col>
+						<el-col :span="6">
+							<el-form-item label="联系电话" prop="contactNum">{{ formData.contactNum }}</el-form-item>
+						</el-col>
+						<el-col :span="6">
+							<el-form-item label="场所地址" prop="location" style="display: block">{{ formData.location }}</el-form-item>
+						</el-col>
+					</el-row>
+					<div id="app_event" class="div_map"></div>
+				</el-form>
+			</div>
+			<div class="div_btn" v-if="pageType != 'view'">
+				<el-button size="small" @click="handleCancle">取 消</el-button>
+				<!-- <el-button size="small" @click="resetData" v-if="pageType != 'view'">重置</el-button> -->
+				<el-button size="small" type="primary" :disabled="btnDisable" @click="handleComfirm">确 定</el-button>
+			</div>
+			<div style="margin-top: 30px;"><record v-if="pageType != 'add' && detailId" :formType="pageType" :id="detailId" :info="{ agencyId: agencyId }"></record></div>
+		</div>
+		<span slot="footer" class="dialog-footer">
+			<el-button @click="handleCancle">关 闭</el-button>
+			<!-- <el-button type="primary" @click="handleComfirm">确 定</el-button> -->
+		</span>
+	</el-dialog>
+</template>
+
+<script>
+import { isMobile } from '@/utils/validate';
+import { mapGetters } from 'vuex';
+import { Loading } from 'element-ui'; // 引入Loading服务
+import { requestPost, requestGet } from '@/js/dai/request';
+import daiMap from '@/utils/dai-map';
+import nextTick from 'dai-js/tools/nextTick';
+import record from './record';
+let loading; // 加载动画
+let map;
+var search;
+var markers;
+var infoWindowList;
+var geocoder; // 新建一个正逆地址解析类
+
+export default {
+	props: {
+		dialogVisible: {
+			type: Boolean,
+			default: ''
+		},
+		defaultData: {
+			type: Object,
+			default: null
+		},
+		pageType: {
+			type: String,
+			default: ''
+		},
+		detailId: {
+			type: String,
+			default: ''
+		},
+		detailData: {
+			type: Object,
+			default: null
+		},
+		disabled: {
+			type: Boolean,
+			default: false
+		}
+	},
+
+	data() {
+		let checkMObile = (rule, value, callback) => {
+			if (value === '') {
+				callback(new Error('请输入手机号'));
+			} else {
+				if (!isMobile(value)) {
+					callback(new Error('手机号格式不正确'));
+				}
+				callback();
+			}
+		};
+		return {
+			btnDisable: false,
+			user: '',
+			agencyId: '',
+			gridList: [], //所属网格list--场所区域
+			placeTypeList: [], //场所类型
+			resultArray: [{ value: '0', label: '合格' }, { value: '1', label: '不合格' }],
+			equipmentCategoryCodeArray: [],
+			list: {},
+			formData: {
+				equipmentName: '',
+				equipmentCategoryCode: '',
+				principalName: '',
+				location: '',
+				contactNum: ''
+			},
+			dataRule: {
+				equipmentName: [{ required: true, message: '设备名称不能为空', trigger: 'bulr' }],
+				equipmentCategoryCode: [{ required: true, message: '设备类型不能为空', trigger: 'bulr' }],
+				principalName: [{ required: true, message: '负责人不能为空', trigger: 'bulr' }],
+				contactNum: [{ required: true, validator: checkMObile, trigger: 'blur' }],
+				location: [{ required: true, message: '所处位置不能为空', trigger: 'blur' }]
+			},
+			//地图
+			loading: false,
+			searchValue: '',
+			searchOptions: []
+		};
+	},
+	watch: {},
+	components: { record },
+	created() {},
+	async mounted() {
+		console.log('detailId', this.detailId);
+		this.user = this.$store.state.user;
+		this.agencyId = this.user.agencyId;
+		this.startLoading();
+		this.loadCategory();
+		// this.loadGrid();
+		// this.loadplaceType();
+		if (this.pageType != 'add') {
+			this.getDetail();
+		} else {
+			this.initMap();
+		}
+		await this.endLoading();
+		this.endLoading();
+	},
+
+	methods: {
+		async loadCategory() {
+			const url = '/sys/dict/data/dictlist';
+
+			let params = {
+				dictType: 'safety_equipment_category'
+			};
+
+			const { data, code, msg } = await requestPost(url, params);
+			if (code === 0) {
+				this.equipmentCategoryCodeArray = data;
+			} else {
+				this.$message.error(msg);
+			}
+		},
+		async loadGrid() {
+			const url = '/gov/org/customergrid/gridoption';
+			let params = {
+				agencyId: this.agencyId,
+				purpose: 'query'
+			};
+			const { data, code, msg } = await requestPost(url, params);
+			if (code === 0) {
+				this.gridList = data;
+			} else {
+				this.$message.error(msg);
+			}
+		},
+		//场所类型
+		async loadplaceType() {
+			const url = '/gov/org/coverage/dict-select-list/enterprise_patrol';
+			let params = {
+				// agencyId: this.agencyId,
+				// purpose: 'query'
+			};
+			const { data, code, msg } = await requestPost(url, params);
+			if (code === 0) {
+				this.placeTypeList = data;
+			} else {
+				this.$message.error(msg);
+			}
+		},
+		async getDetail() {
+			const url = `/actual/base/safetyEquipment/detail/${this.detailId}`;
+			const { data, code, msg } = await requestPost(url);
+			if (code === 0) {
+				console.log('详情数据', data);
+				this.formData = { ...data };
+				this.initMap();
+			} else {
+				this.$message.error(msg);
+			}
+		},
+
+		handleComfirm() {
+			this.save();
+		},
+		async handleAdd() {
+			// this.btnDisable = true;
+			// setTimeout(() => {
+			// 	this.btnDisable = false;
+			// }, 10000);
+			// nextTick(1000);
+			// const form = new Promise((resolve, reject) => {
+			// 	this.$refs['form'].validate(valid => {
+			// 		if (valid) resolve();
+			// 	});
+			// });
+			// const form1 = new Promise((resolve, reject) => {
+			// 	this.$refs['form1'].validate(valid => {
+			// 		if (valid) resolve();
+			// 	});
+			// });
+			// Promise.all([form1, form])
+			// 	.then(() => {
+			// 		this.addFuwu();
+			// 	})
+			// 	.catch(() => {
+			// 		app.util.validateRule(messageObj);
+			// 		this.btnDisable = false;
+			// 	});
+		},
+
+		async save() {
+			console.log('this.formData', this.formData);
+			var url = '';
+			var params = {};
+			if (this.pageType == 'add') {
+				url = '/actual/base/safetyEquipment/save';
+			} else {
+				url = '/actual/base/safetyEquipment/update';
+			}
+			params = { ...this.formData };
+			const { data, code, msg } = await requestPost(url, params);
+			if (code === 0) {
+				this.$message.success('操作成功');
+
+				this.handleCancle();
+			} else if (code >= 8000) {
+				this.$message.error(msg);
+			}
+		},
+		handleCancle() {
+			this.resetData();
+			this.$emit('handleClose');
+		},
+		resetData() {
+			this.$refs.form.resetFields();
+		},
+		// 开启加载动画
+		startLoading() {
+			loading = Loading.service({
+				lock: true, // 是否锁定
+				text: '正在加载……', // 加载中需要显示的文字
+				background: 'rgba(0,0,0,.7)' // 背景颜色
+			});
+		},
+		// 结束加载动画
+		endLoading() {
+			// clearTimeout(timer);
+			if (loading) {
+				loading.close();
+			}
+		}, // 地图初始化函数，本例取名为init，开发者可根据实际情况定义
+		initMap() {
+			let { latitude, longitude } = this.$store.state.user;
+
+			if (this.formData.latitude && this.formData.longitude) {
+				latitude = this.formData.latitude;
+				longitude = this.formData.longitude;
+			}
+			if (!latitude || latitude == '' || latitude == '0') {
+				latitude = 39.9088810666821;
+				longitude = 116.39743841556731;
+			}
+
+			this.$nextTick(() => {
+				map = new daiMap(
+					document.getElementById('app_event'),
+					{ latitude, longitude },
+					{
+						zoom: 16.2, // 设置地图缩放级别
+						pitch: 43.5, // 设置俯仰角
+						rotation: 45 // 设置地图旋转角度
+					}
+				);
+				// 监听地图平移结束
+				map.on('dragend', e => {
+					this.handleMoveCenter(e);
+				});
+
+				map.setCenter(latitude, longitude);
+				if (this.formData.latitude) {
+					map.setMarker(latitude, longitude);
+				}
+			});
+		},
+		async handleMoveCenter() {
+			//修改地图中心点
+			const { lat, lng } = map.getCenter();
+			this.formData.latitude = lat;
+			this.formData.longitude = lng;
+			map.setMarker(lat, lng);
+
+			let { msg, data } = await map.getAddress(lat, lng);
+			if (msg == 'success') {
+				this.formData.location = data.address;
+				this.searchValue = data.address;
+				this.searchOptions = [];
+			}
+		},
+		async remoteMethod(query) {
+			if (query !== '') {
+				this.loading = true;
+				const { msg, data } = await map.searchNearby(query);
+				this.loading = false;
+				this.resultList = [];
+
+				if (msg == 'success' && data.resultList && data.resultList.length > 0) {
+					if (data.resultList && data.resultList.length > 0) {
+						this.resultList = data.resultList;
+						this.searchOptions = this.resultList.map(item => {
+							return { value: `${item.id}`, label: `${item.address + item.name}` };
+						});
+					}
+				} else {
+					this.searchOptions = [
+						{
+							value: '0',
+							label: '未检索到结果'
+						}
+					];
+				}
+			} else {
+				this.searchOptions = [];
+			}
+		},
+		handleClickKey(index) {
+			let selPosition = this.resultList[index];
+			let lonlat = selPosition.lonlat.split(' ');
+			map.setCenter(lonlat[1], lonlat[0]);
+			map.setMarker(lonlat[1], lonlat[0]);
+			this.formData.latitude = lonlat[1];
+			this.formData.longitude = lonlat[0];
+			this.formData.location = selPosition.address + selPosition.name;
+		}
+	}
+};
+</script>
+
+<style lang="scss" scoped>
+@import '@/assets/scss/modules/management/form-main.scss';
+@import '@/assets/scss/modules/management/form.scss';
+@import '@/assets/scss/modules/visual/a_customize.scss';
+</style>
diff --git a/src/views/modules/shequzhili/tuceng/anquan/shebei/index.vue b/src/views/modules/shequzhili/tuceng/anquan/shebei/index.vue
index 556cad95c..17feeee23 100644
--- a/src/views/modules/shequzhili/tuceng/anquan/shebei/index.vue
+++ b/src/views/modules/shequzhili/tuceng/anquan/shebei/index.vue
@@ -57,7 +57,9 @@
 					<!-- <el-table-column label="" fixed="left" type="selection" align="center" width="50" /> -->
 					<el-table-column label="序号" fixed="left" type="index" align="center" width="50" />
 					<el-table-column prop="equipmentName" align="center" label="设备名称" :show-overflow-tooltip="true"></el-table-column>
-					<el-table-column prop="equipmentCategoryCode" align="center" width="80" label="设备类型"></el-table-column>
+					<el-table-column prop="equipmentCategoryName" align="center" width="100" label="设备类型"></el-table-column>
+					
+					<el-table-column prop="agencyName" label="所属组织" min-width="100" align="center" :show-overflow-tooltip="true" />
 					<el-table-column prop="location" label="所处位置" min-width="140" align="center" :show-overflow-tooltip="true" />
 					<el-table-column prop="principalName" align="center" width="110" label="负责人" :show-overflow-tooltip="true"></el-table-column>
 					<el-table-column prop="contactNum" align="center" :show-overflow-tooltip="true" label="联系电话"></el-table-column>
diff --git a/src/views/modules/shequzhili/tuceng/anquan/shebei/record.vue b/src/views/modules/shequzhili/tuceng/anquan/shebei/record.vue
index 84da350d8..aa2de56ce 100644
--- a/src/views/modules/shequzhili/tuceng/anquan/shebei/record.vue
+++ b/src/views/modules/shequzhili/tuceng/anquan/shebei/record.vue
@@ -334,7 +334,7 @@ export default {
 
 			const item = {
 				isEdit: true,
-				id: this.id,
+				// id: this.id,
 				inspectTime: '',
 				inspectStaffId: '',
 				inspectStaffName: '',
diff --git a/src/views/modules/shequzhili/tuceng/anquan/yinhuan/addForm.vue b/src/views/modules/shequzhili/tuceng/anquan/yinhuan/addForm.vue
index 4a4ca657d..df22477d7 100644
--- a/src/views/modules/shequzhili/tuceng/anquan/yinhuan/addForm.vue
+++ b/src/views/modules/shequzhili/tuceng/anquan/yinhuan/addForm.vue
@@ -1,5 +1,10 @@
 <template>
 	<el-dialog title="提示" :visible.sync="dialogVisible" width="1200px" :before-close="handleCancle">
+		<span slot="title">
+			<span v-if="pageType == 'add'">新增</span>
+			<span v-if="pageType == 'edit'">修改</span>
+			<span v-if="pageType == 'view'">查看</span>
+		</span>
 		<div>
 			<div class="dialog-h-content scroll-h">
 				<el-form :inline="true" :model="formData" ref="form" :rules="dataRule" :label-width="'90px'" v-if="pageType != 'view'">
@@ -7,7 +12,7 @@
 						<el-col :span="8">
 							<el-form-item label="上报时间" prop="reportTime">
 								<template slot-scope="scope">
-									<el-date-picker v-model="formData.reportTime" type="date" class="input-width" value-format="yyyy-MM-dd" placeholder="选择日期" ></el-date-picker>
+									<el-date-picker v-model="formData.reportTime" type="date" class="input-width" value-format="yyyy-MM-dd" placeholder="选择日期"></el-date-picker>
 								</template>
 							</el-form-item>
 						</el-col>
@@ -151,7 +156,7 @@
 					<div id="app_event" class="div_map"></div>
 				</el-form>
 			</div>
-			<div class="div_btn"  v-if="pageType != 'view'">
+			<div class="div_btn" v-if="pageType != 'view'">
 				<el-button size="small" @click="handleCancle">取 消</el-button>
 				<!-- <el-button size="small" @click="resetData" v-if="pageType != 'view'">重置</el-button> -->
 				<el-button size="small" type="primary" :disabled="btnDisable" @click="handleComfirm">确 定</el-button>
@@ -494,5 +499,4 @@ export default {
 @import '@/assets/scss/modules/management/form-main.scss';
 @import '@/assets/scss/modules/management/form.scss';
 @import '@/assets/scss/modules/visual/a_customize.scss';
-
-</style>
\ No newline at end of file
+</style>
diff --git a/src/views/modules/shequzhili/tuceng/chengshiguanli/addForm.vue b/src/views/modules/shequzhili/tuceng/chengshiguanli/addForm.vue
index 1e6f11c1b..8bcd2860c 100644
--- a/src/views/modules/shequzhili/tuceng/chengshiguanli/addForm.vue
+++ b/src/views/modules/shequzhili/tuceng/chengshiguanli/addForm.vue
@@ -1,5 +1,10 @@
 <template>
 	<el-dialog title="提示" :visible.sync="dialogVisible" width="1370px" :before-close="handleCancle">
+		<span slot="title">
+			<span v-if="pageType == 'add'">新增</span>
+			<span v-if="pageType == 'edit'">修改</span>
+			<span v-if="pageType == 'view'">查看</span>
+		</span>
 		<div>
 			<div class="dialog-h-content scroll-h">
 				<el-form :inline="true" :model="formData" ref="form" :rules="dataRule" :label-width="'90px'" v-if="pageType != 'view'">
@@ -72,7 +77,7 @@
 			<div class="div_btn" v-if="pageType != 'view'">
 				<el-button size="small" @click="handleCancle">取 消</el-button>
 				<!-- <el-button size="small" @click="resetData" v-if="pageType != 'view'">重置</el-button> -->
-				<el-button size="small" type="primary" :disabled="btnDisable" @click="handleComfirm" >确 定</el-button>
+				<el-button size="small" type="primary" :disabled="btnDisable" @click="handleComfirm">确 定</el-button>
 			</div>
 		</div>
 		<span slot="footer" class="dialog-footer">
@@ -406,5 +411,4 @@ export default {
 @import '@/assets/scss/modules/management/form-main.scss';
 @import '@/assets/scss/modules/management/form.scss';
 @import '@/assets/scss/modules/visual/a_customize.scss';
-
-</style>
\ No newline at end of file
+</style>
diff --git a/src/views/modules/shequzhili/tuceng/gonggongfuwu/addForm.vue b/src/views/modules/shequzhili/tuceng/gonggongfuwu/addForm.vue
index 5b56f19cc..7f83291fe 100644
--- a/src/views/modules/shequzhili/tuceng/gonggongfuwu/addForm.vue
+++ b/src/views/modules/shequzhili/tuceng/gonggongfuwu/addForm.vue
@@ -1,5 +1,10 @@
 <template>
 	<el-dialog title="提示" :visible.sync="dialogVisible" width="1370px" :before-close="handleCancle">
+		<span slot="title">
+			<span v-if="pageType == 'add'">新增</span>
+			<span v-if="pageType == 'edit'">修改</span>
+			<span v-if="pageType == 'view'">查看</span>
+		</span>
 		<div>
 			<div class="dialog-h-content scroll-h">
 				<el-form :inline="true" :model="formData" ref="form" :rules="dataRule" :label-width="'90px'" v-if="pageType != 'view'">
@@ -85,7 +90,7 @@
 			<div class="div_btn" v-if="pageType != 'view'">
 				<el-button size="small" @click="handleCancle">取 消</el-button>
 				<!-- <el-button size="small" @click="resetData" v-if="pageType != 'view'">重置</el-button> -->
-				<el-button size="small" type="primary" :disabled="btnDisable" @click="handleComfirm" >确 定</el-button>
+				<el-button size="small" type="primary" :disabled="btnDisable" @click="handleComfirm">确 定</el-button>
 			</div>
 			<!-- <div style="margin-top: 30px;"><record v-if="pageType != 'add' && detailId" :formType="pageType" :id="detailId" :info="{ agencyId: agencyId }"></record></div> -->
 		</div>
@@ -404,5 +409,4 @@ export default {
 @import '@/assets/scss/modules/management/form-main.scss';
 @import '@/assets/scss/modules/management/form.scss';
 @import '@/assets/scss/modules/visual/a_customize.scss';
-
-</style>
\ No newline at end of file
+</style>
diff --git a/src/views/modules/shequzhili/tuceng/yingji/changsuo/addForm.vue b/src/views/modules/shequzhili/tuceng/yingji/changsuo/addForm.vue
index c371f5a9b..05716d41f 100644
--- a/src/views/modules/shequzhili/tuceng/yingji/changsuo/addForm.vue
+++ b/src/views/modules/shequzhili/tuceng/yingji/changsuo/addForm.vue
@@ -1,5 +1,10 @@
 <template>
 	<el-dialog :title="title" :visible.sync="dialogVisible" width="1370px" :before-close="handleCancle">
+		<span slot="title">
+			<span v-if="pageType == 'add'">新增</span>
+			<span v-if="pageType == 'edit'">修改</span>
+			<span v-if="pageType == 'view'">查看</span>
+		</span>
 		<div>
 			<div class="dialog-h-content scroll-h">
 				<el-form :inline="true" :model="formData" ref="form" :rules="dataRule" :label-width="'90px'" v-if="pageType != 'view'">
@@ -75,7 +80,7 @@
 			<div class="div_btn" v-if="pageType != 'view'">
 				<el-button size="small" @click="handleCancle">取 消</el-button>
 				<!-- <el-button size="small" @click="resetData" v-if="pageType != 'view'">重置</el-button> -->
-				<el-button size="small" type="primary" :disabled="btnDisable" @click="handleComfirm" >确 定</el-button>
+				<el-button size="small" type="primary" :disabled="btnDisable" @click="handleComfirm">确 定</el-button>
 			</div>
 			<div style="margin-top: 30px;"><record v-if="pageType != 'add' && detailId" :formType="pageType" :id="detailId" :info="{ agencyId: agencyId }"></record></div>
 		</div>
@@ -393,5 +398,4 @@ export default {
 @import '@/assets/scss/modules/management/form-main.scss';
 @import '@/assets/scss/modules/management/form.scss';
 @import '@/assets/scss/modules/visual/a_customize.scss';
-
-</style>
\ No newline at end of file
+</style>
diff --git a/src/views/modules/shequzhili/tuceng/yingji/wuzi/addForm.vue b/src/views/modules/shequzhili/tuceng/yingji/wuzi/addForm.vue
index be07e1cd0..f934d1aee 100644
--- a/src/views/modules/shequzhili/tuceng/yingji/wuzi/addForm.vue
+++ b/src/views/modules/shequzhili/tuceng/yingji/wuzi/addForm.vue
@@ -1,5 +1,10 @@
 <template>
 	<el-dialog title="提示" :visible.sync="dialogVisible" width="1370px" :before-close="handleCancle">
+		<span slot="title">
+			<span v-if="pageType == 'add'">新增</span>
+			<span v-if="pageType == 'edit'">修改</span>
+			<span v-if="pageType == 'view'">查看</span>
+		</span>
 		<div>
 			<div class="dialog-h-content scroll-h">
 				<el-form :inline="true" :model="formData" ref="form" :rules="dataRule" :label-width="'90px'" v-if="pageType != 'view'">
@@ -420,5 +425,4 @@ export default {
 @import '@/assets/scss/modules/management/form-main.scss';
 @import '@/assets/scss/modules/management/form.scss';
 @import '@/assets/scss/modules/visual/a_customize.scss';
-
-</style>
\ No newline at end of file
+</style>
diff --git a/src/views/modules/workSys/residentCategoryComponents/addForm.vue b/src/views/modules/workSys/residentCategoryComponents/addForm.vue
index 58daddb68..abeaa082c 100644
--- a/src/views/modules/workSys/residentCategoryComponents/addForm.vue
+++ b/src/views/modules/workSys/residentCategoryComponents/addForm.vue
@@ -1,5 +1,10 @@
 <template>
-	<el-dialog title="提示" :visible.sync="dialogVisible" width="800px" :before-close="handleCancle">
+	<el-dialog :visible.sync="dialogVisible" width="800px" :before-close="handleCancle">
+		<span slot="title">
+			<span v-if="pageType=='add'">新增</span>
+			<span v-if="pageType=='edit'">修改</span>
+			<span v-if="pageType=='view'">查看</span>
+		</span>
 		<div>
 			<el-form :model="formData" ref="form" :rules="dataRule" :label-width="'120px'">
 				<el-form-item label="类别名称" prop="categoryName">
diff --git a/src/views/modules/workSys/serviceMattersComponents/addForm.vue b/src/views/modules/workSys/serviceMattersComponents/addForm.vue
index 733974dd6..d5e29f241 100644
--- a/src/views/modules/workSys/serviceMattersComponents/addForm.vue
+++ b/src/views/modules/workSys/serviceMattersComponents/addForm.vue
@@ -1,5 +1,10 @@
 <template>
-	<el-dialog title="提示" :visible.sync="dialogVisible" width="800px" :before-close="handleCancle">
+	<el-dialog  :visible.sync="dialogVisible" width="800px" :before-close="handleCancle">
+		<span slot="title">
+			<span v-if="pageType=='add'">新增</span>
+			<span v-if="pageType=='edit'">修改</span>
+			<span v-if="pageType=='view'">查看</span>
+		</span>
 		<div>
 			<el-form :model="formData" ref="form" :rules="dataRule" :label-width="'120px'">
 				<el-form-item label="分类名称" prop="categoryName">