From 1ded39fced7b930e8051bf314d73920a728da360 Mon Sep 17 00:00:00 2001
From: tianq <tianq@hgzp.com.cn>
Date: Thu, 30 Mar 2023 16:05:17 +0800
Subject: [PATCH] =?UTF-8?q?=E5=8E=BB=E9=99=A4=E6=89=B9=E9=87=8F=E6=A1=86?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../tuceng/anquan/anquanxuncha/addForm.vue    |  2 +-
 .../tuceng/anquan/anquanxuncha/index.vue      | 49 +++++++++++++------
 .../shequzhili/tuceng/anquan/shebei/index.vue |  2 +-
 .../tuceng/anquan/yinhuan/index.vue           |  2 +-
 .../shequzhili/tuceng/gonggongfuwu/index.vue  |  2 +-
 .../tuceng/yingji/changsuo/index.vue          |  2 +-
 .../shequzhili/tuceng/yingji/wuzi/index.vue   |  2 +-
 7 files changed, 40 insertions(+), 21 deletions(-)

diff --git a/src/views/modules/shequzhili/tuceng/anquan/anquanxuncha/addForm.vue b/src/views/modules/shequzhili/tuceng/anquan/anquanxuncha/addForm.vue
index c848f5353..19ca8c901 100644
--- a/src/views/modules/shequzhili/tuceng/anquan/anquanxuncha/addForm.vue
+++ b/src/views/modules/shequzhili/tuceng/anquan/anquanxuncha/addForm.vue
@@ -106,7 +106,7 @@
 							<el-form-item label="负责人" prop="personInCharge">{{ formData.personInCharge }}</el-form-item>
 						</el-col>
 						<el-col :span="6">
-							<el-form-item label="联系电话" prop="mobile">{{ formData.areaCovered }}</el-form-item>
+							<el-form-item label="联系电话" prop="mobile">{{ formData.mobile }}</el-form-item>
 						</el-col>
 						<el-col :span="16">
 							<el-form-item label="场所地址" prop="address" style="display: block">{{ formData.address }}</el-form-item>
diff --git a/src/views/modules/shequzhili/tuceng/anquan/anquanxuncha/index.vue b/src/views/modules/shequzhili/tuceng/anquan/anquanxuncha/index.vue
index 7f9f29ff7..72fbd3bdd 100644
--- a/src/views/modules/shequzhili/tuceng/anquan/anquanxuncha/index.vue
+++ b/src/views/modules/shequzhili/tuceng/anquan/anquanxuncha/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>
@@ -23,7 +23,8 @@
 							</el-select>
 						</el-form-item>
 						<el-form-item label="场所规模" prop="scaleTotal">
-							<el-input v-model="formData.scaleTotal" class="u-item-width-normal" size="small" clearable placeholder="请输入"></el-input>
+							<el-input-number v-model="formData.scaleTotal" class="u-item-width-normal" size="small" clearable placeholder="请输入">
+							</el-input-number>
 						</el-form-item>
 						<el-form-item label="所属组织" prop="gridId">
 							<el-select class="u-item-width-normal" v-model="formData.gridId" placeholder="全部" size="small" clearable>
@@ -74,8 +75,9 @@
 					<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="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="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="placeTypeName" label="场所类型" align="center" :show-overflow-tooltip="true"></el-table-column>
@@ -94,10 +96,26 @@
 					<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>
@@ -115,9 +133,10 @@
 				</div>
 			</div>
 		</div>
-		<div >
+		<div>
 			<addForm
-			v-if="dialogVisible" :dialogVisible="dialogVisible"
+				v-if="dialogVisible"
+				:dialogVisible="dialogVisible"
 				:pageType="pageType"
 				:disabled="disabled"
 				:detailId="detailId"
@@ -139,7 +158,8 @@ import axios from 'axios';
 
 export default {
 	data() {
-		return {dialogVisible: false,
+		return {
+			dialogVisible: false,
 			disabled: false,
 			user: '',
 			agencyId: '',
@@ -262,10 +282,8 @@ export default {
 				});
 		},
 		handleAdd(row, type) {
-			
 			if (row.enterpriseId) {
 				this.detailId = row.enterpriseId;
-				
 			}
 			this.pageType = type;
 			if (type == 'view') {
@@ -273,9 +291,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();
@@ -304,7 +323,7 @@ export default {
 		},
 		async del(id) {
 			const url = `/actual/base/enterprise/delete/${id}`;
-			
+
 			const { data, code, msg } = await requestPost(url);
 			if (code === 0) {
 				this.$message.success('删除成功！');
diff --git a/src/views/modules/shequzhili/tuceng/anquan/shebei/index.vue b/src/views/modules/shequzhili/tuceng/anquan/shebei/index.vue
index 2ab08bd93..556cad95c 100644
--- a/src/views/modules/shequzhili/tuceng/anquan/shebei/index.vue
+++ b/src/views/modules/shequzhili/tuceng/anquan/shebei/index.vue
@@ -54,7 +54,7 @@
 					<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="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>
diff --git a/src/views/modules/shequzhili/tuceng/anquan/yinhuan/index.vue b/src/views/modules/shequzhili/tuceng/anquan/yinhuan/index.vue
index 0a1db6627..a947a5d60 100644
--- a/src/views/modules/shequzhili/tuceng/anquan/yinhuan/index.vue
+++ b/src/views/modules/shequzhili/tuceng/anquan/yinhuan/index.vue
@@ -67,7 +67,7 @@
 					<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="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="location" align="center" width="80" label="隐患位置"></el-table-column>
diff --git a/src/views/modules/shequzhili/tuceng/gonggongfuwu/index.vue b/src/views/modules/shequzhili/tuceng/gonggongfuwu/index.vue
index 16d4ba044..e5cb2209d 100644
--- a/src/views/modules/shequzhili/tuceng/gonggongfuwu/index.vue
+++ b/src/views/modules/shequzhili/tuceng/gonggongfuwu/index.vue
@@ -51,7 +51,7 @@
 					<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="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>
diff --git a/src/views/modules/shequzhili/tuceng/yingji/changsuo/index.vue b/src/views/modules/shequzhili/tuceng/yingji/changsuo/index.vue
index 5144cf658..1206975e8 100644
--- a/src/views/modules/shequzhili/tuceng/yingji/changsuo/index.vue
+++ b/src/views/modules/shequzhili/tuceng/yingji/changsuo/index.vue
@@ -51,7 +51,7 @@
 					<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="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>
diff --git a/src/views/modules/shequzhili/tuceng/yingji/wuzi/index.vue b/src/views/modules/shequzhili/tuceng/yingji/wuzi/index.vue
index 8eb0ad608..d8b87e143 100644
--- a/src/views/modules/shequzhili/tuceng/yingji/wuzi/index.vue
+++ b/src/views/modules/shequzhili/tuceng/yingji/wuzi/index.vue
@@ -60,7 +60,7 @@
 					<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="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>