Merge branch 'dev-Rain' into shenzhen-dev

.env.development

@@ -3,10 +3,8 @@ NODE_ENV = 'development'
 
 # 本地环境接口地址(/api/index.ts文件中使用)
 # 后端本地
-VITE_API_URL = 'http://192.168.34.221:9111'
-# VITE_API_URL = 'http://182.90.224.237:51234' #雄哥远程
-# VITE_API_URL = 'http://jxj.zhgdyun.com:61212' #杰哥远程
-# VITE_API_URL = 'http://192.168.34.155:19111'
+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'

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>

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">

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;

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