diff --git a/src/views/pictureOnMap/page/FloodControlAndDrainage/Jianceyujin/MonitoringWarningLeft/component/Hhsq.vue b/src/views/pictureOnMap/page/FloodControlAndDrainage/Jianceyujin/MonitoringWarningLeft/component/Hhsq.vue
index 1bf499e..3aa088e 100644
--- a/src/views/pictureOnMap/page/FloodControlAndDrainage/Jianceyujin/MonitoringWarningLeft/component/Hhsq.vue
+++ b/src/views/pictureOnMap/page/FloodControlAndDrainage/Jianceyujin/MonitoringWarningLeft/component/Hhsq.vue
@@ -8,15 +8,15 @@
         </div>
         <div class="sum colorBlue">{{ sumObj.totalNum }}</div>
       </div>
-      <div class="eachSum">
+      <!-- <div class="eachSum">
         <div class="distext">
           <span>超设防</span>
         </div>
         <div class="sum colorYellow">{{ sumObj.csfNum }}</div>
-      </div>
+      </div> -->
       <div class="eachSum">
         <div class="distext">
-          <span>超警戒</span>
+          <span>超常水位</span>
         </div>
         <div class="sum colorOrange">{{ sumObj.cjjNum }}</div>
       </div>
@@ -50,8 +50,8 @@
           <div>{{ item.mormalWaterLevel }}</div>
           <div class="btnOperation">
             <span class="colorRed" v-if="item.warnInfoCode == 3">超控制</span>
-            <span class="colorOrange" v-else-if="item.warnInfoCode == 2">超警戒</span>
-            <span class="colorYellow" v-else-if="item.warnInfoCode == 1">超设防</span>
+            <span class="colorOrange" v-else-if="item.warnInfoCode == 2">超常水位</span>
+            <!-- <span class="colorYellow" v-else-if="item.warnInfoCode == 1">超设防</span> -->
             <span class="start" v-else>正常</span>
           </div>
         </div>
@@ -81,8 +81,8 @@
 <script setup name="Hhsq">
 import { ref, reactive, onMounted } from 'vue';
 import { drainageDispatchMonitorData } from '@/api/FloodControlAndDrainage.js';
-import bus from '@/bus';
 import _bus from '@/bus';
+
 const { proxy } = getCurrentInstance();
 const props = defineProps({
   atSum: {
@@ -142,8 +142,9 @@
   console.log('activeObj.value.fileUrl', activeObj.value);
 
   _bus.emit('panelDataToMap', { ...item, id: undefined });
-  bus.emit('DynamicBus', item);
+  _bus.emit('DynamicBus', item);
 }
+
 onMounted(() => {
   gitDataFun();
 });

diff --git a/src/views/pictureOnMap/page/FloodControlAndDrainage/Jianceyujin/MonitoringWarningLeft/component/Hhsq.vue b/src/views/pictureOnMap/page/FloodControlAndDrainage/Jianceyujin/MonitoringWarningLeft/component/Hhsq.vue
index 1bf499e..3aa088e 100644
--- a/src/views/pictureOnMap/page/FloodControlAndDrainage/Jianceyujin/MonitoringWarningLeft/component/Hhsq.vue
+++ b/src/views/pictureOnMap/page/FloodControlAndDrainage/Jianceyujin/MonitoringWarningLeft/component/Hhsq.vue
@@ -8,15 +8,15 @@
         </div>
         <div class="sum colorBlue">{{ sumObj.totalNum }}</div>
       </div>
-      <div class="eachSum">
+      <!-- <div class="eachSum">
         <div class="distext">
           <span>超设防</span>
         </div>
         <div class="sum colorYellow">{{ sumObj.csfNum }}</div>
-      </div>
+      </div> -->
       <div class="eachSum">
         <div class="distext">
-          <span>超警戒</span>
+          <span>超常水位</span>
         </div>
         <div class="sum colorOrange">{{ sumObj.cjjNum }}</div>
       </div>
@@ -50,8 +50,8 @@
           <div>{{ item.mormalWaterLevel }}</div>
           <div class="btnOperation">
             <span class="colorRed" v-if="item.warnInfoCode == 3">超控制</span>
-            <span class="colorOrange" v-else-if="item.warnInfoCode == 2">超警戒</span>
-            <span class="colorYellow" v-else-if="item.warnInfoCode == 1">超设防</span>
+            <span class="colorOrange" v-else-if="item.warnInfoCode == 2">超常水位</span>
+            <!-- <span class="colorYellow" v-else-if="item.warnInfoCode == 1">超设防</span> -->
             <span class="start" v-else>正常</span>
           </div>
         </div>
@@ -81,8 +81,8 @@
 <script setup name="Hhsq">
 import { ref, reactive, onMounted } from 'vue';
 import { drainageDispatchMonitorData } from '@/api/FloodControlAndDrainage.js';
-import bus from '@/bus';
 import _bus from '@/bus';
+
 const { proxy } = getCurrentInstance();
 const props = defineProps({
   atSum: {
@@ -142,8 +142,9 @@
   console.log('activeObj.value.fileUrl', activeObj.value);
 
   _bus.emit('panelDataToMap', { ...item, id: undefined });
-  bus.emit('DynamicBus', item);
+  _bus.emit('DynamicBus', item);
 }
+
 onMounted(() => {
   gitDataFun();
 });
diff --git a/src/views/pictureOnMap/page/FloodControlAndDrainage/Jianceyujin/MonitoringWarningRigh/component/MonitoringAlarm.vue b/src/views/pictureOnMap/page/FloodControlAndDrainage/Jianceyujin/MonitoringWarningRigh/component/MonitoringAlarm.vue
index 4cf96af..a8c0f5b 100644
--- a/src/views/pictureOnMap/page/FloodControlAndDrainage/Jianceyujin/MonitoringWarningRigh/component/MonitoringAlarm.vue
+++ b/src/views/pictureOnMap/page/FloodControlAndDrainage/Jianceyujin/MonitoringWarningRigh/component/MonitoringAlarm.vue
@@ -51,12 +51,11 @@
         <div class="infoBox">
           <div class="zsIcon"></div>
           <div class="name" :title="item.siteName">{{item.siteName}}</div>
-          <div class="describeCase orangeBor" v-if="item.duration<=15">渍水{{item.duration}}分钟</div>
-          <div class="describeCase redBor"  v-if="item.duration>15">内涝{{item.duration}}分钟</div>
+          <div class="describeCase" :class="item.warnTypeCode=='GJMY'?'redBor':item.warnTypeCode=='GJMYFX'?'orangeBor':item.warnTypeCode=='GWMG'?'yellowBor':'blueBor'">{{getpaikouInfo(item.warnTypeCode)}}{{item.duration}}分钟</div>
         </div>
         <div class="eachProgress">
           <el-progress :text-inside="true" :stroke-width="14" :percentage="item.percentum" status="success">
-            <div class="miaoshu">
+            <div class="miaoshu"  :class="item.percentum>85?'rightSum':''">
               <div class="warningArrows"></div>
               <div class="sum">{{item.warnFactorValue}}</div>
             </div>
@@ -82,7 +81,15 @@
 } from '@/api/FloodControlAndDrainage.js';
 import EachModuleTitle from '@/views/pictureOnMap/page/components/EachModuleTitle.vue';
 import _bus from '@/bus';
+import { getChineseFun } from '@/utils/ruoyi';
+
 const { proxy } = getCurrentInstance();
+const {
+  pipe_warn_type,
+} = proxy.useDict(
+  'pipe_warn_type',
+
+);
 const jcRemark=ref(null)
 
 const activeTab=ref('0')
@@ -128,7 +135,13 @@
 
        gw.map((e)=>{
         let wellDepth=e.wellDepth||2;
-        e.percentum=Number((e.warnFactorValue/wellDepth*100).toFixed(2))
+        let sum=Number((e.warnFactorValue/wellDepth*100).toFixed(2))
+        if(isFinite(sum)){
+e.percentum=sum
+        }else {
+e.percentum=100
+
+        }
       })
     }
   },(error)=>{
@@ -148,7 +161,11 @@
   }
    _bus.emit("DynamicBus", item);
 }
+const getpaikouInfo = (id) => {
+  return getChineseFun(pipe_warn_type.value, 'value', id, 'label');
+};
 onMounted(() => {
+  console.log('pipe_warn_type',pipe_warn_type.value);
   gitDataFun()
 });
 </script>
@@ -158,13 +175,13 @@
   .heatingPower {
    height: calc(100% - 65px);
     overflow-y: auto;
-    padding: 15px;
+    padding: 30px 15px;
     position: relative;
     box-sizing: border-box;
     .unitDeep {
       position: absolute;
       right: 18px;
-      top: 18px;
+      top: 5px;
       font-weight: 500;
       font-size: 14px;
       color: #afd1ff;
@@ -192,6 +209,18 @@
           margin-left: 8px;
           padding: 0 5px;
         }
+        .blueBor {
+          background: linear-gradient(0deg, rgba(250, 150, 64, 0.2) 0%, rgba(250, 150, 64, 0.1) 100%);
+          border-radius: 2px;
+          border: 1px solid #408dfa;
+          color: #408dfa;
+        }
+        .yellowBor {
+          background: linear-gradient(0deg, rgba(250, 150, 64, 0.2) 0%, rgba(250, 150, 64, 0.1) 100%);
+          border-radius: 2px;
+          border: 1px solid #faf740;
+          color: #faf740;
+        }
         .orangeBor {
           background: linear-gradient(0deg, rgba(250, 150, 64, 0.2) 0%, rgba(250, 150, 64, 0.1) 100%);
           border-radius: 2px;
@@ -234,6 +263,9 @@
         color: #ffffff;
       }
     }
+    .rightSum {
+      right: 10px;
+    }
     .eachProgress {
       :deep(.el-progress-bar__outer) {
         height: 14px;

diff --git a/src/views/pictureOnMap/page/FloodControlAndDrainage/Jianceyujin/MonitoringWarningLeft/component/Hhsq.vue b/src/views/pictureOnMap/page/FloodControlAndDrainage/Jianceyujin/MonitoringWarningLeft/component/Hhsq.vue
index 1bf499e..3aa088e 100644
--- a/src/views/pictureOnMap/page/FloodControlAndDrainage/Jianceyujin/MonitoringWarningLeft/component/Hhsq.vue
+++ b/src/views/pictureOnMap/page/FloodControlAndDrainage/Jianceyujin/MonitoringWarningLeft/component/Hhsq.vue
@@ -8,15 +8,15 @@
         </div>
         <div class="sum colorBlue">{{ sumObj.totalNum }}</div>
       </div>
-      <div class="eachSum">
+      <!-- <div class="eachSum">
         <div class="distext">
           <span>超设防</span>
         </div>
         <div class="sum colorYellow">{{ sumObj.csfNum }}</div>
-      </div>
+      </div> -->
       <div class="eachSum">
         <div class="distext">
-          <span>超警戒</span>
+          <span>超常水位</span>
         </div>
         <div class="sum colorOrange">{{ sumObj.cjjNum }}</div>
       </div>
@@ -50,8 +50,8 @@
           <div>{{ item.mormalWaterLevel }}</div>
           <div class="btnOperation">
             <span class="colorRed" v-if="item.warnInfoCode == 3">超控制</span>
-            <span class="colorOrange" v-else-if="item.warnInfoCode == 2">超警戒</span>
-            <span class="colorYellow" v-else-if="item.warnInfoCode == 1">超设防</span>
+            <span class="colorOrange" v-else-if="item.warnInfoCode == 2">超常水位</span>
+            <!-- <span class="colorYellow" v-else-if="item.warnInfoCode == 1">超设防</span> -->
             <span class="start" v-else>正常</span>
           </div>
         </div>
@@ -81,8 +81,8 @@
 <script setup name="Hhsq">
 import { ref, reactive, onMounted } from 'vue';
 import { drainageDispatchMonitorData } from '@/api/FloodControlAndDrainage.js';
-import bus from '@/bus';
 import _bus from '@/bus';
+
 const { proxy } = getCurrentInstance();
 const props = defineProps({
   atSum: {
@@ -142,8 +142,9 @@
   console.log('activeObj.value.fileUrl', activeObj.value);
 
   _bus.emit('panelDataToMap', { ...item, id: undefined });
-  bus.emit('DynamicBus', item);
+  _bus.emit('DynamicBus', item);
 }
+
 onMounted(() => {
   gitDataFun();
 });
diff --git a/src/views/pictureOnMap/page/FloodControlAndDrainage/Jianceyujin/MonitoringWarningRigh/component/MonitoringAlarm.vue b/src/views/pictureOnMap/page/FloodControlAndDrainage/Jianceyujin/MonitoringWarningRigh/component/MonitoringAlarm.vue
index 4cf96af..a8c0f5b 100644
--- a/src/views/pictureOnMap/page/FloodControlAndDrainage/Jianceyujin/MonitoringWarningRigh/component/MonitoringAlarm.vue
+++ b/src/views/pictureOnMap/page/FloodControlAndDrainage/Jianceyujin/MonitoringWarningRigh/component/MonitoringAlarm.vue
@@ -51,12 +51,11 @@
         <div class="infoBox">
           <div class="zsIcon"></div>
           <div class="name" :title="item.siteName">{{item.siteName}}</div>
-          <div class="describeCase orangeBor" v-if="item.duration<=15">渍水{{item.duration}}分钟</div>
-          <div class="describeCase redBor"  v-if="item.duration>15">内涝{{item.duration}}分钟</div>
+          <div class="describeCase" :class="item.warnTypeCode=='GJMY'?'redBor':item.warnTypeCode=='GJMYFX'?'orangeBor':item.warnTypeCode=='GWMG'?'yellowBor':'blueBor'">{{getpaikouInfo(item.warnTypeCode)}}{{item.duration}}分钟</div>
         </div>
         <div class="eachProgress">
           <el-progress :text-inside="true" :stroke-width="14" :percentage="item.percentum" status="success">
-            <div class="miaoshu">
+            <div class="miaoshu"  :class="item.percentum>85?'rightSum':''">
               <div class="warningArrows"></div>
               <div class="sum">{{item.warnFactorValue}}</div>
             </div>
@@ -82,7 +81,15 @@
 } from '@/api/FloodControlAndDrainage.js';
 import EachModuleTitle from '@/views/pictureOnMap/page/components/EachModuleTitle.vue';
 import _bus from '@/bus';
+import { getChineseFun } from '@/utils/ruoyi';
+
 const { proxy } = getCurrentInstance();
+const {
+  pipe_warn_type,
+} = proxy.useDict(
+  'pipe_warn_type',
+
+);
 const jcRemark=ref(null)
 
 const activeTab=ref('0')
@@ -128,7 +135,13 @@
 
        gw.map((e)=>{
         let wellDepth=e.wellDepth||2;
-        e.percentum=Number((e.warnFactorValue/wellDepth*100).toFixed(2))
+        let sum=Number((e.warnFactorValue/wellDepth*100).toFixed(2))
+        if(isFinite(sum)){
+e.percentum=sum
+        }else {
+e.percentum=100
+
+        }
       })
     }
   },(error)=>{
@@ -148,7 +161,11 @@
   }
    _bus.emit("DynamicBus", item);
 }
+const getpaikouInfo = (id) => {
+  return getChineseFun(pipe_warn_type.value, 'value', id, 'label');
+};
 onMounted(() => {
+  console.log('pipe_warn_type',pipe_warn_type.value);
   gitDataFun()
 });
 </script>
@@ -158,13 +175,13 @@
   .heatingPower {
    height: calc(100% - 65px);
     overflow-y: auto;
-    padding: 15px;
+    padding: 30px 15px;
     position: relative;
     box-sizing: border-box;
     .unitDeep {
       position: absolute;
       right: 18px;
-      top: 18px;
+      top: 5px;
       font-weight: 500;
       font-size: 14px;
       color: #afd1ff;
@@ -192,6 +209,18 @@
           margin-left: 8px;
           padding: 0 5px;
         }
+        .blueBor {
+          background: linear-gradient(0deg, rgba(250, 150, 64, 0.2) 0%, rgba(250, 150, 64, 0.1) 100%);
+          border-radius: 2px;
+          border: 1px solid #408dfa;
+          color: #408dfa;
+        }
+        .yellowBor {
+          background: linear-gradient(0deg, rgba(250, 150, 64, 0.2) 0%, rgba(250, 150, 64, 0.1) 100%);
+          border-radius: 2px;
+          border: 1px solid #faf740;
+          color: #faf740;
+        }
         .orangeBor {
           background: linear-gradient(0deg, rgba(250, 150, 64, 0.2) 0%, rgba(250, 150, 64, 0.1) 100%);
           border-radius: 2px;
@@ -234,6 +263,9 @@
         color: #ffffff;
       }
     }
+    .rightSum {
+      right: 10px;
+    }
     .eachProgress {
       :deep(.el-progress-bar__outer) {
         height: 14px;
diff --git a/vite.config.js b/vite.config.js
index 02ad574..c5c2346 100644
--- a/vite.config.js
+++ b/vite.config.js
@@ -5,10 +5,10 @@
 import autoprefixer from 'autoprefixer';
 
 const Timestamp = new Date().getTime(); //随机时间戳
-let ipLink = 'https://server1.wh-nf.cn:8201/prod-api';
+// let ipLink = 'https://server1.wh-nf.cn:8201/prod-api';
 // let ipLink = 'http://192.168.16.135:9100';
 // let ipLink = 'http://192.168.16.124:9100';
-// let ipLink = 'http://192.168.20.43:9100';
+let ipLink = 'http://192.168.20.43:9100';
 /*  */
 // https://vitejs.dev/config/
 export default defineConfig(({ mode, command }) => {