From c8658c737dbea8320c4f770362d9d376fffaa30f Mon Sep 17 00:00:00 2001
From: X_Rian <904416525@qq.com>
Date: Mon, 8 Jul 2024 13:42:35 +0800
Subject: [PATCH] =?UTF-8?q?flx=EF=BC=9A=E4=BF=AE=E5=A4=8D=E4=BA=BA?=
 =?UTF-8?q?=E5=91=98=E9=A3=8E=E9=99=A9=E7=AC=AC=E4=B8=80=E6=AC=A1=E4=B8=8D?=
 =?UTF-8?q?=E6=98=BE=E7=A4=BA=20=E6=96=87=E5=AD=97=E6=8F=90=E7=A4=BA?=
 =?UTF-8?q?=E5=BC=B9=E7=AA=97=E5=A4=AA=E9=95=BF=E5=AF=BC=E8=87=B4=E9=A1=B5?=
 =?UTF-8?q?=E9=9D=A2=E5=AE=BD=E5=BA=A6=E8=B6=85=E5=87=BA?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .env.development                              |  4 +--
 src/styles/element.scss                       |  4 +++
 .../commandCenter/leftBottom.vue              |  5 ++-
 .../dialogCompnnents/major-hidder.vue         | 24 +++++++-------
 .../dialogCompnnents/risk-count.vue           | 32 ++++++++-----------
 5 files changed, 33 insertions(+), 36 deletions(-)

diff --git a/.env.development b/.env.development
index 67b2660..4f79e0e 100644
--- a/.env.development
+++ b/.env.development
@@ -4,7 +4,7 @@ NODE_ENV = 'development'
 # 本地环境接口地址(/api/index.ts文件中使用)
 # 后端本地
 # VITE_API_URL = 'http://192.168.34.155:19111'
-# VITE_API_URL = 'http://192.168.34.221:9111' #雄哥本地
+VITE_API_URL = 'http://192.168.34.221:9111' #雄哥本地
 # VITE_API_URL = 'http://182.90.224.237:51234'  #雄哥远程
 # VITE_API_URL = 'http://192.168.34.221:28889'
 # VITE_API_URL = 'http://121.196.214.246/api'
@@ -25,7 +25,7 @@ NODE_ENV = 'development'
 # 七参数标准版(演示平台)
 # VITE_API_URL = 'http://jxj.zhgdyun.com:9809'
 # agjt
-VITE_API_URL = 'http://42.180.188.17:9809' #生产环境
+# VITE_API_URL = 'http://42.180.188.17:9809' #生产环境
 # VITE_API_URL = 'http://42.180.188.17:11211' #测试环境
 # VITE_API_URL = 'http://jxj.zhgdyun.com:19812'
 # 苏立信/重庆市南岸区
diff --git a/src/styles/element.scss b/src/styles/element.scss
index 46a786e..c2be8d6 100644
--- a/src/styles/element.scss
+++ b/src/styles/element.scss
@@ -371,4 +371,8 @@
 .el-pagination.is-background .el-pager li:not(.is-disabled).is-active {
     background-color: #262d47 !important;
     color: #fff;
+}
+
+.el-popper.is-dark {
+    max-width: 500px;
 }
\ No newline at end of file
diff --git a/src/views/commandScreen/commandCenter/leftBottom.vue b/src/views/commandScreen/commandCenter/leftBottom.vue
index 080b190..801798c 100644
--- a/src/views/commandScreen/commandCenter/leftBottom.vue
+++ b/src/views/commandScreen/commandCenter/leftBottom.vue
@@ -152,7 +152,7 @@ s
 </template>
 
 <script setup lang="ts">
-import { onMounted, ref, reactive } from "vue";
+import { onMounted, ref, reactive, nextTick } from "vue";
 import * as echarts from "echarts";
 // import ECharts from "vue-echarts";
 import { selectQualityStatisticsApi } from "@/api/modules/projectOverview";
@@ -327,7 +327,6 @@ const handleTab = (val: number) => {
 		activeIfo.activeIndex = val;
 		queryAttendanceOfEachCompany(false);
 	} else if (activeIfo.activeIndex == 0) {
-		activeIfo.activeIndex = val;
 		getWorkerRiskByProject(false, 1);
 	}
 };
@@ -547,7 +546,7 @@ const getWorkerRiskByProject = async (showLoading: boolean, val: number) => {
 		];
 		randerInfo.titleInfo.percentage = res.result.area;
 	}
-	// activeIfo.activeIndex = val;
+	activeIfo.activeIndex = val;
 };
 
 const setIntervalFn = (showLoading: boolean) => {
diff --git a/src/views/commandScreen/dialogCompnnents/major-hidder.vue b/src/views/commandScreen/dialogCompnnents/major-hidder.vue
index 541dd29..c26f6f0 100644
--- a/src/views/commandScreen/dialogCompnnents/major-hidder.vue
+++ b/src/views/commandScreen/dialogCompnnents/major-hidder.vue
@@ -981,18 +981,18 @@ onMounted(async () => {
 	// drawEchart3();
 	// await getCompanyList();
 	// await getMemberCountList("search");
-	refScrollbar.value.wrapRef.addEventListener("scroll", (e: any) => {
-		const scrollTop = e.target.scrollTop;
-		const scrollHeight = e.target.scrollHeight;
-		const clientHeight = e.target.clientHeight;
-		// 向上加载更多
-		if (scrollTop >= scrollHeight - clientHeight - 1) {
-			if (moreScroll.value) {
-				// getMemberCountList("more");
-				getXzSecurityQualitylnspectionRecordlist("more");
-			}
-		}
-	});
+	// refScrollbar.value.wrapRef.addEventListener("scroll", (e: any) => {
+	// 	const scrollTop = e.target.scrollTop;
+	// 	const scrollHeight = e.target.scrollHeight;
+	// 	const clientHeight = e.target.clientHeight;
+	// 	// 向上加载更多
+	// 	if (scrollTop >= scrollHeight - clientHeight - 1) {
+	// 		if (moreScroll.value) {
+	// 			// getMemberCountList("more");
+	// 			getXzSecurityQualitylnspectionRecordlist("more");
+	// 		}
+	// 	}
+	// });
 });
 </script>
 
diff --git a/src/views/commandScreen/dialogCompnnents/risk-count.vue b/src/views/commandScreen/dialogCompnnents/risk-count.vue
index 34892e2..69d4bc6 100644
--- a/src/views/commandScreen/dialogCompnnents/risk-count.vue
+++ b/src/views/commandScreen/dialogCompnnents/risk-count.vue
@@ -53,17 +53,11 @@
 						<div>{{ index + 1 }}</div>
 						<div>{{ item.problemDescription }}</div>
 						<div>
-							<el-tooltip class="box-item" effect="dark" :content="item.remark" placement="top-start">
-								<span>{{item.remark}}</span>
+							<el-tooltip :hide-after="500" class="box-item" effect="dark" :content="item.remark" placement="top-start">
+								<span>{{ item.remark }}</span>
 							</el-tooltip>
 						</div>
-						<div>{{ item.level == 1
-                          ? "重大"
-                          : item.level == 2
-                          ? "较大"
-                          : item.level == 3
-                          ? "一般"
-                          : "低" }}</div>
+						<div>{{ item.level == 1 ? "重大" : item.level == 2 ? "较大" : item.level == 3 ? "一般" : "低" }}</div>
 						<div>{{ item.inspectTime }}</div>
 					</div>
 					<div class="notoDta" v-if="partyMemberList.length == 0">
@@ -72,14 +66,14 @@
 					</div>
 				</el-scrollbar>
 				<el-pagination
-			v-if="partyMemberList.length != 0"
-				background
-				:page-size="10"
-				style="justify-content: center"
-				@current-change="onCurrentChange"
-				layout="prev, pager, next"
-				:total="total"
-			/>
+					v-if="partyMemberList.length != 0"
+					background
+					:page-size="10"
+					style="justify-content: center"
+					@current-change="onCurrentChange"
+					layout="prev, pager, next"
+					:total="total"
+				/>
 			</div>
 		</div>
 	</div>
@@ -107,7 +101,7 @@ const searchForm = ref({
 });
 const checked = ref(1);
 const partyMemberList = ref({} as any);
-const statisticsData = ref({} as any)
+const statisticsData = ref({} as any);
 const changeSelect = (index: any) => {
 	checked.value = index;
 };
@@ -288,7 +282,7 @@ onMounted(async () => {
 				}
 			}
 		}
-		.radio-content{
+		.radio-content {
 			margin-top: 2%;
 			:deep(.el-radio) {
 				.el-radio__label {