From 2c08d6eca0987d2fa87f44a3db7f169b0889df7f Mon Sep 17 00:00:00 2001
From: Vce <daisy_vce@yeah.net>
Date: Sun, 12 May 2024 18:02:27 +0800
Subject: [PATCH 1/2] =?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

---
 .env.development                              |  3 ++-
 .../dialogCompnnents/safe-info.vue            | 24 +++++++++++++++----
 2 files changed, 22 insertions(+), 5 deletions(-)

diff --git a/.env.development b/.env.development
index 06c624d..31b7352 100644
--- a/.env.development
+++ b/.env.development
@@ -3,7 +3,8 @@ NODE_ENV = 'development'
 
 # 本地环境接口地址(/api/index.ts文件中使用)
 # 后端本地
-VITE_API_URL = 'http://192.168.34.221:9111'
+VITE_API_URL = 'http://192.168.34.221:19111'
+# VITE_API_URL = 'http://192.168.34.221:9111'
 # VITE_API_URL = 'http://192.168.34.221:28888'
 # VITE_API_URL = 'http://121.196.214.246/api'
 # VITE_API_URL = 'http://jxj.zhgdyun.com:100'
diff --git a/src/views/commandScreen/dialogCompnnents/safe-info.vue b/src/views/commandScreen/dialogCompnnents/safe-info.vue
index d5fcfe4..9853d4b 100644
--- a/src/views/commandScreen/dialogCompnnents/safe-info.vue
+++ b/src/views/commandScreen/dialogCompnnents/safe-info.vue
@@ -75,11 +75,27 @@
 							</el-image>
 							<!-- <img :src="item.fieldAcquisitionUrl" alt="" srcset=""> -->
 						</div>
-						<div>{{ item.enterpriseName }}</div>
-						<div>{{ item.personType == 1 ? item.teamName : item.departmentName }}</div>
-						<div>{{ item.idCard }}</div>
+						<div>
+							<el-tooltip class="box-item" effect="dark" :content="item.enterpriseName" placement="top-start">
+								<text>{{ item.enterpriseName }}</text>
+							</el-tooltip>
+						</div>
+						<div>
+							<el-tooltip class="box-item" effect="dark" :content="item.personType == 1 ? item.teamName : item.departmentName" placement="top-start">
+								<text>{{ item.personType == 1 ? item.teamName : item.departmentName }}</text>
+							</el-tooltip>
+						</div>
+						<div>
+							<el-tooltip class="box-item" effect="dark" :content="item.idCard" placement="top-start">
+								<text>{{ item.idCard }}</text>
+							</el-tooltip>
+						</div>
 						<div>{{ item.phoneNumber }}</div>
-						<div>{{ item.educationTime }}</div>
+						<div>
+							<el-tooltip class="box-item" effect="dark" :content="item.educationTime" placement="top-start">
+								<text>{{ item.educationTime }}</text>
+							</el-tooltip>
+						</div>
 						<div>{{ item.isExamPass == -1 ? "未培训" : item.isExamPass == 1 ? "合格" : "不合格" }}</div>
 					</div>
 					<div class="notoDta" v-if="partyMemberList.length == 0">

From d69541caadce2e535716e37b8547f30889a0eda9 Mon Sep 17 00:00:00 2001
From: Vce <daisy_vce@yeah.net>
Date: Mon, 13 May 2024 01:17:34 +0800
Subject: [PATCH 2/2] =?UTF-8?q?fix=EF=BC=9A=E4=BF=AE=E5=A4=8Dbug?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../dialogCompnnents/month-safe-score.vue          |  2 +-
 .../commandScreen/dialogCompnnents/risk-count.vue  | 14 +++++++++-----
 .../commandScreen/dialogCompnnents/safe-hidden.vue |  9 +++++++--
 .../dialogCompnnents/weather-info.vue              |  2 +-
 4 files changed, 18 insertions(+), 9 deletions(-)

diff --git a/src/views/commandScreen/dialogCompnnents/month-safe-score.vue b/src/views/commandScreen/dialogCompnnents/month-safe-score.vue
index 9b2cc04..010db6b 100644
--- a/src/views/commandScreen/dialogCompnnents/month-safe-score.vue
+++ b/src/views/commandScreen/dialogCompnnents/month-safe-score.vue
@@ -61,7 +61,7 @@
 								<span>告警数量月度环比对比</span>
 							</div>
 							<div class="category-title" style="width:5%">
-								<span>100%</span>
+								<span>20%</span>
 							</div>
 							<div class="category-title" style="width: 10.4%;margin:0 0 0 0">
 								<span>&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;{{ countData.aiScore || 0 }}</span>
diff --git a/src/views/commandScreen/dialogCompnnents/risk-count.vue b/src/views/commandScreen/dialogCompnnents/risk-count.vue
index 1539779..31ab7b9 100644
--- a/src/views/commandScreen/dialogCompnnents/risk-count.vue
+++ b/src/views/commandScreen/dialogCompnnents/risk-count.vue
@@ -52,14 +52,18 @@
 					<div v-for="(item, index) in partyMemberList" class="listStyle" :key="item.id">
 						<div>{{ index + 1 }}</div>
 						<div>{{ item.problemDescription }}</div>
-						<div>{{ item.remark }}</div>
+						<div>
+							<el-tooltip 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>
 						<div>{{ item.inspectTime }}</div>
 					</div>
 					<div class="notoDta" v-if="partyMemberList.length == 0">
diff --git a/src/views/commandScreen/dialogCompnnents/safe-hidden.vue b/src/views/commandScreen/dialogCompnnents/safe-hidden.vue
index 4cc36d2..9263af2 100644
--- a/src/views/commandScreen/dialogCompnnents/safe-hidden.vue
+++ b/src/views/commandScreen/dialogCompnnents/safe-hidden.vue
@@ -305,7 +305,12 @@ onMounted(async () => {
 });
 </script>
 
+<style>
+.el-select-dropdown{
+	width: 180px;
+}</style>
 <style lang="scss" scoped>
+
 @mixin flex {
 	display: flex;
 	align-items: center;
@@ -319,7 +324,7 @@ onMounted(async () => {
 		margin-top: 10px;
 		// background: url("@/assets/images/cardImg.png") no-repeat;
 		background-size: 100% 100%;
-		padding: 20px 15px;
+		padding: 20px 2px;
 		.top-statistics{
 			width: 60%;
 			display: grid;
@@ -328,7 +333,7 @@ onMounted(async () => {
 			color: white;
 			margin: 0 auto;
 			.statistics-item{
-				width: 300px;
+				width: 350px;
 				height: 95px;
 				display: flex;
 				flex-wrap: wrap;
diff --git a/src/views/commandScreen/dialogCompnnents/weather-info.vue b/src/views/commandScreen/dialogCompnnents/weather-info.vue
index 333ecb1..992fa53 100644
--- a/src/views/commandScreen/dialogCompnnents/weather-info.vue
+++ b/src/views/commandScreen/dialogCompnnents/weather-info.vue
@@ -47,7 +47,7 @@
 						<div>{{ index + 1 }}</div>
 						<div>{{ item.regionName }}</div>
 						<div>{{ item.enterpriseName }}</div>
-						<div>{{ item.delayEventType == 1 ? "人为因素" : item.personType == 2 ? "环境因素" : "不可抵抗因素" }}</div>
+						<div>{{ item.delayEventType == 1 ? "人为因素" : item.delayEventType == 2 ? "环境因素" : "不可抵抗因素" }}</div>
 						<div>{{ item.delayEventReason }}</div>
 						<div class="list-img">
 							<el-image