diff --git a/.env.development b/.env.development
index 65bdf2296..139b67286 100644
--- a/.env.development
+++ b/.env.development
@@ -1,6 +1,6 @@
 NODE_ENV=development
 
-VUE_APP_API_SERVER =  http://192.168.1.144/api
+VUE_APP_API_SERVER =  http://dcommunity-dev.elinkservice.cn:30801/api
 # VUE_APP_API_SERVER =  http://118.190.150.119:41080/api
 # VUE_APP_API_SERVER =  https://epmet-yantai.elinkservice.cn/api
 # VUE_APP_API_SERVER =  https://epmet-test.elinkservice.cn/api
diff --git a/src/views/modules/shequzhili/tuceng/anquan/yinhuan/index.vue b/src/views/modules/shequzhili/tuceng/anquan/yinhuan/index.vue
index a947a5d60..abf092032 100644
--- a/src/views/modules/shequzhili/tuceng/anquan/yinhuan/index.vue
+++ b/src/views/modules/shequzhili/tuceng/anquan/yinhuan/index.vue
@@ -1,10 +1,10 @@
 <template>
 	<div class="g-main">
-		<div >
+		<div>
 			<div class="m-search">
 				<el-form :inline="true" :model="formData" ref="ref_searchform" :label-width="'100px'">
 					<div>
-						<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>
@@ -19,7 +19,7 @@
 							</el-select>
 						</el-form-item>
 						<el-form-item label="隐患内容" prop="dangerContent">
-							<el-input v-model="formData.dangerContent"  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>
@@ -28,9 +28,7 @@
 							<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">
-							
-								<el-date-picker v-model="formData.reportTime" type="date" class="input-width" value-format="yyyy-MM-dd" placeholder="选择日期"></el-date-picker>
-							
+							<el-date-picker v-model="formData.reportTime" type="date" class="input-width" value-format="yyyy-MM-dd" placeholder="选择日期"></el-date-picker>
 						</el-form-item>
 						<el-row>
 							<el-col :span="24" align="right">
@@ -69,21 +67,36 @@
 				<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="gridName" align="center" label="所属组织" :show-overflow-tooltip="true"></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="reportTime" 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="200">
 						<template slot-scope="scope">
 							<el-button @click="handleAdd(scope.row, 'view')" type="text" size="small">查看</el-button>
-							
-							<el-button v-if="scope.row.latitude&&agencyId==scope.row.agencyId" style="margin-right: 10px" @click="handleAdd(scope.row, 'edit')" size="small" type="text">编辑</el-button>
-							<el-button v-if="!scope.row.latitude&&agencyId==scope.row.agencyId" style="margin-right: 10px" @click="handleAdd(scope.row, 'edit')" size="small" type="text">待完善</el-button>
-							<el-button @click="handleDel(scope.row)" v-if="agencyId==scope.row.agencyId" type="text" size="small" class="">删除</el-button>
+							<el-button
+								v-if="scope.row.latitude && agencyId == scope.row.agencyId"
+								style="margin-right: 10px"
+								@click="handleAdd(scope.row, 'edit')"
+								size="small"
+								type="text"
+							>
+								编辑
+							</el-button>
+							<el-button
+								v-if="!scope.row.latitude && agencyId == scope.row.agencyId"
+								style="margin-right: 10px"
+								@click="handleAdd(scope.row, 'edit')"
+								size="small"
+								type="text"
+							>
+								待完善
+							</el-button>
+							<el-button @click="handleDel(scope.row)" v-if="agencyId == scope.row.agencyId" type="text" size="small" class="">删除</el-button>
 						</template>
 					</el-table-column>
 				</el-table>
@@ -101,8 +114,10 @@
 				</div>
 			</div>
 		</div>
-		<div >
-			<addForm v-if="dialogVisible" :dialogVisible="dialogVisible"
+		<div>
+			<addForm
+				v-if="dialogVisible"
+				:dialogVisible="dialogVisible"
 				:pageType="pageType"
 				:disabled="disabled"
 				:detailId="detailId"
@@ -124,7 +139,8 @@ import axios from 'axios';
 
 export default {
 	data() {
-		return {dialogVisible: false,
+		return {
+			dialogVisible: false,
 			importLoading: false,
 			disabled: false,
 			user: '',
@@ -150,8 +166,7 @@ export default {
 			detailId: '',
 			detailData: {},
 			multipleSelection: [],
-			rowObj: {},
-			
+			rowObj: {}
 		};
 	},
 	components: { addForm },
@@ -232,7 +247,6 @@ export default {
 		handleAdd(row, type) {
 			if (row.id) {
 				this.detailId = row.id;
-				
 			}
 			this.pageType = type;
 			if (type == 'view') {
@@ -240,9 +254,10 @@ export default {
 			} else {
 				this.disabled = false;
 			}
-			this.dialogVisible=true;
+			this.dialogVisible = true;
 		},
-		handleClose() {this.dialogVisible = false;
+		handleClose() {
+			this.dialogVisible = false;
 			this.pageType = 'list';
 			this.detailId = '';
 			this.getTableData();
@@ -271,7 +286,7 @@ export default {
 		},
 		async del(id) {
 			const url = '/actual/base/hiddenDangerRecord/delete';
-			let idArr=[id]
+			let idArr = [id];
 			const { data, code, msg } = await requestPost(url, idArr);
 			if (code === 0) {
 				this.$message.success('删除成功！');
diff --git a/src/views/modules/shequzhili/tuceng/chengshiguanli/addForm.vue b/src/views/modules/shequzhili/tuceng/chengshiguanli/addForm.vue
index 8bcd2860c..1ae6669cb 100644
--- a/src/views/modules/shequzhili/tuceng/chengshiguanli/addForm.vue
+++ b/src/views/modules/shequzhili/tuceng/chengshiguanli/addForm.vue
@@ -32,7 +32,7 @@
 							<el-form-item label="场所地址" prop="address" style="display: block">
 								<el-select
 									v-model="formData.address"
-									style="width: 500px;"
+								
 									:disabled="disabled"
 									filterable
 									remote
@@ -293,7 +293,7 @@ export default {
 			const { data, code, msg } = await requestPost(url, params);
 			if (code === 0) {
 				this.$message.success('操作成功');
-				this.resetData();
+				
 				this.handleCancle();
 			} else if (code >= 8000) {
 				this.$message.error(msg);
diff --git a/src/views/modules/shequzhili/tuceng/chengshiguanli/index.vue b/src/views/modules/shequzhili/tuceng/chengshiguanli/index.vue
index 69477a83d..f3818a862 100644
--- a/src/views/modules/shequzhili/tuceng/chengshiguanli/index.vue
+++ b/src/views/modules/shequzhili/tuceng/chengshiguanli/index.vue
@@ -1,6 +1,6 @@
 <template>
 	<div class="g-main">
-		<div >
+		<div>
 			<div class="m-search">
 				<el-form :inline="true" :model="formData" ref="ref_searchform" :label-width="'100px'">
 					<div>
@@ -105,8 +105,10 @@
 				</div>
 			</div>
 		</div>
-		<div >
-			<addForm v-if="dialogVisible" :dialogVisible="dialogVisible"
+		<div>
+			<addForm
+				v-if="dialogVisible"
+				:dialogVisible="dialogVisible"
 				:pageType="pageType"
 				:disabled="disabled"
 				:detailId="detailId"
@@ -128,7 +130,8 @@ import axios from 'axios';
 
 export default {
 	data() {
-		return {dialogVisible: false,
+		return {
+			dialogVisible: false,
 			disabled: false,
 			user: '',
 			agencyId: '',
@@ -248,7 +251,6 @@ export default {
 		handleAdd(row, type) {
 			if (row.id) {
 				this.detailId = row.id;
-				
 			}
 			this.pageType = type;
 			if (type == 'view') {
@@ -256,9 +258,10 @@ export default {
 			} else {
 				this.disabled = false;
 			}
-			this.dialogVisible=true;
+			this.dialogVisible = true;
 		},
-		handleClose() {this.dialogVisible = false;
+		handleClose() {
+			this.dialogVisible = false;
 			this.pageType = 'list';
 			this.detailId = '';
 			this.getTableData();
diff --git a/src/views/modules/shequzhili/tuceng/gonggongfuwu/addForm.vue b/src/views/modules/shequzhili/tuceng/gonggongfuwu/addForm.vue
index 7f83291fe..a1a7ce150 100644
--- a/src/views/modules/shequzhili/tuceng/gonggongfuwu/addForm.vue
+++ b/src/views/modules/shequzhili/tuceng/gonggongfuwu/addForm.vue
@@ -36,12 +36,11 @@
 								<el-input v-model="formData.contactNum" :disabled="disabled" class="u-item-width-normal" size="small" clearable placeholder="请输入"></el-input>
 							</el-form-item>
 						</el-col>
-						<el-col :span="6">
+						<el-col :span="18">
 							<el-form-item label="所处位置" prop="location" style="display: block">
 								<!-- <el-input v-model="formData.location" :disabled="disabled" class="u-item-width-normal" size="small" clearable placeholder="请输入"></el-input> -->
 								<el-select
 									v-model="formData.location"
-									style="width: 500px;"
 									:disabled="disabled"
 									filterable
 									remote
@@ -65,7 +64,7 @@
 				</el-form>
 				<el-form :inline="false" :model="formData" ref="form" :label-width="'90px'" v-if="pageType == 'view'">
 					<el-row>
-						<el-col :span="8">
+						<el-col :span="6">
 							<el-form-item label="设备名称" prop="equipmentName">{{ formData.equipmentName }}</el-form-item>
 						</el-col>
 						<el-col :span="6">
@@ -199,7 +198,7 @@ export default {
 		this.agencyId = this.user.agencyId;
 		this.startLoading();
 		// this.loadGrid();
-		// this.loadplaceType();
+		this.loadplaceType();
 		if (this.pageType != 'add') {
 			this.getDetail();
 		} else {
@@ -227,7 +226,7 @@ export default {
 		async loadplaceType() {
 			const url = '/sys/dict/data/dictlist';
 			let params = {
-				dict_type: 'common_service_equipment_category'
+				dictType: 'common_service_equipment_category'
 			};
 			const { data, code, msg } = await requestPost(url, params);
 			if (code === 0) {
@@ -291,7 +290,7 @@ export default {
 			if (code === 0) {
 				this.$message.success('添加成功');
 				// this.resetData();
-				// this.$emit('handleComfirm');
+				this.$emit('handleComfirm');
 			} else if (code >= 8000) {
 				this.$message.error(msg);
 			}
diff --git a/src/views/modules/shequzhili/tuceng/gonggongfuwu/index.vue b/src/views/modules/shequzhili/tuceng/gonggongfuwu/index.vue
index e5cb2209d..ff02ecc5d 100644
--- a/src/views/modules/shequzhili/tuceng/gonggongfuwu/index.vue
+++ b/src/views/modules/shequzhili/tuceng/gonggongfuwu/index.vue
@@ -1,6 +1,6 @@
 <template>
 	<div class="g-main">
-		<div >
+		<div>
 			<div class="m-search">
 				<el-form :inline="true" :model="formData" ref="ref_searchform" :label-width="'100px'">
 					<div>
@@ -53,21 +53,36 @@
 				<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 label="所属社区" prop="agencyName" align="center" width="100" />
 					<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="equipmentCategoryName" align="center" width="80" label="设备类型"></el-table-column>
+					<el-table-column prop="location" label="所处位置"  align="center" :show-overflow-tooltip="true" />
+					<el-table-column prop="principalName" align="center"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 fixed="right" label="操作" align="center" width="200">
 						<template slot-scope="scope">
 							<el-button @click="handleAdd(scope.row, 'view')" type="text" size="small">查看</el-button>
-							
-							<el-button v-if="scope.row.latitude&&agencyId==scope.row.agencyId" style="margin-right: 10px" @click="handleAdd(scope.row, 'edit')" size="small" type="text">编辑</el-button>
-							<el-button v-if="!scope.row.latitude&&agencyId==scope.row.agencyId" style="margin-right: 10px" @click="handleAdd(scope.row, 'edit')" size="small" type="text">待完善</el-button>
-							<el-button @click="handleDel(scope.row)" v-if="agencyId==scope.row.agencyId" type="text" size="small" class="">删除</el-button>
+
+							<el-button
+								v-if="scope.row.latitude && agencyId == scope.row.agencyId"
+								style="margin-right: 10px"
+								@click="handleAdd(scope.row, 'edit')"
+								size="small"
+								type="text"
+							>
+								编辑
+							</el-button>
+							<el-button
+								v-if="!scope.row.latitude && agencyId == scope.row.agencyId"
+								style="margin-right: 10px"
+								@click="handleAdd(scope.row, 'edit')"
+								size="small"
+								type="text"
+							>
+								待完善
+							</el-button>
+							<el-button @click="handleDel(scope.row)" v-if="agencyId == scope.row.agencyId" type="text" size="small" class="">删除</el-button>
 						</template>
 					</el-table-column>
 				</el-table>
@@ -85,8 +100,10 @@
 				</div>
 			</div>
 		</div>
-		<div >
-			<addForm v-if="dialogVisible" :dialogVisible="dialogVisible"
+		<div>
+			<addForm
+				v-if="dialogVisible"
+				:dialogVisible="dialogVisible"
 				:pageType="pageType"
 				:disabled="disabled"
 				:detailId="detailId"
@@ -108,7 +125,8 @@ import axios from 'axios';
 
 export default {
 	data() {
-		return {dialogVisible: false,
+		return {
+			dialogVisible: false,
 			importLoading: false,
 			disabled: false,
 			user: '',
@@ -185,7 +203,7 @@ export default {
 		async loadplaceType() {
 			const url = '/sys/dict/data/dictlist';
 			let params = {
-				dict_type: 'common_service_equipment_category'
+				dictType: 'common_service_equipment_category'
 			};
 
 			const { data, code, msg } = await requestPost(url, params);
@@ -236,7 +254,6 @@ export default {
 			console.log(row);
 			if (row.id) {
 				this.detailId = row.id;
-				
 			}
 			this.pageType = type;
 			if (type == 'view') {
@@ -244,9 +261,10 @@ export default {
 			} else {
 				this.disabled = false;
 			}
-			this.dialogVisible=true;
+			this.dialogVisible = true;
 		},
-		handleClose() {this.dialogVisible = false;
+		handleClose() {
+			this.dialogVisible = false;
 			this.pageType = 'list';
 			this.detailId = '';
 			this.getTableData();
@@ -275,7 +293,7 @@ export default {
 		},
 		async del(id) {
 			const url = '/actual/base/commonServiceEquipment/delete';
-			let idArr=[id]
+			let idArr = [id];
 			const { data, code, msg } = await requestPost(url, idArr);
 			if (code === 0) {
 				this.$message.success('删除成功！');
diff --git a/src/views/modules/shequzhili/tuceng/yingji/changsuo/addForm.vue b/src/views/modules/shequzhili/tuceng/yingji/changsuo/addForm.vue
index 05716d41f..f11759caf 100644
--- a/src/views/modules/shequzhili/tuceng/yingji/changsuo/addForm.vue
+++ b/src/views/modules/shequzhili/tuceng/yingji/changsuo/addForm.vue
@@ -28,7 +28,7 @@
 						</el-col>
 						<el-col :span="6">
 							<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-input v-model="formData.capacity" type="number" :disabled="disabled" class="u-item-width-normal" size="small" clearable placeholder="请输入"></el-input>
 							</el-form-item>
 						</el-col>
 						<el-col :span="6">
@@ -58,20 +58,20 @@
 				</el-form>
 				<el-form :inline="false" :model="formData" ref="form" :label-width="'90px'" v-if="pageType == 'view'">
 					<el-row>
-						<el-col :span="8">
-							<el-form-item label="设备名称" prop="equipmentName">{{ formData.equipmentName }}</el-form-item>
+						<el-col :span="6">
+							<el-form-item label="场所名称" prop="name">{{ formData.name }}</el-form-item>
 						</el-col>
 						<el-col :span="6">
-							<el-form-item label="设备类型" prop="equipmentCategoryCode">{{ formData.equipmentCategoryName }}</el-form-item>
+							<el-form-item label="场所类型" prop="categoryName">{{ formData.categoryName }}</el-form-item>
 						</el-col>
 						<el-col :span="6">
-							<el-form-item label="负责人" prop="principalName">{{ formData.principalName }}</el-form-item>
+							<el-form-item label="占地面积" prop="areaCovered">{{ formData.areaCovered }}</el-form-item>
 						</el-col>
 						<el-col :span="6">
-							<el-form-item label="联系电话" prop="contactNum">{{ formData.contactNum }}</el-form-item>
+							<el-form-item label="场所规模" prop="capacity">{{ formData.capacity }}</el-form-item>
 						</el-col>
 						<el-col :span="6">
-							<el-form-item label="场所地址" prop="location" style="display: block">{{ formData.location }}</el-form-item>
+							<el-form-item label="场所地址" prop="address" style="display: block">{{ formData.address }}</el-form-item>
 						</el-col>
 					</el-row>
 					<div id="app_event" class="div_map"></div>
@@ -189,7 +189,7 @@ export default {
 		this.agencyId = this.user.agencyId;
 		this.startLoading();
 		// this.loadGrid();
-		// this.loadplaceType();
+		this.loadplaceType();
 		if (this.pageType != 'add') {
 			this.getDetail();
 		} else {
@@ -217,7 +217,9 @@ export default {
 		async loadplaceType() {
 			const url = '/sys/dict/data/dictlist';
 			let params = {
-				dict_type: 'emergency_site_type'
+				dictType: 'emergency_site_type'
+			
+				// purpose: 'query'
 			};
 			const { data, code, msg } = await requestPost(url, params);
 			if (code === 0) {
@@ -227,7 +229,7 @@ export default {
 			}
 		},
 		async getDetail() {
-			const url = `/actual/base/safetyEquipment/detail/${this.detailId}`;
+			const url = `/actual/base/emergencySites/detail/${this.detailId}`;
 			const { data, code, msg } = await requestPost(url);
 			if (code === 0) {
 				console.log('详情数据', data);
diff --git a/src/views/modules/shequzhili/tuceng/yingji/changsuo/index.vue b/src/views/modules/shequzhili/tuceng/yingji/changsuo/index.vue
index 1206975e8..1e54ea5a6 100644
--- a/src/views/modules/shequzhili/tuceng/yingji/changsuo/index.vue
+++ b/src/views/modules/shequzhili/tuceng/yingji/changsuo/index.vue
@@ -177,7 +177,7 @@ export default {
 		async loadplaceType() {
 			const url = '/sys/dict/data/dictlist';
 			let params = {
-				dict_type: 'emergency_site_type'
+				dictType: 'emergency_site_type'
 
 				// purpose: 'query'
 			};
@@ -226,8 +226,8 @@ export default {
 				});
 		},
 		handleAdd(row, type) {
-			if (row.equipmentId) {
-				this.detailId = row.equipmentId;
+			if (row.id) {
+				this.detailId = row.id;
 				
 			}
 			this.pageType = type;
@@ -261,7 +261,7 @@ export default {
 				type: 'warning'
 			})
 				.then(() => {
-					this.del(rowData.equipmentId);
+					this.del(rowData.id);
 				})
 				.catch(err => {});
 		},
diff --git a/src/views/modules/shequzhili/tuceng/yingji/wuzi/index.vue b/src/views/modules/shequzhili/tuceng/yingji/wuzi/index.vue
index d8b87e143..3ee50d617 100644
--- a/src/views/modules/shequzhili/tuceng/yingji/wuzi/index.vue
+++ b/src/views/modules/shequzhili/tuceng/yingji/wuzi/index.vue
@@ -64,15 +64,15 @@
 					<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="equipmentCategoryName" 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-if="scope.row.latestInspectResult === '0'">异常</span>
+							<span v-else-if="scope.row.latestInspectResult === '1'">正常</span>
 							<span v-else>--</span>
 						</template>
 					</el-table-column>
diff --git a/src/views/modules/shequzhili/tuceng/yingji/zizuzhi/addForm.vue b/src/views/modules/shequzhili/tuceng/yingji/zizuzhi/addForm.vue
index 157bcb0a8..f1cb3a2af 100644
--- a/src/views/modules/shequzhili/tuceng/yingji/zizuzhi/addForm.vue
+++ b/src/views/modules/shequzhili/tuceng/yingji/zizuzhi/addForm.vue
@@ -10,7 +10,7 @@
 				<el-form :inline="true" :model="formData" ref="form" :rules="dataRule" :label-width="'90px'" v-if="pageType != 'view'">
 					<el-row>
 						<el-col :span="6">
-							<el-form-item label="组织名称" prop="name">
+							<el-form-item label="组织名称" prop="organizationName">
 								<el-input v-model="formData.organizationName" class="u-item-width-normal" size="small" clearable placeholder="请输入"></el-input>
 							</el-form-item>
 						</el-col>
@@ -22,7 +22,7 @@
 							</el-form-item>
 						</el-col>
 						<el-col :span="6">
-							<el-form-item label="组织人数" prop="areaCovered">
+							<el-form-item label="组织人数" prop="organizationPersonCount">
 								<el-input
 									v-model="formData.organizationPersonCount"
 									:disabled="disabled"
@@ -37,7 +37,7 @@
 						<el-col :span="24">
 							<el-form-item label="组织成员" prop="organizationPersonnel">
 								<div class="m-staffs">
-									<div  style="width:500px;" :key="'staff' + index" v-for="(item, index) in formData.organizationPersonnel">
+									<div style="width:500px;" :key="'staff' + index" v-for="(item, index) in formData.organizationPersonnel">
 										<el-row :gutter="10" style="margin-bottom: 10px;">
 											<el-col :span="8">
 												<el-autocomplete
@@ -53,7 +53,6 @@
 											</el-col>
 											<el-col :span="8">
 												<el-input
-													
 													class="item_width_1"
 													show-word-limit
 													placeholder="联系电话"
@@ -61,10 +60,10 @@
 													v-model="item.personPhone"
 												/>
 											</el-col>
-											<el-col :span="8"><el-button type="danger"  size="small" @click="handleDelStaff(index)">删除</el-button></el-col>
+											<el-col :span="8"><el-button type="danger" size="small" @click="handleDelStaff(index)">删除</el-button></el-col>
 										</el-row>
 									</div>
-									<el-button size="small" @click="handleAddStaff" type="primary" >添加</el-button>
+									<el-button size="small" @click="handleAddStaff" type="primary">添加</el-button>
 								</div>
 							</el-form-item>
 						</el-col>
@@ -130,19 +129,40 @@
 				<el-form :inline="false" :model="formData" ref="form" :label-width="'90px'" 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="organizationName">{{ formData.organizationName }}</el-form-item>
 						</el-col>
 						<el-col :span="6">
-							<el-form-item label="设备类型" prop="equipmentCategoryCode">{{ formData.equipmentCategoryName }}</el-form-item>
+							<el-form-item label="分类名称" prop="categoryName">{{ formData.categoryName }}</el-form-item>
 						</el-col>
 						<el-col :span="6">
-							<el-form-item label="负责人" prop="principalName">{{ formData.principalName }}</el-form-item>
+							<el-form-item label="组织人数" prop="organizationPersonCount">{{ formData.organizationPersonCount }}</el-form-item>
 						</el-col>
 						<el-col :span="6">
-							<el-form-item label="联系电话" prop="contactNum">{{ formData.contactNum }}</el-form-item>
+							<el-form-item label="组织成员" prop="organizationPersonnel">
+								<div class="m-staffs">
+									<div style="width:500px;" :key="'staff' + index" v-for="(item, index) in formData.organizationPersonnel">
+										<el-row :gutter="10" style="margin-bottom: 10px;">
+											<el-col :span="8">{{ item.personName }}</el-col>
+											<el-col :span="8">{{ item.personPhone }}</el-col>
+										</el-row>
+									</div>
+								</div>
+							</el-form-item>
+						</el-col>
+						<el-col :span="6">
+							<el-form-item label="服务事项" prop="serviceItem" style="display: block">{{ formData.serviceItem }}</el-form-item>
+						</el-col>
+						<el-col :span="6">
+							<el-form-item label="负责人" prop="principalName" style="display: block">{{ formData.principalName }}</el-form-item>
+						</el-col>
+						<el-col :span="6">
+							<el-form-item label="联系电话" prop="principalPhone" style="display: block">{{ formData.principalPhone }}</el-form-item>
+						</el-col>
+						<el-col :span="6">
+							<el-form-item label="创建时间" prop="organizationCreatedTime" style="display: block">{{ formData.organizationCreatedTime }}</el-form-item>
 						</el-col>
 						<el-col :span="6">
-							<el-form-item label="场所地址" prop="location" style="display: block">{{ formData.location }}</el-form-item>
+							<el-form-item label="详细地址" prop="address" style="display: block">{{ formData.address }}</el-form-item>
 						</el-col>
 					</el-row>
 					<div id="app_event" class="div_map"></div>
@@ -422,7 +442,7 @@ export default {
 				url = '/actual/base/iccommunityselforganization/editcommunityselforganization';
 				// this.dataForm.orgId = this.orgId;
 			}
-           console.log("this.",this.formData)
+			console.log('this.', this.formData);
 			let params = { ...this.formData };
 			const { data, code, msg } = await requestPost(url, params);
 			if (code === 0) {
@@ -545,5 +565,7 @@ export default {
 @import '@/assets/scss/modules/management/form-main.scss';
 @import '@/assets/scss/modules/management/form.scss';
 @import '@/assets/scss/modules/visual/a_customize.scss';
-.textarea{width: 500px;}
+.textarea {
+	width: 500px;
+}
 </style>
diff --git a/vue.config.js b/vue.config.js
index 32ae7f1f3..1d21a7481 100644
--- a/vue.config.js
+++ b/vue.config.js
@@ -33,7 +33,7 @@ module.exports = {
 				target: "http://bipaas.elinkservice.cn", // 我们要代理的真实接口地址
 			},
 		},
-		open: true,
+		open: false,
 		port: 9001,
 		overlay: {
 			errors: true,