From cdd0d3c55b4058eb841d302ea0aa0840fcb9fc44 Mon Sep 17 00:00:00 2001
From: kun <1422840143@qq.com>
Date: Mon, 24 Jul 2023 10:00:48 +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

---
 .../divisionsAndISubItems/index.vue           | 12 ++++++--
 .../progressManagement/index.vue              | 20 +++++++++++--
 .../largeScreen/largeScreenOne/index.vue      |  4 +--
 .../subItemManagement/index.vue               | 12 ++++++--
 .../progressManagement/index.vue              | 20 +++++++++++--
 .../largeScreen/largeScreenOne/index.vue      |  4 +--
 .../subItemManagement/index.vue               | 12 ++++++--
 .../progressManagement/index.vue              | 30 +++++++++++++++++++
 8 files changed, 97 insertions(+), 17 deletions(-)

diff --git a/src/views/goverment/huizhou/progressManagement/divisionsAndISubItems/index.vue b/src/views/goverment/huizhou/progressManagement/divisionsAndISubItems/index.vue
index 60214d1..2bfbea4 100644
--- a/src/views/goverment/huizhou/progressManagement/divisionsAndISubItems/index.vue
+++ b/src/views/goverment/huizhou/progressManagement/divisionsAndISubItems/index.vue
@@ -76,8 +76,12 @@
 									: scope.row.state == 3
 									? "已完成"
 									: scope.row.state == 4
-									? "已逾期"
-									: "其他"
+									? "逾期未开始"
+									: scope.row.state == 5
+									? "逾期进行中"
+									: scope.row.state == 6
+									? "逾期已完成"
+									: ""
 							}}</span>
 						</template>
 					</el-table-column>
@@ -240,7 +244,9 @@ const statusList = ref([
 	{ label: "未开始", value: 1 },
 	{ label: "进行中", value: 2 },
 	{ label: "已完成", value: 3 },
-	{ label: "已逾期", value: 4 }
+	{ label: "逾期未开始", value: 4 },
+	{ label: "逾期进行中", value: 5 },
+	{ label: "逾期已完成", value: 6 }
 ]);
 const tableData = ref([]);
 const pages = ref({
diff --git a/src/views/goverment/huizhou/projectMonitoring/progressManagement/index.vue b/src/views/goverment/huizhou/projectMonitoring/progressManagement/index.vue
index e0f87b3..fad90bf 100644
--- a/src/views/goverment/huizhou/projectMonitoring/progressManagement/index.vue
+++ b/src/views/goverment/huizhou/projectMonitoring/progressManagement/index.vue
@@ -47,7 +47,21 @@
 						<!-- <el-button class="btnStyle">刷新</el-button> -->
 					</template>
 					<template #state="{ row }">
-						<span>{{ row.state == 1 ? "未开始" : row.state == 2 ? "进行中" : row.state == 3 ? "已完成" : "已逾期" }}</span>
+						<span>{{
+							row.state == 1
+								? "未开始"
+								: row.state == 2
+								? "进行中"
+								: row.state == 3
+								? "已完成"
+								: row.state == 4
+								? "逾期未开始"
+								: row.state == 5
+								? "逾期进行中"
+								: row.state == 6
+								? "逾期已完成"
+								: ""
+						}}</span>
 					</template>
 					<template #slippage="{ row }">
 						<span :style="{ color: row.slippage ? 'red' : 'var(--el-menu-text-color)' }">{{
@@ -158,7 +172,9 @@ const columns: ColumnProps[] = [
 			{ label: "未开始", value: 1 },
 			{ label: "进行中", value: 2 },
 			{ label: "已完成", value: 3 },
-			{ label: "已逾期", value: 4 }
+			{ label: "逾期未开始", value: 4 },
+			{ label: "逾期进行中", value: 5 },
+			{ label: "逾期已完成", value: 6 }
 		]
 	},
 	{ prop: "operation", label: "操作", fixed: "right", width: 120 }
diff --git a/src/views/hz-enterprise/largeScreen/largeScreenOne/index.vue b/src/views/hz-enterprise/largeScreen/largeScreenOne/index.vue
index 3ab65f9..da6770a 100644
--- a/src/views/hz-enterprise/largeScreen/largeScreenOne/index.vue
+++ b/src/views/hz-enterprise/largeScreen/largeScreenOne/index.vue
@@ -315,8 +315,8 @@ const BeginPlayer = () => {
 	// 初始化插件
 	myPlugin.value = new JSPlugin({
 		szId: "play_window", //需要英文字母开头 必填
-		szBasePath: "/public/h5player", // 必填,引用H5player.min.js的js相对路径
-		// szBasePath: "/h5player", // 打包后的地址
+		// szBasePath: "/public/h5player", // 必填,引用H5player.min.js的js相对路径
+		szBasePath: "/h5player", // 打包后的地址
 		// szBasePath: "./", // 必填,引用H5player.min.js的js相对路径
 		iWidth: playWndWidth.value + "px",
 		iHeight: playWndHeight.value + "px",
diff --git a/src/views/hz-enterprise/progressManagement/subItemManagement/index.vue b/src/views/hz-enterprise/progressManagement/subItemManagement/index.vue
index 7cc2bdf..32b3343 100644
--- a/src/views/hz-enterprise/progressManagement/subItemManagement/index.vue
+++ b/src/views/hz-enterprise/progressManagement/subItemManagement/index.vue
@@ -89,8 +89,12 @@
 									: scope.row.state == 3
 									? "已完成"
 									: scope.row.state == 4
-									? "已逾期"
-									: "其他"
+									? "逾期未开始"
+									: scope.row.state == 5
+									? "逾期进行中"
+									: scope.row.state == 6
+									? "逾期已完成"
+									: ""
 							}}</span>
 						</template>
 					</el-table-column>
@@ -277,7 +281,9 @@ const statusList = ref([
 	{ label: "未开始", value: 1 },
 	{ label: "进行中", value: 2 },
 	{ label: "已完成", value: 3 },
-	{ label: "已逾期", value: 4 }
+	{ label: "逾期未开始", value: 4 },
+	{ label: "逾期进行中", value: 5 },
+	{ label: "逾期已完成", value: 6 }
 ]);
 const tableData = ref([]);
 const searchForm = ref({
diff --git a/src/views/hz-enterprise/projectMonitor/progressManagement/index.vue b/src/views/hz-enterprise/projectMonitor/progressManagement/index.vue
index 69b02d3..8b6e605 100644
--- a/src/views/hz-enterprise/projectMonitor/progressManagement/index.vue
+++ b/src/views/hz-enterprise/projectMonitor/progressManagement/index.vue
@@ -43,7 +43,21 @@
 					</el-button>
 				</template>
 				<template #state="{ row }">
-					<span>{{ row.state == 1 ? "未开始" : row.state == 2 ? "进行中" : row.state == 3 ? "已完成" : "已逾期" }}</span>
+					<span>{{
+						row.state == 1
+							? "未开始"
+							: row.state == 2
+							? "进行中"
+							: row.state == 3
+							? "已完成"
+							: row.state == 4
+							? "逾期未开始"
+							: row.state == 5
+							? "逾期进行中"
+							: row.state == 6
+							? "逾期已完成"
+							: ""
+					}}</span>
 				</template>
 				<template #slippage="{ row }">
 					<span :style="{ color: row.slippage ? 'red' : 'var(--el-menu-text-color)' }">{{ row.slippage }}</span>
@@ -127,7 +141,9 @@ const columns: ColumnProps[] = [
 			{ label: "未开始", value: 1 },
 			{ label: "进行中", value: 2 },
 			{ label: "已完成", value: 3 },
-			{ label: "已逾期", value: 4 }
+			{ label: "逾期未开始", value: 4 },
+			{ label: "逾期进行中", value: 5 },
+			{ label: "逾期已完成", value: 6 }
 		]
 	},
 	{ prop: "operation", label: "操作", fixed: "right", width: 100 }
diff --git a/src/views/hz-project/largeScreen/largeScreenOne/index.vue b/src/views/hz-project/largeScreen/largeScreenOne/index.vue
index 2dc59d1..3bbb2b2 100644
--- a/src/views/hz-project/largeScreen/largeScreenOne/index.vue
+++ b/src/views/hz-project/largeScreen/largeScreenOne/index.vue
@@ -316,8 +316,8 @@ const BeginPlayer = () => {
 	// 初始化插件
 	myPlugin.value = new JSPlugin({
 		szId: "play_window", //需要英文字母开头 必填
-		szBasePath: "/public/h5player", // 必填,引用H5player.min.js的js相对路径
-		// szBasePath: "/h5player", // 打包后的地址
+		// szBasePath: "/public/h5player", // 必填,引用H5player.min.js的js相对路径
+		szBasePath: "/h5player", // 打包后的地址
 		// szBasePath: "./", // 必填,引用H5player.min.js的js相对路径
 		iWidth: playWndWidth.value + "px",
 		iHeight: playWndHeight.value + "px",
diff --git a/src/views/hz-project/progressManagement/subItemManagement/index.vue b/src/views/hz-project/progressManagement/subItemManagement/index.vue
index a89a3ca..ab16956 100644
--- a/src/views/hz-project/progressManagement/subItemManagement/index.vue
+++ b/src/views/hz-project/progressManagement/subItemManagement/index.vue
@@ -59,8 +59,12 @@
 								: scope.row.state == 3
 								? "已完成"
 								: scope.row.state == 4
-								? "已逾期"
-								: "其他"
+								? "逾期未开始"
+								: scope.row.state == 5
+								? "逾期进行中"
+								: scope.row.state == 6
+								? "逾期已完成"
+								: ""
 						}}</span>
 					</template>
 				</el-table-column>
@@ -229,7 +233,9 @@ const statusList = ref([
 	{ label: "未开始", value: 1 },
 	{ label: "进行中", value: 2 },
 	{ label: "已完成", value: 3 },
-	{ label: "已逾期", value: 4 }
+	{ label: "逾期未开始", value: 4 },
+	{ label: "逾期进行中", value: 5 },
+	{ label: "逾期已完成", value: 6 }
 ]);
 const pageable = ref({
 	pageNo: 1,
diff --git a/src/views/hz-project/projectMonitor/progressManagement/index.vue b/src/views/hz-project/projectMonitor/progressManagement/index.vue
index 7b0158f..2068c9f 100644
--- a/src/views/hz-project/projectMonitor/progressManagement/index.vue
+++ b/src/views/hz-project/projectMonitor/progressManagement/index.vue
@@ -18,6 +18,23 @@
 					<span>查看</span>
 				</el-button>
 			</template>
+			<template #state="{ row }">
+				<span>{{
+					row.state == 1
+						? "未开始"
+						: row.state == 2
+						? "进行中"
+						: row.state == 3
+						? "已完成"
+						: row.state == 4
+						? "逾期未开始"
+						: row.state == 5
+						? "逾期进行中"
+						: row.state == 6
+						? "逾期已完成"
+						: ""
+				}}</span>
+			</template>
 			<template #slippage="{ row }">
 				<span :style="{ color: row.slippage ? 'red' : 'var(--el-menu-text-color)' }">{{ row.slippage }}</span>
 			</template>
@@ -87,6 +104,19 @@ const columns: ColumnProps[] = [
 			}
 		}
 	},
+	{
+		prop: "state",
+		label: "状态",
+		search: { el: "select" },
+		enum: [
+			{ label: "未开始", value: 1 },
+			{ label: "进行中", value: 2 },
+			{ label: "已完成", value: 3 },
+			{ label: "逾期未开始", value: 4 },
+			{ label: "逾期进行中", value: 5 },
+			{ label: "逾期已完成", value: 6 }
+		]
+	},
 	{ prop: "operation", label: "操作", fixed: "right", width: 100 }
 ];
 // dataCallback 是对于返回的表格数据做处理，如果你后台返回的数据不是 list && total && pageNum && pageSize 这些字段，那么你可以在这里进行处理成这些字段