From d8d8063ace71536a4fb3ecc778c73216dbd61820 Mon Sep 17 00:00:00 2001
From: kun <1422840143@qq.com>
Date: Thu, 10 Aug 2023 17:43:51 +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

---
 .../progressManagement/ganttChart/index.vue   | 10 +++-
 .../subItemManagement/index.vue               | 58 +++++++++++++++++--
 .../GanttchartChart/index.vue                 | 10 +++-
 .../unmannedVideo/alarmRecord/index.vue       |  7 ++-
 .../progressManagement/ganttChart/index.vue   | 10 +++-
 .../subItemManagement/index.vue               | 56 ++++++++++++++++--
 6 files changed, 129 insertions(+), 22 deletions(-)

diff --git a/src/views/enterprise/progressManagement/ganttChart/index.vue b/src/views/enterprise/progressManagement/ganttChart/index.vue
index f68092e..c4036f8 100644
--- a/src/views/enterprise/progressManagement/ganttChart/index.vue
+++ b/src/views/enterprise/progressManagement/ganttChart/index.vue
@@ -34,8 +34,12 @@
 					<div class="row-groups" :class="{ open: openedIndex === i }" v-for="(p, i) in projects" :key="p.name">
 						<div class="row">
 							<div class="td fixed_1" @click="handleOpen(i)" style="color: #333333; padding-left: 25px">
-								<el-icon size="16" v-if="openedIndex === i && p.children && p.children.length > 0"><caret-bottom /></el-icon>
-								<el-icon size="16" v-if="openedIndex != i && p.children && p.children.length > 0"><caret-right /></el-icon>
+								<el-icon size="16" :style="{ visibility: openedIndex === i && p.children.length > 0 ? 'visible' : 'hidden' }"
+									><caret-bottom
+								/></el-icon>
+								<el-icon size="16" :style="{ visibility: openedIndex != i && p.children.length > 0 ? 'visible' : 'hidden' }"
+									><caret-right
+								/></el-icon>
 								<span>{{ p.name }}</span>
 							</div>
 							<div class="td fixed_2">{{ p.planStartTime }}</div>
@@ -438,7 +442,7 @@ const handleHover = (e: any, item: any) => {
 	console.log(666);
 	console.log(e);
 	console.log(item);
-	if (item.state == 4) {
+	if (item.state == 4 || item.state == 5 || item.state == 6) {
 		const { clientX, clientY } = e;
 		const decreaseLeft = clientX - 380;
 		const decreaseTop = clientY - 200;
diff --git a/src/views/enterprise/progressManagement/subItemManagement/index.vue b/src/views/enterprise/progressManagement/subItemManagement/index.vue
index aff1cf8..e7bf650 100644
--- a/src/views/enterprise/progressManagement/subItemManagement/index.vue
+++ b/src/views/enterprise/progressManagement/subItemManagement/index.vue
@@ -25,10 +25,13 @@
 				<el-upload
 					accept=".mpp"
 					:headers="headers"
-					:action="`${baseUrl}` + '/project/projectSubItem/importMpp'"
+					:action="`${baseUrl}` + '/ent/projectSubItem/importMpp'"
 					:on-success="uploadFileSuccess"
 					multiple
 					:limit="1"
+					:data="{
+						engineeringSn: searchSn
+					}"
 					style="margin-left: 20px"
 					:show-file-list="false"
 				>
@@ -160,10 +163,18 @@
 				<el-form-item label="负责人：" prop="commander">
 					<el-input v-model="childrenFormData.commander" placeholder="请输入" />
 				</el-form-item>
-				<el-form-item label="逾期问题描述：" prop="overdueIssueDesc">
+				<el-form-item
+					label="逾期问题描述："
+					prop="overdueIssueDesc"
+					v-if="childrenFormData.state == 4 || childrenFormData.state == 5 || childrenFormData.state == 6"
+				>
 					<el-input v-model="childrenFormData.overdueIssueDesc" placeholder="请输入" />
 				</el-form-item>
-				<el-form-item label="整改期限：" prop="deadline">
+				<el-form-item
+					label="整改期限："
+					prop="deadline"
+					v-if="childrenFormData.state == 4 || childrenFormData.state == 5 || childrenFormData.state == 6"
+				>
 					<el-date-picker
 						style="width: 100%"
 						v-model="childrenFormData.deadline"
@@ -173,7 +184,11 @@
 						placeholder="请选择时间"
 					/>
 				</el-form-item>
-				<el-form-item label="逾期文件说明：" prop="overdueIssueFile">
+				<el-form-item
+					label="逾期文件说明："
+					prop="overdueIssueFile"
+					v-if="childrenFormData.state == 4 || childrenFormData.state == 5 || childrenFormData.state == 6"
+				>
 					<el-upload
 						ref="upload1"
 						:headers="headers"
@@ -275,6 +290,31 @@ const rules = reactive<FormRules>({
 		required: true,
 		message: "请输入",
 		trigger: "blur"
+	},
+	workload: {
+		required: true,
+		message: "请输入",
+		trigger: "blur"
+	},
+	completeRatio: {
+		required: true,
+		message: "请输入",
+		trigger: "blur"
+	},
+	state: {
+		required: true,
+		message: "请选择",
+		trigger: "change"
+	},
+	planStartTime: {
+		required: true,
+		message: "请选择",
+		trigger: "change"
+	},
+	planEndTime: {
+		required: true,
+		message: "请选择",
+		trigger: "change"
 	}
 });
 const childrenVisible = ref(false);
@@ -359,6 +399,12 @@ const childrenConfirm = async (formEl: FormInstance | undefined, form: any) => {
 	if (!formEl) return;
 	await formEl.validate(async (valid, fields) => {
 		if (valid) {
+			if (form.planStartTime && form.planEndTime) {
+				if (new Date(form.planEndTime).getTime() < new Date(form.planStartTime).getTime()) {
+					ElMessage.error("预计完成日期需大于等于预计开始日期");
+					return;
+				}
+			}
 			if (form.id) {
 				if (newTitle.value == "编辑子项") {
 					form.parentId = parentObj.value.parentId;
@@ -469,8 +515,8 @@ const handleEditItem = async (row: any) => {
 		newTitle.value = "编辑";
 	}
 	childrenFormData.value = { ...row };
-	fileList.value = [{ name: "文件", url: row.annexFile }];
-	fileList1.value = [{ name: "文件", url: row.overdueIssueFile }];
+	fileList.value = row.annexFile ? [{ name: "文件", url: row.annexFile }] : [];
+	fileList1.value = row.overdueIssueFile ? [{ name: "文件", url: row.overdueIssueFile }] : [];
 	childrenVisible.value = true;
 };
 onMounted(() => {
diff --git a/src/views/goverment/progressManagement/GanttchartChart/index.vue b/src/views/goverment/progressManagement/GanttchartChart/index.vue
index 75946ba..e3969c5 100644
--- a/src/views/goverment/progressManagement/GanttchartChart/index.vue
+++ b/src/views/goverment/progressManagement/GanttchartChart/index.vue
@@ -63,8 +63,12 @@
 						<div class="row-groups" :class="{ open: openedIndex === i }" v-for="(p, i) in projects" :key="p.name">
 							<div class="row">
 								<div class="td fixed_1" @click="handleOpen(i)" style="color: #333333; padding-left: 25px">
-									<el-icon size="16" v-if="openedIndex === i && p.children.length > 0"><caret-bottom /></el-icon>
-									<el-icon size="16" v-if="openedIndex != i && p.children.length > 0"><caret-right /></el-icon>
+									<el-icon size="16" :style="{ visibility: openedIndex === i && p.children.length > 0 ? 'visible' : 'hidden' }"
+										><caret-bottom
+									/></el-icon>
+									<el-icon size="16" :style="{ visibility: openedIndex != i && p.children.length > 0 ? 'visible' : 'hidden' }"
+										><caret-right
+									/></el-icon>
 									<span>{{ p.name }}</span>
 								</div>
 								<div class="td fixed_2">{{ p.planStartTime }}</div>
@@ -527,7 +531,7 @@ const handleHover = (e: any, item: any) => {
 	console.log(666);
 	console.log(e);
 	console.log(item);
-	if (item.state == 4) {
+	if (item.state == 4 || item.state == 5 || item.state == 6) {
 		const { clientX, clientY } = e;
 		const decreaseLeft = clientX - 680;
 		const decreaseTop = clientY - 200;
diff --git a/src/views/goverment/unmannedVideo/alarmRecord/index.vue b/src/views/goverment/unmannedVideo/alarmRecord/index.vue
index 8a6aab5..2fcf246 100644
--- a/src/views/goverment/unmannedVideo/alarmRecord/index.vue
+++ b/src/views/goverment/unmannedVideo/alarmRecord/index.vue
@@ -34,7 +34,7 @@
 					<el-button type="primary" @click="handSearch">查询</el-button>
 				</el-form-item>
 				<el-form-item>
-					<el-button type="warning" @click="handSearch">刷新</el-button>
+					<el-button type="warning" @click="reFresh">刷新</el-button>
 				</el-form-item>
 			</el-form>
 			<ProTable
@@ -212,7 +212,10 @@ const columns: ColumnProps[] = [
 const initParam = reactive({
 	solveFlag: 1
 });
-
+const reFresh = () => {
+	searchParams.value.dname = "";
+	handSearch();
+};
 watch(
 	() => active.value,
 	async (value: number) => {
diff --git a/src/views/project/progressManagement/ganttChart/index.vue b/src/views/project/progressManagement/ganttChart/index.vue
index 5241480..ab50e6a 100644
--- a/src/views/project/progressManagement/ganttChart/index.vue
+++ b/src/views/project/progressManagement/ganttChart/index.vue
@@ -34,8 +34,12 @@
 					<div class="row-groups" :class="{ open: openedIndex === i }" v-for="(p, i) in projects" :key="p.name">
 						<div class="row">
 							<div class="td fixed_1" @click="handleOpen(i)" style="color: #333333; padding-left: 25px">
-								<el-icon size="16" v-if="openedIndex === i && p.children.length > 0"><caret-bottom /></el-icon>
-								<el-icon size="16" v-if="openedIndex != i && p.children.length > 0"><caret-right /></el-icon>
+								<el-icon size="16" :style="{ visibility: openedIndex === i && p.children.length > 0 ? 'visible' : 'hidden' }"
+									><caret-bottom
+								/></el-icon>
+								<el-icon size="16" :style="{ visibility: openedIndex != i && p.children.length > 0 ? 'visible' : 'hidden' }"
+									><caret-right
+								/></el-icon>
 								<span>{{ p.name }}</span>
 							</div>
 							<div class="td fixed_2">{{ p.planStartTime }}</div>
@@ -431,7 +435,7 @@ const handleHover = (e: any, item: any) => {
 	console.log(666);
 	console.log(e);
 	console.log(item);
-	if (item.state == 4) {
+	if (item.state == 4 || item.state == 5 || item.state == 6) {
 		const { clientX, clientY } = e;
 		const decreaseLeft = clientX - 380;
 		const decreaseTop = clientY - 200;
diff --git a/src/views/project/progressManagement/subItemManagement/index.vue b/src/views/project/progressManagement/subItemManagement/index.vue
index 77c0386..d707584 100644
--- a/src/views/project/progressManagement/subItemManagement/index.vue
+++ b/src/views/project/progressManagement/subItemManagement/index.vue
@@ -29,6 +29,9 @@
 					:on-success="uploadFileSuccess"
 					multiple
 					:limit="1"
+					:data="{
+						engineeringSn: searchSn
+					}"
 					style="margin-left: 20px"
 					:show-file-list="false"
 				>
@@ -160,10 +163,18 @@
 				<el-form-item label="负责人：" prop="commander">
 					<el-input v-model="childrenFormData.commander" placeholder="请输入" />
 				</el-form-item>
-				<el-form-item label="逾期问题描述：" prop="overdueIssueDesc">
+				<el-form-item
+					label="逾期问题描述："
+					prop="overdueIssueDesc"
+					v-if="childrenFormData.state == 4 || childrenFormData.state == 5 || childrenFormData.state == 6"
+				>
 					<el-input v-model="childrenFormData.overdueIssueDesc" placeholder="请输入" />
 				</el-form-item>
-				<el-form-item label="整改期限：" prop="deadline">
+				<el-form-item
+					label="整改期限："
+					prop="deadline"
+					v-if="childrenFormData.state == 4 || childrenFormData.state == 5 || childrenFormData.state == 6"
+				>
 					<el-date-picker
 						style="width: 100%"
 						v-model="childrenFormData.deadline"
@@ -173,7 +184,11 @@
 						placeholder="请选择时间"
 					/>
 				</el-form-item>
-				<el-form-item label="逾期文件说明：" prop="overdueIssueFile">
+				<el-form-item
+					label="逾期文件说明："
+					prop="overdueIssueFile"
+					v-if="childrenFormData.state == 4 || childrenFormData.state == 5 || childrenFormData.state == 6"
+				>
 					<el-upload
 						ref="upload1"
 						:headers="headers"
@@ -274,6 +289,31 @@ const rules = reactive<FormRules>({
 		required: true,
 		message: "请输入",
 		trigger: "blur"
+	},
+	workload: {
+		required: true,
+		message: "请输入",
+		trigger: "blur"
+	},
+	completeRatio: {
+		required: true,
+		message: "请输入",
+		trigger: "blur"
+	},
+	state: {
+		required: true,
+		message: "请选择",
+		trigger: "change"
+	},
+	planStartTime: {
+		required: true,
+		message: "请选择",
+		trigger: "change"
+	},
+	planEndTime: {
+		required: true,
+		message: "请选择",
+		trigger: "change"
 	}
 });
 const childrenVisible = ref(false);
@@ -352,6 +392,12 @@ const childrenConfirm = async (formEl: FormInstance | undefined, form: any) => {
 	if (!formEl) return;
 	await formEl.validate(async (valid, fields) => {
 		if (valid) {
+			if (form.planStartTime && form.planEndTime) {
+				if (new Date(form.planEndTime).getTime() < new Date(form.planStartTime).getTime()) {
+					ElMessage.error("预计完成日期需大于等于预计开始日期");
+					return;
+				}
+			}
 			if (form.id) {
 				if (newTitle.value == "编辑子项") {
 					form.parentId = parentObj.value.parentId;
@@ -462,8 +508,8 @@ const handleEditItem = async (row: any) => {
 		newTitle.value = "编辑";
 	}
 	childrenFormData.value = { ...row };
-	fileList.value = [{ name: "文件", url: row.annexFile }];
-	fileList1.value = [{ name: "文件", url: row.overdueIssueFile }];
+	fileList.value = row.annexFile?[{ name: "文件", url: row.annexFile }]:[];
+	fileList1.value = row.overdueIssueFile?[{ name: "文件", url: row.overdueIssueFile }]:[];
 	childrenVisible.value = true;
 };
 onMounted(() => {