From 797be282129a680dc00259f8af1116e901c150ee Mon Sep 17 00:00:00 2001
From: kun <1422840143@qq.com>
Date: Tue, 22 Aug 2023 17:53:47 +0800
Subject: [PATCH] =?UTF-8?q?fix:=20BUG=E4=BF=AE=E6=94=B9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .env.development                                |  4 ++--
 .../enterprise/AIwarning/alarmRecord/index.vue  |  2 +-
 .../laborRealName/buildUnit/index.vue           |  7 +++++++
 .../memberManage/components/addMemberForm.vue   | 13 +++++++++++--
 .../subItemManagement/index.vue                 |  1 +
 .../unmannedVideo/videoData/index.scss          |  6 ++++++
 .../project/AIwarning/alarmRecord/index.vue     |  2 +-
 .../project/laborRealName/buildUnit/index.vue   |  7 +++++++
 .../memberManage/components/addMemberForm.vue   | 17 ++++++++++++++---
 .../subItemManagement/index.vue                 |  1 +
 .../project/unmannedVideo/videoData/index.scss  |  9 ++++++++-
 .../project/unmannedVideo/videoData/index.vue   |  1 -
 12 files changed, 59 insertions(+), 11 deletions(-)

diff --git a/.env.development b/.env.development
index ffefc80..bd41f8a 100644
--- a/.env.development
+++ b/.env.development
@@ -2,9 +2,9 @@
 NODE_ENV = 'development'
 
 # 本地环境接口地址(/api/index.ts文件中使用)
-# VITE_API_URL = 'http://192.168.34.155:6688'
+VITE_API_URL = 'http://192.168.34.155:6688'
 VITE_WPAPI_URL = "http://182.90.224.147:8081"
-VITE_API_URL = "http://182.90.224.147:6688"
+# VITE_API_URL = "http://182.90.224.147:6688"
 
 # 上传
 # VITE_ULD_API_URL = 'http://192.168.34.155:8012/onlinePreview?url='
diff --git a/src/views/enterprise/AIwarning/alarmRecord/index.vue b/src/views/enterprise/AIwarning/alarmRecord/index.vue
index e2968a4..1b9293c 100644
--- a/src/views/enterprise/AIwarning/alarmRecord/index.vue
+++ b/src/views/enterprise/AIwarning/alarmRecord/index.vue
@@ -15,7 +15,7 @@
 		>
 			<template #operation="{ row }">
 				<div class="txtLeft">
-					<el-button type="primary" v-if="row.state !== 1" link @click="handleEditItem(1, row)">
+					<el-button type="primary" v-if="row.state === 0" link @click="handleEditItem(1, row)">
 						<img src="@/assets/images/tableIcon/问题整改.png" alt="" class="configureIcon" />
 						<span>问题整改</span>
 					</el-button>
diff --git a/src/views/enterprise/laborRealName/buildUnit/index.vue b/src/views/enterprise/laborRealName/buildUnit/index.vue
index f9c06ef..159a6ff 100644
--- a/src/views/enterprise/laborRealName/buildUnit/index.vue
+++ b/src/views/enterprise/laborRealName/buildUnit/index.vue
@@ -338,6 +338,13 @@ const rules = ref({
 			trigger: "change"
 		}
 	],
+	registeredCapital: [
+		{
+			pattern: /^[0-9\.]+$/,
+			message: "请输入整数或小数",
+			trigger: "blur"
+		}
+	],
 	email: [
 		{
 			type: "email",
diff --git a/src/views/enterprise/laborRealName/memberManage/components/addMemberForm.vue b/src/views/enterprise/laborRealName/memberManage/components/addMemberForm.vue
index 0b76471..40d3a34 100644
--- a/src/views/enterprise/laborRealName/memberManage/components/addMemberForm.vue
+++ b/src/views/enterprise/laborRealName/memberManage/components/addMemberForm.vue
@@ -161,7 +161,13 @@
 					</div>
 					<div class="row">
 						<el-form-item label="参建单位:" prop="companySn">
-							<el-select v-model="form.companySn" :disabled="props.title == '查看人员'" placeholder="请选择" style="width: 100%">
+							<el-select
+								v-model="form.companySn"
+								:disabled="props.title == '查看人员'"
+								placeholder="请选择"
+								style="width: 100%"
+								@change="companySelect"
+							>
 								<el-option v-for="item in unitList" :key="item.value" :label="item.label" :value="item.value"> </el-option>
 							</el-select>
 						</el-form-item>
@@ -551,6 +557,9 @@ const bankTypeList: any = ref([
 	{ label: "浙商银行", value: 15 }
 ]);
 const form = ref();
+const companySelect = () => {
+	getGroupList();
+};
 // 图片上传成功后的钩子
 const handleAvatarSuccess: UploadProps["onSuccess"] = (response, uploadFile, index) => {
 	console.log(response.result.url);
@@ -623,7 +632,7 @@ const getUnitList = async () => {
 };
 // 获取班组管理列表
 const getGroupList = async () => {
-	const res = await getClassGroupAll({ engineeringSn: props.engineeringSn });
+	const res = await getClassGroupAll({ companySn: form.value.companySn, engineeringSn: props.engineeringSn });
 	console.log(res);
 	groupList.value = res.result.map(item => {
 		console.log(item);
diff --git a/src/views/enterprise/progressManagement/subItemManagement/index.vue b/src/views/enterprise/progressManagement/subItemManagement/index.vue
index ec15bfa..a9b11c6 100644
--- a/src/views/enterprise/progressManagement/subItemManagement/index.vue
+++ b/src/views/enterprise/progressManagement/subItemManagement/index.vue
@@ -522,6 +522,7 @@ const handleAddItem = () => {
 };
 // 修改数据按钮
 const handleEditItem = async (row: any) => {
+	ruleFormRef.value?.resetFields();
 	console.log(row);
 	parentObj.value = row;
 	if (row.parentId != 0) {
diff --git a/src/views/enterprise/unmannedVideo/videoData/index.scss b/src/views/enterprise/unmannedVideo/videoData/index.scss
index b2aee6d..6d1633f 100644
--- a/src/views/enterprise/unmannedVideo/videoData/index.scss
+++ b/src/views/enterprise/unmannedVideo/videoData/index.scss
@@ -205,6 +205,12 @@
 	.tabs-option {
 		display: none;
 	}
+	.el-progress-bar {
+		display: none;
+	}
+	.el-progress__text {
+		display: none;
+	}
 }
 // :deep(.el-dialog__body) {
 // 	padding: 0 0 0 0 !important;
diff --git a/src/views/project/AIwarning/alarmRecord/index.vue b/src/views/project/AIwarning/alarmRecord/index.vue
index 537ca2d..5a6373b 100644
--- a/src/views/project/AIwarning/alarmRecord/index.vue
+++ b/src/views/project/AIwarning/alarmRecord/index.vue
@@ -14,7 +14,7 @@
 		>
 			<template #operation="{ row }">
 				<div class="txtLeft">
-					<el-button type="primary" v-if="row.state !== 1" link @click="handleEditItem(1, row)">
+					<el-button type="primary" v-if="row.state === 0" link @click="handleEditItem(1, row)">
 						<img src="@/assets/images/tableIcon/问题整改.png" alt="" class="configureIcon" />
 						<span>问题整改</span>
 					</el-button>
diff --git a/src/views/project/laborRealName/buildUnit/index.vue b/src/views/project/laborRealName/buildUnit/index.vue
index 13ec640..105a261 100644
--- a/src/views/project/laborRealName/buildUnit/index.vue
+++ b/src/views/project/laborRealName/buildUnit/index.vue
@@ -344,6 +344,13 @@ const rules = ref({
 			trigger: "change"
 		}
 	],
+	registeredCapital: [
+		{
+			pattern: /^[0-9\.]+$/,
+			message: "请输入整数或小数",
+			trigger: "blur"
+		}
+	],
 	email: [
 		{
 			type: "email",
diff --git a/src/views/project/laborRealName/memberManage/components/addMemberForm.vue b/src/views/project/laborRealName/memberManage/components/addMemberForm.vue
index 53427df..ed3591b 100644
--- a/src/views/project/laborRealName/memberManage/components/addMemberForm.vue
+++ b/src/views/project/laborRealName/memberManage/components/addMemberForm.vue
@@ -161,11 +161,17 @@
 					</div>
 					<div class="row">
 						<el-form-item label="参建单位:" prop="companySn">
-							<el-select v-model="form.companySn" :disabled="props.title == '查看人员'" placeholder="请选择" style="width: 100%">
+							<el-select
+								v-model="form.companySn"
+								:disabled="props.title == '查看人员'"
+								placeholder="请选择"
+								style="width: 100%"
+								@change="companySelect"
+							>
 								<el-option v-for="item in unitList" :key="item.value" :label="item.label" :value="item.value"> </el-option>
 							</el-select>
 						</el-form-item>
-						<el-form-item label="班组 :" prop="teamSn">
+						<el-form-item label="班组 :" prop="teamSn" v-if="form.companySn">
 							<el-select v-model="form.teamSn" :disabled="props.title == '查看人员'" placeholder="请选择" style="width: 100%">
 								<el-option v-for="item in groupList" :key="item.value" :label="item.label" :value="item.value"> </el-option>
 							</el-select>
@@ -552,6 +558,9 @@ const bankTypeList: any = ref([
 	{ label: "浙商银行", value: 15 }
 ]);
 const form = ref();
+const companySelect = () => {
+	getGroupList();
+};
 // 图片上传成功后的钩子
 const handleAvatarSuccess: UploadProps["onSuccess"] = (response, uploadFile, index) => {
 	console.log(response.result.url);
@@ -634,7 +643,9 @@ const getUnitList = async () => {
 };
 // 获取班组管理列表
 const getGroupList = async () => {
-	let requestData = {};
+	let requestData = {
+		companySn: form.value.companySn
+	};
 	if (props.active == "eng") {
 		requestData.engineeringSn = props.searchSn;
 	} else if (props.active == "project") {
diff --git a/src/views/project/progressManagement/subItemManagement/index.vue b/src/views/project/progressManagement/subItemManagement/index.vue
index fc4203a..fac32d1 100644
--- a/src/views/project/progressManagement/subItemManagement/index.vue
+++ b/src/views/project/progressManagement/subItemManagement/index.vue
@@ -560,6 +560,7 @@ const handleAddItem = () => {
 };
 // 修改数据按钮
 const handleEditItem = async (row: any) => {
+	ruleFormRef.value?.resetFields();
 	console.log(row);
 	parentObj.value = row;
 	if (row.parentId != 0) {
diff --git a/src/views/project/unmannedVideo/videoData/index.scss b/src/views/project/unmannedVideo/videoData/index.scss
index ca0504f..32ee04c 100644
--- a/src/views/project/unmannedVideo/videoData/index.scss
+++ b/src/views/project/unmannedVideo/videoData/index.scss
@@ -152,7 +152,14 @@
 :deep(.el-form .el-form-item__content .el-range-editor) {
 	width: 200px;
 }
-
+:deep() {
+	.el-progress-bar {
+		display: none;
+	}
+	.el-progress__text {
+		display: none;
+	}
+}
 // :deep(.el-dialog__body) {
 // 	padding: 0 0 0 0 !important;
 // 	background-color: pink;
diff --git a/src/views/project/unmannedVideo/videoData/index.vue b/src/views/project/unmannedVideo/videoData/index.vue
index 527d125..895690d 100644
--- a/src/views/project/unmannedVideo/videoData/index.vue
+++ b/src/views/project/unmannedVideo/videoData/index.vue
@@ -99,7 +99,6 @@
 					class="upload-demo"
 					:action="`${baseUrl}` + '/xmgl/file/upload'"
 					:on-remove="onRemove"
-					multiple
 					:limit="1"
 					:on-success="uploadSuccess"
 					:before-upload="beforeUpload"