Merge remote-tracking branch 'origin/dev' into dev

src/components/FooterSection/index.vue

@@ -6,7 +6,8 @@
 .footer-section {
   width: 8960px;
   height: 256px;
-  background: url('@/assets/images/footer.png') no-repeat 100% 100%;
+  background: url('@/assets/images/footer.png') no-repeat;
+  background-size: 100% 100%;
   pointer-events: none;
 }
 </style>

src/components/HeaderSection/index.vue

@@ -111,6 +111,8 @@ const clickMenu = (item) => {
       margin-left: 81px;
       .menu-item {
         background-image: url('@/assets/images/header/leftMenu.png');
+        background-repeat: no-repeat;
+        background-size: 100% 100%;
         &:hover {
           background-image: url('@/assets/images/header/leftMenuActive.png');
         }
@@ -148,6 +150,8 @@ const clickMenu = (item) => {
     .menu {
       .menu-item {
         background-image: url('@/assets/images/header/rightMenu.png');
+        background-repeat: no-repeat;
+        background-size: 100% 100%;
         &:hover {
           background-image: url('@/assets/images/header/rightMenuActive.png');
         }
@@ -160,6 +164,8 @@ const clickMenu = (item) => {
       width: 68px;
       height: 68px;
       background-image: url('@/assets/images/header/user.png');
+      background-repeat: no-repeat;
+      background-size: 100% 100%;
       margin-top: 54px;
       margin-left: 57px;
       margin-right: 57px;

src/views/emergencyCommandMap/RightSection/SelectPlan.vue

@@ -1,5 +1,5 @@
 <template>
-  <Dialog ref="dialogRef" v-model="isDialogVisible" type="lg" title="预案任务下发" @confirm="confirmRegister" @close="handleCloseDialog">
+  <Dialog ref="dialogRef" v-model="isDialogVisible" type="lg" title="预案任务下发" @confirm="startSelectedPlan" @close="handleCloseDialog">
     <div class="dialog-content">
       <div class="dialog-body">
         <!--        <div class="plan-selector">-->

src/views/emergencyCommandMap/RightSection/StartPlan.vue

@@ -197,9 +197,7 @@ const fetchPlanData = async () => {
       //planData.scope = data.scope || '这是内容...';
       //planData.principles = data.principles || '这是内容...';
       planData.plan_id = data.plan_id; // 确保 planData 中包含 plan_id
-
       getPlanDocInfo(planData.plan_id);
-
     } else {
       ElMessage.error('未能从服务器获取有效的预案数据');
     }
@@ -340,7 +338,7 @@ h2 {
   margin-top: 30px;
   .tabs2 {
     height: 560px;
-    
+
     overflow-y: auto;
     .tab {
       /*width: 399px;*/

src/views/routineCommandMap/LeftSection/RiskMonitor.vue

@@ -37,7 +37,7 @@
           <i :class="getStatusClass()"></i>
           <div class="text-box">
             <div class="text1">当前最高预警等级</div>
-            <div :class="getStatusClass2()">{{ hazardousChemicals.nowWarningLevelName }}</div>
+            <div :class="getStatusClass2()">{{ hazardousChemicals.nowWarningLevel }}</div>
           </div>
         </div>
         <i class="line" />
@@ -119,31 +119,30 @@ const riskList = ref([
 // 危化品
 const hazardousChemicals = reactive({
   nowWarningLevel: '',
-  nowWarningLevelName: '',
   highRiskArea: '',
   warningLevelData: []
 });
 const getStatusClass = () => {
   const level = hazardousChemicals.nowWarningLevel;
-  if (level === 1) {
+  if (level === '低风险') {
     return 'icon1 lowRisk1';
-  } else if (level === 2) {
+  } else if (level === '一般风险') {
     return 'icon1 normalRisk1';
-  } else if (level === 3) {
+  } else if (level === '较大风险') {
     return 'icon1 moreRisk1';
-  } else if (level === 4) {
+  } else if (level === '重大风险') {
     return 'icon1 significantRisk1';
   }
 };
 const getStatusClass2 = () => {
   const level = hazardousChemicals.nowWarningLevel;
-  if (level === 1) {
+  if (level === '低风险') {
     return 'lowRiskText1';
-  } else if (level === 2) {
+  } else if (level === '一般风险') {
     return 'normalRiskText1';
-  } else if (level === 3) {
+  } else if (level === '较大风险') {
     return 'moreRiskText1';
-  } else if (level === 4) {
+  } else if (level === '重大风险') {
     return 'significantRiskText1';
   }
 };
@@ -206,13 +205,13 @@ const getStatusClass5 = () => {
 };
 const getStatusClass6 = (level: string) => {
   if (level === '较低危险') {
-    return 'lowRiskBox';
+    return 'forestFire1';
   } else if (level === '较高危险') {
-    return 'normalRiskBox';
+    return 'forestFire2';
   } else if (level === '高度危险') {
-    return 'moreRiskBox';
+    return 'forestFire3';
   } else if (level === '极度危险') {
-    return 'significantRiskBox';
+    return 'forestFire4';
   }
 };
 const getStatusClass7 = (level: string) => {
@@ -233,14 +232,7 @@ const getStatusClass7 = (level: string) => {
 const initData = () => {
   if (active.value === '0') {
     getMaxHazardous().then((res) => {
-      const levelList = {
-        1: '低风险',
-        2: '一般风险',
-        3: '较大风险',
-        4: '重大风险'
-      };
       hazardousChemicals.nowWarningLevel = res.data.max_level;
-      hazardousChemicals.nowWarningLevelName = levelList[res.data.max_level];
     });
     getHazardousWarrning().then((res) => {
       hazardousChemicals.highRiskArea = res.data.result;
@@ -562,6 +554,7 @@ onMounted(() => {
   color: #fff;
   font-size: 38px;
   line-height: 70px;
+  overflow-y: auto;
 }
 .data-box5 {
   width: 1892px;
@@ -634,6 +627,8 @@ onMounted(() => {
     margin: 0 72px;
   }
   .box-right {
+    height: 170px;
+    overflow-y: auto;
     font-size: 38px;
     line-height: 76px;
     color: #edfaff;
@@ -652,69 +647,68 @@ onMounted(() => {
     display: flex;
     font-size: 38px;
     color: #edfaff;
-    .lowRiskBox {
+    .forestFire1 {
       background: url('@/assets/images/routineCommandMap/riskMonitor/dataBox1.png') no-repeat;
       background-size: 100% 100%;
       .icon {
         width: 76px;
         height: 82px;
-        background: url('@/assets/images/routineCommandMap/riskMonitor/lowRisk2.png') no-repeat;
-        background-size: 100% 100%;
-        margin-right: 25px;
+        background: url('@/assets/images/routineCommandMap/riskMonitor/forestFire1.png') no-repeat;
       }
       .text {
         background-image: linear-gradient(to bottom, #ffffff 25%, #247dff 100%);
       }
     }
-    .normalRiskBox {
+    .forestFire2 {
       background: url('@/assets/images/routineCommandMap/riskMonitor/dataBox2.png') no-repeat;
       .icon {
         width: 76px;
         height: 82px;
-        background: url('@/assets/images/routineCommandMap/riskMonitor/normalRisk2.png') no-repeat;
-        background-size: 100% 100%;
-        margin-right: 25px;
+        background: url('@/assets/images/routineCommandMap/riskMonitor/forestFire2.png') no-repeat;
       }
       .text {
         background-image: linear-gradient(to bottom, #ffffff 25%, #ffda00 100%);
       }
     }
-    .moreRiskBox {
+    .forestFire3 {
       background: url('@/assets/images/routineCommandMap/riskMonitor/dataBox3.png') no-repeat;
       .icon {
         width: 76px;
         height: 83px;
-        background: url('@/assets/images/routineCommandMap/riskMonitor/moreRisk2.png') no-repeat;
-        background-size: 100% 100%;
-        margin-right: 25px;
+        background: url('@/assets/images/routineCommandMap/riskMonitor/forestFire3.png') no-repeat;
       }
       .text {
         background-image: linear-gradient(to bottom, #ffffff 25%, #ff8400 100%);
       }
     }
-    .significantRiskBox {
+    .forestFire4 {
       background: url('@/assets/images/routineCommandMap/riskMonitor/dataBox4.png') no-repeat;
       .icon {
         width: 76px;
         height: 83px;
-        background: url('@/assets/images/routineCommandMap/riskMonitor/significantRisk2.png') no-repeat;
-        background-size: 100% 100%;
-        margin-right: 25px;
+        background: url('@/assets/images/routineCommandMap/riskMonitor/forestFire4.png') no-repeat;
       }
       .text {
         background-image: linear-gradient(to bottom, #ffffff 25%, #ff2b34 100%);
       }
     }
-    .lowRiskBox,
-    .normalRiskBox,
-    .moreRiskBox,
-    .significantRiskBox {
+    .forestFire1,
+    .forestFire2,
+    .forestFire3,
+    .forestFire4 {
       width: 365px;
       height: 124px;
       background-size: 100% 100%;
       padding-left: 30px;
       display: flex;
       align-items: center;
+      .icon {
+        width: 70px;
+        height: 73px;
+        background-size: 100% 100%;
+        margin-right: 25px;
+        flex-shrink: 0;
+      }
       .text {
         color: transparent;
         -webkit-background-clip: text;