雨量预警调整

src/views/disasterRiskMonitor/hazardousChemicalEnterprises.vue

@@ -81,7 +81,8 @@
           >
             <template #default="scope">
               <div style="display: flex; justify-content: center">
-                <img :src="iconStatus(scope.row)" style="width: 40px" alt="" />
+                <div v-if="scope.row.weather_warninglevel === '-'">-</div>
+                <img v-else :src="iconStatus(scope.row)" style="width: 40px" alt="" />
               </div>
             </template>
           </el-table-column>
@@ -205,7 +206,7 @@ const iconStatus = row => {
     } else {
       return tempRed;
     }
-  } else if (row.weather_warning_type === "雷雨大风") {
+  } else if (row.weather_warning_type === "雷雨大风预警") {
     if (row.weather_warninglevel === "5") {
       return thunWhite;
     } else if (row.weather_warninglevel === "4") {
@@ -217,7 +218,7 @@ const iconStatus = row => {
     } else {
       return thunRed;
     }
-  } else {
+  } else if (row.weather_warning_type === "台风") {
     if (row.weather_warninglevel === "5") {
       return thphoonWhite;
     } else if (row.weather_warninglevel === "4") {

src/views/disasterRiskMonitor/rainfallInRainShelter.vue

@@ -79,11 +79,8 @@
           >
             <template #default="scope">
               <div style="display: flex; justify-content: center">
-                <img
-                  :src="iconStatus(scope.row)"
-                  style="width: 40px"
-                  alt=""
-                />
+                <div v-if="scope.row.weather_warninglevel === '-'">-</div>
+                <img v-else :src="iconStatus(scope.row)" style="width: 40px" alt="" />
               </div>
             </template>
           </el-table-column>
@@ -216,7 +213,7 @@ const iconStatus = row => {
     } else {
       return tempRed;
     }
-  } else if (row.weather_warning_type === "雷雨大风") {
+  } else if (row.weather_warning_type === "雷雨大风预警") {
     if (row.weather_warninglevel === "5") {
       return thunWhite;
     } else if (row.weather_warninglevel === "4") {
@@ -228,7 +225,7 @@ const iconStatus = row => {
     } else {
       return thunRed;
     }
-  } else {
+  } else if (row.weather_warning_type === "台风") {
     if (row.weather_warninglevel === "5") {
       return thphoonWhite;
     } else if (row.weather_warninglevel === "4") {

src/views/disasterRiskMonitor/rainfallMonitoring.vue

@@ -78,11 +78,8 @@
           >
             <template #default="scope">
               <div style="display: flex; justify-content: center">
-                <img
-                    :src="iconStatus(scope.row)"
-                    style="width: 40px"
-                    alt=""
-                />
+                <div v-if="scope.row.weather_warninglevel === '-'">-</div>
+                <img v-else :src="iconStatus(scope.row)" style="width: 40px" alt="" />
               </div>
             </template>
           </el-table-column>
@@ -210,7 +207,7 @@ const iconStatus = row => {
     } else {
       return tempRed;
     }
-  } else if (row.weather_warning_type === "雷雨大风") {
+  } else if (row.weather_warning_type === "雷雨大风预警") {
     if (row.weather_warninglevel === "5") {
       return thunWhite;
     } else if (row.weather_warninglevel === "4") {
@@ -222,7 +219,7 @@ const iconStatus = row => {
     } else {
       return thunRed;
     }
-  } else {
+  } else if (row.weather_warning_type === "台风") {
     if (row.weather_warninglevel === "5") {
       return thphoonWhite;
     } else if (row.weather_warninglevel === "4") {

src/views/leader/index.vue

@@ -44,6 +44,7 @@
         :text="noticeBarState.event_title"
         class="notice"
         @click="handleNoticeBar"
+        @close="handleClose"
       />
       <div class="padding-content">
         <van-grid :column-num="2">
@@ -104,6 +105,9 @@ const noticeBarState = reactive({
 const handleNoticeBar = () => {
   router.push({name: 'InformationReception'});
 };
+const handleClose = (e) => {
+  e.stopPropagation();
+}
 // 菜单数据
 const menu = ref([
   { name: "工作审批", icon: "icon1", num: 0, url: "workApprovalIndex" },