From 3a204335e1e1f87fd25f9c2b96df0061961517cd Mon Sep 17 00:00:00 2001
From: kun <1422840143@qq.com>
Date: Wed, 19 Jul 2023 15:35:44 +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/goverment.ts                  |  4 +-
 src/api/modules/largeSreen.ts                 |  6 +-
 .../components/Header/ToolBarRight.vue        | 10 +--
 src/views/goverment/dustManagement/index.vue  |  9 +-
 .../largeScreen/components/map2D.vue          | 28 ++-----
 .../notice/newNotification/index.scss         |  8 ++
 .../notice/newNotification/index.vue          | 83 +++++++++++++------
 src/views/goverment/videoMonitor/index.scss   | 17 +++-
 src/views/goverment/videoMonitor/index.vue    |  7 +-
 9 files changed, 110 insertions(+), 62 deletions(-)

diff --git a/src/api/modules/goverment.ts b/src/api/modules/goverment.ts
index 8eb9dbf..40ec7a2 100644
--- a/src/api/modules/goverment.ts
+++ b/src/api/modules/goverment.ts
@@ -250,8 +250,8 @@ export const getDustengineeringPage = (params: User.ReqUserParams) => {
 	return http.post<ResPage<User.ResUserList>>(BASEURL + `/gov/environmentDev/engineeringPage`, params);
 };
 // 统计扬尘设备数据
-export const getDuststatistics = () => {
-	return http.get<ResPage<User.ResUserList>>(BASEURL + `/gov/environmentDev/statistics`);
+export const getDuststatistics = (params: any) => {
+	return http.get<ResPage<User.ResUserList>>(BASEURL + `/gov/environmentDev/statistics/${params.type}`);
 };
 // 列表查询扬尘设备管理信息
 export const getDustMonitorDev = (params: ReqAiMonitorDev) => {
diff --git a/src/api/modules/largeSreen.ts b/src/api/modules/largeSreen.ts
index a1f3277..87b81bf 100644
--- a/src/api/modules/largeSreen.ts
+++ b/src/api/modules/largeSreen.ts
@@ -31,6 +31,10 @@ export const getEngineeringAll = () => {
 	return http.get<ResponseSame<ScreenResponse.EngineeringAllResponse>>(BASEURL + `/gov/api/index/engineeringStat`);
 };
 //顶部查询工程统计信息
-export const getMapProject = () => {
+export const getMapEngineering = () => {
 	return http.get<ResponseSame<ScreenResponse.mapProjectResponse>>(BASEURL + `/gov/api/index/engineeringList`);
 };
+// 顶部查询项目统计信息
+export const getMapProject = () => {
+	return http.get<ResponseSame<ScreenResponse.mapProjectResponse>>(BASEURL + `/gov/api/index/projectList`);
+};
diff --git a/src/layouts/components/Header/ToolBarRight.vue b/src/layouts/components/Header/ToolBarRight.vue
index 80efd9e..19ed8e4 100644
--- a/src/layouts/components/Header/ToolBarRight.vue
+++ b/src/layouts/components/Header/ToolBarRight.vue
@@ -1,17 +1,17 @@
 <template>
 	<div class="tool-bar-ri">
-		<div class="header-icon">
+		<div class="header-icon" style="margin: 0 26px">
 			<!-- <AssemblySize id="assemblySize" />
 			<Language id="language" />
 			<SearchMenu id="searchMenu" />
 			<ThemeSetting id="themeSetting" /> -->
-			<div style="display: flex; align-items: center; cursor: pointer">
+			<!-- <div style="display: flex; align-items: center; cursor: pointer">
 				<Message id="message" />
-				<!-- <Fullscreen id="fullscreen" /> -->
-				<!-- <div class="messagetext">消息</div> -->
+				<Fullscreen id="fullscreen" />
+				<div class="messagetext">消息</div>
 			</div>
 
-			<span style="margin: 0 26px">|</span>
+			<span style="margin: 0 26px">|</span> -->
 		</div>
 		<!-- <span class="username">Geeker</span> -->
 		<Avatar />
diff --git a/src/views/goverment/dustManagement/index.vue b/src/views/goverment/dustManagement/index.vue
index 5a72ec8..73cd880 100644
--- a/src/views/goverment/dustManagement/index.vue
+++ b/src/views/goverment/dustManagement/index.vue
@@ -338,7 +338,10 @@ const getAIengPage = async () => {
 };
 // 获取页面统计数字
 const getStatisticsList = async () => {
-	const res = await getDuststatistics();
+	let requestData = {
+		type: active.value + 1
+	};
+	const res = await getDuststatistics(requestData);
 	mapTitleList.value = res.result;
 };
 
@@ -364,10 +367,12 @@ watch(
 			await getAIproPage();
 			await getproList();
 			onSearch(records.value[0]);
+			getStatisticsList();
 		} else {
 			await getAIengPage();
 			await getengList();
 			onSearch(records.value[0]);
+			getStatisticsList();
 		}
 	},
 	{
@@ -385,8 +390,8 @@ watch(
 
 onMounted(async () => {
 	await mapData();
-	// getAIengPage();
 	getStatisticsList();
+	// getAIengPage();
 	getproList();
 	await getAIproPage();
 
diff --git a/src/views/goverment/largeScreen/components/map2D.vue b/src/views/goverment/largeScreen/components/map2D.vue
index 3bc3fab..e5c118c 100644
--- a/src/views/goverment/largeScreen/components/map2D.vue
+++ b/src/views/goverment/largeScreen/components/map2D.vue
@@ -59,13 +59,11 @@ const projectStatusImg = ref({
 	}
 });
 const projectStatus = ref({
-	1: "末开工",
-	2: "在建",
-	3: "普通停工",
-	4: "处罚停工",
-	5: "完工",
-	6: "待竣工",
-	7: "竣工"
+	0: "末开工",
+	1: "在建",
+	2: "停工",
+	3: "验收",
+	4: "完工"
 });
 const mapProjectList = ref([]);
 const getProjectList = async () => {
@@ -152,27 +150,15 @@ const initMap = () => {
 			    </div>
 			    <div class="info">
 			      <span class="label">项目名称：</span>
-			      <span class="value">${item.engineering_name}</span>
+			      <span class="value">${item.project_name}</span>
 			    </div>
 			    <div class="info">
 			      <span class="label">项目状态：</span>
 			      <span class="value">${projectStatusEnum.value[item.state] ? projectStatusEnum.value[item.state] : "暂无"}</span>
 			    </div>
-			    <div class="info">
-			      <span class="label">项目造价：</span>
-			      <span class="value">${item.engineering_cost || 0}万元</span>
-			    </div>
-			    <div class="info">
-			      <span class="label">工程面积：</span>
-			      <span class="value">${item.engineering_area || 0}m²</span>
-			    </div>
-			    <div class="info">
-			      <span class="label">建设单位：</span>
-			      <span class="value">${item.enterprise_name || "暂无"}</span>
-			    </div>
 			    <div class="info">
 			      <span class="label">项目地址：</span>
-			      <span class="value">${item.province + item.city + item.district + item.address || "暂无"}</span>
+			      <span class="value">${item.project_address || "暂无"}</span>
 			    </div>
 			  </div>`;
 				marker.on("mousemove", markerMousemove);
diff --git a/src/views/goverment/notice/newNotification/index.scss b/src/views/goverment/notice/newNotification/index.scss
index 75e7156..8977662 100644
--- a/src/views/goverment/notice/newNotification/index.scss
+++ b/src/views/goverment/notice/newNotification/index.scss
@@ -11,6 +11,7 @@
 	.content {
 		display: flex;
 		flex: 1;
+		height: calc(100% - 96px);
 		.left-content {
 			// flex: 1;
 			padding: 26px 36px 0 0;
@@ -24,6 +25,9 @@
 			flex: 1;
 			border-radius: 8px;
 			padding-left: 20px;
+			display: flex;
+			flex-direction: column;
+			overflow: hidden;
 			.book-content {
 				margin: 20px 0;
 				color: #333;
@@ -32,6 +36,10 @@
 					font-size: 20px;
 				}
 			}
+			.checkgroup-content {
+				overflow-y: scroll;
+				flex: 1;
+			}
 		}
 	}
 }
diff --git a/src/views/goverment/notice/newNotification/index.vue b/src/views/goverment/notice/newNotification/index.vue
index 2558f26..05e2380 100644
--- a/src/views/goverment/notice/newNotification/index.vue
+++ b/src/views/goverment/notice/newNotification/index.vue
@@ -89,13 +89,15 @@
 					<el-radio v-for="item in option" :label="item.dictLabel" :key="item.dictCode">{{ item.dictValue }}</el-radio>
 				</el-radio-group>
 				<div>收件人</div>
-				<el-checkbox-group class="flx-justify-column" v-model="value">
-					<el-checkbox
-						v-for="item in nameList"
-						:label="item.realName || item.enterpriseName || item.projectName || item.acceptName"
-						@change="onChange(item)"
-					/>
-				</el-checkbox-group>
+				<div class="checkgroup-content">
+					<el-checkbox-group class="flx-justify-column" v-model="value">
+						<el-checkbox
+							v-for="item in nameList"
+							:label="item.realName || item.enterpriseName || item.projectName || item.acceptName"
+							@change="onChange(item)"
+						/>
+					</el-checkbox-group>
+				</div>
 			</div>
 		</div>
 		<FileUpload v-model="showFilesUpload" @update:files="handlechange" :files="current.files" :reset="true" />
@@ -189,10 +191,16 @@ const getMsg = val => {
 };
 const handlechange = e => {
 	console.log(e);
+	console.log(current.value);
 	current.value.files = e.map(item => {
 		item.label = current.value.dictLabel;
 		return item;
 	});
+	if (!current.value.fileName) {
+		e.map(item => {
+			current.value.fileName = item.response.filename;
+		});
+	}
 	console.log(annexFileList.value);
 };
 // 通讯录过滤寻找匹配合适项
@@ -267,7 +275,9 @@ const onAddData = () => {
 
 const deleteRow = row => {
 	const i = annexFileList.value?.indexOf(row);
-	i != null && annexFileList.value?.splice(i, 1);
+	console.log(i);
+	annexFileList.value?.splice(i, 1);
+	// i != null && annexFileList.value?.splice(i, 1);
 };
 
 // 上传附件按钮
@@ -325,7 +335,15 @@ const handleSubmit = async (formEl: FormInstance | undefined) => {
 				annexFileList.value.forEach(item => {
 					let files = item.files;
 					files?.forEach(j => {
-						editFiles.push(j.response);
+						if (j.response.fileId) {
+							editFiles.push(j.response);
+						} else {
+							editFiles.push({
+								fileName: j.response.filename,
+								fileSize: "",
+								fileUrl: j.response.url
+							});
+						}
 					});
 				});
 				await noticeeditmyPost({
@@ -395,27 +413,42 @@ onMounted(async () => {
 		console.log(searchForm.value.type);
 
 		leftForm.value = store.Message;
-		annexFileList.value.forEach(item => {
-			const currFiles = store.Message.annexFileList.filter(j => {
-				return j.label == item.fileName;
-			});
-			const files = [];
+		console.log(annexFileList.value);
+		console.log(store.Message.annexFileList);
+		annexFileList.value = [];
+		store.Message.annexFileList.forEach(item => {
+			// const currFiles = store.Message.annexFileList.filter(j => {
+			// 	return j.label == item.fileName;
+			// });
+			// const files = [];
 
-			currFiles.forEach(curr => {
-				annexFileList.value.fileName = curr.fileName;
-				files.push({
-					id: curr.fileId,
-					name: curr.fileName,
-					size: +curr.fileSize,
-					type: "image/png",
-					response: { ...curr, contentType: "image/png" }
-				});
+			// currFiles.forEach(curr => {
+			// 	// item.fileName = curr.fileName;
+			// 	files.push({
+			// 		id: curr.fileId,
+			// 		name: curr.fileName,
+			// 		size: +curr.fileSize,
+			// 		type: "image/png",
+			// 		response: { ...curr, contentType: "image/png" }
+			// 	});
+			// });
+			annexFileList.value.push({
+				fileName: item.fileName,
+				files: [
+					{
+						id: item.fileId,
+						name: item.fileName,
+						size: +item.fileSize,
+						type: "image/png",
+						response: { ...item, contentType: "image/png" }
+					}
+				]
 			});
-
-			item.files = files;
+			// item.files = files;
 			// item.fileName = store.Message?.title;
 		});
 		console.log(annexFileList.value);
+		console.log(annexFileList.value.fileName);
 		tags.value = store.Message.acceptList;
 
 		tags.value.forEach(item => {
diff --git a/src/views/goverment/videoMonitor/index.scss b/src/views/goverment/videoMonitor/index.scss
index f6a6e65..2392d8c 100644
--- a/src/views/goverment/videoMonitor/index.scss
+++ b/src/views/goverment/videoMonitor/index.scss
@@ -4,6 +4,9 @@
 	display: flex;
 	flex-direction: column;
 	background-color: #f6f6f6;
+	.plr-20 {
+		height: calc(100% - 112px);
+	}
 	// padding: 0 20px;
 	// overflow: hidden;
 	.middle-video {
@@ -85,7 +88,17 @@
 		}
 	}
 }
-
+:deep() {
+	.el-tabs__content {
+		height: calc(100% - 55px);
+	}
+	.el-tab-pane {
+		height: 100%;
+	}
+	.el-scrollbar {
+		overflow-y: scroll;
+	}
+}
 .demo-tabs > .el-tabs__content {
 	padding: 32px;
 	width: 15vw;
@@ -98,7 +111,7 @@
 	border-radius: 8px;
 	height: 100%;
 	background-color: #fff;
-	overflow: auto;
+	// overflow: auto;
 	:deep(.el-tabs__nav-wrap) {
 		// overflow: auto;
 		display: flex;
diff --git a/src/views/goverment/videoMonitor/index.vue b/src/views/goverment/videoMonitor/index.vue
index bc985bb..f14cdf2 100644
--- a/src/views/goverment/videoMonitor/index.vue
+++ b/src/views/goverment/videoMonitor/index.vue
@@ -26,7 +26,7 @@
 					<h3>实时视频</h3>
 					<!-- <span>-</span>
 					<h3>{{ childTitle }}</h3> -->
-					<img @click="onPhoto" src="@/assets/images/AIwaring/抓拍.png" alt="" />
+					<!-- <img @click="onPhoto" src="@/assets/images/AIwaring/抓拍.png" alt="" /> -->
 				</div>
 				<!-- 视频数据站位 -->
 				<!-- <div id="playWnd" ref="playWndBox" class="box vedioShow"></div> -->
@@ -41,7 +41,7 @@
 					></div>
 				</div>
 			</div>
-			<div class="right-form">
+			<!-- <div class="right-form">
 				<div class="date-form">
 					<el-date-picker
 						v-model="dateForm.dateTime"
@@ -84,7 +84,6 @@
 							</div>
 						</div>
 						<div class="question-form" v-for="item in rightForm" :key="item.monitorId">
-							<!-- <div class="title">{{ active === "first" ? item.projectName : item.engineeringName }}</div> -->
 							<div class="title">{{ item.engineeringName === null ? item.projectName : item.engineeringName }}</div>
 
 							<div class="desc">
@@ -149,7 +148,7 @@
 					:handleCurrentChange="handleCurrentChange"
 					class="pagination"
 				/>
-			</div>
+			</div> -->
 		</div>
 	</div>
 </template>