diff --git a/src/views/modules/shequzhili/tuceng/anquan/anquanxuncha/index.vue b/src/views/modules/shequzhili/tuceng/anquan/anquanxuncha/index.vue
index bdeaa2a2f..d0252b1ab 100644
--- a/src/views/modules/shequzhili/tuceng/anquan/anquanxuncha/index.vue
+++ b/src/views/modules/shequzhili/tuceng/anquan/anquanxuncha/index.vue
@@ -80,9 +80,9 @@
 					<el-table-column label="序号" fixed="left" type="index" align="center" width="50" />
 					<el-table-column prop="placeOrgName" align="center" label="场所名称" :show-overflow-tooltip="true"></el-table-column>
 					<el-table-column prop="address" label="场所地址" min-width="140" align="center" :show-overflow-tooltip="true" />
-					<el-table-column prop="placeType" label="场所类型" align="center" :show-overflow-tooltip="true"></el-table-column>
+					<el-table-column prop="placeTypeName" label="场所类型" align="center" :show-overflow-tooltip="true"></el-table-column>
 					<el-table-column prop="scaleTotal" align="center" width="80" label="场所规模"></el-table-column>
-					<el-table-column prop="placeCategory" align="center" width="80" label="场所类别"></el-table-column>
+					<el-table-column prop="placeCategoryName" align="center" width="80" label="场所类别"></el-table-column>
 					<el-table-column prop="personInCharge" align="center" width="110" label="负责人" :show-overflow-tooltip="true"></el-table-column>
 					<el-table-column prop="mobile" align="center" :show-overflow-tooltip="true" label="联系电话"></el-table-column>
 					<el-table-column prop="latestPatrolTime" align="center" width="100" label="最新检查时间" :show-overflow-tooltip="true"></el-table-column>
@@ -158,6 +158,7 @@ export default {
 			placeTypeList: [], //场所类型
 			tableData: [],
 			resultArray: [{ value: '0', label: '合格' }, { value: '1', label: '不合格' }],
+
 			placeCategoryArray: [{ value: '0', label: '九小场所' }, { value: '1', label: '企事业单位' }],
 			pageNo: 1,
 			pageSize: window.localStorage.getItem('pageSize') || 20,
@@ -209,12 +210,13 @@ export default {
 				this.$message.error(msg);
 			}
 		},
+
 		//场所类型
 		async loadplaceType() {
-			const url = '/gov/org/coverage/dict-select-list/enterprise_patrol';
+			const url = '/sys/dict/data/dictlist';
+
 			let params = {
-				// agencyId: this.agencyId,
-				// purpose: 'query'
+				dictType: 'ic_enterprise_place_type'
 			};
 			const { data, code, msg } = await requestPost(url, params);
 			if (code === 0) {
@@ -223,6 +225,7 @@ export default {
 				this.$message.error(msg);
 			}
 		},
+
 		async handleExport() {
 			// 导出
 			const url = '/actual/base/enterprise/export';
diff --git a/src/views/modules/shequzhili/tuceng/anquan/shebei/addForm.vue b/src/views/modules/shequzhili/tuceng/anquan/shebei/addForm.vue
index e83eed2f2..caca0c05d 100644
--- a/src/views/modules/shequzhili/tuceng/anquan/shebei/addForm.vue
+++ b/src/views/modules/shequzhili/tuceng/anquan/shebei/addForm.vue
@@ -130,7 +130,7 @@ export default {
 			gridList: [], //所属网格list--场所区域
 			placeTypeList: [], //场所类型
 			resultArray: [{ value: '0', label: '合格' }, { value: '1', label: '不合格' }],
-			equipmentCategoryCodeArray: [{ value: '0', label: '九小场所' }, { value: '1', label: '企事业单位' }],
+			equipmentCategoryCodeArray: [],
 			list: {},
 			formData: {
 				equipmentName: '',
@@ -170,10 +170,12 @@ export default {
 		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();
 		}
@@ -182,6 +184,20 @@ export default {
 	},
 
 	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 = {
diff --git a/src/views/modules/shequzhili/tuceng/anquan/shebei/index.vue b/src/views/modules/shequzhili/tuceng/anquan/shebei/index.vue
index 1acff51b7..005fcdb95 100644
--- a/src/views/modules/shequzhili/tuceng/anquan/shebei/index.vue
+++ b/src/views/modules/shequzhili/tuceng/anquan/shebei/index.vue
@@ -135,7 +135,7 @@ export default {
 			placeTypeList: [], //场所类型
 			tableData: [],
 			resultArray: [{ value: '0', label: '合格' }, { value: '1', label: '不合格' }],
-			equipmentCategoryCodeArray: [{ value: '0', label: '九小场所' }, { value: '1', label: '企事业单位' }],
+			equipmentCategoryCodeArray: [],
 			pageNo: 1,
 			pageSize: window.localStorage.getItem('pageSize') || 20,
 			total: 1,
@@ -159,6 +159,7 @@ export default {
 		this.agencyId = this.user.agencyId;
 		this.loadGrid();
 		this.loadplaceType();
+		this.loadCategory();
 		this.getTableData();
 	},
 	methods: {
@@ -200,7 +201,21 @@ export default {
 				this.$message.error(msg);
 			}
 		},
+		//设备类型
+		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 handleImport() {
 			// 导入
 		},
@@ -238,8 +253,8 @@ export default {
 				});
 		},
 		handleAdd(row, type) {
-			if (row.equipmentId) {
-				this.detailId = row.equipmentId;
+			if (row.id) {
+				this.detailId = row.id;
 			}
 			this.pageType = type;
 			if (type == 'view') {
@@ -271,7 +286,7 @@ export default {
 				type: 'warning'
 			})
 				.then(() => {
-					this.del(rowData.equipmentId);
+					this.del(rowData.id);
 				})
 				.catch(err => {});
 		},
diff --git a/src/views/modules/shequzhili/tuceng/anquan/yinhuan/addForm.vue b/src/views/modules/shequzhili/tuceng/anquan/yinhuan/addForm.vue
index a95f9d24d..47316b863 100644
--- a/src/views/modules/shequzhili/tuceng/anquan/yinhuan/addForm.vue
+++ b/src/views/modules/shequzhili/tuceng/anquan/yinhuan/addForm.vue
@@ -6,13 +6,13 @@
 					<el-col :span="8">
 						<el-form-item label="上报时间" prop="reportTime">
 							<template slot-scope="scope">
-								<el-date-picker v-model="scope.row.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-form-item label="隐患场所" prop="dangerPlaceName">
 							<el-input v-model="formData.dangerPlaceName" class="u-item-width-normal" size="small" clearable placeholder="请输入"></el-input>
 						</el-form-item>
-						<el-form-item label="所属组织" prop="gridId">
+						<el-form-item label="所属网格" prop="gridId">
 							<el-select class="u-item-width-normal" v-model="formData.gridId" placeholder="全部" size="small" clearable>
 								<el-option v-for="item in gridList" :key="item.value" :label="item.label" :value="item.value"></el-option>
 							</el-select>
@@ -28,9 +28,8 @@
 								clearable
 								placeholder="请输入"
 							></el-input>
-						</el-form-item>
-						<el-form-item label="处理情况" prop="imgList">
-							<div v-if="pageType == 'view'">
+
+							<div v-if="pageType != 'view'">
 								<!-- :data="{ customerId: customerId }" -->
 								<el-upload
 									:headers="$getElUploadHeaders()"
@@ -49,7 +48,7 @@
 								</el-upload>
 							</div>
 
-							<div v-else class="div-content">
+							<div  class="div-content" v-if="pageType != 'add'">
 								<el-image
 									v-if="formData.imgList.length > 0"
 									style="width: 100px; height: 50px"
@@ -102,9 +101,9 @@
 					<el-col :span="8">
 						<el-form-item label="上报时间" prop="reportTime">{{ formData.reportTime }}</el-form-item>
 						<el-form-item label="隐患场所" prop="dangerPlaceName">{{ formData.dangerPlaceName }}</el-form-item>
-						<el-form-item label="所属组织" prop="gridId">{{ formData.gridName }}</el-form-item>
+						<el-form-item label="所属网格" prop="gridId">{{ formData.gridName }}</el-form-item>
 						<el-form-item label="隐患内容" prop="dangerContent">{{ formData.dangerContent }}</el-form-item>
-						<el-form-item label="处理情况" prop="handleState">{{ formData.handleStateName }}</el-form-item>
+						<el-form-item label="处理情况" prop="handleStateName">{{ formData.handleStateName }}</el-form-item>
 						<el-form-item label="上报人" prop="reportPerson">{{ formData.reportPerson }}</el-form-item>
 						<el-form-item label="联系电话" prop="mobile">{{ formData.mobile }}</el-form-item>
 					</el-col>
@@ -182,7 +181,7 @@ export default {
 			agencyId: '',
 			gridList: [], //所属网格list--场所区域
 			placeTypeList: [], //场所类型
-			resultArray: [{ value: '0', label: '合格' }, { value: '1', label: '不合格' }],
+			handleStateArray: [{ value: '0', label: '待处理' }, { value: '1', label: '处理完成' }],
 			equipmentCategoryCodeArray: [{ value: '0', label: '九小场所' }, { value: '1', label: '企事业单位' }],
 			list: {},
 			formData: {
diff --git a/src/views/modules/shequzhili/tuceng/anquan/yinhuan/index.vue b/src/views/modules/shequzhili/tuceng/anquan/yinhuan/index.vue
index beb5d091e..3560c4fc7 100644
--- a/src/views/modules/shequzhili/tuceng/anquan/yinhuan/index.vue
+++ b/src/views/modules/shequzhili/tuceng/anquan/yinhuan/index.vue
@@ -19,18 +19,17 @@
 							</el-select>
 						</el-form-item>
 						<el-form-item label="隐患内容" prop="dangerContent">
-							<el-input v-model="formData.dangerContent" :disabled="disabled" class="u-item-width-normal" size="small" clearable placeholder="请输入"></el-input>
+							<el-input v-model="formData.dangerContent"  class="u-item-width-normal" size="small" clearable placeholder="请输入"></el-input>
 						</el-form-item>
 						<el-form-item label="上报人" prop="reportPerson">
 							<el-input v-model="formData.reportPerson" class="u-item-width-normal" size="small" clearable placeholder="请输入"></el-input>
 						</el-form-item>
 						<el-form-item label="隐患位置" prop="location">
-							<el-input v-model="formData.location" :disabled="disabled" class="u-item-width-normal" size="small" clearable placeholder="请输入"></el-input>
+							<el-input v-model="formData.location" class="u-item-width-normal" size="small" clearable placeholder="请输入"></el-input>
 						</el-form-item>
 						<el-form-item label="上报时间" prop="reportTime">
 							<template slot-scope="scope">
 								<el-date-picker v-model="scope.row.reportTime" type="date" class="input-width" value-format="yyyy-MM-dd" placeholder="选择日期"></el-date-picker>
-								
 							</template>
 						</el-form-item>
 						<el-row>
@@ -70,19 +69,14 @@
 				<el-table :data="tableData" border class="m-table-item" style="width: 100%" @selection-change="handleSelectionChange" :height="maxTableHeight">
 					<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="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>
-					<el-table-column prop="latestInspectTime" align="center" width="100" label="最新检查时间" :show-overflow-tooltip="true"></el-table-column>
-					<el-table-column prop="latestInspectResult" align="center" label="最新巡查结果" :show-overflow-tooltip="true">
-						<template slot-scope="scope">
-							<span v-if="scope.row.latestResult === '0'">合格</span>
-							<span v-else-if="scope.row.latestResult === '1'">不合格</span>
-							<span v-else>--</span>
-						</template>
-					</el-table-column>
+					<el-table-column prop="gridName" align="center" label="所属组织" :show-overflow-tooltip="true"></el-table-column>
+					<el-table-column prop="location" align="center" width="80" label="隐患位置"></el-table-column>
+					<el-table-column prop="dangerPlaceName" label="隐患场所" min-width="140" align="center" :show-overflow-tooltip="true" />
+					<el-table-column prop="reportPerson" align="center" width="110" label="上报人" :show-overflow-tooltip="true"></el-table-column>
+					<el-table-column prop="mobile" align="center" :show-overflow-tooltip="true" label="联系电话"></el-table-column>
+					<el-table-column prop="dangerContent" align="center" :show-overflow-tooltip="true" label="隐患内容"></el-table-column>
+
+					<el-table-column prop="handleStateName" align="center" label="处理结果" :show-overflow-tooltip="true"></el-table-column>
 					<el-table-column fixed="right" label="操作" align="center" width="130">
 						<template slot-scope="scope">
 							<el-button @click="handleAdd(scope.row, 'view')" type="text" size="small">查看</el-button>
@@ -233,8 +227,8 @@ export default {
 				});
 		},
 		handleAdd(row, type) {
-			if (row.equipmentId) {
-				this.detailId = row.idid;
+			if (row.id) {
+				this.detailId = row.id;
 			}
 			this.pageType = type;
 			if (type == 'view') {
diff --git a/src/views/modules/shequzhili/tuceng/anquan/yinhuan/record.vue b/src/views/modules/shequzhili/tuceng/anquan/yinhuan/record.vue
index c0a24b3fd..da986bbfd 100644
--- a/src/views/modules/shequzhili/tuceng/anquan/yinhuan/record.vue
+++ b/src/views/modules/shequzhili/tuceng/anquan/yinhuan/record.vue
@@ -22,7 +22,7 @@
 							<div v-else class="div-content">{{ scope.row.handleTime }}</div>
 						</template>
 					</el-table-column>
-					<el-table-column prop="handleState" label="处理结果" align="center" width="200px">
+					<el-table-column prop="handleState" label="处理结果" align="center" >
 						<template slot-scope="scope">
 							<el-select v-if="scope.row.isEdit" v-model="scope.row.handleState" placeholder="请选择" class="input-width" size="small" clearable>
 								<el-option v-for="subItem in optionResult" :key="subItem.value" :label="subItem.label" :value="subItem.value"></el-option>
diff --git a/src/views/modules/shequzhili/tuceng/chengshiguanli/addForm.vue b/src/views/modules/shequzhili/tuceng/chengshiguanli/addForm.vue
new file mode 100644
index 000000000..db9514853
--- /dev/null
+++ b/src/views/modules/shequzhili/tuceng/chengshiguanli/addForm.vue
@@ -0,0 +1,416 @@
+<template>
+	<el-card>
+		<div class="dialog-h-content scroll-h">
+			<el-form :inline="true" :model="formData" ref="form" :rules="dataRule" :label-width="'120px'" v-if="pageType != 'view'">
+				<el-row>
+					<el-col :span="8">
+						<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-form-item label="设备编号" prop="equipmentNum">
+							<el-input v-model="formData.equipmentNum" :disabled="disabled" class="u-item-width-normal" size="small" clearable placeholder="请输入"></el-input>
+						</el-form-item>
+						<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-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-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="16">
+						<el-form-item label="所处位置" prop="location" style="display: block">
+							<el-select
+								v-model="formData.location"
+								style="width: 200px;"
+								: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>
+							<div id="app_event" class="div_map"></div>
+						</el-form-item>
+					</el-col>
+				</el-row>
+			</el-form>
+			<el-form :inline="false" :model="formData" ref="form" :label-width="'120px'" v-if="pageType == 'view'">
+				<el-row>
+					<el-col :span="8">
+						<el-form-item label="设备名称" prop="equipmentName">{{ formData.equipmentName }}</el-form-item>
+						<el-form-item label="设备编号" prop="equipmentNum">{{ formData.equipmentNum }}</el-form-item>
+						<el-form-item label="设备类型" prop="equipmentCategoryCode">{{ formData.equipmentCategoryName }}</el-form-item>
+						<el-form-item label="负责人" prop="principalName">{{ formData.principalName }}</el-form-item>
+						<el-form-item label="联系电话" prop="contactNum">{{ formData.contactNum }}</el-form-item>
+					</el-col>
+					<el-col :span="16">
+						<el-form-item label="场所地址" prop="location" style="display: block">
+							{{ formData.location }}
+							<div id="app_event" class="div_map"></div>
+						</el-form-item>
+					</el-col>
+				</el-row>
+			</el-form>
+		</div>
+		<div class="div_btn">
+			<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" 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> -->
+	</el-card>
+</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: {
+		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: [{ value: '0', label: '九小场所' }, { value: '1', label: '企事业单位' }],
+			list: {},
+			formData: {
+				equipmentName: '',
+				scaleTotal: '',
+				gridId: '',
+				equipmentCategoryCode: '',
+				placeType: '',
+				principalName: '',
+				location: '',
+				contactNum: '',
+				// result: '',
+				remark: ''
+			},
+			dataRule: {
+				equipmentName: [{ required: true, message: '设备名称不能为空', trigger: 'bulr' }],
+				equipmentCategoryCode: [{ required: true, message: '设备类型不能为空', trigger: 'bulr' }],
+				placeType: [{ required: true, message: '场所类型不能为空', trigger: 'bulr' }],
+				result: [{ required: true, message: '巡查结果不能为空', trigger: 'bulr' }],
+				scaleTotal: [{ required: true, message: '场所规模不能为空', trigger: 'bulr' }],
+				gridId: [{ required: true, message: '所属组织不能为空', trigger: 'bulr' }],
+				principalName: [{ required: true, message: '负责人不能为空', trigger: 'bulr' }],
+				contactNum: [{ required: true, validator: checkMObile, trigger: 'blur' }],
+				location: [{ required: true, message: '场所地址不能为空', trigger: 'blur' }]
+				// content: [{ required: true, message: '详细说明不能为空', trigger: 'bulr' }, { max: 1000, message: '不能超出1000个字符', trigger: 'blur' }]
+			},
+			//地图
+			loading: false,
+			searchValue: '',
+			searchOptions: []
+		};
+	},
+	watch: {},
+	components: {  },
+	created() {},
+	async mounted() {
+		console.log('detailId', this.detailId);
+		this.user = this.$store.state.user;
+		this.agencyId = this.user.agencyId;
+		this.startLoading();
+		// this.loadGrid();
+		// this.loadplaceType();
+		if (this.pageType != 'add') {
+			this.getDetail();
+		} else {
+			this.initMap();
+		}
+		await this.endLoading();
+		this.endLoading();
+	},
+
+	methods: {
+		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/emergencyEquipment/save';
+			} else {
+				url = '/actual/base/emergencyEquipment/update';
+			}
+			params = { ...this.formData };
+			const { data, code, msg } = await requestPost(url, params);
+			if (code === 0) {
+				this.$message.success('添加成功');
+				this.resetData();
+				this.$emit('handleComfirm');
+			} 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(() => {
+				if (!map) {
+					map = new daiMap(
+						document.getElementById('app_event'),
+						{ latitude, longitude },
+						{
+							zoom: 16.2, // 设置地图缩放级别
+							pitch: 43.5, // 设置俯仰角
+							rotation: 45 // 设置地图旋转角度
+						}
+					);
+					// 监听地图平移结束
+					map.on('dragend', e => {
+						this.handleMoveCenter(e);
+					});
+				} else {
+					map.setCenter(latitude, longitude);
+					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.hotPointID}`, 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.address = selPosition.address + selPosition.name;
+		}
+	}
+};
+</script>
+
+<style lang="scss" scoped>
+@import '@/assets/scss/modules/management/form-main.scss';
+@import '@/assets/scss/modules/visual/a_customize.scss';
+/deep/ .el-input.is-disabled .el-input__inner,
+/deep/ .el-textarea.is-disabled textarea.el-textarea__inner {
+	// border:none;background-color: transparent;
+}
+.div_map {
+	width: 100%;
+}
+.form-item::v-deep .el-form-item__label {
+	color: #fff;
+}
+.form-item {
+	.el-radio {
+		color: #fff;
+	}
+
+	.el-checkbox {
+		color: #fff;
+	}
+}
+.verifyRed::before {
+	content: '*';
+	color: #f56c6c;
+	margin-right: 4px;
+}
+.form_label_box {
+	width: 150px;
+	display: inline-block;
+	text-align: right;
+	padding-right: 12px;
+}
+</style>
diff --git a/src/views/modules/shequzhili/tuceng/chengshiguanli/index.vue b/src/views/modules/shequzhili/tuceng/chengshiguanli/index.vue
index 02409e35d..5cbee9000 100644
--- a/src/views/modules/shequzhili/tuceng/chengshiguanli/index.vue
+++ b/src/views/modules/shequzhili/tuceng/chengshiguanli/index.vue
@@ -1,8 +1,448 @@
 <template>
+	<div class="g-main">
+		<div v-show="pageType == 'list'">
+			<div class="m-search">
+				<el-form :inline="true" :model="formData" ref="ref_searchform" :label-width="'100px'">
+					<div>
+						<el-form-item label="设备名称" prop="equipmentName">
+							<el-input v-model="formData.equipmentName" class="u-item-width-normal" size="small" clearable placeholder="请输入"></el-input>
+						</el-form-item>
+						<el-form-item label="设备编号" prop="equipmentNum">
+							<el-input v-model="formData.equipmentNum" :disabled="disabled" class="u-item-width-normal" size="small" clearable placeholder="请输入"></el-input>
+						</el-form-item>
+						<el-form-item label="设备类型" prop="equipmentCategoryCode">
+							<el-select v-model="formData.equipmentCategoryCode" 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-row>
+							<el-col :span="24" align="right">
+								<el-button style="margin-left: 30px" size="small" type="primary " @click="handleSearch">查询</el-button>
+								<el-button style="margin-left: 10px" size="small" class="diy-button--white" @click="resetSearch">重置</el-button>
+							</el-col>
+						</el-row>
+					</div>
+				</el-form>
+			</div>
+			<div class="m-table">
+				<div class="div_btn">
+					<el-button size="small" type="primary " @click="handleAdd({}, 'add')">新增</el-button>
+					<el-button class="diy-button--white" size="small" @click="handleExportModule('room')">下载导入模板</el-button>
+					<el-upload
+						:headers="$getElUploadHeaders()"
+						ref="upload"
+						class="upload-btn"
+						action="uploadUlr"
+						:limit="1"
+						:accept="'.xls,.xlsx'"
+						:with-credentials="true"
+						:show-file-list="false"
+						:auto-upload="true"
+						:on-progress="handleProgress"
+						:on-success="handleExcelSuccess"
+						:before-upload="beforeExcelUpload"
+						:http-request="uploadHttpRequest"
+						style="display: inline-block;margin:0px 10px"
+					>
+						<el-button size="small" class="diy-button--white" :loading="importLoading">导入模板</el-button>
+					</el-upload>
+
+					<el-button @click="handleExport" class="diy-button--white" size="small">导出</el-button>
+				</div>
+				<el-table :data="tableData" border class="m-table-item" style="width: 100%" @selection-change="handleSelectionChange" :height="maxTableHeight">
+					<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="equipmentNum" 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="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>
+					<el-table-column prop="latestInspectTime" align="center" width="100" label="最新检查时间" :show-overflow-tooltip="true"></el-table-column>
+					<el-table-column prop="latestInspectResult" align="center" label="最新巡查结果" :show-overflow-tooltip="true">
+						<template slot-scope="scope">
+							<span v-if="scope.row.latestResult === '0'">合格</span>
+							<span v-else-if="scope.row.latestResult === '1'">不合格</span>
+							<span v-else>--</span>
+						</template>
+					</el-table-column>
+					<el-table-column fixed="right" label="操作" align="center" width="130">
+						<template slot-scope="scope">
+							<el-button @click="handleAdd(scope.row, 'view')" type="text" size="small">查看</el-button>
+							<el-button style="margin-right: 10px" @click="handleAdd(scope.row, 'edit')" size="small" type="text">编辑</el-button>
+							<el-button @click="handleDel(scope.row)" type="text" size="small" class="">删除</el-button>
+						</template>
+					</el-table-column>
+				</el-table>
+
+				<div>
+					<el-pagination
+						@size-change="handleSizeChange"
+						@current-change="handleCurrentChange"
+						:current-page.sync="pageNo"
+						:page-sizes="[20, 50, 100, 200]"
+						:page-size="parseInt(pageSize)"
+						layout="sizes, prev, pager, next, total"
+						:total="total"
+					></el-pagination>
+				</div>
+			</div>
+		</div>
+		<div v-if="pageType != 'list'">
+			<addForm
+				:pageType="pageType"
+				:disabled="disabled"
+				:detailId="detailId"
+				:detailData="detailData"
+				@handleClose="handleClose"
+				@handleOk="handleOk"
+				@dialogOk="handleEditSuccess"
+			/>
+		</div>
+	</div>
 </template>
 
 <script>
+import { requestPost } from '@/js/dai/request';
+import nextTick from 'dai-js/tools/nextTick';
+import { mapGetters } from 'vuex';
+import addForm from './addForm.vue';
+import axios from 'axios';
+
+export default {
+	data() {
+		return {
+			importLoading: false,
+			disabled: false,
+			user: '',
+			agencyId: '',
+			formData: {
+				equipmentName: '',
+				gridId: '',
+				equipmentCategoryCode: '',
+				placeType: '',
+				result: '',
+				scaleTotal: '',
+				contactNum: '',
+				address: '',
+				principalName: ''
+			},
+			pageType: 'list', // 列表list 新增add  处理dispose 详情info
+			gridList: [], //所属网格list--场所区域
+			placeTypeList: [], //场所类型
+			tableData: [],
+			resultArray: [{ value: '0', label: '合格' }, { value: '1', label: '不合格' }],
+			equipmentCategoryCodeArray: [{ value: '0', label: '九小场所' }, { value: '1', label: '企事业单位' }],
+			pageNo: 1,
+			pageSize: window.localStorage.getItem('pageSize') || 20,
+			total: 1,
+			detailId: '',
+			detailData: {},
+			multipleSelection: [],
+			rowObj: {}
+		};
+	},
+	components: { addForm },
+	created() {},
+	computed: {
+		maxTableHeight() {
+			return this.$store.state.inIframe ? this.clientHeight - 410 + this.iframeHeigh : this.clientHeight - 410;
+		},
+		...mapGetters(['clientHeight', 'iframeHeight'])
+	},
+	watch: {},
+	mounted() {
+		this.user = this.$store.state.user;
+		this.agencyId = this.user.agencyId;
+		this.loadGrid();
+		this.loadplaceType();
+		this.getTableData();
+	},
+	methods: {
+		handleSelectionChange(val) {
+			this.multipleSelection = [];
+			val.forEach(element => {
+				this.multipleSelection.push(element.icEventId);
+			});
+		},
+		handleSearch(val) {
+			console.log(this.formData);
+			this.pageNo = 1;
+			this.getTableData();
+		},
+		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 handleImport() {
+			// 导入
+		},
+		async handleExport() {
+			// 导出
+			const url = '/actual/base/cityManagement/export';
+			const { pageSize, pageNo, formData } = this;
+			axios({
+				url: window.SITE_CONFIG['apiURL'] + url,
+				method: 'post',
+				data: {
+					pageSize,
+					pageNo,
+					...formData
+				},
+				responseType: 'blob'
+			})
+				.then(res => {
+					let fileName = window.decodeURI(res.headers['content-disposition'].split(';')[1].split('=')[1]);
+					console.log('filename', fileName);
+					let blob = new Blob([res.data], { type: 'application/vnd.ms-excel' });
+					var url = window.URL.createObjectURL(blob);
+					var aLink = document.createElement('a');
+					aLink.style.display = 'none';
+					aLink.href = url;
+					aLink.setAttribute('download', fileName);
+					document.body.appendChild(aLink);
+					aLink.click();
+					document.body.removeChild(aLink); //下载完成移除元素
+					window.URL.revokeObjectURL(url); //释放掉blob对象
+				})
+				.catch(err => {
+					console.log('获取导出情失败', err);
+					return this.$message.error('网络错误');
+				});
+		},
+		handleAdd(row, type) {
+			if (row.id) {
+				this.detailId = row.id;
+			}
+			this.pageType = type;
+			if (type == 'view') {
+				this.disabled = true;
+			} else {
+				this.disabled = false;
+			}
+		},
+		handleClose() {
+			this.pageType = 'list';
+			this.detailId = '';
+			this.getTableData();
+		},
+		handleOk() {
+			this.pageType = 'list';
+			this.detailId = '';
+			this.pageNo = 1;
+			this.getTableData();
+		},
+		handleEditSuccess() {
+			this.handleClose();
+			this.getTableData();
+		},
+		async handleDel(rowData) {
+			let message = '确认删除?';
+			this.$confirm(message, '提示', {
+				confirmButtonText: '确定',
+				cancelButtonText: '取消',
+				type: 'warning'
+			})
+				.then(() => {
+					this.del(rowData.id);
+				})
+				.catch(err => {});
+		},
+		async del(id) {
+			const url = '/actual/base/cityManagement/delete';
+			const { data, code, msg } = await requestPost(url, id);
+			if (code === 0) {
+				this.$message.success('删除成功！');
+				this.getTableData();
+			} else {
+				this.$message.error('操作失败！');
+			}
+		},
+		async getTableData() {
+			const url = '/actual/base/cityManagement/page';
+			// const url = 'http://yapi.elinkservice.cn/mock/330/actual/base/enterprise/list';
+			const { pageSize, pageNo, formData } = this;
+			const { data, code, msg } = await requestPost(url, {
+				pageSize,
+				pageNo,
+				...formData
+			});
+			if (code === 0) {
+				this.total = data.total || 0;
+				this.tableData = data.list
+					? data.list.map(item => {
+							return item;
+					  })
+					: [];
+			} else {
+				this.$message.error(msg);
+			}
+		},
+		handleSizeChange(val) {
+			this.pageSize = val;
+			window.localStorage.setItem('pageSize', val);
+			this.getTableData();
+		},
+		handleCurrentChange(val) {
+			this.pageNo = val;
+			this.getTableData();
+		},
+		resetSearch() {
+			this.formData = {
+				equipmentName: '',
+				gridId: '',
+				equipmentCategoryCode: '',
+				placeType: '',
+				result: '',
+				scaleTotal: '',
+				contactNum: '',
+				address: '',
+				principalName: ''
+			};
+			this.pageNo = 1;
+			this.getTableData();
+		},
+		async handleExportModule() {
+			let url = '/actual/base/cityManagement/downloadTemplate';
+			let params = {};
+			await this.$http({
+				method: 'POST',
+				url,
+				responseType: 'blob',
+				data: params
+			})
+				.then(res => {
+					// this.download(res.data, title + '.xls')
+					if (res.headers['content-disposition']) {
+						let fileName = window.decodeURI(res.headers['content-disposition'].split(';')[1].split('=')[1]);
+						console.log('filename', fileName);
+						let blob = new Blob([res.data], {
+							type: 'application/vnd.ms-excel'
+						});
+						var url = window.URL.createObjectURL(blob);
+						var aLink = document.createElement('a');
+						aLink.style.display = 'none';
+						aLink.href = url;
+						aLink.setAttribute('download', fileName);
+						document.body.appendChild(aLink);
+						aLink.click();
+						document.body.removeChild(aLink); //下载完成移除元素
+						window.URL.revokeObjectURL(url); //释放掉blob对象
+					} else this.$message.error('下载失败');
+				})
+				.catch(err => {
+					console.log('err', err);
+					return this.$message.error('网络错误');
+				});
+		},
+		handleExcelSuccess(res, file) {
+			if (res.code === 0 && res.msg === 'success') {
+				console.log('resss---ppp', res);
+			} else {
+				this.$message.error(res.msg);
+			}
+		},
+		handleProgress(event, file, fileList) {
+			console.log('percentage', file.percentage);
+		},
+
+		beforeExcelUpload(file) {
+			console.log('file', file);
+			const isType = file.type === 'application/vnd.ms-excel';
+			const isTypeComputer = file.type === 'application/vnd.openxmlformats-officedocument.spreadsheetml.sheet';
+			const fileType = isType || isTypeComputer;
+			const isLt1M = file.size / 1024 / 1024 < 10;
+			if (!fileType) {
+				this.$message.error('上传文件只能是xls/xlsx格式！');
+			}
+
+			if (!isLt1M) {
+				this.$message.error('上传文件大小不能超过 10MB!');
+			}
+			return fileType && isLt1M;
+		},
+
+		async uploadHttpRequest(file) {
+			this.importLoading = true;
+			this.importBtnTitle = '正在上传中...';
+			const formData = new FormData(); //FormData对象，添加参数只能通过append('key', value)的形式添加
+			formData.append('file', file.file); //添加文件对象
+			formData.append('code', ''); //添加文件对象
+			await this.$http
+				.post('/actual/base/cityManagement/import', formData)
+				.then(res => {
+					console.log('res-up', res);
+					if (res.data.code == 0 && res.data.msg == 'success') {
+						console.log(res.data.data);
+						const data = res.data.data;
+
+						this.dataList = [
+							...Object.keys(data.option.exist).map(k => {
+								return {
+									index: k,
+									srcField: data.option.exist[k],
+									exist: true,
+									field: data.option.exist[k]
+								};
+							}),
+							...Object.keys(data.option.notExist).map(k => {
+								return {
+									index: k,
+									srcField: data.option.notExist[k],
+									exist: false,
+									field: ''
+								};
+							})
+						];
+						this.importOption = data.option;
+						this.importCode = data.code;
+						this.fileData = file;
+					} else this.$message.error(res.data.msg);
+				})
+				.catch(err => {
+					console.log('失败', err);
+					file.onError(); //上传失败的文件会从文件列表中删除
+					// this.$message.error('导入失败')
+				});
+			this.importLoading = false;
+			this.importBtnTitle = '导入';
+			this.$refs.upload.clearFiles();
+		}
+	}
+};
 </script>
 
-<style>
-</style>
\ No newline at end of file
+<style lang="scss" scoped>
+@import '@/assets/scss/modules/management/list-main.scss';
+.m-search {
+	.u-item-width-normal {
+		width: 200px;
+	}
+}
+</style>
diff --git a/src/views/modules/shequzhili/tuceng/gonggong/addForm.vue b/src/views/modules/shequzhili/tuceng/gonggong/addForm.vue
new file mode 100644
index 000000000..eb9e93ee6
--- /dev/null
+++ b/src/views/modules/shequzhili/tuceng/gonggong/addForm.vue
@@ -0,0 +1,416 @@
+<template>
+	<el-card>
+		<div class="dialog-h-content scroll-h">
+			<el-form :inline="true" :model="formData" ref="form" :rules="dataRule" :label-width="'120px'" v-if="pageType != 'view'">
+				<el-row>
+					<el-col :span="8">
+						<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-form-item label="设备编号" prop="equipmentNum">
+							<el-input v-model="formData.equipmentNum" :disabled="disabled" class="u-item-width-normal" size="small" clearable placeholder="请输入"></el-input>
+						</el-form-item>
+						<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-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-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="16">
+						<el-form-item label="所处位置" prop="location" style="display: block">
+							<el-select
+								v-model="formData.location"
+								style="width: 200px;"
+								: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>
+							<div id="app_event" class="div_map"></div>
+						</el-form-item>
+					</el-col>
+				</el-row>
+			</el-form>
+			<el-form :inline="false" :model="formData" ref="form" :label-width="'120px'" v-if="pageType == 'view'">
+				<el-row>
+					<el-col :span="8">
+						<el-form-item label="设备名称" prop="equipmentName">{{ formData.equipmentName }}</el-form-item>
+						<el-form-item label="设备编号" prop="equipmentNum">{{ formData.equipmentNum }}</el-form-item>
+						<el-form-item label="设备类型" prop="equipmentCategoryCode">{{ formData.equipmentCategoryName }}</el-form-item>
+						<el-form-item label="负责人" prop="principalName">{{ formData.principalName }}</el-form-item>
+						<el-form-item label="联系电话" prop="contactNum">{{ formData.contactNum }}</el-form-item>
+					</el-col>
+					<el-col :span="16">
+						<el-form-item label="场所地址" prop="location" style="display: block">
+							{{ formData.location }}
+							<div id="app_event" class="div_map"></div>
+						</el-form-item>
+					</el-col>
+				</el-row>
+			</el-form>
+		</div>
+		<div class="div_btn">
+			<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" 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>
+	</el-card>
+</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: {
+		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: [{ value: '0', label: '九小场所' }, { value: '1', label: '企事业单位' }],
+			list: {},
+			formData: {
+				equipmentName: '',
+				scaleTotal: '',
+				gridId: '',
+				equipmentCategoryCode: '',
+				placeType: '',
+				principalName: '',
+				location: '',
+				contactNum: '',
+				// result: '',
+				remark: ''
+			},
+			dataRule: {
+				equipmentName: [{ required: true, message: '设备名称不能为空', trigger: 'bulr' }],
+				equipmentCategoryCode: [{ required: true, message: '设备类型不能为空', trigger: 'bulr' }],
+				placeType: [{ required: true, message: '场所类型不能为空', trigger: 'bulr' }],
+				result: [{ required: true, message: '巡查结果不能为空', trigger: 'bulr' }],
+				scaleTotal: [{ required: true, message: '场所规模不能为空', trigger: 'bulr' }],
+				gridId: [{ required: true, message: '所属组织不能为空', trigger: 'bulr' }],
+				principalName: [{ required: true, message: '负责人不能为空', trigger: 'bulr' }],
+				contactNum: [{ required: true, validator: checkMObile, trigger: 'blur' }],
+				location: [{ required: true, message: '场所地址不能为空', trigger: 'blur' }]
+				// content: [{ required: true, message: '详细说明不能为空', trigger: 'bulr' }, { max: 1000, message: '不能超出1000个字符', 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.loadGrid();
+		// this.loadplaceType();
+		if (this.pageType != 'add') {
+			this.getDetail();
+		} else {
+			this.initMap();
+		}
+		await this.endLoading();
+		this.endLoading();
+	},
+
+	methods: {
+		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/emergencyEquipment/save';
+			} else {
+				url = '/actual/base/emergencyEquipment/update';
+			}
+			params = { ...this.formData };
+			const { data, code, msg } = await requestPost(url, params);
+			if (code === 0) {
+				this.$message.success('添加成功');
+				this.resetData();
+				this.$emit('handleComfirm');
+			} 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(() => {
+				if (!map) {
+					map = new daiMap(
+						document.getElementById('app_event'),
+						{ latitude, longitude },
+						{
+							zoom: 16.2, // 设置地图缩放级别
+							pitch: 43.5, // 设置俯仰角
+							rotation: 45 // 设置地图旋转角度
+						}
+					);
+					// 监听地图平移结束
+					map.on('dragend', e => {
+						this.handleMoveCenter(e);
+					});
+				} else {
+					map.setCenter(latitude, longitude);
+					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.hotPointID}`, 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.address = selPosition.address + selPosition.name;
+		}
+	}
+};
+</script>
+
+<style lang="scss" scoped>
+@import '@/assets/scss/modules/management/form-main.scss';
+@import '@/assets/scss/modules/visual/a_customize.scss';
+/deep/ .el-input.is-disabled .el-input__inner,
+/deep/ .el-textarea.is-disabled textarea.el-textarea__inner {
+	// border:none;background-color: transparent;
+}
+.div_map {
+	width: 100%;
+}
+.form-item::v-deep .el-form-item__label {
+	color: #fff;
+}
+.form-item {
+	.el-radio {
+		color: #fff;
+	}
+
+	.el-checkbox {
+		color: #fff;
+	}
+}
+.verifyRed::before {
+	content: '*';
+	color: #f56c6c;
+	margin-right: 4px;
+}
+.form_label_box {
+	width: 150px;
+	display: inline-block;
+	text-align: right;
+	padding-right: 12px;
+}
+</style>
diff --git a/src/views/modules/shequzhili/tuceng/gonggong/index.vue b/src/views/modules/shequzhili/tuceng/gonggong/index.vue
index 02409e35d..3f91146db 100644
--- a/src/views/modules/shequzhili/tuceng/gonggong/index.vue
+++ b/src/views/modules/shequzhili/tuceng/gonggong/index.vue
@@ -1,8 +1,448 @@
 <template>
+	<div class="g-main">
+		<div v-show="pageType == 'list'">
+			<div class="m-search">
+				<el-form :inline="true" :model="formData" ref="ref_searchform" :label-width="'100px'">
+					<div>
+						<el-form-item label="设备名称" prop="equipmentName">
+							<el-input v-model="formData.equipmentName" class="u-item-width-normal" size="small" clearable placeholder="请输入"></el-input>
+						</el-form-item>
+						<el-form-item label="设备编号" prop="equipmentNum">
+							<el-input v-model="formData.equipmentNum" :disabled="disabled" class="u-item-width-normal" size="small" clearable placeholder="请输入"></el-input>
+						</el-form-item>
+						<el-form-item label="设备类型" prop="equipmentCategoryCode">
+							<el-select v-model="formData.equipmentCategoryCode" 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-row>
+							<el-col :span="24" align="right">
+								<el-button style="margin-left: 30px" size="small" type="primary " @click="handleSearch">查询</el-button>
+								<el-button style="margin-left: 10px" size="small" class="diy-button--white" @click="resetSearch">重置</el-button>
+							</el-col>
+						</el-row>
+					</div>
+				</el-form>
+			</div>
+			<div class="m-table">
+				<div class="div_btn">
+					<el-button size="small" type="primary " @click="handleAdd({}, 'add')">新增</el-button>
+					<el-button class="diy-button--white" size="small" @click="handleExportModule('room')">下载导入模板</el-button>
+					<el-upload
+						:headers="$getElUploadHeaders()"
+						ref="upload"
+						class="upload-btn"
+						action="uploadUlr"
+						:limit="1"
+						:accept="'.xls,.xlsx'"
+						:with-credentials="true"
+						:show-file-list="false"
+						:auto-upload="true"
+						:on-progress="handleProgress"
+						:on-success="handleExcelSuccess"
+						:before-upload="beforeExcelUpload"
+						:http-request="uploadHttpRequest"
+						style="display: inline-block;margin:0px 10px"
+					>
+						<el-button size="small" class="diy-button--white" :loading="importLoading">导入模板</el-button>
+					</el-upload>
+
+					<el-button @click="handleExport" class="diy-button--white" size="small">导出</el-button>
+				</div>
+				<el-table :data="tableData" border class="m-table-item" style="width: 100%" @selection-change="handleSelectionChange" :height="maxTableHeight">
+					<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="equipmentNum" 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="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>
+					<el-table-column prop="latestInspectTime" align="center" width="100" label="最新检查时间" :show-overflow-tooltip="true"></el-table-column>
+					<el-table-column prop="latestInspectResult" align="center" label="最新巡查结果" :show-overflow-tooltip="true">
+						<template slot-scope="scope">
+							<span v-if="scope.row.latestResult === '0'">合格</span>
+							<span v-else-if="scope.row.latestResult === '1'">不合格</span>
+							<span v-else>--</span>
+						</template>
+					</el-table-column>
+					<el-table-column fixed="right" label="操作" align="center" width="130">
+						<template slot-scope="scope">
+							<el-button @click="handleAdd(scope.row, 'view')" type="text" size="small">查看</el-button>
+							<el-button style="margin-right: 10px" @click="handleAdd(scope.row, 'edit')" size="small" type="text">编辑</el-button>
+							<el-button @click="handleDel(scope.row)" type="text" size="small" class="">删除</el-button>
+						</template>
+					</el-table-column>
+				</el-table>
+
+				<div>
+					<el-pagination
+						@size-change="handleSizeChange"
+						@current-change="handleCurrentChange"
+						:current-page.sync="pageNo"
+						:page-sizes="[20, 50, 100, 200]"
+						:page-size="parseInt(pageSize)"
+						layout="sizes, prev, pager, next, total"
+						:total="total"
+					></el-pagination>
+				</div>
+			</div>
+		</div>
+		<div v-if="pageType != 'list'">
+			<addForm
+				:pageType="pageType"
+				:disabled="disabled"
+				:detailId="detailId"
+				:detailData="detailData"
+				@handleClose="handleClose"
+				@handleOk="handleOk"
+				@dialogOk="handleEditSuccess"
+			/>
+		</div>
+	</div>
 </template>
 
 <script>
+import { requestPost } from '@/js/dai/request';
+import nextTick from 'dai-js/tools/nextTick';
+import { mapGetters } from 'vuex';
+import addForm from './addForm.vue';
+import axios from 'axios';
+
+export default {
+	data() {
+		return {
+			importLoading: false,
+			disabled: false,
+			user: '',
+			agencyId: '',
+			formData: {
+				equipmentName: '',
+				gridId: '',
+				equipmentCategoryCode: '',
+				placeType: '',
+				result: '',
+				scaleTotal: '',
+				contactNum: '',
+				address: '',
+				principalName: ''
+			},
+			pageType: 'list', // 列表list 新增add  处理dispose 详情info
+			gridList: [], //所属网格list--场所区域
+			placeTypeList: [], //场所类型
+			tableData: [],
+			resultArray: [{ value: '0', label: '合格' }, { value: '1', label: '不合格' }],
+			equipmentCategoryCodeArray: [{ value: '0', label: '九小场所' }, { value: '1', label: '企事业单位' }],
+			pageNo: 1,
+			pageSize: window.localStorage.getItem('pageSize') || 20,
+			total: 1,
+			detailId: '',
+			detailData: {},
+			multipleSelection: [],
+			rowObj: {}
+		};
+	},
+	components: { addForm },
+	created() {},
+	computed: {
+		maxTableHeight() {
+			return this.$store.state.inIframe ? this.clientHeight - 410 + this.iframeHeigh : this.clientHeight - 410;
+		},
+		...mapGetters(['clientHeight', 'iframeHeight'])
+	},
+	watch: {},
+	mounted() {
+		this.user = this.$store.state.user;
+		this.agencyId = this.user.agencyId;
+		this.loadGrid();
+		this.loadplaceType();
+		this.getTableData();
+	},
+	methods: {
+		handleSelectionChange(val) {
+			this.multipleSelection = [];
+			val.forEach(element => {
+				this.multipleSelection.push(element.icEventId);
+			});
+		},
+		handleSearch(val) {
+			console.log(this.formData);
+			this.pageNo = 1;
+			this.getTableData();
+		},
+		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 handleImport() {
+			// 导入
+		},
+		async handleExport() {
+			// 导出
+			const url = '/actual/base/emergencyEquipment/export';
+			const { pageSize, pageNo, formData } = this;
+			axios({
+				url: window.SITE_CONFIG['apiURL'] + url,
+				method: 'post',
+				data: {
+					pageSize,
+					pageNo,
+					...formData
+				},
+				responseType: 'blob'
+			})
+				.then(res => {
+					let fileName = window.decodeURI(res.headers['content-disposition'].split(';')[1].split('=')[1]);
+					console.log('filename', fileName);
+					let blob = new Blob([res.data], { type: 'application/vnd.ms-excel' });
+					var url = window.URL.createObjectURL(blob);
+					var aLink = document.createElement('a');
+					aLink.style.display = 'none';
+					aLink.href = url;
+					aLink.setAttribute('download', fileName);
+					document.body.appendChild(aLink);
+					aLink.click();
+					document.body.removeChild(aLink); //下载完成移除元素
+					window.URL.revokeObjectURL(url); //释放掉blob对象
+				})
+				.catch(err => {
+					console.log('获取导出情失败', err);
+					return this.$message.error('网络错误');
+				});
+		},
+		handleAdd(row, type) {
+			if (row.equipmentId) {
+				this.detailId = row.equipmentId;
+			}
+			this.pageType = type;
+			if (type == 'view') {
+				this.disabled = true;
+			} else {
+				this.disabled = false;
+			}
+		},
+		handleClose() {
+			this.pageType = 'list';
+			this.detailId = '';
+			this.getTableData();
+		},
+		handleOk() {
+			this.pageType = 'list';
+			this.detailId = '';
+			this.pageNo = 1;
+			this.getTableData();
+		},
+		handleEditSuccess() {
+			this.handleClose();
+			this.getTableData();
+		},
+		async handleDel(rowData) {
+			let message = '确认删除?';
+			this.$confirm(message, '提示', {
+				confirmButtonText: '确定',
+				cancelButtonText: '取消',
+				type: 'warning'
+			})
+				.then(() => {
+					this.del(rowData.equipmentId);
+				})
+				.catch(err => {});
+		},
+		async del(id) {
+			const url = '/actual/base/emergencyEquipment/delete';
+			const { data, code, msg } = await requestPost(url, id);
+			if (code === 0) {
+				this.$message.success('删除成功！');
+				this.getTableData();
+			} else {
+				this.$message.error('操作失败！');
+			}
+		},
+		async getTableData() {
+			const url = '/actual/base/emergencyEquipment/page';
+			// const url = 'http://yapi.elinkservice.cn/mock/330/actual/base/enterprise/list';
+			const { pageSize, pageNo, formData } = this;
+			const { data, code, msg } = await requestPost(url, {
+				pageSize,
+				pageNo,
+				...formData
+			});
+			if (code === 0) {
+				this.total = data.total || 0;
+				this.tableData = data.list
+					? data.list.map(item => {
+							return item;
+					  })
+					: [];
+			} else {
+				this.$message.error(msg);
+			}
+		},
+		handleSizeChange(val) {
+			this.pageSize = val;
+			window.localStorage.setItem('pageSize', val);
+			this.getTableData();
+		},
+		handleCurrentChange(val) {
+			this.pageNo = val;
+			this.getTableData();
+		},
+		resetSearch() {
+			this.formData = {
+				equipmentName: '',
+				gridId: '',
+				equipmentCategoryCode: '',
+				placeType: '',
+				result: '',
+				scaleTotal: '',
+				contactNum: '',
+				address: '',
+				principalName: ''
+			};
+			this.pageNo = 1;
+			this.getTableData();
+		},
+		async handleExportModule() {
+			let url = '/actual/base/emergencyEquipment/downloadTemplate';
+			let params = {};
+			await this.$http({
+				method: 'POST',
+				url,
+				responseType: 'blob',
+				data: params
+			})
+				.then(res => {
+					// this.download(res.data, title + '.xls')
+					if (res.headers['content-disposition']) {
+						let fileName = window.decodeURI(res.headers['content-disposition'].split(';')[1].split('=')[1]);
+						console.log('filename', fileName);
+						let blob = new Blob([res.data], {
+							type: 'application/vnd.ms-excel'
+						});
+						var url = window.URL.createObjectURL(blob);
+						var aLink = document.createElement('a');
+						aLink.style.display = 'none';
+						aLink.href = url;
+						aLink.setAttribute('download', fileName);
+						document.body.appendChild(aLink);
+						aLink.click();
+						document.body.removeChild(aLink); //下载完成移除元素
+						window.URL.revokeObjectURL(url); //释放掉blob对象
+					} else this.$message.error('下载失败');
+				})
+				.catch(err => {
+					console.log('err', err);
+					return this.$message.error('网络错误');
+				});
+		},
+		handleExcelSuccess(res, file) {
+			if (res.code === 0 && res.msg === 'success') {
+				console.log('resss---ppp', res);
+			} else {
+				this.$message.error(res.msg);
+			}
+		},
+		handleProgress(event, file, fileList) {
+			console.log('percentage', file.percentage);
+		},
+
+		beforeExcelUpload(file) {
+			console.log('file', file);
+			const isType = file.type === 'application/vnd.ms-excel';
+			const isTypeComputer = file.type === 'application/vnd.openxmlformats-officedocument.spreadsheetml.sheet';
+			const fileType = isType || isTypeComputer;
+			const isLt1M = file.size / 1024 / 1024 < 10;
+			if (!fileType) {
+				this.$message.error('上传文件只能是xls/xlsx格式！');
+			}
+
+			if (!isLt1M) {
+				this.$message.error('上传文件大小不能超过 10MB!');
+			}
+			return fileType && isLt1M;
+		},
+
+		async uploadHttpRequest(file) {
+			this.importLoading = true;
+			this.importBtnTitle = '正在上传中...';
+			const formData = new FormData(); //FormData对象，添加参数只能通过append('key', value)的形式添加
+			formData.append('file', file.file); //添加文件对象
+			formData.append('code', ''); //添加文件对象
+			await this.$http
+				.post('/actual/base/emergencyEquipment/import', formData)
+				.then(res => {
+					console.log('res-up', res);
+					if (res.data.code == 0 && res.data.msg == 'success') {
+						console.log(res.data.data);
+						const data = res.data.data;
+
+						this.dataList = [
+							...Object.keys(data.option.exist).map(k => {
+								return {
+									index: k,
+									srcField: data.option.exist[k],
+									exist: true,
+									field: data.option.exist[k]
+								};
+							}),
+							...Object.keys(data.option.notExist).map(k => {
+								return {
+									index: k,
+									srcField: data.option.notExist[k],
+									exist: false,
+									field: ''
+								};
+							})
+						];
+						this.importOption = data.option;
+						this.importCode = data.code;
+						this.fileData = file;
+					} else this.$message.error(res.data.msg);
+				})
+				.catch(err => {
+					console.log('失败', err);
+					file.onError(); //上传失败的文件会从文件列表中删除
+					// this.$message.error('导入失败')
+				});
+			this.importLoading = false;
+			this.importBtnTitle = '导入';
+			this.$refs.upload.clearFiles();
+		}
+	}
+};
 </script>
 
-<style>
-</style>
\ No newline at end of file
+<style lang="scss" scoped>
+@import '@/assets/scss/modules/management/list-main.scss';
+.m-search {
+	.u-item-width-normal {
+		width: 200px;
+	}
+}
+</style>
diff --git a/src/views/modules/shequzhili/tuceng/gonggong/record.vue b/src/views/modules/shequzhili/tuceng/gonggong/record.vue
new file mode 100644
index 000000000..a0bb8938a
--- /dev/null
+++ b/src/views/modules/shequzhili/tuceng/gonggong/record.vue
@@ -0,0 +1,428 @@
+<template>
+	<div class="m-record">
+		<h3>检查记录</h3>
+		<div>
+			<div class="u-table-btn1 mt10" v-if="formType == 'edit'">
+				<el-button size="small" class="diy-button--blue" :disabled="btnDisabled || disabled" @click="handleAdd">新增</el-button>
+			</div>
+			<div class="m-table-item">
+				<el-table :data="tableData" class="resi-table" row-key="id" border style="width: 100%">
+					<el-table-column label="序号" type="index" align="center" width="50"></el-table-column>
+
+					<el-table-column prop="inspectTime" label="检查时间" align="center" width="200px">
+						<template slot-scope="scope">
+							<el-date-picker
+								v-if="scope.row.isEdit"
+								v-model="scope.row.inspectTime"
+								type="date"
+								class="input-width"
+								value-format="yyyy-MM-dd"
+								placeholder="选择日期"
+							></el-date-picker>
+							<div v-else class="div-content">{{ scope.row.inspectTime }}</div>
+						</template>
+					</el-table-column>
+
+					<el-table-column prop="inspectStaffId" label="检查人员" align="center" width="200px">
+						<template slot-scope="scope">
+							<el-select
+								v-if="scope.row.isEdit"
+								v-model="scope.row.inspectStaffId"
+								placeholder="请选择"
+								class="input-width"
+								@change="handleChangeStaff(scope.row)"
+								clearable
+							>
+								<el-option v-for="subItem in optionStaff" :key="subItem.value" :label="subItem.label" :value="subItem.value"></el-option>
+							</el-select>
+							<div v-else class="div-content">{{ scope.row.inspectStaffName }}</div>
+						</template>
+					</el-table-column>
+
+					<el-table-column prop="inspectStaffMobile" label="联系电话" align="center" width="200px">
+						<template slot-scope="scope">
+							<el-input
+								v-if="scope.row.isEdit"
+								type="number"
+								v-model="scope.row.inspectStaffMobile"
+								placeholder="请输入"
+								class="input-width"
+								clearable
+								disabled
+							></el-input>
+							<div v-else class="div-content">{{ scope.row.inspectStaffMobile }}</div>
+						</template>
+					</el-table-column>
+
+					<el-table-column prop="inspectResult" label="检查结果" align="center" width="200px">
+						<template slot-scope="scope">
+							<el-select v-if="scope.row.isEdit" v-model="scope.row.inspectResult" placeholder="请选择" class="input-width" size="small" clearable>
+								<el-option v-for="subItem in optionResult" :key="subItem.value" :label="subItem.label" :value="subItem.value"></el-option>
+							</el-select>
+							<div v-else class="div-content">{{ scope.row.inspectResult == 1 ? '正常' : '异常' }}</div>
+						</template>
+					</el-table-column>
+
+					<!-- <el-table-column
+						prop="detailed"
+						label="隐患明细"
+						align="center"
+						width="200px"
+					>
+						<template slot-scope="scope">
+							<el-input
+								v-if="scope.row.isEdit"
+								type="text"
+								v-model="scope.row.detailed"
+								placeholder="请输入"
+								class="input-width"
+								maxlength="500"
+								clearable
+							></el-input>
+							<div v-else class="div-content">
+								{{ scope.row.detailed }}
+							</div>
+						</template>
+					</el-table-column> -->
+
+					<el-table-column prop="imgList" label="图片列表" align="center" width="150px">
+						<template slot-scope="scope">
+							<div v-if="scope.row.isEdit">
+								<el-upload
+									:headers="$getElUploadHeaders()"
+									class="avatar-uploader"
+									:action="uploadUrl"
+									:data="{ customerId: customerId }"
+									:show-file-list="true"
+									:limit="3"
+									:file-list="scope.row.imgShowList"
+									:on-success="res => handleImgSuccess(res, scope.row)"
+									:on-remove="res => handleImgRemove(res, scope.row)"
+									list-type="picture"
+									:before-upload="beforeImgUpload"
+								>
+									<i class="el-icon-plus avatar-uploader-icon"></i>
+									最多三张图片
+								</el-upload>
+							</div>
+
+							<div v-else class="div-content">
+								<el-image
+									v-if="scope.row.imgList.length > 0"
+									style="width: 100px; height: 50px"
+									:src="scope.row.imgList[0]"
+									fit="cover"
+									:preview-src-list="scope.row.imgList"
+								></el-image>
+							</div>
+						</template>
+					</el-table-column>
+
+					<el-table-column prop="nextInspectTime" label="拟复查时间" align="center" width="200px">
+						<template slot-scope="scope">
+							<el-date-picker
+								v-if="scope.row.isEdit"
+								v-model="scope.row.nextInspectTime"
+								type="date"
+								class="input-width"
+								value-format="yyyy-MM-dd"
+								placeholder="选择日期"
+							></el-date-picker>
+							<div v-else class="div-content">{{ scope.row.nextInspectTime }}</div>
+						</template>
+					</el-table-column>
+
+					<el-table-column v-if="!disabled" fixed="right" label="操作" align="center" width="120">
+						<template slot-scope="scope">
+							<template v-if="scope.row.isEdit">
+								<el-button @click="handleEdit(scope.row)" type="text" size="small" class="btn-color-edit">保存</el-button>
+								<el-button @click="handleChange(scope.row, 'cancle')" type="text" size="small" class="btn-color-edit">取消</el-button>
+							</template>
+							<template v-else>
+								<el-button v-if="formType == 'edit'" @click="handleChange(scope.row, 'edit')" type="text" size="small" :disabled="disabled" class="btn-color-edit">
+									修改
+								</el-button>
+								<el-popconfirm v-if="formType == 'edit'" title="删除之后无法恢复，确认删除？" @onConfirm="del(scope.row)" @confirm="del(scope.row)">
+									<el-button slot="reference" type="text" size="small" class="btn-color-del" style="margin-left: 10px">删除</el-button>
+								</el-popconfirm>
+							</template>
+						</template>
+					</el-table-column>
+				</el-table>
+			</div>
+		</div>
+	</div>
+</template>
+
+<script>
+import { requestPost, requestGet } from '@/js/dai/request';
+export default {
+	props: {
+		id: {
+			type: String,
+			default: ''
+		},
+		info: {
+			type: Object,
+			default: () => ({})
+		},
+		disabled: {
+			type: Boolean,
+			default: false
+		},
+		formType: {
+			type: String,
+			default: ''
+		},
+		source: {
+			//展示来源：manage  管理平台    visiual  可视化平台
+			type: String,
+			default: 'manage'
+		}
+	},
+	data() {
+		return {
+			uploadUrl: window.SITE_CONFIG['apiURL'] + '/oss/file/uploadqrcodeV2',
+			customerId: localStorage.getItem('customerId'),
+
+			btnDisabled: false,
+			btnType: 'cancle',
+			isEdit: false,
+			tableData: [],
+			tempRow: {},
+
+			optionResult: [
+				{
+					label: '合格',
+					value: '0'
+				},
+				{
+					label: '不合格',
+					value: '1'
+				}
+			],
+			optionStaff: [
+				// {
+				//   label: "人名",
+				//   value: "inspectStaffId",
+				// },
+			]
+		};
+	},
+
+	computed: {
+		allowOperate() {
+			const {
+				info: { agencyId }
+			} = this;
+			return agencyId && agencyId == this.$store.state.user.agencyId;
+		}
+	},
+	watch: {
+		id: {
+			handler(val) {
+				console.log('val------points', val);
+				if (val.length > 0) {
+					this.btnDisabled = false;
+					this.getList();
+				} else this.btnDisabled = true;
+			},
+			immediate: true
+		}
+	},
+
+	created() {
+		console.log("id",this.id)
+		this.getOptionStaff();
+	},
+
+	methods: {
+		beforeImgUpload(file) {
+			console.log(file);
+			const isLt1M = file.size / 1024 / 1024 < 10;
+			const srcType = file.type;
+			const format = file.name.split('.').pop();
+
+			if (!isLt1M) {
+				this.$message.error('上传文件大小不能超过 10MB!');
+				return false;
+			}
+			if (srcType.indexOf('image') == -1) {
+				this.$message.error('仅限图片格式');
+				return false;
+			}
+			return true;
+		},
+
+		handleImgSuccess(res, row) {
+			console.log('handleImgSuccess', res);
+			if (res.code === 0 && res.msg === 'success') {
+				row.imgList.push(res.data.url);
+				this.computeImgShowList(row);
+			} else {
+				this.$message.error(res.msg);
+			}
+		},
+
+		computeImgShowList(row) {
+			row.imgShowList = row.imgList.map(url => {
+				return { name: '', url };
+			});
+		},
+
+		handleImgRemove(file, row) {
+			console.log('handleImgRemove', file);
+			let url = file.url || file.response.data.url;
+			if (url) {
+				row.imgList = row.imgList.filter(item => item !== url);
+				this.computeImgShowList(row);
+			}
+		},
+
+		getRowClass({ rowIndex, columnIndex }) {
+			if (rowIndex === 0) {
+				return 'background: #2195fe; color: #fff;';
+			}
+		},
+
+		handleChange(row, type) {
+			console.log('type----', type);
+			if (type == 'cancle') {
+				row = { ...this.tempRow };
+				row.isEdit = false;
+				if (this.btnType == 'add') this.tableData.pop();
+				this.getList();
+				console.log('row----', row);
+			} else {
+				this.tempRow = { ...row };
+				row.isEdit = true;
+			}
+			this.btnType = type;
+			this.isEdit = !this.isEdit;
+		},
+
+		handleChangeStaff(row) {
+			const { inspectStaffId } = row;
+			const { optionStaff } = this;
+			let item = optionStaff.find(item => item.value == inspectStaffId);
+			if (item) {
+				row.inspectStaffName = item.name;
+				row.inspectStaffMobile = item.mobile;
+			}
+		},
+
+		async getOptionStaff() {
+			let url = `/data/aggregator/org/staff-select-list/${this.$store.state.user.agencyId}`;
+			const { data, code, msg } = await requestPost(url, {});
+
+			if (code === 0) {
+				this.optionStaff = data || [];
+			} else {
+				this.$message.error('请求工作人员数据失败！');
+			}
+		},
+
+		async handleEdit(row) {
+			if (this.btnType == 'add') this.save(row);
+			else this.edit(row);
+		},
+
+		handleAdd() {
+			this.btnType = 'add';
+			this.isEdit = true;
+
+			const item = {
+				isEdit: true,
+				id: this.id,
+				inspectTime: '',
+				inspectStaffId: '',
+				inspectStaffName: '',
+				inspectStaffMobile: '',
+				inspectResult: '',
+				imgList: [],
+				nextInspectTime: ''
+			};
+			this.computeImgShowList(item);
+			this.tableData.push(item);
+		},
+
+		async save(row) {
+			const params = {
+				equipmentId: this.id,
+				...row
+			};
+			const url = `/actual/base/emergencyEquipment/inspect-save`;
+			const { data, code, msg } = await requestPost(url, params);
+			if (code === 0) {
+				return this.$message.error(res.msg);
+			} else {
+				this.$message.success('保存成功');
+				row.isEdit = false;
+				this.isEdit = false;
+				this.btnType = 'cancle';
+				this.getList();
+			}
+		},
+
+		async edit(row) {
+			const params = {
+				...row
+			};
+			const url = `/actual/base/emergencyEquipment/inspect-update`;
+			const { data, code, msg } = await requestPost(url, params);
+			if (code === 0) {
+				return this.$message.error(res.msg);
+			} else {
+				this.$message.success('保存成功');
+				row.isEdit = false;
+				this.isEdit = false;
+				this.getList();
+			}
+		},
+
+		async del(row) {
+			const url = `/actual/base/emergencyEquipment/inspect-delete/${this.id}`;
+			const { data, code, msg } = await requestPost(url);
+
+			if (code === 0) {
+				return this.$message.error(res.msg);
+			} else {
+				this.$message.success('删除成功');
+				this.getList();
+			}
+		},
+
+		async getList() {
+			const params = {
+				equipmentId: this.id
+			};
+			const url = `/actual/base/emergencyEquipment/inspect-page`;
+			const { data, code, msg } = await requestPost(url, params);
+
+			if (code === 0) {
+				return this.$message.error(res.msg);
+			} else {
+				this.tableData = res.data.list.map(item => {
+					this.computeImgShowList(item);
+					return {
+						...item,
+						isEdit: false
+					};
+				});
+			}
+		}
+	}
+};
+</script>
+
+<style lang="scss" scoped>
+@import '@/assets/scss/buttonstyle.scss';
+@import '@/assets/scss/modules/management/list-main.scss';
+
+.mt10 {
+	margin-bottom: 10px;
+}
+.input-width {
+	width: 170px;
+}
+</style>
diff --git a/src/views/modules/shequzhili/tuceng/gonggongfuwu/addForm.vue b/src/views/modules/shequzhili/tuceng/gonggongfuwu/addForm.vue
new file mode 100644
index 000000000..7f9bec0ba
--- /dev/null
+++ b/src/views/modules/shequzhili/tuceng/gonggongfuwu/addForm.vue
@@ -0,0 +1,417 @@
+<template>
+	<el-card>
+		<div class="dialog-h-content scroll-h">
+			<el-form :inline="true" :model="formData" ref="form" :rules="dataRule" :label-width="'120px'" v-if="pageType != 'view'">
+				<el-row>
+					<el-col :span="8">
+						<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-form-item label="设备编号" prop="equipmentNum">
+							<el-input v-model="formData.equipmentNum" :disabled="disabled" class="u-item-width-normal" size="small" clearable placeholder="请输入"></el-input>
+						</el-form-item>
+						<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-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-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="16">
+						<el-form-item label="所处位置" prop="location" style="display: block">
+							<el-select
+								v-model="formData.location"
+								style="width: 200px;"
+								: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>
+							<div id="app_event" class="div_map"></div>
+						</el-form-item>
+					</el-col>
+				</el-row>
+			</el-form>
+			<el-form :inline="false" :model="formData" ref="form" :label-width="'120px'" v-if="pageType == 'view'">
+				<el-row>
+					<el-col :span="8">
+						<el-form-item label="设备名称" prop="equipmentName">{{ formData.equipmentName }}</el-form-item>
+						<el-form-item label="设备编号" prop="equipmentNum">{{ formData.equipmentNum }}</el-form-item>
+						<el-form-item label="设备类型" prop="equipmentCategoryCode">{{ formData.equipmentCategoryName }}</el-form-item>
+						<el-form-item label="负责人" prop="principalName">{{ formData.principalName }}</el-form-item>
+						<el-form-item label="联系电话" prop="contactNum">{{ formData.contactNum }}</el-form-item>
+					</el-col>
+					<el-col :span="16">
+						<el-form-item label="场所地址" prop="location" style="display: block">
+							{{ formData.location }}
+							<div id="app_event" class="div_map"></div>
+						</el-form-item>
+					</el-col>
+				</el-row>
+			</el-form>
+		</div>
+		<div class="div_btn">
+			<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" 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> -->
+	</el-card>
+</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: {
+		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: [{ value: '0', label: '九小场所' }, { value: '1', label: '企事业单位' }],
+			list: {},
+			formData: {
+				equipmentName: '',
+				scaleTotal: '',
+				gridId: '',
+				equipmentCategoryCode: '',
+				placeType: '',
+				principalName: '',
+				location: '',
+				contactNum: '',
+				// result: '',
+				remark: ''
+			},
+			dataRule: {
+				equipmentName: [{ required: true, message: '设备名称不能为空', trigger: 'bulr' }],
+				equipmentNum: [{ required: true, message: '设备编号不能为空', trigger: 'bulr' }],
+				equipmentCategoryCode: [{ required: true, message: '设备类型不能为空', trigger: 'bulr' }],
+				// placeType: [{ required: true, message: '场所类型不能为空', trigger: 'bulr' }],
+				// result: [{ required: true, message: '巡查结果不能为空', trigger: 'bulr' }],
+				// scaleTotal: [{ required: true, message: '场所规模不能为空', trigger: 'bulr' }],
+				// gridId: [{ required: true, message: '所属组织不能为空', trigger: 'bulr' }],
+				principalName: [{ required: true, message: '负责人不能为空', trigger: 'bulr' }],
+				contactNum: [{ required: true, validator: checkMObile, trigger: 'blur' }],
+				location: [{ required: true, message: '所处位置不能为空', trigger: 'blur' }]
+				// content: [{ required: true, message: '详细说明不能为空', trigger: 'bulr' }, { max: 1000, message: '不能超出1000个字符', trigger: 'blur' }]
+			},
+			//地图
+			loading: false,
+			searchValue: '',
+			searchOptions: []
+		};
+	},
+	watch: {},
+	components: {},
+	created() {},
+	async mounted() {
+		console.log('detailId', this.detailId);
+		this.user = this.$store.state.user;
+		this.agencyId = this.user.agencyId;
+		this.startLoading();
+		// this.loadGrid();
+		// this.loadplaceType();
+		if (this.pageType != 'add') {
+			this.getDetail();
+		} else {
+			this.initMap();
+		}
+		await this.endLoading();
+		this.endLoading();
+	},
+
+	methods: {
+		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/commonServiceEquipment/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/cityManagement/save';
+			} else {
+				url = '/actual/base/cityManagement/update';
+			}
+			params = { ...this.formData };
+			const { data, code, msg } = await requestPost(url, params);
+			if (code === 0) {
+				this.$message.success('添加成功');
+				this.resetData();
+				this.$emit('handleComfirm');
+			} 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(() => {
+				if (!map) {
+					map = new daiMap(
+						document.getElementById('app_event'),
+						{ latitude, longitude },
+						{
+							zoom: 16.2, // 设置地图缩放级别
+							pitch: 43.5, // 设置俯仰角
+							rotation: 45 // 设置地图旋转角度
+						}
+					);
+					// 监听地图平移结束
+					map.on('dragend', e => {
+						this.handleMoveCenter(e);
+					});
+				} else {
+					map.setCenter(latitude, longitude);
+					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.hotPointID}`, 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.address = selPosition.address + selPosition.name;
+		}
+	}
+};
+</script>
+
+<style lang="scss" scoped>
+@import '@/assets/scss/modules/management/form-main.scss';
+@import '@/assets/scss/modules/visual/a_customize.scss';
+/deep/ .el-input.is-disabled .el-input__inner,
+/deep/ .el-textarea.is-disabled textarea.el-textarea__inner {
+	// border:none;background-color: transparent;
+}
+.div_map {
+	width: 100%;
+}
+.form-item::v-deep .el-form-item__label {
+	color: #fff;
+}
+.form-item {
+	.el-radio {
+		color: #fff;
+	}
+
+	.el-checkbox {
+		color: #fff;
+	}
+}
+.verifyRed::before {
+	content: '*';
+	color: #f56c6c;
+	margin-right: 4px;
+}
+.form_label_box {
+	width: 150px;
+	display: inline-block;
+	text-align: right;
+	padding-right: 12px;
+}
+</style>
diff --git a/src/views/modules/shequzhili/tuceng/gonggongfuwu/index.vue b/src/views/modules/shequzhili/tuceng/gonggongfuwu/index.vue
new file mode 100644
index 000000000..4bedef63c
--- /dev/null
+++ b/src/views/modules/shequzhili/tuceng/gonggongfuwu/index.vue
@@ -0,0 +1,451 @@
+<template>
+	<div class="g-main">
+		<div v-show="pageType == 'list'">
+			<div class="m-search">
+				<el-form :inline="true" :model="formData" ref="ref_searchform" :label-width="'100px'">
+					<div>
+						<el-form-item label="设备名称" prop="equipmentName">
+							<el-input v-model="formData.equipmentName" class="u-item-width-normal" size="small" clearable placeholder="请输入"></el-input>
+						</el-form-item>
+						<el-form-item label="设备编号" prop="equipmentNum">
+							<el-input v-model="formData.equipmentNum" :disabled="disabled" class="u-item-width-normal" size="small" clearable placeholder="请输入"></el-input>
+						</el-form-item>
+						<el-form-item label="设备类型" prop="equipmentCategoryCode">
+							<el-select v-model="formData.equipmentCategoryCode" 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-row>
+							<el-col :span="24" align="right">
+								<el-button style="margin-left: 30px" size="small" type="primary " @click="handleSearch">查询</el-button>
+								<el-button style="margin-left: 10px" size="small" class="diy-button--white" @click="resetSearch">重置</el-button>
+							</el-col>
+						</el-row>
+					</div>
+				</el-form>
+			</div>
+			<div class="m-table">
+				<div class="div_btn">
+					<el-button size="small" type="primary " @click="handleAdd({}, 'add')">新增</el-button>
+					<el-button class="diy-button--white" size="small" @click="handleExportModule('room')">下载导入模板</el-button>
+					<el-upload
+						:headers="$getElUploadHeaders()"
+						ref="upload"
+						class="upload-btn"
+						action="uploadUlr"
+						:limit="1"
+						:accept="'.xls,.xlsx'"
+						:with-credentials="true"
+						:show-file-list="false"
+						:auto-upload="true"
+						:on-progress="handleProgress"
+						:on-success="handleExcelSuccess"
+						:before-upload="beforeExcelUpload"
+						:http-request="uploadHttpRequest"
+						style="display: inline-block;margin:0px 10px"
+					>
+						<el-button size="small" class="diy-button--white" :loading="importLoading">导入模板</el-button>
+					</el-upload>
+
+					<el-button @click="handleExport" class="diy-button--white" size="small">导出</el-button>
+				</div>
+				<el-table :data="tableData" border class="m-table-item" style="width: 100%" @selection-change="handleSelectionChange" :height="maxTableHeight">
+					<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 label="序号" prop="agencyId" fixed="left"  align="center" width="50" /> -->
+					<el-table-column prop="equipmentName" align="center" label="设备名称" :show-overflow-tooltip="true"></el-table-column>
+					<el-table-column prop="equipmentNum" 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="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>
+					<el-table-column prop="latestInspectTime" align="center" width="100" label="最新检查时间" :show-overflow-tooltip="true"></el-table-column>
+					<el-table-column prop="latestInspectResult" align="center" label="最新巡查结果" :show-overflow-tooltip="true">
+						<template slot-scope="scope">
+							<span v-if="scope.row.latestResult === '0'">合格</span>
+							<span v-else-if="scope.row.latestResult === '1'">不合格</span>
+							<span v-else>--</span>
+						</template>
+					</el-table-column>
+					<el-table-column fixed="right" label="操作" align="center" width="130">
+						<template slot-scope="scope">
+							<el-button @click="handleAdd(scope.row, 'view')" type="text" size="small">查看</el-button>
+							<el-button style="margin-right: 10px" @click="handleAdd(scope.row, 'edit')" size="small" type="text" v-if="agencyId==scope.row.agencyId">编辑</el-button>
+							<el-button @click="handleDel(scope.row)" type="text" size="small" class=""  v-if="agencyId==scope.row.agencyId">删除</el-button>
+						</template>
+					</el-table-column>
+				</el-table>
+
+				<div>
+					<el-pagination
+						@size-change="handleSizeChange"
+						@current-change="handleCurrentChange"
+						:current-page.sync="pageNo"
+						:page-sizes="[20, 50, 100, 200]"
+						:page-size="parseInt(pageSize)"
+						layout="sizes, prev, pager, next, total"
+						:total="total"
+					></el-pagination>
+				</div>
+			</div>
+		</div>
+		<div v-if="pageType != 'list'">
+			<addForm
+				:pageType="pageType"
+				:disabled="disabled"
+				:detailId="detailId"
+				:detailData="detailData"
+				@handleClose="handleClose"
+				@handleOk="handleOk"
+				@dialogOk="handleEditSuccess"
+			/>
+		</div>
+	</div>
+</template>
+
+<script>
+import { requestPost } from '@/js/dai/request';
+import nextTick from 'dai-js/tools/nextTick';
+import { mapGetters } from 'vuex';
+import addForm from './addForm.vue';
+import axios from 'axios';
+
+export default {
+	data() {
+		return {
+			importLoading: false,
+			disabled: false,
+			user: '',
+			agencyId: '',
+			formData: {
+				equipmentName: '',
+				gridId: '',
+				equipmentCategoryCode: '',
+				placeType: '',
+				result: '',
+				scaleTotal: '',
+				contactNum: '',
+				address: '',
+				principalName: ''
+			},
+			pageType: 'list', // 列表list 新增add  处理dispose 详情info
+			gridList: [], //所属网格list--场所区域
+			placeTypeList: [], //场所类型
+			tableData: [],
+			resultArray: [{ value: '0', label: '合格' }, { value: '1', label: '不合格' }],
+			equipmentCategoryCodeArray: [{ value: '0', label: '九小场所' }, { value: '1', label: '企事业单位' }],
+			pageNo: 1,
+			pageSize: window.localStorage.getItem('pageSize') || 20,
+			total: 1,
+			detailId: '',
+			detailData: {},
+			multipleSelection: [],
+			rowObj: {}
+		};
+	},
+	components: { addForm },
+	created() {},
+	computed: {
+		maxTableHeight() {
+			return this.$store.state.inIframe ? this.clientHeight - 410 + this.iframeHeigh : this.clientHeight - 410;
+		},
+		...mapGetters(['clientHeight', 'iframeHeight'])
+	},
+	watch: {},
+	mounted() {
+		this.user = this.$store.state.user;
+		this.agencyId = this.user.agencyId;
+		console.log("this.agencyId",this.agencyId)
+		this.loadGrid();
+		this.loadplaceType();
+		this.getTableData();
+	},
+	methods: {
+		handleSelectionChange(val) {
+			this.multipleSelection = [];
+			val.forEach(element => {
+				this.multipleSelection.push(element.icEventId);
+			});
+		},
+		handleSearch(val) {
+			console.log(this.formData);
+			this.pageNo = 1;
+			this.getTableData();
+		},
+		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 handleImport() {
+			// 导入
+		},
+		async handleExport() {
+			// 导出
+			const url = '/actual/base/commonServiceEquipment/export';
+			const { pageSize, pageNo, formData } = this;
+			axios({
+				url: window.SITE_CONFIG['apiURL'] + url,
+				method: 'post',
+				data: {
+					pageSize,
+					pageNo,
+					...formData
+				},
+				responseType: 'blob'
+			})
+				.then(res => {
+					let fileName = window.decodeURI(res.headers['content-disposition'].split(';')[1].split('=')[1]);
+					console.log('filename', fileName);
+					let blob = new Blob([res.data], { type: 'application/vnd.ms-excel' });
+					var url = window.URL.createObjectURL(blob);
+					var aLink = document.createElement('a');
+					aLink.style.display = 'none';
+					aLink.href = url;
+					aLink.setAttribute('download', fileName);
+					document.body.appendChild(aLink);
+					aLink.click();
+					document.body.removeChild(aLink); //下载完成移除元素
+					window.URL.revokeObjectURL(url); //释放掉blob对象
+				})
+				.catch(err => {
+					console.log('获取导出情失败', err);
+					return this.$message.error('网络错误');
+				});
+		},
+		handleAdd(row, type) {
+			console.log(row)
+			if (row.id) {
+				this.detailId = row.id;
+			}
+			this.pageType = type;
+			if (type == 'view') {
+				this.disabled = true;
+			} else {
+				this.disabled = false;
+			}
+		},
+		handleClose() {
+			this.pageType = 'list';
+			this.detailId = '';
+			this.getTableData();
+		},
+		handleOk() {
+			this.pageType = 'list';
+			this.detailId = '';
+			this.pageNo = 1;
+			this.getTableData();
+		},
+		handleEditSuccess() {
+			this.handleClose();
+			this.getTableData();
+		},
+		async handleDel(rowData) {
+			let message = '确认删除?';
+			this.$confirm(message, '提示', {
+				confirmButtonText: '确定',
+				cancelButtonText: '取消',
+				type: 'warning'
+			})
+				.then(() => {
+					this.del(rowData.id);
+				})
+				.catch(err => {});
+		},
+		async del(id) {
+			const url = '/actual/base/commonServiceEquipment/delete';
+			const { data, code, msg } = await requestPost(url, id);
+			if (code === 0) {
+				this.$message.success('删除成功！');
+				this.getTableData();
+			} else {
+				this.$message.error('操作失败！');
+			}
+		},
+		async getTableData() {
+			const url = '/actual/base/commonServiceEquipment/page';
+			// const url = 'http://yapi.elinkservice.cn/mock/330/actual/base/enterprise/list';
+			const { pageSize, pageNo, formData } = this;
+			const { data, code, msg } = await requestPost(url, {
+				pageSize,
+				pageNo,
+				...formData
+			});
+			if (code === 0) {
+				this.total = data.total || 0;
+				this.tableData = data.list
+					? data.list.map(item => {
+							return item;
+					  })
+					: [];
+			} else {
+				this.$message.error(msg);
+			}
+		},
+		handleSizeChange(val) {
+			this.pageSize = val;
+			window.localStorage.setItem('pageSize', val);
+			this.getTableData();
+		},
+		handleCurrentChange(val) {
+			this.pageNo = val;
+			this.getTableData();
+		},
+		resetSearch() {
+			this.formData = {
+				equipmentName: '',
+				gridId: '',
+				equipmentCategoryCode: '',
+				placeType: '',
+				result: '',
+				scaleTotal: '',
+				contactNum: '',
+				address: '',
+				principalName: ''
+			};
+			this.pageNo = 1;
+			this.getTableData();
+		},
+		async handleExportModule() {
+			let url = '/actual/base/commonServiceEquipment/downloadTemplate';
+			let params = {};
+			await this.$http({
+				method: 'POST',
+				url,
+				responseType: 'blob',
+				data: params
+			})
+				.then(res => {
+					// this.download(res.data, title + '.xls')
+					if (res.headers['content-disposition']) {
+						let fileName = window.decodeURI(res.headers['content-disposition'].split(';')[1].split('=')[1]);
+						console.log('filename', fileName);
+						let blob = new Blob([res.data], {
+							type: 'application/vnd.ms-excel'
+						});
+						var url = window.URL.createObjectURL(blob);
+						var aLink = document.createElement('a');
+						aLink.style.display = 'none';
+						aLink.href = url;
+						aLink.setAttribute('download', fileName);
+						document.body.appendChild(aLink);
+						aLink.click();
+						document.body.removeChild(aLink); //下载完成移除元素
+						window.URL.revokeObjectURL(url); //释放掉blob对象
+					} else this.$message.error('下载失败');
+				})
+				.catch(err => {
+					console.log('err', err);
+					return this.$message.error('网络错误');
+				});
+		},
+		handleExcelSuccess(res, file) {
+			if (res.code === 0 && res.msg === 'success') {
+				console.log('resss---ppp', res);
+			} else {
+				this.$message.error(res.msg);
+			}
+		},
+		handleProgress(event, file, fileList) {
+			console.log('percentage', file.percentage);
+		},
+
+		beforeExcelUpload(file) {
+			console.log('file', file);
+			const isType = file.type === 'application/vnd.ms-excel';
+			const isTypeComputer = file.type === 'application/vnd.openxmlformats-officedocument.spreadsheetml.sheet';
+			const fileType = isType || isTypeComputer;
+			const isLt1M = file.size / 1024 / 1024 < 10;
+			if (!fileType) {
+				this.$message.error('上传文件只能是xls/xlsx格式！');
+			}
+
+			if (!isLt1M) {
+				this.$message.error('上传文件大小不能超过 10MB!');
+			}
+			return fileType && isLt1M;
+		},
+
+		async uploadHttpRequest(file) {
+			this.importLoading = true;
+			this.importBtnTitle = '正在上传中...';
+			const formData = new FormData(); //FormData对象，添加参数只能通过append('key', value)的形式添加
+			formData.append('file', file.file); //添加文件对象
+			formData.append('code', ''); //添加文件对象
+			await this.$http
+				.post('/actual/base/commonServiceEquipment/import', formData)
+				.then(res => {
+					console.log('res-up', res);
+					if (res.data.code == 0 && res.data.msg == 'success') {
+						console.log(res.data.data);
+						const data = res.data.data;
+
+						this.dataList = [
+							...Object.keys(data.option.exist).map(k => {
+								return {
+									index: k,
+									srcField: data.option.exist[k],
+									exist: true,
+									field: data.option.exist[k]
+								};
+							}),
+							...Object.keys(data.option.notExist).map(k => {
+								return {
+									index: k,
+									srcField: data.option.notExist[k],
+									exist: false,
+									field: ''
+								};
+							})
+						];
+						this.importOption = data.option;
+						this.importCode = data.code;
+						this.fileData = file;
+					} else this.$message.error(res.data.msg);
+				})
+				.catch(err => {
+					console.log('失败', err);
+					file.onError(); //上传失败的文件会从文件列表中删除
+					// this.$message.error('导入失败')
+				});
+			this.importLoading = false;
+			this.importBtnTitle = '导入';
+			this.$refs.upload.clearFiles();
+		}
+	}
+};
+</script>
+
+<style lang="scss" scoped>
+@import '@/assets/scss/modules/management/list-main.scss';
+.m-search {
+	.u-item-width-normal {
+		width: 200px;
+	}
+}
+</style>
diff --git a/src/views/modules/shequzhili/tuceng/yingji/changsuo/addForm.vue b/src/views/modules/shequzhili/tuceng/yingji/changsuo/addForm.vue
new file mode 100644
index 000000000..bc907ac15
--- /dev/null
+++ b/src/views/modules/shequzhili/tuceng/yingji/changsuo/addForm.vue
@@ -0,0 +1,412 @@
+<template>
+	<el-card>
+		<div class="dialog-h-content scroll-h">
+			<el-form :inline="true" :model="formData" ref="form" :rules="dataRule" :label-width="'120px'" v-if="pageType != 'view'">
+				<el-row>
+					<el-col :span="8">
+						<el-form-item label="场所名称" prop="name">
+							<el-input v-model="formData.equipmentName" class="u-item-width-normal" size="small" clearable placeholder="请输入"></el-input>
+						</el-form-item>
+						<el-form-item label="场所类型" prop="category">
+							<el-select v-model="formData.category" placeholder="请选择" size="small" clearable class="u-item-width-normal">
+								<el-option v-for="item in placeTypeList" :key="item.value" :label="item.label" :value="item.value"></el-option>
+							</el-select>
+						</el-form-item>
+						
+						<el-form-item label="占地面积" prop="areaCovered">
+							<el-input v-model="formData.areaCovered" :disabled="disabled" class="u-item-width-normal" size="small" clearable placeholder="请输入"></el-input>
+						</el-form-item>
+						<el-form-item label="场所规模" prop="capacity">
+							<el-input v-model="formData.capacity" :disabled="disabled" class="u-item-width-normal" size="small" clearable placeholder="请输入"></el-input>
+						</el-form-item>
+					</el-col>
+					<el-col :span="16">
+						<el-form-item label="所处位置" prop="address" style="display: block">
+							<el-select
+								v-model="formData.address"
+								style="width: 200px;"
+								: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>
+							<div id="app_event" class="div_map"></div>
+						</el-form-item>
+					</el-col>
+				</el-row>
+			</el-form>
+			<el-form :inline="false" :model="formData" ref="form" :label-width="'120px'" v-if="pageType == 'view'">
+				<el-row>
+					<el-col :span="8">
+						<el-form-item label="设备名称" prop="equipmentName">{{ formData.equipmentName }}</el-form-item>
+						<el-form-item label="设备类型" prop="equipmentCategoryCode">{{ formData.equipmentCategoryName }}</el-form-item>
+						<el-form-item label="负责人" prop="principalName">{{ formData.principalName }}</el-form-item>
+						<el-form-item label="联系电话" prop="contactNum">{{ formData.contactNum }}</el-form-item>
+					</el-col>
+					<el-col :span="16">
+						<el-form-item label="场所地址" prop="location" style="display: block">
+							{{ formData.location }}
+							<div id="app_event" class="div_map"></div>
+						</el-form-item>
+					</el-col>
+				</el-row>
+			</el-form>
+		</div>
+		<div class="div_btn">
+			<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" 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>
+	</el-card>
+</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: {
+		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: [{ value: '0', label: '九小场所' }, { value: '1', label: '企事业单位' }],
+			list: {},
+			formData: {
+				equipmentName: '',
+				scaleTotal: '',
+				gridId: '',
+				equipmentCategoryCode: '',
+				placeType: '',
+				principalName: '',
+				location: '',
+				contactNum: '',
+				// result: '',
+				remark: ''
+			},
+			dataRule: {
+				equipmentName: [{ required: true, message: '设备名称不能为空', trigger: 'bulr' }],
+				equipmentCategoryCode: [{ required: true, message: '设备类型不能为空', trigger: 'bulr' }],
+				placeType: [{ required: true, message: '场所类型不能为空', trigger: 'bulr' }],
+				result: [{ required: true, message: '巡查结果不能为空', trigger: 'bulr' }],
+				scaleTotal: [{ required: true, message: '场所规模不能为空', trigger: 'bulr' }],
+				gridId: [{ required: true, message: '所属组织不能为空', trigger: 'bulr' }],
+				principalName: [{ required: true, message: '负责人不能为空', trigger: 'bulr' }],
+				contactNum: [{ required: true, validator: checkMObile, trigger: 'blur' }],
+				location: [{ required: true, message: '场所地址不能为空', trigger: 'blur' }]
+				// content: [{ required: true, message: '详细说明不能为空', trigger: 'bulr' }, { max: 1000, message: '不能超出1000个字符', 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.loadGrid();
+		// this.loadplaceType();
+		if (this.pageType != 'add') {
+			this.getDetail();
+		} else {
+			this.initMap();
+		}
+		await this.endLoading();
+		this.endLoading();
+	},
+
+	methods: {
+		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/emergencySites/save';
+			} else {
+				url = '/actual/base/emergencySites/update';
+			}
+			params = { ...this.formData };
+			const { data, code, msg } = await requestPost(url, params);
+			if (code === 0) {
+				this.$message.success('添加成功');
+				this.resetData();
+				this.$emit('handleComfirm');
+			} 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(() => {
+				if (!map) {
+					map = new daiMap(
+						document.getElementById('app_event'),
+						{ latitude, longitude },
+						{
+							zoom: 16.2, // 设置地图缩放级别
+							pitch: 43.5, // 设置俯仰角
+							rotation: 45 // 设置地图旋转角度
+						}
+					);
+					// 监听地图平移结束
+					map.on('dragend', e => {
+						this.handleMoveCenter(e);
+					});
+				} else {
+					map.setCenter(latitude, longitude);
+					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.hotPointID}`, 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.address = selPosition.address + selPosition.name;
+		}
+	}
+};
+</script>
+
+<style lang="scss" scoped>
+@import '@/assets/scss/modules/management/form-main.scss';
+@import '@/assets/scss/modules/visual/a_customize.scss';
+/deep/ .el-input.is-disabled .el-input__inner,
+/deep/ .el-textarea.is-disabled textarea.el-textarea__inner {
+	// border:none;background-color: transparent;
+}
+.div_map {
+	width: 100%;
+}
+.form-item::v-deep .el-form-item__label {
+	color: #fff;
+}
+.form-item {
+	.el-radio {
+		color: #fff;
+	}
+
+	.el-checkbox {
+		color: #fff;
+	}
+}
+.verifyRed::before {
+	content: '*';
+	color: #f56c6c;
+	margin-right: 4px;
+}
+.form_label_box {
+	width: 150px;
+	display: inline-block;
+	text-align: right;
+	padding-right: 12px;
+}
+</style>
diff --git a/src/views/modules/shequzhili/tuceng/yingji/changsuo/index.vue b/src/views/modules/shequzhili/tuceng/yingji/changsuo/index.vue
index 02409e35d..e4a3d078b 100644
--- a/src/views/modules/shequzhili/tuceng/yingji/changsuo/index.vue
+++ b/src/views/modules/shequzhili/tuceng/yingji/changsuo/index.vue
@@ -1,8 +1,440 @@
 <template>
+	<div class="g-main">
+		<div v-show="pageType == 'list'">
+			<div class="m-search">
+				<el-form :inline="true" :model="formData" ref="ref_searchform" :label-width="'100px'">
+					<div>
+						<el-form-item label="场所名称" prop="name">
+							<el-input v-model="formData.equipmentName" class="u-item-width-normal" size="small" clearable placeholder="请输入"></el-input>
+						</el-form-item>
+						<el-form-item label="场所类型" prop="category">
+							<el-select v-model="formData.category" placeholder="请选择" size="small" clearable class="u-item-width-normal">
+								<el-option v-for="item in placeTypeList" :key="item.value" :label="item.label" :value="item.value"></el-option>
+							</el-select>
+						</el-form-item>
+						<el-form-item label="场所地址" prop="address">
+							<el-input v-model="formData.address" :disabled="disabled" class="u-item-width-normal" size="small" clearable placeholder="请输入"></el-input>
+						</el-form-item>
+						
+
+						<el-row>
+							<el-col :span="24" align="right">
+								<el-button style="margin-left: 30px" size="small" type="primary " @click="handleSearch">查询</el-button>
+								<el-button style="margin-left: 10px" size="small" class="diy-button--white" @click="resetSearch">重置</el-button>
+							</el-col>
+						</el-row>
+					</div>
+				</el-form>
+			</div>
+			<div class="m-table">
+				<div class="div_btn">
+					<el-button size="small" type="primary " @click="handleAdd({}, 'add')">新增</el-button>
+					<el-button class="diy-button--white" size="small" @click="handleExportModule('room')">下载导入模板</el-button>
+					<el-upload
+						:headers="$getElUploadHeaders()"
+						ref="upload"
+						class="upload-btn"
+						action="uploadUlr"
+						:limit="1"
+						:accept="'.xls,.xlsx'"
+						:with-credentials="true"
+						:show-file-list="false"
+						:auto-upload="true"
+						:on-progress="handleProgress"
+						:on-success="handleExcelSuccess"
+						:before-upload="beforeExcelUpload"
+						:http-request="uploadHttpRequest"
+						style="display: inline-block;margin:0px 10px"
+					>
+						<el-button size="small" class="diy-button--white" :loading="importLoading">导入模板</el-button>
+					</el-upload>
+
+					<el-button @click="handleExport" class="diy-button--white" size="small">导出</el-button>
+				</div>
+				<el-table :data="tableData" border class="m-table-item" style="width: 100%" @selection-change="handleSelectionChange" :height="maxTableHeight">
+					<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="name" align="center" label="场所名称" :show-overflow-tooltip="true"></el-table-column>
+					<el-table-column prop="categoryName" align="center" width="80" label="场所类型"></el-table-column>
+					<el-table-column prop="areaCovered" label="占地面积" min-width="140" align="center" :show-overflow-tooltip="true" />
+					<el-table-column prop="capacity" align="center" width="110" label="场所规模" :show-overflow-tooltip="true"></el-table-column>
+					<el-table-column prop="address" align="center" :show-overflow-tooltip="true" label="场所地址"></el-table-column>
+					
+					<el-table-column fixed="right" label="操作" align="center" width="130">
+						<template slot-scope="scope">
+							<el-button @click="handleAdd(scope.row, 'view')" type="text" size="small">查看</el-button>
+							<el-button style="margin-right: 10px" @click="handleAdd(scope.row, 'edit')" size="small" type="text">编辑</el-button>
+							<el-button @click="handleDel(scope.row)" type="text" size="small" class="">删除</el-button>
+						</template>
+					</el-table-column>
+				</el-table>
+
+				<div>
+					<el-pagination
+						@size-change="handleSizeChange"
+						@current-change="handleCurrentChange"
+						:current-page.sync="pageNo"
+						:page-sizes="[20, 50, 100, 200]"
+						:page-size="parseInt(pageSize)"
+						layout="sizes, prev, pager, next, total"
+						:total="total"
+					></el-pagination>
+				</div>
+			</div>
+		</div>
+		<div v-if="pageType != 'list'">
+			<addForm
+				:pageType="pageType"
+				:disabled="disabled"
+				:detailId="detailId"
+				:detailData="detailData"
+				@handleClose="handleClose"
+				@handleOk="handleOk"
+				@dialogOk="handleEditSuccess"
+			/>
+		</div>
+	</div>
 </template>
 
 <script>
+import { requestPost } from '@/js/dai/request';
+import nextTick from 'dai-js/tools/nextTick';
+import { mapGetters } from 'vuex';
+import addForm from './addForm.vue';
+import axios from 'axios';
+
+export default {
+	data() {
+		return {
+			importLoading: false,
+			disabled: false,
+			user: '',
+			agencyId: '',
+			formData: {
+				equipmentName: '',
+				gridId: '',
+				equipmentCategoryCode: '',
+				placeType: '',
+				result: '',
+				scaleTotal: '',
+				contactNum: '',
+				address: '',
+				principalName: ''
+			},
+			pageType: 'list', // 列表list 新增add  处理dispose 详情info
+			gridList: [], //所属网格list--场所区域
+			placeTypeList: [], //场所类型
+			tableData: [],
+			
+			categoryArray: [],
+			pageNo: 1,
+			pageSize: window.localStorage.getItem('pageSize') || 20,
+			total: 1,
+			detailId: '',
+			detailData: {},
+			multipleSelection: [],
+			rowObj: {}
+		};
+	},
+	components: { addForm },
+	created() {},
+	computed: {
+		maxTableHeight() {
+			return this.$store.state.inIframe ? this.clientHeight - 410 + this.iframeHeigh : this.clientHeight - 410;
+		},
+		...mapGetters(['clientHeight', 'iframeHeight'])
+	},
+	watch: {},
+	mounted() {
+		this.user = this.$store.state.user;
+		this.agencyId = this.user.agencyId;
+		this.loadGrid();
+		this.loadplaceType();
+		this.getTableData();
+	},
+	methods: {
+		handleSelectionChange(val) {
+			this.multipleSelection = [];
+			val.forEach(element => {
+				this.multipleSelection.push(element.icEventId);
+			});
+		},
+		handleSearch(val) {
+			console.log(this.formData);
+			this.pageNo = 1;
+			this.getTableData();
+		},
+		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 handleImport() {
+			// 导入
+		},
+		async handleExport() {
+			// 导出
+			const url = '/actual/base/emergencySites/export';
+			const { pageSize, pageNo, formData } = this;
+			axios({
+				url: window.SITE_CONFIG['apiURL'] + url,
+				method: 'post',
+				data: {
+					pageSize,
+					pageNo,
+					...formData
+				},
+				responseType: 'blob'
+			})
+				.then(res => {
+					let fileName = window.decodeURI(res.headers['content-disposition'].split(';')[1].split('=')[1]);
+					console.log('filename', fileName);
+					let blob = new Blob([res.data], { type: 'application/vnd.ms-excel' });
+					var url = window.URL.createObjectURL(blob);
+					var aLink = document.createElement('a');
+					aLink.style.display = 'none';
+					aLink.href = url;
+					aLink.setAttribute('download', fileName);
+					document.body.appendChild(aLink);
+					aLink.click();
+					document.body.removeChild(aLink); //下载完成移除元素
+					window.URL.revokeObjectURL(url); //释放掉blob对象
+				})
+				.catch(err => {
+					console.log('获取导出情失败', err);
+					return this.$message.error('网络错误');
+				});
+		},
+		handleAdd(row, type) {
+			if (row.equipmentId) {
+				this.detailId = row.equipmentId;
+			}
+			this.pageType = type;
+			if (type == 'view') {
+				this.disabled = true;
+			} else {
+				this.disabled = false;
+			}
+		},
+		handleClose() {
+			this.pageType = 'list';
+			this.detailId = '';
+			this.getTableData();
+		},
+		handleOk() {
+			this.pageType = 'list';
+			this.detailId = '';
+			this.pageNo = 1;
+			this.getTableData();
+		},
+		handleEditSuccess() {
+			this.handleClose();
+			this.getTableData();
+		},
+		async handleDel(rowData) {
+			let message = '确认删除?';
+			this.$confirm(message, '提示', {
+				confirmButtonText: '确定',
+				cancelButtonText: '取消',
+				type: 'warning'
+			})
+				.then(() => {
+					this.del(rowData.equipmentId);
+				})
+				.catch(err => {});
+		},
+		async del(id) {
+			const url = '/actual/base/emergencySites/delete';
+			const { data, code, msg } = await requestPost(url, id);
+			if (code === 0) {
+				this.$message.success('删除成功！');
+				this.getTableData();
+			} else {
+				this.$message.error('操作失败！');
+			}
+		},
+		async getTableData() {
+			const url = '/actual/base/emergencySites/page';
+			// const url = 'http://yapi.elinkservice.cn/mock/330/actual/base/enterprise/list';
+			const { pageSize, pageNo, formData } = this;
+			const { data, code, msg } = await requestPost(url, {
+				pageSize,
+				pageNo,
+				...formData
+			});
+			if (code === 0) {
+				this.total = data.total || 0;
+				this.tableData = data.list
+					? data.list.map(item => {
+							return item;
+					  })
+					: [];
+			} else {
+				this.$message.error(msg);
+			}
+		},
+		handleSizeChange(val) {
+			this.pageSize = val;
+			window.localStorage.setItem('pageSize', val);
+			this.getTableData();
+		},
+		handleCurrentChange(val) {
+			this.pageNo = val;
+			this.getTableData();
+		},
+		resetSearch() {
+			this.formData = {
+				equipmentName: '',
+				gridId: '',
+				equipmentCategoryCode: '',
+				placeType: '',
+				result: '',
+				scaleTotal: '',
+				contactNum: '',
+				address: '',
+				principalName: ''
+			};
+			this.pageNo = 1;
+			this.getTableData();
+		},
+		async handleExportModule() {
+			let url = '/actual/base/emergencySites/downloadTemplate';
+			let params = {};
+			await this.$http({
+				method: 'POST',
+				url,
+				responseType: 'blob',
+				data: params
+			})
+				.then(res => {
+					// this.download(res.data, title + '.xls')
+					if (res.headers['content-disposition']) {
+						let fileName = window.decodeURI(res.headers['content-disposition'].split(';')[1].split('=')[1]);
+						console.log('filename', fileName);
+						let blob = new Blob([res.data], {
+							type: 'application/vnd.ms-excel'
+						});
+						var url = window.URL.createObjectURL(blob);
+						var aLink = document.createElement('a');
+						aLink.style.display = 'none';
+						aLink.href = url;
+						aLink.setAttribute('download', fileName);
+						document.body.appendChild(aLink);
+						aLink.click();
+						document.body.removeChild(aLink); //下载完成移除元素
+						window.URL.revokeObjectURL(url); //释放掉blob对象
+					} else this.$message.error('下载失败');
+				})
+				.catch(err => {
+					console.log('err', err);
+					return this.$message.error('网络错误');
+				});
+		},
+		handleExcelSuccess(res, file) {
+			if (res.code === 0 && res.msg === 'success') {
+				console.log('resss---ppp', res);
+			} else {
+				this.$message.error(res.msg);
+			}
+		},
+		handleProgress(event, file, fileList) {
+			console.log('percentage', file.percentage);
+		},
+
+		beforeExcelUpload(file) {
+			console.log('file', file);
+			const isType = file.type === 'application/vnd.ms-excel';
+			const isTypeComputer = file.type === 'application/vnd.openxmlformats-officedocument.spreadsheetml.sheet';
+			const fileType = isType || isTypeComputer;
+			const isLt1M = file.size / 1024 / 1024 < 10;
+			if (!fileType) {
+				this.$message.error('上传文件只能是xls/xlsx格式！');
+			}
+
+			if (!isLt1M) {
+				this.$message.error('上传文件大小不能超过 10MB!');
+			}
+			return fileType && isLt1M;
+		},
+
+		async uploadHttpRequest(file) {
+			this.importLoading = true;
+			this.importBtnTitle = '正在上传中...';
+			const formData = new FormData(); //FormData对象，添加参数只能通过append('key', value)的形式添加
+			formData.append('file', file.file); //添加文件对象
+			formData.append('code', ''); //添加文件对象
+			await this.$http
+				.post('/actual/base/emergencySites/import', formData)
+				.then(res => {
+					console.log('res-up', res);
+					if (res.data.code == 0 && res.data.msg == 'success') {
+						console.log(res.data.data);
+						const data = res.data.data;
+
+						this.dataList = [
+							...Object.keys(data.option.exist).map(k => {
+								return {
+									index: k,
+									srcField: data.option.exist[k],
+									exist: true,
+									field: data.option.exist[k]
+								};
+							}),
+							...Object.keys(data.option.notExist).map(k => {
+								return {
+									index: k,
+									srcField: data.option.notExist[k],
+									exist: false,
+									field: ''
+								};
+							})
+						];
+						this.importOption = data.option;
+						this.importCode = data.code;
+						this.fileData = file;
+					} else this.$message.error(res.data.msg);
+				})
+				.catch(err => {
+					console.log('失败', err);
+					file.onError(); //上传失败的文件会从文件列表中删除
+					// this.$message.error('导入失败')
+				});
+			this.importLoading = false;
+			this.importBtnTitle = '导入';
+			this.$refs.upload.clearFiles();
+		}
+	}
+};
 </script>
 
-<style>
-</style>
\ No newline at end of file
+<style lang="scss" scoped>
+@import '@/assets/scss/modules/management/list-main.scss';
+.m-search {
+	.u-item-width-normal {
+		width: 200px;
+	}
+}
+</style>
diff --git a/src/views/modules/shequzhili/tuceng/yingji/changsuo/record.vue b/src/views/modules/shequzhili/tuceng/yingji/changsuo/record.vue
new file mode 100644
index 000000000..f05336d12
--- /dev/null
+++ b/src/views/modules/shequzhili/tuceng/yingji/changsuo/record.vue
@@ -0,0 +1,428 @@
+<template>
+	<div class="m-record">
+		<h3>检查记录</h3>
+		<div>
+			<div class="u-table-btn1 mt10" v-if="formType == 'edit'">
+				<el-button size="small" class="diy-button--blue" :disabled="btnDisabled || disabled" @click="handleAdd">新增</el-button>
+			</div>
+			<div class="m-table-item">
+				<el-table :data="tableData" class="resi-table" row-key="id" border style="width: 100%">
+					<el-table-column label="序号" type="index" align="center" width="50"></el-table-column>
+
+					<el-table-column prop="inspectTime" label="检查时间" align="center" width="200px">
+						<template slot-scope="scope">
+							<el-date-picker
+								v-if="scope.row.isEdit"
+								v-model="scope.row.inspectTime"
+								type="date"
+								class="input-width"
+								value-format="yyyy-MM-dd"
+								placeholder="选择日期"
+							></el-date-picker>
+							<div v-else class="div-content">{{ scope.row.inspectTime }}</div>
+						</template>
+					</el-table-column>
+
+					<el-table-column prop="inspectStaffId" label="检查人员" align="center" width="200px">
+						<template slot-scope="scope">
+							<el-select
+								v-if="scope.row.isEdit"
+								v-model="scope.row.inspectStaffId"
+								placeholder="请选择"
+								class="input-width"
+								@change="handleChangeStaff(scope.row)"
+								clearable
+							>
+								<el-option v-for="subItem in optionStaff" :key="subItem.value" :label="subItem.label" :value="subItem.value"></el-option>
+							</el-select>
+							<div v-else class="div-content">{{ scope.row.inspectStaffName }}</div>
+						</template>
+					</el-table-column>
+
+					<el-table-column prop="inspectStaffMobile" label="联系电话" align="center" width="200px">
+						<template slot-scope="scope">
+							<el-input
+								v-if="scope.row.isEdit"
+								type="number"
+								v-model="scope.row.inspectStaffMobile"
+								placeholder="请输入"
+								class="input-width"
+								clearable
+								disabled
+							></el-input>
+							<div v-else class="div-content">{{ scope.row.inspectStaffMobile }}</div>
+						</template>
+					</el-table-column>
+
+					<el-table-column prop="inspectResult" label="检查结果" align="center" width="200px">
+						<template slot-scope="scope">
+							<el-select v-if="scope.row.isEdit" v-model="scope.row.inspectResult" placeholder="请选择" class="input-width" size="small" clearable>
+								<el-option v-for="subItem in optionResult" :key="subItem.value" :label="subItem.label" :value="subItem.value"></el-option>
+							</el-select>
+							<div v-else class="div-content">{{ scope.row.inspectResult == 1 ? '正常' : '异常' }}</div>
+						</template>
+					</el-table-column>
+
+					<!-- <el-table-column
+						prop="detailed"
+						label="隐患明细"
+						align="center"
+						width="200px"
+					>
+						<template slot-scope="scope">
+							<el-input
+								v-if="scope.row.isEdit"
+								type="text"
+								v-model="scope.row.detailed"
+								placeholder="请输入"
+								class="input-width"
+								maxlength="500"
+								clearable
+							></el-input>
+							<div v-else class="div-content">
+								{{ scope.row.detailed }}
+							</div>
+						</template>
+					</el-table-column> -->
+
+					<el-table-column prop="imgList" label="图片列表" align="center" width="150px">
+						<template slot-scope="scope">
+							<div v-if="scope.row.isEdit">
+								<el-upload
+									:headers="$getElUploadHeaders()"
+									class="avatar-uploader"
+									:action="uploadUrl"
+									:data="{ customerId: customerId }"
+									:show-file-list="true"
+									:limit="3"
+									:file-list="scope.row.imgShowList"
+									:on-success="res => handleImgSuccess(res, scope.row)"
+									:on-remove="res => handleImgRemove(res, scope.row)"
+									list-type="picture"
+									:before-upload="beforeImgUpload"
+								>
+									<i class="el-icon-plus avatar-uploader-icon"></i>
+									最多三张图片
+								</el-upload>
+							</div>
+
+							<div v-else class="div-content">
+								<el-image
+									v-if="scope.row.imgList.length > 0"
+									style="width: 100px; height: 50px"
+									:src="scope.row.imgList[0]"
+									fit="cover"
+									:preview-src-list="scope.row.imgList"
+								></el-image>
+							</div>
+						</template>
+					</el-table-column>
+
+					<el-table-column prop="nextInspectTime" label="拟复查时间" align="center" width="200px">
+						<template slot-scope="scope">
+							<el-date-picker
+								v-if="scope.row.isEdit"
+								v-model="scope.row.nextInspectTime"
+								type="date"
+								class="input-width"
+								value-format="yyyy-MM-dd"
+								placeholder="选择日期"
+							></el-date-picker>
+							<div v-else class="div-content">{{ scope.row.nextInspectTime }}</div>
+						</template>
+					</el-table-column>
+
+					<el-table-column v-if="!disabled" fixed="right" label="操作" align="center" width="120">
+						<template slot-scope="scope">
+							<template v-if="scope.row.isEdit">
+								<el-button @click="handleEdit(scope.row)" type="text" size="small" class="btn-color-edit">保存</el-button>
+								<el-button @click="handleChange(scope.row, 'cancle')" type="text" size="small" class="btn-color-edit">取消</el-button>
+							</template>
+							<template v-else>
+								<el-button v-if="formType == 'edit'" @click="handleChange(scope.row, 'edit')" type="text" size="small" :disabled="disabled" class="btn-color-edit">
+									修改
+								</el-button>
+								<el-popconfirm v-if="formType == 'edit'" title="删除之后无法恢复，确认删除？" @onConfirm="del(scope.row)" @confirm="del(scope.row)">
+									<el-button slot="reference" type="text" size="small" class="btn-color-del" style="margin-left: 10px">删除</el-button>
+								</el-popconfirm>
+							</template>
+						</template>
+					</el-table-column>
+				</el-table>
+			</div>
+		</div>
+	</div>
+</template>
+
+<script>
+import { requestPost, requestGet } from '@/js/dai/request';
+export default {
+	props: {
+		id: {
+			type: String,
+			default: ''
+		},
+		info: {
+			type: Object,
+			default: () => ({})
+		},
+		disabled: {
+			type: Boolean,
+			default: false
+		},
+		formType: {
+			type: String,
+			default: ''
+		},
+		source: {
+			//展示来源：manage  管理平台    visiual  可视化平台
+			type: String,
+			default: 'manage'
+		}
+	},
+	data() {
+		return {
+			uploadUrl: window.SITE_CONFIG['apiURL'] + '/oss/file/uploadqrcodeV2',
+			customerId: localStorage.getItem('customerId'),
+
+			btnDisabled: false,
+			btnType: 'cancle',
+			isEdit: false,
+			tableData: [],
+			tempRow: {},
+
+			optionResult: [
+				{
+					label: '合格',
+					value: '0'
+				},
+				{
+					label: '不合格',
+					value: '1'
+				}
+			],
+			optionStaff: [
+				// {
+				//   label: "人名",
+				//   value: "inspectStaffId",
+				// },
+			]
+		};
+	},
+
+	computed: {
+		allowOperate() {
+			const {
+				info: { agencyId }
+			} = this;
+			return agencyId && agencyId == this.$store.state.user.agencyId;
+		}
+	},
+	watch: {
+		id: {
+			handler(val) {
+				console.log('val------points', val);
+				if (val.length > 0) {
+					this.btnDisabled = false;
+					this.getList();
+				} else this.btnDisabled = true;
+			},
+			immediate: true
+		}
+	},
+
+	created() {
+		console.log("id",this.id)
+		this.getOptionStaff();
+	},
+
+	methods: {
+		beforeImgUpload(file) {
+			console.log(file);
+			const isLt1M = file.size / 1024 / 1024 < 10;
+			const srcType = file.type;
+			const format = file.name.split('.').pop();
+
+			if (!isLt1M) {
+				this.$message.error('上传文件大小不能超过 10MB!');
+				return false;
+			}
+			if (srcType.indexOf('image') == -1) {
+				this.$message.error('仅限图片格式');
+				return false;
+			}
+			return true;
+		},
+
+		handleImgSuccess(res, row) {
+			console.log('handleImgSuccess', res);
+			if (res.code === 0 && res.msg === 'success') {
+				row.imgList.push(res.data.url);
+				this.computeImgShowList(row);
+			} else {
+				this.$message.error(res.msg);
+			}
+		},
+
+		computeImgShowList(row) {
+			row.imgShowList = row.imgList.map(url => {
+				return { name: '', url };
+			});
+		},
+
+		handleImgRemove(file, row) {
+			console.log('handleImgRemove', file);
+			let url = file.url || file.response.data.url;
+			if (url) {
+				row.imgList = row.imgList.filter(item => item !== url);
+				this.computeImgShowList(row);
+			}
+		},
+
+		getRowClass({ rowIndex, columnIndex }) {
+			if (rowIndex === 0) {
+				return 'background: #2195fe; color: #fff;';
+			}
+		},
+
+		handleChange(row, type) {
+			console.log('type----', type);
+			if (type == 'cancle') {
+				row = { ...this.tempRow };
+				row.isEdit = false;
+				if (this.btnType == 'add') this.tableData.pop();
+				this.getList();
+				console.log('row----', row);
+			} else {
+				this.tempRow = { ...row };
+				row.isEdit = true;
+			}
+			this.btnType = type;
+			this.isEdit = !this.isEdit;
+		},
+
+		handleChangeStaff(row) {
+			const { inspectStaffId } = row;
+			const { optionStaff } = this;
+			let item = optionStaff.find(item => item.value == inspectStaffId);
+			if (item) {
+				row.inspectStaffName = item.name;
+				row.inspectStaffMobile = item.mobile;
+			}
+		},
+
+		async getOptionStaff() {
+			let url = `/data/aggregator/org/staff-select-list/${this.$store.state.user.agencyId}`;
+			const { data, code, msg } = await requestPost(url, {});
+
+			if (code === 0) {
+				this.optionStaff = data || [];
+			} else {
+				this.$message.error('请求工作人员数据失败！');
+			}
+		},
+
+		async handleEdit(row) {
+			if (this.btnType == 'add') this.save(row);
+			else this.edit(row);
+		},
+
+		handleAdd() {
+			this.btnType = 'add';
+			this.isEdit = true;
+
+			const item = {
+				isEdit: true,
+				id: this.id,
+				inspectTime: '',
+				inspectStaffId: '',
+				inspectStaffName: '',
+				inspectStaffMobile: '',
+				inspectResult: '',
+				imgList: [],
+				nextInspectTime: ''
+			};
+			this.computeImgShowList(item);
+			this.tableData.push(item);
+		},
+
+		async save(row) {
+			const params = {
+				equipmentId: this.id,
+				...row
+			};
+			const url = `/actual/base/safetyEquipmentInspectRecord/save`;
+			const { data, code, msg } = await requestPost(url, params);
+			if (code === 0) {
+				return this.$message.error(res.msg);
+			} else {
+				this.$message.success('保存成功');
+				row.isEdit = false;
+				this.isEdit = false;
+				this.btnType = 'cancle';
+				this.getList();
+			}
+		},
+
+		async edit(row) {
+			const params = {
+				...row
+			};
+			const url = `/actual/base/safetyEquipmentInspectRecord/update`;
+			const { data, code, msg } = await requestPost(url, params);
+			if (code === 0) {
+				return this.$message.error(res.msg);
+			} else {
+				this.$message.success('保存成功');
+				row.isEdit = false;
+				this.isEdit = false;
+				this.getList();
+			}
+		},
+
+		async del(row) {
+			const url = `/actual/base/safetyEquipmentInspectRecord/delete/${this.id}`;
+			const { data, code, msg } = await requestPost(url);
+
+			if (code === 0) {
+				return this.$message.error(res.msg);
+			} else {
+				this.$message.success('删除成功');
+				this.getList();
+			}
+		},
+
+		async getList() {
+			const params = {
+				equipmentId: this.id
+			};
+			const url = `/actual/base/safetyEquipmentInspectRecord/page`;
+			const { data, code, msg } = await requestPost(url, params);
+
+			if (code === 0) {
+				return this.$message.error(res.msg);
+			} else {
+				this.tableData = res.data.list.map(item => {
+					this.computeImgShowList(item);
+					return {
+						...item,
+						isEdit: false
+					};
+				});
+			}
+		}
+	}
+};
+</script>
+
+<style lang="scss" scoped>
+@import '@/assets/scss/buttonstyle.scss';
+@import '@/assets/scss/modules/management/list-main.scss';
+
+.mt10 {
+	margin-bottom: 10px;
+}
+.input-width {
+	width: 170px;
+}
+</style>
diff --git a/src/views/modules/shequzhili/tuceng/yingji/wuzi/addForm.vue b/src/views/modules/shequzhili/tuceng/yingji/wuzi/addForm.vue
new file mode 100644
index 000000000..eb9e93ee6
--- /dev/null
+++ b/src/views/modules/shequzhili/tuceng/yingji/wuzi/addForm.vue
@@ -0,0 +1,416 @@
+<template>
+	<el-card>
+		<div class="dialog-h-content scroll-h">
+			<el-form :inline="true" :model="formData" ref="form" :rules="dataRule" :label-width="'120px'" v-if="pageType != 'view'">
+				<el-row>
+					<el-col :span="8">
+						<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-form-item label="设备编号" prop="equipmentNum">
+							<el-input v-model="formData.equipmentNum" :disabled="disabled" class="u-item-width-normal" size="small" clearable placeholder="请输入"></el-input>
+						</el-form-item>
+						<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-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-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="16">
+						<el-form-item label="所处位置" prop="location" style="display: block">
+							<el-select
+								v-model="formData.location"
+								style="width: 200px;"
+								: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>
+							<div id="app_event" class="div_map"></div>
+						</el-form-item>
+					</el-col>
+				</el-row>
+			</el-form>
+			<el-form :inline="false" :model="formData" ref="form" :label-width="'120px'" v-if="pageType == 'view'">
+				<el-row>
+					<el-col :span="8">
+						<el-form-item label="设备名称" prop="equipmentName">{{ formData.equipmentName }}</el-form-item>
+						<el-form-item label="设备编号" prop="equipmentNum">{{ formData.equipmentNum }}</el-form-item>
+						<el-form-item label="设备类型" prop="equipmentCategoryCode">{{ formData.equipmentCategoryName }}</el-form-item>
+						<el-form-item label="负责人" prop="principalName">{{ formData.principalName }}</el-form-item>
+						<el-form-item label="联系电话" prop="contactNum">{{ formData.contactNum }}</el-form-item>
+					</el-col>
+					<el-col :span="16">
+						<el-form-item label="场所地址" prop="location" style="display: block">
+							{{ formData.location }}
+							<div id="app_event" class="div_map"></div>
+						</el-form-item>
+					</el-col>
+				</el-row>
+			</el-form>
+		</div>
+		<div class="div_btn">
+			<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" 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>
+	</el-card>
+</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: {
+		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: [{ value: '0', label: '九小场所' }, { value: '1', label: '企事业单位' }],
+			list: {},
+			formData: {
+				equipmentName: '',
+				scaleTotal: '',
+				gridId: '',
+				equipmentCategoryCode: '',
+				placeType: '',
+				principalName: '',
+				location: '',
+				contactNum: '',
+				// result: '',
+				remark: ''
+			},
+			dataRule: {
+				equipmentName: [{ required: true, message: '设备名称不能为空', trigger: 'bulr' }],
+				equipmentCategoryCode: [{ required: true, message: '设备类型不能为空', trigger: 'bulr' }],
+				placeType: [{ required: true, message: '场所类型不能为空', trigger: 'bulr' }],
+				result: [{ required: true, message: '巡查结果不能为空', trigger: 'bulr' }],
+				scaleTotal: [{ required: true, message: '场所规模不能为空', trigger: 'bulr' }],
+				gridId: [{ required: true, message: '所属组织不能为空', trigger: 'bulr' }],
+				principalName: [{ required: true, message: '负责人不能为空', trigger: 'bulr' }],
+				contactNum: [{ required: true, validator: checkMObile, trigger: 'blur' }],
+				location: [{ required: true, message: '场所地址不能为空', trigger: 'blur' }]
+				// content: [{ required: true, message: '详细说明不能为空', trigger: 'bulr' }, { max: 1000, message: '不能超出1000个字符', 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.loadGrid();
+		// this.loadplaceType();
+		if (this.pageType != 'add') {
+			this.getDetail();
+		} else {
+			this.initMap();
+		}
+		await this.endLoading();
+		this.endLoading();
+	},
+
+	methods: {
+		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/emergencyEquipment/save';
+			} else {
+				url = '/actual/base/emergencyEquipment/update';
+			}
+			params = { ...this.formData };
+			const { data, code, msg } = await requestPost(url, params);
+			if (code === 0) {
+				this.$message.success('添加成功');
+				this.resetData();
+				this.$emit('handleComfirm');
+			} 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(() => {
+				if (!map) {
+					map = new daiMap(
+						document.getElementById('app_event'),
+						{ latitude, longitude },
+						{
+							zoom: 16.2, // 设置地图缩放级别
+							pitch: 43.5, // 设置俯仰角
+							rotation: 45 // 设置地图旋转角度
+						}
+					);
+					// 监听地图平移结束
+					map.on('dragend', e => {
+						this.handleMoveCenter(e);
+					});
+				} else {
+					map.setCenter(latitude, longitude);
+					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.hotPointID}`, 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.address = selPosition.address + selPosition.name;
+		}
+	}
+};
+</script>
+
+<style lang="scss" scoped>
+@import '@/assets/scss/modules/management/form-main.scss';
+@import '@/assets/scss/modules/visual/a_customize.scss';
+/deep/ .el-input.is-disabled .el-input__inner,
+/deep/ .el-textarea.is-disabled textarea.el-textarea__inner {
+	// border:none;background-color: transparent;
+}
+.div_map {
+	width: 100%;
+}
+.form-item::v-deep .el-form-item__label {
+	color: #fff;
+}
+.form-item {
+	.el-radio {
+		color: #fff;
+	}
+
+	.el-checkbox {
+		color: #fff;
+	}
+}
+.verifyRed::before {
+	content: '*';
+	color: #f56c6c;
+	margin-right: 4px;
+}
+.form_label_box {
+	width: 150px;
+	display: inline-block;
+	text-align: right;
+	padding-right: 12px;
+}
+</style>
diff --git a/src/views/modules/shequzhili/tuceng/yingji/wuzi/index.vue b/src/views/modules/shequzhili/tuceng/yingji/wuzi/index.vue
index 02409e35d..48d3f2965 100644
--- a/src/views/modules/shequzhili/tuceng/yingji/wuzi/index.vue
+++ b/src/views/modules/shequzhili/tuceng/yingji/wuzi/index.vue
@@ -1,8 +1,453 @@
 <template>
+	<div class="g-main">
+		<div v-show="pageType == 'list'">
+			<div class="m-search">
+				<el-form :inline="true" :model="formData" ref="ref_searchform" :label-width="'100px'">
+					<div>
+						<el-form-item label="设备名称" prop="equipmentName">
+							<el-input v-model="formData.equipmentName" class="u-item-width-normal" size="small" clearable placeholder="请输入"></el-input>
+						</el-form-item>
+						<el-form-item label="设备编号" prop="equipmentNum">
+							<el-input v-model="formData.equipmentNum" :disabled="disabled" class="u-item-width-normal" size="small" clearable placeholder="请输入"></el-input>
+						</el-form-item>
+						<el-form-item label="设备类型" prop="equipmentCategoryCode">
+							<el-select v-model="formData.equipmentCategoryCode" 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-form-item label="所处位置" prop="location">
+							<el-input v-model="formData.location" :disabled="disabled" class="u-item-width-normal" size="small" clearable placeholder="请输入"></el-input>
+						</el-form-item>
+						<el-form-item label="负责人" prop="principalName">
+							<el-input v-model="formData.principalName" class="u-item-width-normal" size="small" clearable placeholder="请输入"></el-input>
+						</el-form-item>
+
+						<el-row>
+							<el-col :span="24" align="right">
+								<el-button style="margin-left: 30px" size="small" type="primary " @click="handleSearch">查询</el-button>
+								<el-button style="margin-left: 10px" size="small" class="diy-button--white" @click="resetSearch">重置</el-button>
+							</el-col>
+						</el-row>
+					</div>
+				</el-form>
+			</div>
+			<div class="m-table">
+				<div class="div_btn">
+					<el-button size="small" type="primary " @click="handleAdd({}, 'add')">新增</el-button>
+					<el-button class="diy-button--white" size="small" @click="handleExportModule('room')">下载导入模板</el-button>
+					<el-upload
+						:headers="$getElUploadHeaders()"
+						ref="upload"
+						class="upload-btn"
+						action="uploadUlr"
+						:limit="1"
+						:accept="'.xls,.xlsx'"
+						:with-credentials="true"
+						:show-file-list="false"
+						:auto-upload="true"
+						:on-progress="handleProgress"
+						:on-success="handleExcelSuccess"
+						:before-upload="beforeExcelUpload"
+						:http-request="uploadHttpRequest"
+						style="display: inline-block;margin:0px 10px"
+					>
+						<el-button size="small" class="diy-button--white" :loading="importLoading">导入模板</el-button>
+					</el-upload>
+
+					<el-button @click="handleExport" class="diy-button--white" size="small">导出</el-button>
+				</div>
+				<el-table :data="tableData" border class="m-table-item" style="width: 100%" @selection-change="handleSelectionChange" :height="maxTableHeight">
+					<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="equipmentNum" 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="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>
+					<el-table-column prop="latestInspectTime" align="center" width="100" label="最新检查时间" :show-overflow-tooltip="true"></el-table-column>
+					<el-table-column prop="latestInspectResult" align="center" label="最新巡查结果" :show-overflow-tooltip="true">
+						<template slot-scope="scope">
+							<span v-if="scope.row.latestResult === '0'">合格</span>
+							<span v-else-if="scope.row.latestResult === '1'">不合格</span>
+							<span v-else>--</span>
+						</template>
+					</el-table-column>
+					<el-table-column fixed="right" label="操作" align="center" width="130">
+						<template slot-scope="scope">
+							<el-button @click="handleAdd(scope.row, 'view')" type="text" size="small">查看</el-button>
+							<el-button style="margin-right: 10px" @click="handleAdd(scope.row, 'edit')" size="small" type="text">编辑</el-button>
+							<el-button @click="handleDel(scope.row)" type="text" size="small" class="">删除</el-button>
+						</template>
+					</el-table-column>
+				</el-table>
+
+				<div>
+					<el-pagination
+						@size-change="handleSizeChange"
+						@current-change="handleCurrentChange"
+						:current-page.sync="pageNo"
+						:page-sizes="[20, 50, 100, 200]"
+						:page-size="parseInt(pageSize)"
+						layout="sizes, prev, pager, next, total"
+						:total="total"
+					></el-pagination>
+				</div>
+			</div>
+		</div>
+		<div v-if="pageType != 'list'">
+			<addForm
+				:pageType="pageType"
+				:disabled="disabled"
+				:detailId="detailId"
+				:detailData="detailData"
+				@handleClose="handleClose"
+				@handleOk="handleOk"
+				@dialogOk="handleEditSuccess"
+			/>
+		</div>
+	</div>
 </template>
 
 <script>
+import { requestPost } from '@/js/dai/request';
+import nextTick from 'dai-js/tools/nextTick';
+import { mapGetters } from 'vuex';
+import addForm from './addForm.vue';
+import axios from 'axios';
+
+export default {
+	data() {
+		return {
+			importLoading: false,
+			disabled: false,
+			user: '',
+			agencyId: '',
+			formData: {
+				equipmentName: '',
+				gridId: '',
+				equipmentCategoryCode: '',
+				placeType: '',
+				result: '',
+				scaleTotal: '',
+				contactNum: '',
+				address: '',
+				principalName: ''
+			},
+			pageType: 'list', // 列表list 新增add  处理dispose 详情info
+			gridList: [], //所属网格list--场所区域
+			placeTypeList: [], //场所类型
+			tableData: [],
+			resultArray: [{ value: '0', label: '合格' }, { value: '1', label: '不合格' }],
+			equipmentCategoryCodeArray: [{ value: '0', label: '九小场所' }, { value: '1', label: '企事业单位' }],
+			pageNo: 1,
+			pageSize: window.localStorage.getItem('pageSize') || 20,
+			total: 1,
+			detailId: '',
+			detailData: {},
+			multipleSelection: [],
+			rowObj: {}
+		};
+	},
+	components: { addForm },
+	created() {},
+	computed: {
+		maxTableHeight() {
+			return this.$store.state.inIframe ? this.clientHeight - 410 + this.iframeHeigh : this.clientHeight - 410;
+		},
+		...mapGetters(['clientHeight', 'iframeHeight'])
+	},
+	watch: {},
+	mounted() {
+		this.user = this.$store.state.user;
+		this.agencyId = this.user.agencyId;
+		this.loadGrid();
+		this.loadplaceType();
+		this.getTableData();
+	},
+	methods: {
+		handleSelectionChange(val) {
+			this.multipleSelection = [];
+			val.forEach(element => {
+				this.multipleSelection.push(element.icEventId);
+			});
+		},
+		handleSearch(val) {
+			console.log(this.formData);
+			this.pageNo = 1;
+			this.getTableData();
+		},
+		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 handleImport() {
+			// 导入
+		},
+		async handleExport() {
+			// 导出
+			const url = '/actual/base/emergencyEquipment/export';
+			const { pageSize, pageNo, formData } = this;
+			axios({
+				url: window.SITE_CONFIG['apiURL'] + url,
+				method: 'post',
+				data: {
+					pageSize,
+					pageNo,
+					...formData
+				},
+				responseType: 'blob'
+			})
+				.then(res => {
+					let fileName = window.decodeURI(res.headers['content-disposition'].split(';')[1].split('=')[1]);
+					console.log('filename', fileName);
+					let blob = new Blob([res.data], { type: 'application/vnd.ms-excel' });
+					var url = window.URL.createObjectURL(blob);
+					var aLink = document.createElement('a');
+					aLink.style.display = 'none';
+					aLink.href = url;
+					aLink.setAttribute('download', fileName);
+					document.body.appendChild(aLink);
+					aLink.click();
+					document.body.removeChild(aLink); //下载完成移除元素
+					window.URL.revokeObjectURL(url); //释放掉blob对象
+				})
+				.catch(err => {
+					console.log('获取导出情失败', err);
+					return this.$message.error('网络错误');
+				});
+		},
+		handleAdd(row, type) {
+			if (row.equipmentId) {
+				this.detailId = row.equipmentId;
+			}
+			this.pageType = type;
+			if (type == 'view') {
+				this.disabled = true;
+			} else {
+				this.disabled = false;
+			}
+		},
+		handleClose() {
+			this.pageType = 'list';
+			this.detailId = '';
+			this.getTableData();
+		},
+		handleOk() {
+			this.pageType = 'list';
+			this.detailId = '';
+			this.pageNo = 1;
+			this.getTableData();
+		},
+		handleEditSuccess() {
+			this.handleClose();
+			this.getTableData();
+		},
+		async handleDel(rowData) {
+			let message = '确认删除?';
+			this.$confirm(message, '提示', {
+				confirmButtonText: '确定',
+				cancelButtonText: '取消',
+				type: 'warning'
+			})
+				.then(() => {
+					this.del(rowData.equipmentId);
+				})
+				.catch(err => {});
+		},
+		async del(id) {
+			const url = '/actual/base/emergencyEquipment/delete';
+			const { data, code, msg } = await requestPost(url, id);
+			if (code === 0) {
+				this.$message.success('删除成功！');
+				this.getTableData();
+			} else {
+				this.$message.error('操作失败！');
+			}
+		},
+		async getTableData() {
+			const url = '/actual/base/emergencyEquipment/page';
+			// const url = 'http://yapi.elinkservice.cn/mock/330/actual/base/enterprise/list';
+			const { pageSize, pageNo, formData } = this;
+			const { data, code, msg } = await requestPost(url, {
+				pageSize,
+				pageNo,
+				...formData
+			});
+			if (code === 0) {
+				this.total = data.total || 0;
+				this.tableData = data.list
+					? data.list.map(item => {
+							return item;
+					  })
+					: [];
+			} else {
+				this.$message.error(msg);
+			}
+		},
+		handleSizeChange(val) {
+			this.pageSize = val;
+			window.localStorage.setItem('pageSize', val);
+			this.getTableData();
+		},
+		handleCurrentChange(val) {
+			this.pageNo = val;
+			this.getTableData();
+		},
+		resetSearch() {
+			this.formData = {
+				equipmentName: '',
+				gridId: '',
+				equipmentCategoryCode: '',
+				placeType: '',
+				result: '',
+				scaleTotal: '',
+				contactNum: '',
+				address: '',
+				principalName: ''
+			};
+			this.pageNo = 1;
+			this.getTableData();
+		},
+		async handleExportModule() {
+			let url = '/actual/base/emergencyEquipment/downloadTemplate';
+			let params = {};
+			await this.$http({
+				method: 'POST',
+				url,
+				responseType: 'blob',
+				data: params
+			})
+				.then(res => {
+					// this.download(res.data, title + '.xls')
+					if (res.headers['content-disposition']) {
+						let fileName = window.decodeURI(res.headers['content-disposition'].split(';')[1].split('=')[1]);
+						console.log('filename', fileName);
+						let blob = new Blob([res.data], {
+							type: 'application/vnd.ms-excel'
+						});
+						var url = window.URL.createObjectURL(blob);
+						var aLink = document.createElement('a');
+						aLink.style.display = 'none';
+						aLink.href = url;
+						aLink.setAttribute('download', fileName);
+						document.body.appendChild(aLink);
+						aLink.click();
+						document.body.removeChild(aLink); //下载完成移除元素
+						window.URL.revokeObjectURL(url); //释放掉blob对象
+					} else this.$message.error('下载失败');
+				})
+				.catch(err => {
+					console.log('err', err);
+					return this.$message.error('网络错误');
+				});
+		},
+		handleExcelSuccess(res, file) {
+			if (res.code === 0 && res.msg === 'success') {
+				console.log('resss---ppp', res);
+			} else {
+				this.$message.error(res.msg);
+			}
+		},
+		handleProgress(event, file, fileList) {
+			console.log('percentage', file.percentage);
+		},
+
+		beforeExcelUpload(file) {
+			console.log('file', file);
+			const isType = file.type === 'application/vnd.ms-excel';
+			const isTypeComputer = file.type === 'application/vnd.openxmlformats-officedocument.spreadsheetml.sheet';
+			const fileType = isType || isTypeComputer;
+			const isLt1M = file.size / 1024 / 1024 < 10;
+			if (!fileType) {
+				this.$message.error('上传文件只能是xls/xlsx格式！');
+			}
+
+			if (!isLt1M) {
+				this.$message.error('上传文件大小不能超过 10MB!');
+			}
+			return fileType && isLt1M;
+		},
+
+		async uploadHttpRequest(file) {
+			this.importLoading = true;
+			this.importBtnTitle = '正在上传中...';
+			const formData = new FormData(); //FormData对象，添加参数只能通过append('key', value)的形式添加
+			formData.append('file', file.file); //添加文件对象
+			formData.append('code', ''); //添加文件对象
+			await this.$http
+				.post('/actual/base/emergencyEquipment/import', formData)
+				.then(res => {
+					console.log('res-up', res);
+					if (res.data.code == 0 && res.data.msg == 'success') {
+						console.log(res.data.data);
+						const data = res.data.data;
+
+						this.dataList = [
+							...Object.keys(data.option.exist).map(k => {
+								return {
+									index: k,
+									srcField: data.option.exist[k],
+									exist: true,
+									field: data.option.exist[k]
+								};
+							}),
+							...Object.keys(data.option.notExist).map(k => {
+								return {
+									index: k,
+									srcField: data.option.notExist[k],
+									exist: false,
+									field: ''
+								};
+							})
+						];
+						this.importOption = data.option;
+						this.importCode = data.code;
+						this.fileData = file;
+					} else this.$message.error(res.data.msg);
+				})
+				.catch(err => {
+					console.log('失败', err);
+					file.onError(); //上传失败的文件会从文件列表中删除
+					// this.$message.error('导入失败')
+				});
+			this.importLoading = false;
+			this.importBtnTitle = '导入';
+			this.$refs.upload.clearFiles();
+		}
+	}
+};
 </script>
 
-<style>
-</style>
\ No newline at end of file
+<style lang="scss" scoped>
+@import '@/assets/scss/modules/management/list-main.scss';
+.m-search {
+	.u-item-width-normal {
+		width: 200px;
+	}
+}
+</style>
diff --git a/src/views/modules/shequzhili/tuceng/yingji/wuzi/record.vue b/src/views/modules/shequzhili/tuceng/yingji/wuzi/record.vue
new file mode 100644
index 000000000..a0bb8938a
--- /dev/null
+++ b/src/views/modules/shequzhili/tuceng/yingji/wuzi/record.vue
@@ -0,0 +1,428 @@
+<template>
+	<div class="m-record">
+		<h3>检查记录</h3>
+		<div>
+			<div class="u-table-btn1 mt10" v-if="formType == 'edit'">
+				<el-button size="small" class="diy-button--blue" :disabled="btnDisabled || disabled" @click="handleAdd">新增</el-button>
+			</div>
+			<div class="m-table-item">
+				<el-table :data="tableData" class="resi-table" row-key="id" border style="width: 100%">
+					<el-table-column label="序号" type="index" align="center" width="50"></el-table-column>
+
+					<el-table-column prop="inspectTime" label="检查时间" align="center" width="200px">
+						<template slot-scope="scope">
+							<el-date-picker
+								v-if="scope.row.isEdit"
+								v-model="scope.row.inspectTime"
+								type="date"
+								class="input-width"
+								value-format="yyyy-MM-dd"
+								placeholder="选择日期"
+							></el-date-picker>
+							<div v-else class="div-content">{{ scope.row.inspectTime }}</div>
+						</template>
+					</el-table-column>
+
+					<el-table-column prop="inspectStaffId" label="检查人员" align="center" width="200px">
+						<template slot-scope="scope">
+							<el-select
+								v-if="scope.row.isEdit"
+								v-model="scope.row.inspectStaffId"
+								placeholder="请选择"
+								class="input-width"
+								@change="handleChangeStaff(scope.row)"
+								clearable
+							>
+								<el-option v-for="subItem in optionStaff" :key="subItem.value" :label="subItem.label" :value="subItem.value"></el-option>
+							</el-select>
+							<div v-else class="div-content">{{ scope.row.inspectStaffName }}</div>
+						</template>
+					</el-table-column>
+
+					<el-table-column prop="inspectStaffMobile" label="联系电话" align="center" width="200px">
+						<template slot-scope="scope">
+							<el-input
+								v-if="scope.row.isEdit"
+								type="number"
+								v-model="scope.row.inspectStaffMobile"
+								placeholder="请输入"
+								class="input-width"
+								clearable
+								disabled
+							></el-input>
+							<div v-else class="div-content">{{ scope.row.inspectStaffMobile }}</div>
+						</template>
+					</el-table-column>
+
+					<el-table-column prop="inspectResult" label="检查结果" align="center" width="200px">
+						<template slot-scope="scope">
+							<el-select v-if="scope.row.isEdit" v-model="scope.row.inspectResult" placeholder="请选择" class="input-width" size="small" clearable>
+								<el-option v-for="subItem in optionResult" :key="subItem.value" :label="subItem.label" :value="subItem.value"></el-option>
+							</el-select>
+							<div v-else class="div-content">{{ scope.row.inspectResult == 1 ? '正常' : '异常' }}</div>
+						</template>
+					</el-table-column>
+
+					<!-- <el-table-column
+						prop="detailed"
+						label="隐患明细"
+						align="center"
+						width="200px"
+					>
+						<template slot-scope="scope">
+							<el-input
+								v-if="scope.row.isEdit"
+								type="text"
+								v-model="scope.row.detailed"
+								placeholder="请输入"
+								class="input-width"
+								maxlength="500"
+								clearable
+							></el-input>
+							<div v-else class="div-content">
+								{{ scope.row.detailed }}
+							</div>
+						</template>
+					</el-table-column> -->
+
+					<el-table-column prop="imgList" label="图片列表" align="center" width="150px">
+						<template slot-scope="scope">
+							<div v-if="scope.row.isEdit">
+								<el-upload
+									:headers="$getElUploadHeaders()"
+									class="avatar-uploader"
+									:action="uploadUrl"
+									:data="{ customerId: customerId }"
+									:show-file-list="true"
+									:limit="3"
+									:file-list="scope.row.imgShowList"
+									:on-success="res => handleImgSuccess(res, scope.row)"
+									:on-remove="res => handleImgRemove(res, scope.row)"
+									list-type="picture"
+									:before-upload="beforeImgUpload"
+								>
+									<i class="el-icon-plus avatar-uploader-icon"></i>
+									最多三张图片
+								</el-upload>
+							</div>
+
+							<div v-else class="div-content">
+								<el-image
+									v-if="scope.row.imgList.length > 0"
+									style="width: 100px; height: 50px"
+									:src="scope.row.imgList[0]"
+									fit="cover"
+									:preview-src-list="scope.row.imgList"
+								></el-image>
+							</div>
+						</template>
+					</el-table-column>
+
+					<el-table-column prop="nextInspectTime" label="拟复查时间" align="center" width="200px">
+						<template slot-scope="scope">
+							<el-date-picker
+								v-if="scope.row.isEdit"
+								v-model="scope.row.nextInspectTime"
+								type="date"
+								class="input-width"
+								value-format="yyyy-MM-dd"
+								placeholder="选择日期"
+							></el-date-picker>
+							<div v-else class="div-content">{{ scope.row.nextInspectTime }}</div>
+						</template>
+					</el-table-column>
+
+					<el-table-column v-if="!disabled" fixed="right" label="操作" align="center" width="120">
+						<template slot-scope="scope">
+							<template v-if="scope.row.isEdit">
+								<el-button @click="handleEdit(scope.row)" type="text" size="small" class="btn-color-edit">保存</el-button>
+								<el-button @click="handleChange(scope.row, 'cancle')" type="text" size="small" class="btn-color-edit">取消</el-button>
+							</template>
+							<template v-else>
+								<el-button v-if="formType == 'edit'" @click="handleChange(scope.row, 'edit')" type="text" size="small" :disabled="disabled" class="btn-color-edit">
+									修改
+								</el-button>
+								<el-popconfirm v-if="formType == 'edit'" title="删除之后无法恢复，确认删除？" @onConfirm="del(scope.row)" @confirm="del(scope.row)">
+									<el-button slot="reference" type="text" size="small" class="btn-color-del" style="margin-left: 10px">删除</el-button>
+								</el-popconfirm>
+							</template>
+						</template>
+					</el-table-column>
+				</el-table>
+			</div>
+		</div>
+	</div>
+</template>
+
+<script>
+import { requestPost, requestGet } from '@/js/dai/request';
+export default {
+	props: {
+		id: {
+			type: String,
+			default: ''
+		},
+		info: {
+			type: Object,
+			default: () => ({})
+		},
+		disabled: {
+			type: Boolean,
+			default: false
+		},
+		formType: {
+			type: String,
+			default: ''
+		},
+		source: {
+			//展示来源：manage  管理平台    visiual  可视化平台
+			type: String,
+			default: 'manage'
+		}
+	},
+	data() {
+		return {
+			uploadUrl: window.SITE_CONFIG['apiURL'] + '/oss/file/uploadqrcodeV2',
+			customerId: localStorage.getItem('customerId'),
+
+			btnDisabled: false,
+			btnType: 'cancle',
+			isEdit: false,
+			tableData: [],
+			tempRow: {},
+
+			optionResult: [
+				{
+					label: '合格',
+					value: '0'
+				},
+				{
+					label: '不合格',
+					value: '1'
+				}
+			],
+			optionStaff: [
+				// {
+				//   label: "人名",
+				//   value: "inspectStaffId",
+				// },
+			]
+		};
+	},
+
+	computed: {
+		allowOperate() {
+			const {
+				info: { agencyId }
+			} = this;
+			return agencyId && agencyId == this.$store.state.user.agencyId;
+		}
+	},
+	watch: {
+		id: {
+			handler(val) {
+				console.log('val------points', val);
+				if (val.length > 0) {
+					this.btnDisabled = false;
+					this.getList();
+				} else this.btnDisabled = true;
+			},
+			immediate: true
+		}
+	},
+
+	created() {
+		console.log("id",this.id)
+		this.getOptionStaff();
+	},
+
+	methods: {
+		beforeImgUpload(file) {
+			console.log(file);
+			const isLt1M = file.size / 1024 / 1024 < 10;
+			const srcType = file.type;
+			const format = file.name.split('.').pop();
+
+			if (!isLt1M) {
+				this.$message.error('上传文件大小不能超过 10MB!');
+				return false;
+			}
+			if (srcType.indexOf('image') == -1) {
+				this.$message.error('仅限图片格式');
+				return false;
+			}
+			return true;
+		},
+
+		handleImgSuccess(res, row) {
+			console.log('handleImgSuccess', res);
+			if (res.code === 0 && res.msg === 'success') {
+				row.imgList.push(res.data.url);
+				this.computeImgShowList(row);
+			} else {
+				this.$message.error(res.msg);
+			}
+		},
+
+		computeImgShowList(row) {
+			row.imgShowList = row.imgList.map(url => {
+				return { name: '', url };
+			});
+		},
+
+		handleImgRemove(file, row) {
+			console.log('handleImgRemove', file);
+			let url = file.url || file.response.data.url;
+			if (url) {
+				row.imgList = row.imgList.filter(item => item !== url);
+				this.computeImgShowList(row);
+			}
+		},
+
+		getRowClass({ rowIndex, columnIndex }) {
+			if (rowIndex === 0) {
+				return 'background: #2195fe; color: #fff;';
+			}
+		},
+
+		handleChange(row, type) {
+			console.log('type----', type);
+			if (type == 'cancle') {
+				row = { ...this.tempRow };
+				row.isEdit = false;
+				if (this.btnType == 'add') this.tableData.pop();
+				this.getList();
+				console.log('row----', row);
+			} else {
+				this.tempRow = { ...row };
+				row.isEdit = true;
+			}
+			this.btnType = type;
+			this.isEdit = !this.isEdit;
+		},
+
+		handleChangeStaff(row) {
+			const { inspectStaffId } = row;
+			const { optionStaff } = this;
+			let item = optionStaff.find(item => item.value == inspectStaffId);
+			if (item) {
+				row.inspectStaffName = item.name;
+				row.inspectStaffMobile = item.mobile;
+			}
+		},
+
+		async getOptionStaff() {
+			let url = `/data/aggregator/org/staff-select-list/${this.$store.state.user.agencyId}`;
+			const { data, code, msg } = await requestPost(url, {});
+
+			if (code === 0) {
+				this.optionStaff = data || [];
+			} else {
+				this.$message.error('请求工作人员数据失败！');
+			}
+		},
+
+		async handleEdit(row) {
+			if (this.btnType == 'add') this.save(row);
+			else this.edit(row);
+		},
+
+		handleAdd() {
+			this.btnType = 'add';
+			this.isEdit = true;
+
+			const item = {
+				isEdit: true,
+				id: this.id,
+				inspectTime: '',
+				inspectStaffId: '',
+				inspectStaffName: '',
+				inspectStaffMobile: '',
+				inspectResult: '',
+				imgList: [],
+				nextInspectTime: ''
+			};
+			this.computeImgShowList(item);
+			this.tableData.push(item);
+		},
+
+		async save(row) {
+			const params = {
+				equipmentId: this.id,
+				...row
+			};
+			const url = `/actual/base/emergencyEquipment/inspect-save`;
+			const { data, code, msg } = await requestPost(url, params);
+			if (code === 0) {
+				return this.$message.error(res.msg);
+			} else {
+				this.$message.success('保存成功');
+				row.isEdit = false;
+				this.isEdit = false;
+				this.btnType = 'cancle';
+				this.getList();
+			}
+		},
+
+		async edit(row) {
+			const params = {
+				...row
+			};
+			const url = `/actual/base/emergencyEquipment/inspect-update`;
+			const { data, code, msg } = await requestPost(url, params);
+			if (code === 0) {
+				return this.$message.error(res.msg);
+			} else {
+				this.$message.success('保存成功');
+				row.isEdit = false;
+				this.isEdit = false;
+				this.getList();
+			}
+		},
+
+		async del(row) {
+			const url = `/actual/base/emergencyEquipment/inspect-delete/${this.id}`;
+			const { data, code, msg } = await requestPost(url);
+
+			if (code === 0) {
+				return this.$message.error(res.msg);
+			} else {
+				this.$message.success('删除成功');
+				this.getList();
+			}
+		},
+
+		async getList() {
+			const params = {
+				equipmentId: this.id
+			};
+			const url = `/actual/base/emergencyEquipment/inspect-page`;
+			const { data, code, msg } = await requestPost(url, params);
+
+			if (code === 0) {
+				return this.$message.error(res.msg);
+			} else {
+				this.tableData = res.data.list.map(item => {
+					this.computeImgShowList(item);
+					return {
+						...item,
+						isEdit: false
+					};
+				});
+			}
+		}
+	}
+};
+</script>
+
+<style lang="scss" scoped>
+@import '@/assets/scss/buttonstyle.scss';
+@import '@/assets/scss/modules/management/list-main.scss';
+
+.mt10 {
+	margin-bottom: 10px;
+}
+.input-width {
+	width: 170px;
+}
+</style>
diff --git a/src/views/modules/shequzhili/tuceng/yingji/zizuzhi/addForm.vue b/src/views/modules/shequzhili/tuceng/yingji/zizuzhi/addForm.vue
new file mode 100644
index 000000000..e83eed2f2
--- /dev/null
+++ b/src/views/modules/shequzhili/tuceng/yingji/zizuzhi/addForm.vue
@@ -0,0 +1,413 @@
+<template>
+	<el-card>
+		<div class="dialog-h-content scroll-h">
+			<el-form :inline="true" :model="formData" ref="form" :rules="dataRule" :label-width="'120px'" v-if="pageType != 'view'">
+				<el-row>
+					<el-col :span="8">
+						<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-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-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-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="16">
+						<el-form-item label="所处位置" prop="location" style="display: block">
+							<el-select
+								v-model="formData.location"
+								style="width: 200px;"
+								: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>
+							<div id="app_event" class="div_map"></div>
+						</el-form-item>
+					</el-col>
+				</el-row>
+			</el-form>
+			<el-form :inline="false" :model="formData" ref="form" :label-width="'120px'" v-if="pageType == 'view'">
+				<el-row>
+					<el-col :span="8">
+						<el-form-item label="设备名称" prop="equipmentName">{{ formData.equipmentName }}</el-form-item>
+						<el-form-item label="设备类型" prop="equipmentCategoryCode">{{ formData.equipmentCategoryName }}</el-form-item>
+						<el-form-item label="负责人" prop="principalName">{{ formData.principalName }}</el-form-item>
+						<el-form-item label="联系电话" prop="contactNum">{{ formData.contactNum }}</el-form-item>
+					</el-col>
+					<el-col :span="16">
+						<el-form-item label="场所地址" prop="location" style="display: block">
+							{{ formData.location }}
+							<div id="app_event" class="div_map"></div>
+						</el-form-item>
+					</el-col>
+				</el-row>
+			</el-form>
+		</div>
+		<div class="div_btn">
+			<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" 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>
+	</el-card>
+</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: {
+		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: [{ value: '0', label: '九小场所' }, { value: '1', label: '企事业单位' }],
+			list: {},
+			formData: {
+				equipmentName: '',
+				scaleTotal: '',
+				gridId: '',
+				equipmentCategoryCode: '',
+				placeType: '',
+				principalName: '',
+				location: '',
+				contactNum: '',
+				// result: '',
+				remark: ''
+			},
+			dataRule: {
+				equipmentName: [{ required: true, message: '设备名称不能为空', trigger: 'bulr' }],
+				equipmentCategoryCode: [{ required: true, message: '设备类型不能为空', trigger: 'bulr' }],
+				placeType: [{ required: true, message: '场所类型不能为空', trigger: 'bulr' }],
+				result: [{ required: true, message: '巡查结果不能为空', trigger: 'bulr' }],
+				scaleTotal: [{ required: true, message: '场所规模不能为空', trigger: 'bulr' }],
+				gridId: [{ required: true, message: '所属组织不能为空', trigger: 'bulr' }],
+				principalName: [{ required: true, message: '负责人不能为空', trigger: 'bulr' }],
+				contactNum: [{ required: true, validator: checkMObile, trigger: 'blur' }],
+				location: [{ required: true, message: '场所地址不能为空', trigger: 'blur' }]
+				// content: [{ required: true, message: '详细说明不能为空', trigger: 'bulr' }, { max: 1000, message: '不能超出1000个字符', 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.loadGrid();
+		// this.loadplaceType();
+		if (this.pageType != 'add') {
+			this.getDetail();
+		} else {
+			this.initMap();
+		}
+		await this.endLoading();
+		this.endLoading();
+	},
+
+	methods: {
+		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.resetData();
+				this.$emit('handleComfirm');
+			} 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(() => {
+				if (!map) {
+					map = new daiMap(
+						document.getElementById('app_event'),
+						{ latitude, longitude },
+						{
+							zoom: 16.2, // 设置地图缩放级别
+							pitch: 43.5, // 设置俯仰角
+							rotation: 45 // 设置地图旋转角度
+						}
+					);
+					// 监听地图平移结束
+					map.on('dragend', e => {
+						this.handleMoveCenter(e);
+					});
+				} else {
+					map.setCenter(latitude, longitude);
+					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.hotPointID}`, 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.address = selPosition.address + selPosition.name;
+		}
+	}
+};
+</script>
+
+<style lang="scss" scoped>
+@import '@/assets/scss/modules/management/form-main.scss';
+@import '@/assets/scss/modules/visual/a_customize.scss';
+/deep/ .el-input.is-disabled .el-input__inner,
+/deep/ .el-textarea.is-disabled textarea.el-textarea__inner {
+	// border:none;background-color: transparent;
+}
+.div_map {
+	width: 100%;
+}
+.form-item::v-deep .el-form-item__label {
+	color: #fff;
+}
+.form-item {
+	.el-radio {
+		color: #fff;
+	}
+
+	.el-checkbox {
+		color: #fff;
+	}
+}
+.verifyRed::before {
+	content: '*';
+	color: #f56c6c;
+	margin-right: 4px;
+}
+.form_label_box {
+	width: 150px;
+	display: inline-block;
+	text-align: right;
+	padding-right: 12px;
+}
+</style>
diff --git a/src/views/modules/shequzhili/tuceng/yingji/zizuzhi/index.vue b/src/views/modules/shequzhili/tuceng/yingji/zizuzhi/index.vue
index 02409e35d..1acff51b7 100644
--- a/src/views/modules/shequzhili/tuceng/yingji/zizuzhi/index.vue
+++ b/src/views/modules/shequzhili/tuceng/yingji/zizuzhi/index.vue
@@ -1,8 +1,449 @@
 <template>
+	<div class="g-main">
+		<div v-show="pageType == 'list'">
+			<div class="m-search">
+				<el-form :inline="true" :model="formData" ref="ref_searchform" :label-width="'100px'">
+					<div>
+						<el-form-item label="设备名称" prop="equipmentName">
+							<el-input v-model="formData.equipmentName" class="u-item-width-normal" size="small" clearable placeholder="请输入"></el-input>
+						</el-form-item>
+						<el-form-item label="设备类型" prop="equipmentCategoryCode">
+							<el-select v-model="formData.equipmentCategoryCode" 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-form-item label="所处位置" prop="location">
+							<el-input v-model="formData.location" :disabled="disabled" class="u-item-width-normal" size="small" clearable placeholder="请输入"></el-input>
+						</el-form-item>
+						<el-form-item label="负责人" prop="principalName">
+							<el-input v-model="formData.principalName" class="u-item-width-normal" size="small" clearable placeholder="请输入"></el-input>
+						</el-form-item>
+
+						<el-row>
+							<el-col :span="24" align="right">
+								<el-button style="margin-left: 30px" size="small" type="primary " @click="handleSearch">查询</el-button>
+								<el-button style="margin-left: 10px" size="small" class="diy-button--white" @click="resetSearch">重置</el-button>
+							</el-col>
+						</el-row>
+					</div>
+				</el-form>
+			</div>
+			<div class="m-table">
+				<div class="div_btn">
+					<el-button size="small" type="primary " @click="handleAdd({}, 'add')">新增</el-button>
+					<el-button class="diy-button--white" size="small" @click="handleExportModule('room')">下载导入模板</el-button>
+					<el-upload
+						:headers="$getElUploadHeaders()"
+						ref="upload"
+						class="upload-btn"
+						action="uploadUlr"
+						:limit="1"
+						:accept="'.xls,.xlsx'"
+						:with-credentials="true"
+						:show-file-list="false"
+						:auto-upload="true"
+						:on-progress="handleProgress"
+						:on-success="handleExcelSuccess"
+						:before-upload="beforeExcelUpload"
+						:http-request="uploadHttpRequest"
+						style="display: inline-block;margin:0px 10px"
+					>
+						<el-button size="small" class="diy-button--white" :loading="importLoading">导入模板</el-button>
+					</el-upload>
+
+					<el-button @click="handleExport" class="diy-button--white" size="small">导出</el-button>
+				</div>
+				<el-table :data="tableData" border class="m-table-item" style="width: 100%" @selection-change="handleSelectionChange" :height="maxTableHeight">
+					<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="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>
+					<el-table-column prop="latestInspectTime" align="center" width="100" label="最新检查时间" :show-overflow-tooltip="true"></el-table-column>
+					<el-table-column prop="latestInspectResult" align="center" label="最新巡查结果" :show-overflow-tooltip="true">
+						<template slot-scope="scope">
+							<span v-if="scope.row.latestResult === '0'">合格</span>
+							<span v-else-if="scope.row.latestResult === '1'">不合格</span>
+							<span v-else>--</span>
+						</template>
+					</el-table-column>
+					<el-table-column fixed="right" label="操作" align="center" width="130">
+						<template slot-scope="scope">
+							<el-button @click="handleAdd(scope.row, 'view')" type="text" size="small">查看</el-button>
+							<el-button style="margin-right: 10px" @click="handleAdd(scope.row, 'edit')" size="small" type="text">编辑</el-button>
+							<el-button @click="handleDel(scope.row)" type="text" size="small" class="">删除</el-button>
+						</template>
+					</el-table-column>
+				</el-table>
+
+				<div>
+					<el-pagination
+						@size-change="handleSizeChange"
+						@current-change="handleCurrentChange"
+						:current-page.sync="pageNo"
+						:page-sizes="[20, 50, 100, 200]"
+						:page-size="parseInt(pageSize)"
+						layout="sizes, prev, pager, next, total"
+						:total="total"
+					></el-pagination>
+				</div>
+			</div>
+		</div>
+		<div v-if="pageType != 'list'">
+			<addForm
+				:pageType="pageType"
+				:disabled="disabled"
+				:detailId="detailId"
+				:detailData="detailData"
+				@handleClose="handleClose"
+				@handleOk="handleOk"
+				@dialogOk="handleEditSuccess"
+			/>
+		</div>
+	</div>
 </template>
 
 <script>
+import { requestPost } from '@/js/dai/request';
+import nextTick from 'dai-js/tools/nextTick';
+import { mapGetters } from 'vuex';
+import addForm from './addForm.vue';
+import axios from 'axios';
+
+export default {
+	data() {
+		return {
+			importLoading: false,
+			disabled: false,
+			user: '',
+			agencyId: '',
+			formData: {
+				equipmentName: '',
+				gridId: '',
+				equipmentCategoryCode: '',
+				placeType: '',
+				result: '',
+				scaleTotal: '',
+				contactNum: '',
+				address: '',
+				principalName: ''
+			},
+			pageType: 'list', // 列表list 新增add  处理dispose 详情info
+			gridList: [], //所属网格list--场所区域
+			placeTypeList: [], //场所类型
+			tableData: [],
+			resultArray: [{ value: '0', label: '合格' }, { value: '1', label: '不合格' }],
+			equipmentCategoryCodeArray: [{ value: '0', label: '九小场所' }, { value: '1', label: '企事业单位' }],
+			pageNo: 1,
+			pageSize: window.localStorage.getItem('pageSize') || 20,
+			total: 1,
+			detailId: '',
+			detailData: {},
+			multipleSelection: [],
+			rowObj: {}
+		};
+	},
+	components: { addForm },
+	created() {},
+	computed: {
+		maxTableHeight() {
+			return this.$store.state.inIframe ? this.clientHeight - 410 + this.iframeHeigh : this.clientHeight - 410;
+		},
+		...mapGetters(['clientHeight', 'iframeHeight'])
+	},
+	watch: {},
+	mounted() {
+		this.user = this.$store.state.user;
+		this.agencyId = this.user.agencyId;
+		this.loadGrid();
+		this.loadplaceType();
+		this.getTableData();
+	},
+	methods: {
+		handleSelectionChange(val) {
+			this.multipleSelection = [];
+			val.forEach(element => {
+				this.multipleSelection.push(element.icEventId);
+			});
+		},
+		handleSearch(val) {
+			console.log(this.formData);
+			this.pageNo = 1;
+			this.getTableData();
+		},
+		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 handleImport() {
+			// 导入
+		},
+		async handleExport() {
+			// 导出
+			const url = '/actual/base/safetyEquipment/export';
+			const { pageSize, pageNo, formData } = this;
+			axios({
+				url: window.SITE_CONFIG['apiURL'] + url,
+				method: 'post',
+				data: {
+					pageSize,
+					pageNo,
+					...formData
+				},
+				responseType: 'blob'
+			})
+				.then(res => {
+					let fileName = window.decodeURI(res.headers['content-disposition'].split(';')[1].split('=')[1]);
+					console.log('filename', fileName);
+					let blob = new Blob([res.data], { type: 'application/vnd.ms-excel' });
+					var url = window.URL.createObjectURL(blob);
+					var aLink = document.createElement('a');
+					aLink.style.display = 'none';
+					aLink.href = url;
+					aLink.setAttribute('download', fileName);
+					document.body.appendChild(aLink);
+					aLink.click();
+					document.body.removeChild(aLink); //下载完成移除元素
+					window.URL.revokeObjectURL(url); //释放掉blob对象
+				})
+				.catch(err => {
+					console.log('获取导出情失败', err);
+					return this.$message.error('网络错误');
+				});
+		},
+		handleAdd(row, type) {
+			if (row.equipmentId) {
+				this.detailId = row.equipmentId;
+			}
+			this.pageType = type;
+			if (type == 'view') {
+				this.disabled = true;
+			} else {
+				this.disabled = false;
+			}
+		},
+		handleClose() {
+			this.pageType = 'list';
+			this.detailId = '';
+			this.getTableData();
+		},
+		handleOk() {
+			this.pageType = 'list';
+			this.detailId = '';
+			this.pageNo = 1;
+			this.getTableData();
+		},
+		handleEditSuccess() {
+			this.handleClose();
+			this.getTableData();
+		},
+		async handleDel(rowData) {
+			let message = '确认删除?';
+			this.$confirm(message, '提示', {
+				confirmButtonText: '确定',
+				cancelButtonText: '取消',
+				type: 'warning'
+			})
+				.then(() => {
+					this.del(rowData.equipmentId);
+				})
+				.catch(err => {});
+		},
+		async del(id) {
+			const url = '/actual/base/enterprise/delete';
+			const { data, code, msg } = await requestPost(url, id);
+			if (code === 0) {
+				this.$message.success('删除成功！');
+				this.getTableData();
+			} else {
+				this.$message.error('操作失败！');
+			}
+		},
+		async getTableData() {
+			const url = '/actual/base/safetyEquipment/page';
+			// const url = 'http://yapi.elinkservice.cn/mock/330/actual/base/enterprise/list';
+			const { pageSize, pageNo, formData } = this;
+			const { data, code, msg } = await requestPost(url, {
+				pageSize,
+				pageNo,
+				...formData
+			});
+			if (code === 0) {
+				this.total = data.total || 0;
+				this.tableData = data.list
+					? data.list.map(item => {
+							return item;
+					  })
+					: [];
+			} else {
+				this.$message.error(msg);
+			}
+		},
+		handleSizeChange(val) {
+			this.pageSize = val;
+			window.localStorage.setItem('pageSize', val);
+			this.getTableData();
+		},
+		handleCurrentChange(val) {
+			this.pageNo = val;
+			this.getTableData();
+		},
+		resetSearch() {
+			this.formData = {
+				equipmentName: '',
+				gridId: '',
+				equipmentCategoryCode: '',
+				placeType: '',
+				result: '',
+				scaleTotal: '',
+				contactNum: '',
+				address: '',
+				principalName: ''
+			};
+			this.pageNo = 1;
+			this.getTableData();
+		},
+		async handleExportModule() {
+			let url = '/actual/base/safetyEquipment/downloadTemplate';
+			let params = {};
+			await this.$http({
+				method: 'POST',
+				url,
+				responseType: 'blob',
+				data: params
+			})
+				.then(res => {
+					// this.download(res.data, title + '.xls')
+					if (res.headers['content-disposition']) {
+						let fileName = window.decodeURI(res.headers['content-disposition'].split(';')[1].split('=')[1]);
+						console.log('filename', fileName);
+						let blob = new Blob([res.data], {
+							type: 'application/vnd.ms-excel'
+						});
+						var url = window.URL.createObjectURL(blob);
+						var aLink = document.createElement('a');
+						aLink.style.display = 'none';
+						aLink.href = url;
+						aLink.setAttribute('download', fileName);
+						document.body.appendChild(aLink);
+						aLink.click();
+						document.body.removeChild(aLink); //下载完成移除元素
+						window.URL.revokeObjectURL(url); //释放掉blob对象
+					} else this.$message.error('下载失败');
+				})
+				.catch(err => {
+					console.log('err', err);
+					return this.$message.error('网络错误');
+				});
+		},
+		handleExcelSuccess(res, file) {
+			if (res.code === 0 && res.msg === 'success') {
+				console.log('resss---ppp', res);
+			} else {
+				this.$message.error(res.msg);
+			}
+		},
+		handleProgress(event, file, fileList) {
+			console.log('percentage', file.percentage);
+		},
+
+		beforeExcelUpload(file) {
+			console.log('file', file);
+			const isType = file.type === 'application/vnd.ms-excel';
+			const isTypeComputer = file.type === 'application/vnd.openxmlformats-officedocument.spreadsheetml.sheet';
+			const fileType = isType || isTypeComputer;
+			const isLt1M = file.size / 1024 / 1024 < 10;
+			if (!fileType) {
+				this.$message.error('上传文件只能是xls/xlsx格式！');
+			}
+
+			if (!isLt1M) {
+				this.$message.error('上传文件大小不能超过 10MB!');
+			}
+			return fileType && isLt1M;
+		},
+
+		async uploadHttpRequest(file) {
+			this.importLoading = true;
+			this.importBtnTitle = '正在上传中...';
+			const formData = new FormData(); //FormData对象，添加参数只能通过append('key', value)的形式添加
+			formData.append('file', file.file); //添加文件对象
+			formData.append('code', ''); //添加文件对象
+			await this.$http
+				.post('/actual/base/safetyEquipment/import', formData)
+				.then(res => {
+					console.log('res-up', res);
+					if (res.data.code == 0 && res.data.msg == 'success') {
+						console.log(res.data.data);
+						const data = res.data.data;
+
+						this.dataList = [
+							...Object.keys(data.option.exist).map(k => {
+								return {
+									index: k,
+									srcField: data.option.exist[k],
+									exist: true,
+									field: data.option.exist[k]
+								};
+							}),
+							...Object.keys(data.option.notExist).map(k => {
+								return {
+									index: k,
+									srcField: data.option.notExist[k],
+									exist: false,
+									field: ''
+								};
+							})
+						];
+						this.importOption = data.option;
+						this.importCode = data.code;
+						this.fileData = file;
+					} else this.$message.error(res.data.msg);
+				})
+				.catch(err => {
+					console.log('失败', err);
+					file.onError(); //上传失败的文件会从文件列表中删除
+					// this.$message.error('导入失败')
+				});
+			this.importLoading = false;
+			this.importBtnTitle = '导入';
+			this.$refs.upload.clearFiles();
+		}
+	}
+};
 </script>
 
-<style>
-</style>
\ No newline at end of file
+<style lang="scss" scoped>
+@import '@/assets/scss/modules/management/list-main.scss';
+.m-search {
+	.u-item-width-normal {
+		width: 200px;
+	}
+}
+</style>
diff --git a/src/views/modules/shequzhili/tuceng/yingji/zizuzhi/record.vue b/src/views/modules/shequzhili/tuceng/yingji/zizuzhi/record.vue
new file mode 100644
index 000000000..f05336d12
--- /dev/null
+++ b/src/views/modules/shequzhili/tuceng/yingji/zizuzhi/record.vue
@@ -0,0 +1,428 @@
+<template>
+	<div class="m-record">
+		<h3>检查记录</h3>
+		<div>
+			<div class="u-table-btn1 mt10" v-if="formType == 'edit'">
+				<el-button size="small" class="diy-button--blue" :disabled="btnDisabled || disabled" @click="handleAdd">新增</el-button>
+			</div>
+			<div class="m-table-item">
+				<el-table :data="tableData" class="resi-table" row-key="id" border style="width: 100%">
+					<el-table-column label="序号" type="index" align="center" width="50"></el-table-column>
+
+					<el-table-column prop="inspectTime" label="检查时间" align="center" width="200px">
+						<template slot-scope="scope">
+							<el-date-picker
+								v-if="scope.row.isEdit"
+								v-model="scope.row.inspectTime"
+								type="date"
+								class="input-width"
+								value-format="yyyy-MM-dd"
+								placeholder="选择日期"
+							></el-date-picker>
+							<div v-else class="div-content">{{ scope.row.inspectTime }}</div>
+						</template>
+					</el-table-column>
+
+					<el-table-column prop="inspectStaffId" label="检查人员" align="center" width="200px">
+						<template slot-scope="scope">
+							<el-select
+								v-if="scope.row.isEdit"
+								v-model="scope.row.inspectStaffId"
+								placeholder="请选择"
+								class="input-width"
+								@change="handleChangeStaff(scope.row)"
+								clearable
+							>
+								<el-option v-for="subItem in optionStaff" :key="subItem.value" :label="subItem.label" :value="subItem.value"></el-option>
+							</el-select>
+							<div v-else class="div-content">{{ scope.row.inspectStaffName }}</div>
+						</template>
+					</el-table-column>
+
+					<el-table-column prop="inspectStaffMobile" label="联系电话" align="center" width="200px">
+						<template slot-scope="scope">
+							<el-input
+								v-if="scope.row.isEdit"
+								type="number"
+								v-model="scope.row.inspectStaffMobile"
+								placeholder="请输入"
+								class="input-width"
+								clearable
+								disabled
+							></el-input>
+							<div v-else class="div-content">{{ scope.row.inspectStaffMobile }}</div>
+						</template>
+					</el-table-column>
+
+					<el-table-column prop="inspectResult" label="检查结果" align="center" width="200px">
+						<template slot-scope="scope">
+							<el-select v-if="scope.row.isEdit" v-model="scope.row.inspectResult" placeholder="请选择" class="input-width" size="small" clearable>
+								<el-option v-for="subItem in optionResult" :key="subItem.value" :label="subItem.label" :value="subItem.value"></el-option>
+							</el-select>
+							<div v-else class="div-content">{{ scope.row.inspectResult == 1 ? '正常' : '异常' }}</div>
+						</template>
+					</el-table-column>
+
+					<!-- <el-table-column
+						prop="detailed"
+						label="隐患明细"
+						align="center"
+						width="200px"
+					>
+						<template slot-scope="scope">
+							<el-input
+								v-if="scope.row.isEdit"
+								type="text"
+								v-model="scope.row.detailed"
+								placeholder="请输入"
+								class="input-width"
+								maxlength="500"
+								clearable
+							></el-input>
+							<div v-else class="div-content">
+								{{ scope.row.detailed }}
+							</div>
+						</template>
+					</el-table-column> -->
+
+					<el-table-column prop="imgList" label="图片列表" align="center" width="150px">
+						<template slot-scope="scope">
+							<div v-if="scope.row.isEdit">
+								<el-upload
+									:headers="$getElUploadHeaders()"
+									class="avatar-uploader"
+									:action="uploadUrl"
+									:data="{ customerId: customerId }"
+									:show-file-list="true"
+									:limit="3"
+									:file-list="scope.row.imgShowList"
+									:on-success="res => handleImgSuccess(res, scope.row)"
+									:on-remove="res => handleImgRemove(res, scope.row)"
+									list-type="picture"
+									:before-upload="beforeImgUpload"
+								>
+									<i class="el-icon-plus avatar-uploader-icon"></i>
+									最多三张图片
+								</el-upload>
+							</div>
+
+							<div v-else class="div-content">
+								<el-image
+									v-if="scope.row.imgList.length > 0"
+									style="width: 100px; height: 50px"
+									:src="scope.row.imgList[0]"
+									fit="cover"
+									:preview-src-list="scope.row.imgList"
+								></el-image>
+							</div>
+						</template>
+					</el-table-column>
+
+					<el-table-column prop="nextInspectTime" label="拟复查时间" align="center" width="200px">
+						<template slot-scope="scope">
+							<el-date-picker
+								v-if="scope.row.isEdit"
+								v-model="scope.row.nextInspectTime"
+								type="date"
+								class="input-width"
+								value-format="yyyy-MM-dd"
+								placeholder="选择日期"
+							></el-date-picker>
+							<div v-else class="div-content">{{ scope.row.nextInspectTime }}</div>
+						</template>
+					</el-table-column>
+
+					<el-table-column v-if="!disabled" fixed="right" label="操作" align="center" width="120">
+						<template slot-scope="scope">
+							<template v-if="scope.row.isEdit">
+								<el-button @click="handleEdit(scope.row)" type="text" size="small" class="btn-color-edit">保存</el-button>
+								<el-button @click="handleChange(scope.row, 'cancle')" type="text" size="small" class="btn-color-edit">取消</el-button>
+							</template>
+							<template v-else>
+								<el-button v-if="formType == 'edit'" @click="handleChange(scope.row, 'edit')" type="text" size="small" :disabled="disabled" class="btn-color-edit">
+									修改
+								</el-button>
+								<el-popconfirm v-if="formType == 'edit'" title="删除之后无法恢复，确认删除？" @onConfirm="del(scope.row)" @confirm="del(scope.row)">
+									<el-button slot="reference" type="text" size="small" class="btn-color-del" style="margin-left: 10px">删除</el-button>
+								</el-popconfirm>
+							</template>
+						</template>
+					</el-table-column>
+				</el-table>
+			</div>
+		</div>
+	</div>
+</template>
+
+<script>
+import { requestPost, requestGet } from '@/js/dai/request';
+export default {
+	props: {
+		id: {
+			type: String,
+			default: ''
+		},
+		info: {
+			type: Object,
+			default: () => ({})
+		},
+		disabled: {
+			type: Boolean,
+			default: false
+		},
+		formType: {
+			type: String,
+			default: ''
+		},
+		source: {
+			//展示来源：manage  管理平台    visiual  可视化平台
+			type: String,
+			default: 'manage'
+		}
+	},
+	data() {
+		return {
+			uploadUrl: window.SITE_CONFIG['apiURL'] + '/oss/file/uploadqrcodeV2',
+			customerId: localStorage.getItem('customerId'),
+
+			btnDisabled: false,
+			btnType: 'cancle',
+			isEdit: false,
+			tableData: [],
+			tempRow: {},
+
+			optionResult: [
+				{
+					label: '合格',
+					value: '0'
+				},
+				{
+					label: '不合格',
+					value: '1'
+				}
+			],
+			optionStaff: [
+				// {
+				//   label: "人名",
+				//   value: "inspectStaffId",
+				// },
+			]
+		};
+	},
+
+	computed: {
+		allowOperate() {
+			const {
+				info: { agencyId }
+			} = this;
+			return agencyId && agencyId == this.$store.state.user.agencyId;
+		}
+	},
+	watch: {
+		id: {
+			handler(val) {
+				console.log('val------points', val);
+				if (val.length > 0) {
+					this.btnDisabled = false;
+					this.getList();
+				} else this.btnDisabled = true;
+			},
+			immediate: true
+		}
+	},
+
+	created() {
+		console.log("id",this.id)
+		this.getOptionStaff();
+	},
+
+	methods: {
+		beforeImgUpload(file) {
+			console.log(file);
+			const isLt1M = file.size / 1024 / 1024 < 10;
+			const srcType = file.type;
+			const format = file.name.split('.').pop();
+
+			if (!isLt1M) {
+				this.$message.error('上传文件大小不能超过 10MB!');
+				return false;
+			}
+			if (srcType.indexOf('image') == -1) {
+				this.$message.error('仅限图片格式');
+				return false;
+			}
+			return true;
+		},
+
+		handleImgSuccess(res, row) {
+			console.log('handleImgSuccess', res);
+			if (res.code === 0 && res.msg === 'success') {
+				row.imgList.push(res.data.url);
+				this.computeImgShowList(row);
+			} else {
+				this.$message.error(res.msg);
+			}
+		},
+
+		computeImgShowList(row) {
+			row.imgShowList = row.imgList.map(url => {
+				return { name: '', url };
+			});
+		},
+
+		handleImgRemove(file, row) {
+			console.log('handleImgRemove', file);
+			let url = file.url || file.response.data.url;
+			if (url) {
+				row.imgList = row.imgList.filter(item => item !== url);
+				this.computeImgShowList(row);
+			}
+		},
+
+		getRowClass({ rowIndex, columnIndex }) {
+			if (rowIndex === 0) {
+				return 'background: #2195fe; color: #fff;';
+			}
+		},
+
+		handleChange(row, type) {
+			console.log('type----', type);
+			if (type == 'cancle') {
+				row = { ...this.tempRow };
+				row.isEdit = false;
+				if (this.btnType == 'add') this.tableData.pop();
+				this.getList();
+				console.log('row----', row);
+			} else {
+				this.tempRow = { ...row };
+				row.isEdit = true;
+			}
+			this.btnType = type;
+			this.isEdit = !this.isEdit;
+		},
+
+		handleChangeStaff(row) {
+			const { inspectStaffId } = row;
+			const { optionStaff } = this;
+			let item = optionStaff.find(item => item.value == inspectStaffId);
+			if (item) {
+				row.inspectStaffName = item.name;
+				row.inspectStaffMobile = item.mobile;
+			}
+		},
+
+		async getOptionStaff() {
+			let url = `/data/aggregator/org/staff-select-list/${this.$store.state.user.agencyId}`;
+			const { data, code, msg } = await requestPost(url, {});
+
+			if (code === 0) {
+				this.optionStaff = data || [];
+			} else {
+				this.$message.error('请求工作人员数据失败！');
+			}
+		},
+
+		async handleEdit(row) {
+			if (this.btnType == 'add') this.save(row);
+			else this.edit(row);
+		},
+
+		handleAdd() {
+			this.btnType = 'add';
+			this.isEdit = true;
+
+			const item = {
+				isEdit: true,
+				id: this.id,
+				inspectTime: '',
+				inspectStaffId: '',
+				inspectStaffName: '',
+				inspectStaffMobile: '',
+				inspectResult: '',
+				imgList: [],
+				nextInspectTime: ''
+			};
+			this.computeImgShowList(item);
+			this.tableData.push(item);
+		},
+
+		async save(row) {
+			const params = {
+				equipmentId: this.id,
+				...row
+			};
+			const url = `/actual/base/safetyEquipmentInspectRecord/save`;
+			const { data, code, msg } = await requestPost(url, params);
+			if (code === 0) {
+				return this.$message.error(res.msg);
+			} else {
+				this.$message.success('保存成功');
+				row.isEdit = false;
+				this.isEdit = false;
+				this.btnType = 'cancle';
+				this.getList();
+			}
+		},
+
+		async edit(row) {
+			const params = {
+				...row
+			};
+			const url = `/actual/base/safetyEquipmentInspectRecord/update`;
+			const { data, code, msg } = await requestPost(url, params);
+			if (code === 0) {
+				return this.$message.error(res.msg);
+			} else {
+				this.$message.success('保存成功');
+				row.isEdit = false;
+				this.isEdit = false;
+				this.getList();
+			}
+		},
+
+		async del(row) {
+			const url = `/actual/base/safetyEquipmentInspectRecord/delete/${this.id}`;
+			const { data, code, msg } = await requestPost(url);
+
+			if (code === 0) {
+				return this.$message.error(res.msg);
+			} else {
+				this.$message.success('删除成功');
+				this.getList();
+			}
+		},
+
+		async getList() {
+			const params = {
+				equipmentId: this.id
+			};
+			const url = `/actual/base/safetyEquipmentInspectRecord/page`;
+			const { data, code, msg } = await requestPost(url, params);
+
+			if (code === 0) {
+				return this.$message.error(res.msg);
+			} else {
+				this.tableData = res.data.list.map(item => {
+					this.computeImgShowList(item);
+					return {
+						...item,
+						isEdit: false
+					};
+				});
+			}
+		}
+	}
+};
+</script>
+
+<style lang="scss" scoped>
+@import '@/assets/scss/buttonstyle.scss';
+@import '@/assets/scss/modules/management/list-main.scss';
+
+.mt10 {
+	margin-bottom: 10px;
+}
+.input-width {
+	width: 170px;
+}
+</style>