From fee68af174b30545d09f2dffbc028d91dad8256b Mon Sep 17 00:00:00 2001
From: tianq <tianq>
Date: Fri, 14 Apr 2023 14:48:02 +0800
Subject: [PATCH] =?UTF-8?q?=E6=96=B0=E5=A2=9E=E6=98=BE=E7=A4=BA=E8=AE=B0?=
 =?UTF-8?q?=E5=BD=95=EF=BC=8C=E5=9C=B0=E5=9B=BE=E6=8B=96=E6=8B=BD?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../tuceng/anquan/anquanxuncha/addForm.vue      | 10 ++++++----
 .../tuceng/anquan/anquanxuncha/index.vue        | 17 +++++++++++++----
 .../tuceng/anquan/anquanxuncha/record.vue       |  4 ++--
 .../shequzhili/tuceng/anquan/shebei/addForm.vue |  6 ++++--
 .../shequzhili/tuceng/anquan/shebei/index.vue   | 10 ++++++++++
 .../tuceng/anquan/yinhuan/addForm.vue           |  6 ++++--
 .../shequzhili/tuceng/anquan/yinhuan/index.vue  | 10 ++++++++++
 .../tuceng/chengshiguanli/addForm.vue           |  4 +++-
 .../shequzhili/tuceng/chengshiguanli/index.vue  | 10 ++++++++++
 .../shequzhili/tuceng/gonggongfuwu/index.vue    | 10 ++++++++++
 .../tuceng/yingji/changsuo/addForm.vue          |  6 ++++--
 .../shequzhili/tuceng/yingji/changsuo/index.vue | 10 ++++++++++
 .../shequzhili/tuceng/yingji/wuzi/addForm.vue   |  6 ++++--
 .../shequzhili/tuceng/yingji/wuzi/index.vue     | 10 ++++++++++
 .../tuceng/yingji/zizuzhi/addForm.vue           |  4 +++-
 .../shequzhili/tuceng/yingji/zizuzhi/index.vue  | 10 ++++++++++
 16 files changed, 113 insertions(+), 20 deletions(-)

diff --git a/src/views/modules/shequzhili/tuceng/anquan/anquanxuncha/addForm.vue b/src/views/modules/shequzhili/tuceng/anquan/anquanxuncha/addForm.vue
index 55986d814..dfdfccaa8 100644
--- a/src/views/modules/shequzhili/tuceng/anquan/anquanxuncha/addForm.vue
+++ b/src/views/modules/shequzhili/tuceng/anquan/anquanxuncha/addForm.vue
@@ -126,7 +126,7 @@
 				<!-- <el-button size="small" @click="resetData" v-if="pageType != 'view'">重置</el-button> -->
 				<el-button size="small" type="primary" :disabled="btnDisable" @click="handleComfirm">保 存</el-button>
 			</div>
-			<div class="recordBox"><record v-if="pageType != 'add' && detailId" :formType="pageType" :id="detailId" :info="{ agencyId: agencyId }"></record></div>
+			<div class="recordBox"><record :disabled="disabled" :formType="pageType" :id="detailId" :info="{ agencyId: agencyId }"></record></div>
 		</div>
 
 		<span slot="footer" class="dialog-footer">
@@ -230,7 +230,7 @@ export default {
 				scaleTotal: [{ required: true, validator: checkNum, trigger: 'bulr' }],
 				gridId: [{ required: true, message: '所属组织不能为空', trigger: 'bulr' }],
 				personInCharge: [{ required: true, message: '负责人不能为空', trigger: 'bulr' }],
-				mobile: [{ required: true,message: '联系电话不能为空', trigger: 'blur' }],
+				mobile: [{ required: true, message: '联系电话不能为空', trigger: 'blur' }],
 				address: [{ required: true, message: '场所地址不能为空', trigger: 'blur' }]
 				// content: [{ required: true, message: '详细说明不能为空', trigger: 'bulr' }, { max: 1000, message: '不能超出1000个字符', trigger: 'blur' }]
 			},
@@ -390,7 +390,9 @@ export default {
 				);
 				// 监听地图平移结束
 				map.on('dragend', e => {
-					this.handleMoveCenter(e);
+					if (!this.disabled) {
+						this.handleMoveCenter(e);
+					}
 				});
 
 				map.setCenter(latitude, longitude);
@@ -457,6 +459,6 @@ export default {
 @import '@/assets/scss/modules/management/form.scss';
 @import '@/assets/scss/modules/visual/a_customize.scss';
 .el-dialog__body {
-    padding: 30px 80px;
+	padding: 30px 80px;
 }
 </style>
diff --git a/src/views/modules/shequzhili/tuceng/anquan/anquanxuncha/index.vue b/src/views/modules/shequzhili/tuceng/anquan/anquanxuncha/index.vue
index 093a79983..407b480be 100644
--- a/src/views/modules/shequzhili/tuceng/anquan/anquanxuncha/index.vue
+++ b/src/views/modules/shequzhili/tuceng/anquan/anquanxuncha/index.vue
@@ -23,8 +23,7 @@
 							</el-select>
 						</el-form-item>
 						<el-form-item label="场所规模" prop="scaleTotal">
-							<el-input type="number" v-model="formData.scaleTotal" class="u-item-width-normal" size="small" clearable placeholder="请输入">
-							</el-input>
+							<el-input type="number" v-model="formData.scaleTotal" class="u-item-width-normal" size="small" clearable placeholder="请输入"></el-input>
 						</el-form-item>
 						<el-form-item label="所属组织" prop="gridId">
 							<el-select class="u-item-width-normal" v-model="formData.gridId" placeholder="全部" size="small" clearable>
@@ -88,8 +87,8 @@
 					<el-table-column prop="latestPatrolTime" align="center" width="100" label="最新检查时间" :show-overflow-tooltip="true"></el-table-column>
 					<el-table-column prop="latestResultName" 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.latestResult === '1'">合格</span>
+							<span v-else-if="scope.row.latestResult === '0'">不合格</span>
 							<span v-else>--</span>
 						</template>
 					</el-table-column>
@@ -437,6 +436,16 @@ export default {
 		async uploadHttpRequest(file) {
 			this.importLoading = true;
 			this.importBtnTitle = '正在上传中...';
+			this.$message({
+				showClose: true,
+				dangerouslyUseHTMLString: true,
+				message: "导入中，请到系统管理-<a id='clickA' style='cursor: pointer;'>导入记录</a>中查看进度",
+				duration: 3000
+			});
+			let than = this;
+			document.getElementById('clickA').addEventListener('click', function() {
+				than.$router.replace('/main/importRecord-index');
+			});
 			const formData = new FormData(); //FormData对象，添加参数只能通过append('key', value)的形式添加
 			formData.append('file', file.file); //添加文件对象
 			formData.append('code', ''); //添加文件对象
diff --git a/src/views/modules/shequzhili/tuceng/anquan/anquanxuncha/record.vue b/src/views/modules/shequzhili/tuceng/anquan/anquanxuncha/record.vue
index 08eeef03c..c72f8f833 100644
--- a/src/views/modules/shequzhili/tuceng/anquan/anquanxuncha/record.vue
+++ b/src/views/modules/shequzhili/tuceng/anquan/anquanxuncha/record.vue
@@ -54,7 +54,7 @@
 						</template>
 					</el-table-column>
 
-					<!-- <el-table-column
+					<el-table-column
 						prop="detailed"
 						label="隐患明细"
 						align="center"
@@ -74,7 +74,7 @@
 								{{ scope.row.detailed }}
 							</div>
 						</template>
-					</el-table-column> -->
+					</el-table-column>
 
 					<el-table-column prop="imgList" label="图片列表" align="center">
 						<template slot-scope="scope">
diff --git a/src/views/modules/shequzhili/tuceng/anquan/shebei/addForm.vue b/src/views/modules/shequzhili/tuceng/anquan/shebei/addForm.vue
index 731358004..a380b329a 100644
--- a/src/views/modules/shequzhili/tuceng/anquan/shebei/addForm.vue
+++ b/src/views/modules/shequzhili/tuceng/anquan/shebei/addForm.vue
@@ -82,7 +82,7 @@
 				<!-- <el-button size="small" @click="resetData" v-if="pageType != 'view'">重置</el-button> -->
 				<el-button size="small" type="primary" :disabled="btnDisable" @click="handleComfirm">确 定</el-button>
 			</div>
-			<div class="recordBox"><record v-if="pageType != 'add' && detailId" :formType="pageType" :id="detailId" :info="{ agencyId: agencyId }"></record></div>
+			<div class="recordBox"><record :disabled="disabled" :formType="pageType" :id="detailId" :info="{ agencyId: agencyId }"></record></div>
 		</div>
 		<span slot="footer" class="dialog-footer">
 			<el-button @click="handleCancle">关 闭</el-button>
@@ -342,7 +342,9 @@ export default {
 				);
 				// 监听地图平移结束
 				map.on('dragend', e => {
-					this.handleMoveCenter(e);
+					if (!this.disabled) {
+						this.handleMoveCenter(e);
+					}
 				});
 
 				map.setCenter(latitude, longitude);
diff --git a/src/views/modules/shequzhili/tuceng/anquan/shebei/index.vue b/src/views/modules/shequzhili/tuceng/anquan/shebei/index.vue
index a17445ffa..b86c8cc2f 100644
--- a/src/views/modules/shequzhili/tuceng/anquan/shebei/index.vue
+++ b/src/views/modules/shequzhili/tuceng/anquan/shebei/index.vue
@@ -418,6 +418,16 @@ export default {
 		async uploadHttpRequest(file) {
 			this.importLoading = true;
 			this.importBtnTitle = '正在上传中...';
+			this.$message({
+				showClose: true,
+				dangerouslyUseHTMLString: true,
+				message: "导入中，请到系统管理-<a id='clickA' style='cursor: pointer;'>导入记录</a>中查看进度",
+				duration: 3000
+			});
+			let than = this;
+			document.getElementById('clickA').addEventListener('click', function() {
+				than.$router.replace('/main/importRecord-index');
+			});
 			const formData = new FormData(); //FormData对象，添加参数只能通过append('key', value)的形式添加
 			formData.append('file', file.file); //添加文件对象
 			formData.append('code', ''); //添加文件对象
diff --git a/src/views/modules/shequzhili/tuceng/anquan/yinhuan/addForm.vue b/src/views/modules/shequzhili/tuceng/anquan/yinhuan/addForm.vue
index 1d3dd6898..3314cd7d7 100644
--- a/src/views/modules/shequzhili/tuceng/anquan/yinhuan/addForm.vue
+++ b/src/views/modules/shequzhili/tuceng/anquan/yinhuan/addForm.vue
@@ -161,7 +161,7 @@
 				<!-- <el-button size="small" @click="resetData" v-if="pageType != 'view'">重置</el-button> -->
 				<el-button size="small" type="primary" :disabled="btnDisable" @click="handleComfirm">确 定</el-button>
 			</div>
-			<div class="recordBox"><record v-if="pageType != 'add' && detailId" :formType="pageType" :id="detailId" :info="{ agencyId: agencyId }"></record></div>
+			<div class="recordBox"><record  :disabled="disabled" :formType="pageType" :id="detailId" :info="{ agencyId: agencyId }"></record></div>
 		</div>
 		<span slot="footer" class="dialog-footer">
 			<el-button @click="handleCancle">关 闭</el-button>
@@ -403,7 +403,9 @@ export default {
 				);
 				// 监听地图平移结束
 				map.on('dragend', e => {
-					this.handleMoveCenter(e);
+					if (!this.disabled) {
+						this.handleMoveCenter(e);
+					}
 				});
 
 				map.setCenter(latitude, longitude);
diff --git a/src/views/modules/shequzhili/tuceng/anquan/yinhuan/index.vue b/src/views/modules/shequzhili/tuceng/anquan/yinhuan/index.vue
index 32f68cd63..7f4ffd921 100644
--- a/src/views/modules/shequzhili/tuceng/anquan/yinhuan/index.vue
+++ b/src/views/modules/shequzhili/tuceng/anquan/yinhuan/index.vue
@@ -400,6 +400,16 @@ export default {
 		async uploadHttpRequest(file) {
 			this.importLoading = true;
 			this.importBtnTitle = '正在上传中...';
+			this.$message({
+				showClose: true,
+				dangerouslyUseHTMLString: true,
+				message: "导入中，请到系统管理-<a id='clickA' style='cursor: pointer;'>导入记录</a>中查看进度",
+				duration: 3000
+			});
+			let than = this;
+			document.getElementById('clickA').addEventListener('click', function() {
+				than.$router.replace('/main/importRecord-index');
+			});
 			const formData = new FormData(); //FormData对象，添加参数只能通过append('key', value)的形式添加
 			formData.append('file', file.file); //添加文件对象
 			formData.append('code', ''); //添加文件对象
diff --git a/src/views/modules/shequzhili/tuceng/chengshiguanli/addForm.vue b/src/views/modules/shequzhili/tuceng/chengshiguanli/addForm.vue
index e9b88376c..5c7009840 100644
--- a/src/views/modules/shequzhili/tuceng/chengshiguanli/addForm.vue
+++ b/src/views/modules/shequzhili/tuceng/chengshiguanli/addForm.vue
@@ -345,7 +345,9 @@ export default {
 				);
 				// 监听地图平移结束
 				map.on('dragend', e => {
-					this.handleMoveCenter(e);
+					if (!this.disabled) {
+						this.handleMoveCenter(e);
+					}
 				});
 
 				map.setCenter(latitude, longitude);
diff --git a/src/views/modules/shequzhili/tuceng/chengshiguanli/index.vue b/src/views/modules/shequzhili/tuceng/chengshiguanli/index.vue
index fc5bef7bb..1a5f6cf1b 100644
--- a/src/views/modules/shequzhili/tuceng/chengshiguanli/index.vue
+++ b/src/views/modules/shequzhili/tuceng/chengshiguanli/index.vue
@@ -399,6 +399,16 @@ export default {
 		async uploadHttpRequest(file) {
 			this.importLoading = true;
 			this.importBtnTitle = '正在上传中...';
+			this.$message({
+				showClose: true,
+				dangerouslyUseHTMLString: true,
+				message: "导入中，请到系统管理-<a id='clickA' style='cursor: pointer;'>导入记录</a>中查看进度",
+				duration: 3000
+			});
+			let than = this;
+			document.getElementById('clickA').addEventListener('click', function() {
+				than.$router.replace('/main/importRecord-index');
+			});
 			const formData = new FormData(); //FormData对象，添加参数只能通过append('key', value)的形式添加
 			formData.append('file', file.file); //添加文件对象
 			formData.append('code', ''); //添加文件对象
diff --git a/src/views/modules/shequzhili/tuceng/gonggongfuwu/index.vue b/src/views/modules/shequzhili/tuceng/gonggongfuwu/index.vue
index 1eec6f2dc..3bb699289 100644
--- a/src/views/modules/shequzhili/tuceng/gonggongfuwu/index.vue
+++ b/src/views/modules/shequzhili/tuceng/gonggongfuwu/index.vue
@@ -409,6 +409,16 @@ export default {
 		async uploadHttpRequest(file) {
 			this.importLoading = true;
 			this.importBtnTitle = '正在上传中...';
+			this.$message({
+				showClose: true,
+				dangerouslyUseHTMLString: true,
+				message: "导入中，请到系统管理-<a id='clickA' style='cursor: pointer;'>导入记录</a>中查看进度",
+				duration: 3000
+			});
+			let than = this;
+			document.getElementById('clickA').addEventListener('click', function() {
+				than.$router.replace('/main/importRecord-index');
+			});
 			const formData = new FormData(); //FormData对象，添加参数只能通过append('key', value)的形式添加
 			formData.append('file', file.file); //添加文件对象
 			formData.append('code', ''); //添加文件对象
diff --git a/src/views/modules/shequzhili/tuceng/yingji/changsuo/addForm.vue b/src/views/modules/shequzhili/tuceng/yingji/changsuo/addForm.vue
index 18d4b5dcd..50047653b 100644
--- a/src/views/modules/shequzhili/tuceng/yingji/changsuo/addForm.vue
+++ b/src/views/modules/shequzhili/tuceng/yingji/changsuo/addForm.vue
@@ -90,7 +90,7 @@
 				<!-- <el-button size="small" @click="resetData" v-if="pageType != 'view'">重置</el-button> -->
 				<el-button size="small" type="primary" :disabled="btnDisable" @click="handleComfirm">确 定</el-button>
 			</div>
-			<div class="recordBox"><record v-if="pageType != 'add' && detailId" :formType="pageType" :id="detailId" :info="{ agencyId: agencyId }"></record></div>
+			<div class="recordBox"><record  :disabled="disabled" :formType="pageType" :id="detailId" :info="{ agencyId: agencyId }"></record></div>
 		</div>
 		<span slot="footer" class="dialog-footer">
 			<el-button @click="handleCancle">关 闭</el-button>
@@ -342,7 +342,9 @@ export default {
 				);
 				// 监听地图平移结束
 				map.on('dragend', e => {
-					this.handleMoveCenter(e);
+					if (!this.disabled) {
+						this.handleMoveCenter(e);
+					}
 				});
 
 				map.setCenter(latitude, longitude);
diff --git a/src/views/modules/shequzhili/tuceng/yingji/changsuo/index.vue b/src/views/modules/shequzhili/tuceng/yingji/changsuo/index.vue
index cdea1fcc6..cfe7d13c1 100644
--- a/src/views/modules/shequzhili/tuceng/yingji/changsuo/index.vue
+++ b/src/views/modules/shequzhili/tuceng/yingji/changsuo/index.vue
@@ -378,6 +378,16 @@ export default {
 		async uploadHttpRequest(file) {
 			this.importLoading = true;
 			this.importBtnTitle = '正在上传中...';
+			this.$message({
+				showClose: true,
+				dangerouslyUseHTMLString: true,
+				message: "导入中，请到系统管理-<a id='clickA' style='cursor: pointer;'>导入记录</a>中查看进度",
+				duration: 3000
+			});
+			let than = this;
+			document.getElementById('clickA').addEventListener('click', function() {
+				than.$router.replace('/main/importRecord-index');
+			});
 			const formData = new FormData(); //FormData对象，添加参数只能通过append('key', value)的形式添加
 			formData.append('file', file.file); //添加文件对象
 			formData.append('code', ''); //添加文件对象
diff --git a/src/views/modules/shequzhili/tuceng/yingji/wuzi/addForm.vue b/src/views/modules/shequzhili/tuceng/yingji/wuzi/addForm.vue
index 06f25a19c..37ee65f65 100644
--- a/src/views/modules/shequzhili/tuceng/yingji/wuzi/addForm.vue
+++ b/src/views/modules/shequzhili/tuceng/yingji/wuzi/addForm.vue
@@ -90,7 +90,7 @@
 				<!-- <el-button size="small" @click="resetData" v-if="pageType != 'view'">重置</el-button> -->
 				<el-button size="small" type="primary" :disabled="btnDisable" @click="handleComfirm">确 定</el-button>
 			</div>
-			<div class="recordBox"><record v-if="pageType != 'add' && detailId" :formType="pageType" :id="detailId" :info="{ agencyId: agencyId }"></record></div>
+			<div class="recordBox"><record   :disabled="disabled" :formType="pageType" :id="detailId" :info="{ agencyId: agencyId }"></record></div>
 		</div>
 		<span slot="footer" class="dialog-footer">
 			<el-button @click="handleCancle">关闭</el-button>
@@ -360,7 +360,9 @@ export default {
 				);
 				// 监听地图平移结束
 				map.on('dragend', e => {
-					this.handleMoveCenter(e);
+					if (!this.disabled) {
+						this.handleMoveCenter(e);
+					}
 				});
 
 				map.setCenter(latitude, longitude);
diff --git a/src/views/modules/shequzhili/tuceng/yingji/wuzi/index.vue b/src/views/modules/shequzhili/tuceng/yingji/wuzi/index.vue
index 71a3b95e5..a3d297b81 100644
--- a/src/views/modules/shequzhili/tuceng/yingji/wuzi/index.vue
+++ b/src/views/modules/shequzhili/tuceng/yingji/wuzi/index.vue
@@ -421,6 +421,16 @@ export default {
 		async uploadHttpRequest(file) {
 			this.importLoading = true;
 			this.importBtnTitle = '正在上传中...';
+			this.$message({
+				showClose: true,
+				dangerouslyUseHTMLString: true,
+				message: "导入中，请到系统管理-<a id='clickA' style='cursor: pointer;'>导入记录</a>中查看进度",
+				duration: 3000
+			});
+			let than = this;
+			document.getElementById('clickA').addEventListener('click', function() {
+				than.$router.replace('/main/importRecord-index');
+			});
 			const formData = new FormData(); //FormData对象，添加参数只能通过append('key', value)的形式添加
 			formData.append('file', file.file); //添加文件对象
 			formData.append('code', ''); //添加文件对象
diff --git a/src/views/modules/shequzhili/tuceng/yingji/zizuzhi/addForm.vue b/src/views/modules/shequzhili/tuceng/yingji/zizuzhi/addForm.vue
index 50eb75820..0f92378c2 100644
--- a/src/views/modules/shequzhili/tuceng/yingji/zizuzhi/addForm.vue
+++ b/src/views/modules/shequzhili/tuceng/yingji/zizuzhi/addForm.vue
@@ -522,7 +522,9 @@ export default {
 				);
 				// 监听地图平移结束
 				map.on('dragend', e => {
-					this.handleMoveCenter(e);
+					if (!this.disabled) {
+						this.handleMoveCenter(e);
+					}
 				});
 
 				map.setCenter(latitude, longitude);
diff --git a/src/views/modules/shequzhili/tuceng/yingji/zizuzhi/index.vue b/src/views/modules/shequzhili/tuceng/yingji/zizuzhi/index.vue
index 8103e2ae2..289bce78d 100644
--- a/src/views/modules/shequzhili/tuceng/yingji/zizuzhi/index.vue
+++ b/src/views/modules/shequzhili/tuceng/yingji/zizuzhi/index.vue
@@ -516,6 +516,16 @@ export default {
 		async uploadHttpRequest(file) {
 			this.importLoading = true;
 			this.importBtnTitle = '正在上传中...';
+			this.$message({
+				showClose: true,
+				dangerouslyUseHTMLString: true,
+				message: "导入中，请到系统管理-<a id='clickA' style='cursor: pointer;'>导入记录</a>中查看进度",
+				duration: 3000
+			});
+			let than = this;
+			document.getElementById('clickA').addEventListener('click', function() {
+				than.$router.replace('/main/importRecord-index');
+			});
 			const formData = new FormData(); //FormData对象，添加参数只能通过append('key', value)的形式添加
 			formData.append('file', file.file); //添加文件对象
 			formData.append('code', ''); //添加文件对象