From 8a88dd57bc5bcd009c8a4d5807c526cdf2b36cd7 Mon Sep 17 00:00:00 2001
From: kun <1422840143@qq.com>
Date: Thu, 20 Jul 2023 18:23:56 +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

---
 src/api/modules/huizhou.ts                    |  8 +++++++
 .../progressManagement/index.vue              | 14 +++++++++++
 .../qualityControl/index.vue                  | 10 +++++++-
 .../safetyManagement/index.vue                | 10 +++++++-
 .../largeScreenOne/components/BDmaps.vue      | 10 ++++----
 .../planFinishSituation/index.vue             |  8 +++----
 .../progressManagement/index.vue              | 24 +++++++++++--------
 .../qualityManagement/index.vue               | 13 ++++++++++
 .../projectMonitor/safetyManagement/index.vue | 13 ++++++++++
 9 files changed, 90 insertions(+), 20 deletions(-)

diff --git a/src/api/modules/huizhou.ts b/src/api/modules/huizhou.ts
index a3d622e..63f2cbc 100644
--- a/src/api/modules/huizhou.ts
+++ b/src/api/modules/huizhou.ts
@@ -281,6 +281,10 @@ export const getEntSubItemproject = (params: User.ReqUserParams) => {
 	return http.post<ResPage<User.ResUserList>>(BASEURL + `/ent/projectSubItem/engineeringPage`, params);
 };
 // 分部分项全部数据
+export const bigEntItemAll = (params: any) => {
+	return http.post(BASEURL + `/ent/projectSubItem/list`, params);
+};
+// 分部分项分页数据
 export const bigEntItemPage = (params: any) => {
 	return http.post(BASEURL + `/ent/projectSubItem/page`, params);
 };
@@ -356,6 +360,10 @@ export const entApplyTimeList = (params: any) => {
 export const entSubItemDetailAdd = (params: any) => {
 	return http.post(BASEURL + `/ent/investmentPaymentDetail/add`, params);
 };
+// 分页列表查询投资支付工程
+export const getEntApplyTimeproject = (params: User.ReqUserParams) => {
+	return http.post<ResPage<User.ResUserList>>(BASEURL + `/ent/investmentApply/engineeringPage`, params);
+};
 // 申报时段分页列表
 export const entApplyTimePage = (params: any) => {
 	return http.post(BASEURL + `/ent/investmentApply/page`, params);
diff --git a/src/views/goverment/huizhou/projectMonitoring/progressManagement/index.vue b/src/views/goverment/huizhou/projectMonitoring/progressManagement/index.vue
index d60534f..e0f87b3 100644
--- a/src/views/goverment/huizhou/projectMonitoring/progressManagement/index.vue
+++ b/src/views/goverment/huizhou/projectMonitoring/progressManagement/index.vue
@@ -46,6 +46,9 @@
 						<el-button class="btnStyle" @click="handleAddItem()">新增</el-button>
 						<!-- <el-button class="btnStyle">刷新</el-button> -->
 					</template>
+					<template #state="{ row }">
+						<span>{{ row.state == 1 ? "未开始" : row.state == 2 ? "进行中" : row.state == 3 ? "已完成" : "已逾期" }}</span>
+					</template>
 					<template #slippage="{ row }">
 						<span :style="{ color: row.slippage ? 'red' : 'var(--el-menu-text-color)' }">{{
 							row.slippage ? row.slippage : ""
@@ -147,6 +150,17 @@ const columns: ColumnProps[] = [
 			}
 		}
 	},
+	{
+		prop: "state",
+		label: "状态",
+		search: { el: "select" },
+		enum: [
+			{ label: "未开始", value: 1 },
+			{ label: "进行中", value: 2 },
+			{ label: "已完成", value: 3 },
+			{ label: "已逾期", value: 4 }
+		]
+	},
 	{ prop: "operation", label: "操作", fixed: "right", width: 120 }
 ];
 // 弹窗中的配置
diff --git a/src/views/goverment/huizhou/projectMonitoring/qualityControl/index.vue b/src/views/goverment/huizhou/projectMonitoring/qualityControl/index.vue
index 45d0fcb..97f5d6d 100644
--- a/src/views/goverment/huizhou/projectMonitoring/qualityControl/index.vue
+++ b/src/views/goverment/huizhou/projectMonitoring/qualityControl/index.vue
@@ -181,7 +181,15 @@ const columns: ColumnProps[] = [
 	{
 		prop: "state",
 		label: "状态",
-		width: 150
+		search: { el: "select" },
+		width: 150,
+		enum: [
+			{ label: "执法中", value: 1 },
+			{ label: "待整改", value: 2 },
+			{ label: "待审核", value: 3 },
+			{ label: "已闭合", value: 4 },
+			{ label: "已驳回", value: 5 }
+		]
 	},
 	{ prop: "slippage", label: "逾期情况(天)", width: 150 },
 	{ prop: "operation", label: "操作", fixed: "right", width: 100 }
diff --git a/src/views/goverment/huizhou/projectMonitoring/safetyManagement/index.vue b/src/views/goverment/huizhou/projectMonitoring/safetyManagement/index.vue
index 1aee85b..daf522b 100644
--- a/src/views/goverment/huizhou/projectMonitoring/safetyManagement/index.vue
+++ b/src/views/goverment/huizhou/projectMonitoring/safetyManagement/index.vue
@@ -150,7 +150,15 @@ const columns: ColumnProps[] = [
 	{
 		prop: "state",
 		label: "状态",
-		width: 150
+		search: { el: "select" },
+		width: 150,
+		enum: [
+			{ label: "执法中", value: 1 },
+			{ label: "待整改", value: 2 },
+			{ label: "待审核", value: 3 },
+			{ label: "已闭合", value: 4 },
+			{ label: "已驳回", value: 5 }
+		]
 	},
 	{ prop: "slippage", label: "逾期情况(天)", width: 150 },
 	{ prop: "operation", label: "操作", fixed: "right", width: 100 }
diff --git a/src/views/hz-enterprise/largeScreen/largeScreenOne/components/BDmaps.vue b/src/views/hz-enterprise/largeScreen/largeScreenOne/components/BDmaps.vue
index cb036d9..836a1ea 100644
--- a/src/views/hz-enterprise/largeScreen/largeScreenOne/components/BDmaps.vue
+++ b/src/views/hz-enterprise/largeScreen/largeScreenOne/components/BDmaps.vue
@@ -50,12 +50,14 @@ const onClose = () => {
 const mapData = async () => {
 	console.log(props.projectData);
 	map.value = new BMapGL.Map("mapBox"); // 初始化地图
-	let point = new BMapGL.Point(props.projectData.longitude, props.projectData.latitude); // 点位设置
-	map.value.centerAndZoom(point, 12); // 初始化地图，设置中心点坐标和地图级别
 	map.value.enableScrollWheelZoom(true); // 设置可以鼠标滑动进行缩放
 	map.value.setMapStyleV2({
 		styleJson: mapstyle()
 	});
+	setTimeout(function () {
+		let point = new BMapGL.Point(props.projectData.longitude, props.projectData.latitude); // 点位设置
+		map.value.centerAndZoom(point, 12); // 初始化地图，设置中心点坐标和地图级别
+	}, 500);
 };
 // 设置镂空面
 // const setHoleArea = () => {
@@ -180,8 +182,8 @@ const translateCallback = (data: any) => {
 onMounted(async () => {
 	console.log("onMounted");
 	await mapData();
-	// addMarker();
-	// drawArea();
+	addMarker();
+	drawArea();
 	// setHoleArea();
 	// createArea();
 });
diff --git a/src/views/hz-enterprise/progressManagement/planFinishSituation/index.vue b/src/views/hz-enterprise/progressManagement/planFinishSituation/index.vue
index 92b1208..13c14c4 100644
--- a/src/views/hz-enterprise/progressManagement/planFinishSituation/index.vue
+++ b/src/views/hz-enterprise/progressManagement/planFinishSituation/index.vue
@@ -74,7 +74,7 @@ import { useRouter } from "vue-router";
 import { ColumnProps } from "@/components/ProTable/interface";
 import ProTable from "@/components/ProTable/index.vue";
 import changeTheme from "@/components/changeTheme/index.vue";
-import { entApplyTimePage, entApplyTimeAdd, getEntSubItemproject } from "@/api/modules/huizhou";
+import { entApplyTimePage, entApplyTimeAdd, getEntApplyTimeproject } from "@/api/modules/huizhou";
 import { GlobalStore } from "@/stores";
 import DialogForm from "@/components/DialogForm/index.vue";
 import transformInfo1 from "./components/transformInfo1.vue";
@@ -191,13 +191,13 @@ const onSearch = async (params: any) => {
 // leftMenu页面的搜索按钮
 const onSearchInput = async (params: string) => {
 	console.log(params);
-	const { result } = await getEntSubItemproject({ engineeringName: params, ...pages.value });
+	const { result } = await getEntApplyTimeproject({ engineeringName: params, ...pages.value });
 	records.value = result.records;
 };
 // leftMenu页面的分页
 const onCurChange = async (params: number) => {
 	console.log(active.value);
-	const { result } = await getEntSubItemproject({ ...pages.value, pageNo: params });
+	const { result } = await getEntApplyTimeproject({ ...pages.value, pageNo: params });
 	records.value = result.records;
 	pages.value.total = +result.total;
 };
@@ -277,7 +277,7 @@ const handleItemDetail = (index: number, row: any) => {
 };
 // 获取工程名称分页
 const getEngPage = async () => {
-	const { result } = await getEntSubItemproject(pages.value);
+	const { result } = await getEntApplyTimeproject(pages.value);
 	records.value = result.records;
 	records.value.map(item => {
 		let showGif = false;
diff --git a/src/views/hz-enterprise/projectMonitor/progressManagement/index.vue b/src/views/hz-enterprise/projectMonitor/progressManagement/index.vue
index 8bd6db5..69b02d3 100644
--- a/src/views/hz-enterprise/projectMonitor/progressManagement/index.vue
+++ b/src/views/hz-enterprise/projectMonitor/progressManagement/index.vue
@@ -42,6 +42,9 @@
 						<span>查看</span>
 					</el-button>
 				</template>
+				<template #state="{ row }">
+					<span>{{ row.state == 1 ? "未开始" : row.state == 2 ? "进行中" : row.state == 3 ? "已完成" : "已逾期" }}</span>
+				</template>
 				<template #slippage="{ row }">
 					<span :style="{ color: row.slippage ? 'red' : 'var(--el-menu-text-color)' }">{{ row.slippage }}</span>
 				</template>
@@ -102,16 +105,6 @@ const columns: ColumnProps[] = [
 	{ prop: "planEndTime", label: "结束日期" },
 	{ prop: "completeRatio", label: "完成百分比(%)" },
 	{ prop: "slippage", label: "逾期情况(天)" },
-	// {
-	// 	prop: "state",
-	// 	label: "状态",
-	// 	search: { el: "select" },
-	// 	isShow: false,
-	// 	enum: [
-	// 		{ label: "启用", value: 1 },
-	// 		{ label: "禁用", value: 0 }
-	// 	]
-	// },
 	{
 		prop: "createTime",
 		label: "时间筛选",
@@ -126,6 +119,17 @@ const columns: ColumnProps[] = [
 			}
 		}
 	},
+	{
+		prop: "state",
+		label: "状态",
+		search: { el: "select" },
+		enum: [
+			{ label: "未开始", value: 1 },
+			{ label: "进行中", value: 2 },
+			{ label: "已完成", value: 3 },
+			{ label: "已逾期", value: 4 }
+		]
+	},
 	{ prop: "operation", label: "操作", fixed: "right", width: 100 }
 ];
 // 项目或者工程名字
diff --git a/src/views/hz-enterprise/projectMonitor/qualityManagement/index.vue b/src/views/hz-enterprise/projectMonitor/qualityManagement/index.vue
index 6664c50..1df82fd 100644
--- a/src/views/hz-enterprise/projectMonitor/qualityManagement/index.vue
+++ b/src/views/hz-enterprise/projectMonitor/qualityManagement/index.vue
@@ -142,6 +142,19 @@ const columns: ColumnProps[] = [
 		width: 150
 	},
 	{ prop: "slippage", label: "逾期情况(天)", width: 150 },
+	{
+		prop: "state",
+		label: "状态",
+		search: { el: "select" },
+		width: 150,
+		enum: [
+			{ label: "执法中", value: 1 },
+			{ label: "待整改", value: 2 },
+			{ label: "待审核", value: 3 },
+			{ label: "已闭合", value: 4 },
+			{ label: "已驳回", value: 5 }
+		]
+	},
 	{ prop: "operation", label: "操作", fixed: "right", width: 100 }
 ];
 const detailsDialog = ref(false);
diff --git a/src/views/hz-enterprise/projectMonitor/safetyManagement/index.vue b/src/views/hz-enterprise/projectMonitor/safetyManagement/index.vue
index fe2bfef..e6ae5d9 100644
--- a/src/views/hz-enterprise/projectMonitor/safetyManagement/index.vue
+++ b/src/views/hz-enterprise/projectMonitor/safetyManagement/index.vue
@@ -140,6 +140,19 @@ const columns: ColumnProps[] = [
 		width: 150
 	},
 	{ prop: "slippage", label: "逾期情况(天)", width: 150 },
+	{
+		prop: "state",
+		label: "状态",
+		search: { el: "select" },
+		width: 150,
+		enum: [
+			{ label: "执法中", value: 1 },
+			{ label: "待整改", value: 2 },
+			{ label: "待审核", value: 3 },
+			{ label: "已闭合", value: 4 },
+			{ label: "已驳回", value: 5 }
+		]
+	},
 	{ prop: "operation", label: "操作", fixed: "right", width: 100 }
 ];
 const detailsDialog = ref(false);