Browse Source

Merge branch 'dev-webgis' of http://47.101.207.123:3000/CITYGIS-BDP/EOC-UI into dev-webgis-lt

haha_sir 17 hours ago
parent
commit
1dcf3a28bd

+ 7 - 9
src/views/left/comp/EventTwoView1.vue

@@ -104,7 +104,7 @@ function getImgSrc(picName) {
 
     .title_container {
       width: 100%;
-      height: 28px;
+      height: 35px;
 
       .title_content {
         display: flex;
@@ -159,13 +159,11 @@ function getImgSrc(picName) {
 
       .line {
         width: 100%;
-        // height: 1px;
-        // background: linear-gradient(90deg, rgba(59, 220, 255, 0) 0%, rgba(59, 220, 255, 0.6) 34%, rgba(59, 220, 255, 0) 100%);
-        // border-radius: 0px 0px 0px 0px;
-
-        height: 2px;
-        background: url('../../../assets/img/处置中_线.png') no-repeat;
-        background-size: 100% 100%;
+        background: linear-gradient(90deg, rgba(59, 220, 255, 0) 0%, rgba(59, 220, 255, 0.6) 34%, rgba(59, 220, 255, 0) 100%);
+        border-radius: 0px 0px 0px 0px;
+        height: 1px;
+        // background: url('../../../assets/img/处置中_线.png') no-repeat;
+        // background-size: 100% 100%;
       }
     }
   }
@@ -233,7 +231,7 @@ function getImgSrc(picName) {
             text-align: center;
             color: #ffffff;
             font-weight: 700;
-            font-family: Alibaba PuHuiTi 3.0;
+            font-family: Alibaba PuHuiTi 3;
           }
         }
         .risk-特别重大 {

+ 4 - 8
src/views/left/comp/EventTwoView2.vue

@@ -159,13 +159,9 @@ function getImgSrc(picName) {
 
       .line {
         width: 100%;
-        // height: 1px;
-        // background: linear-gradient(90deg, rgba(59, 220, 255, 0) 0%, rgba(59, 220, 255, 0.6) 34%, rgba(59, 220, 255, 0) 100%);
-        // border-radius: 0px 0px 0px 0px;
-
-        height: 2px;
-        background: url('../../../assets/img/处置中_线.png') no-repeat;
-        background-size: 100% 100%;
+        background: linear-gradient(90deg, rgba(59, 220, 255, 0) 0%, rgba(59, 220, 255, 0.6) 34%, rgba(59, 220, 255, 0) 100%);
+        border-radius: 0px 0px 0px 0px;
+        height: 1px;
       }
     }
   }
@@ -233,7 +229,7 @@ function getImgSrc(picName) {
             text-align: center;
             color: #ffffff;
             font-weight: 700;
-            font-family: Alibaba PuHuiTi 3.0;
+            font-family: Alibaba PuHuiTi 3;
           }
         }
         .risk-特别重大 {

+ 4 - 8
src/views/left/comp/EventTwoView3.vue

@@ -158,14 +158,10 @@ function getImgSrc(picName) {
       }
 
       .line {
-        width: 100%;
-        // height: 1px;
-        // background: linear-gradient(90deg, rgba(59, 220, 255, 0) 0%, rgba(59, 220, 255, 0.6) 34%, rgba(59, 220, 255, 0) 100%);
-        // border-radius: 0px 0px 0px 0px;
-
-        height: 2px;
-        background: url('../../../assets/img/处置中_线.png') no-repeat;
-        background-size: 100% 100%;
+         width: 100%;
+        background: linear-gradient(90deg, rgba(59, 220, 255, 0) 0%, rgba(59, 220, 255, 0.6) 34%, rgba(59, 220, 255, 0) 100%);
+        border-radius: 0px 0px 0px 0px;
+        height: 1px;
       }
     }
   }

+ 10 - 16
src/views/left/comp/RiskTwoView1.vue

@@ -95,25 +95,24 @@ function getImgSrc(picName) {
   box-sizing: border-box;
 
   .risk_report_top {
-    height: 28px;
+    height: 35px;
+    width: 320px;
     display: flex;
     align-items: center;
     // justify-content: space-between;
     box-sizing: border-box;
-    width: 100%;
-    // min-width: 183px;
-    // height: 58px;
     padding-right: 10px;
 
     .title_container {
-      width: 100%;
-      height: 28px;
+      width: 320px;
+      height: 35px;
 
       .title_content {
         display: flex;
         align-items: center;
         margin-bottom: 2px;
         padding-left: 10px;
+        box-sizing: border-box;
 
         .title {
           display: flex;
@@ -160,16 +159,11 @@ function getImgSrc(picName) {
           transition: all 0.3s ease;
         }
       }
-
-      .line2 {
+      .line {
         width: 100%;
-        // height: 1px;
-        // background: linear-gradient(90deg, rgba(59, 220, 255, 0) 0%, rgba(59, 220, 255, 0.6) 34%, rgba(59, 220, 255, 0) 100%);
-        // border-radius: 0px 0px 0px 0px;
-
-        height: 2px;
-        background: url('../../../assets/img/处置中_线.png') no-repeat;
-        background-size: 100% 100%;
+        background: linear-gradient(90deg, rgba(59, 220, 255, 0) 0%, rgba(59, 220, 255, 0.6) 34%, rgba(59, 220, 255, 0) 100%);
+        border-radius: 0px 0px 0px 0px;
+        height: 1px;
       }
     }
   }
@@ -239,7 +233,7 @@ function getImgSrc(picName) {
             color: #ffffff;
             font-weight: 700;
             font-size: 20px;
-            font-family: Alibaba PuHuiTi 3.0;
+            font-family: Alibaba PuHuiTi 3;
           }
         }
         .risk-A {

+ 11 - 11
src/views/left/comp/RiskTwoView2.vue

@@ -163,9 +163,9 @@ function getImgSrc(picName) {
 
       .line {
         width: 100%;
-        height: 2px;
-        background: url('../../../assets/img/处置中_线.png') no-repeat;
-        background-size: 100% 100%;
+        background: linear-gradient(90deg, rgba(59, 220, 255, 0) 0%, rgba(59, 220, 255, 0.6) 34%, rgba(59, 220, 255, 0) 100%);
+        border-radius: 0px 0px 0px 0px;
+        height: 1px;
       }
     }
   }
@@ -237,7 +237,7 @@ function getImgSrc(picName) {
             color: #ffffff;
             font-weight: 700;
             font-size: 20px;
-            font-family: Alibaba PuHuiTi 3.0;
+            font-family: Alibaba PuHuiTi 3;
           }
         }
         .risk-A {
@@ -272,13 +272,13 @@ function getImgSrc(picName) {
         margin: 0 20px;
       }
     }
-    .line2{
-        height: 56px;
-        width: 2px;
-        // background: linear-gradient(0deg, rgba(34, 73, 127, 0) 0%, rgba(136, 234, 255, 0.6) 50%, rgba(34, 73, 127, 0) 100%);
-        margin: 0 15px;
-        background: url('../../../assets/img/等级分割竖线.png') no-repeat;
-        background-size: 100% 100%;
+    .line2 {
+      height: 56px;
+      width: 2px;
+      // background: linear-gradient(0deg, rgba(34, 73, 127, 0) 0%, rgba(136, 234, 255, 0.6) 50%, rgba(34, 73, 127, 0) 100%);
+      margin: 0 15px;
+      background: url('../../../assets/img/等级分割竖线.png') no-repeat;
+      background-size: 100% 100%;
     }
   }
 }

+ 4 - 4
src/views/left/comp/RiskTwoView3.vue

@@ -165,10 +165,10 @@ function getImgSrc(picName) {
       }
 
       .line {
-        width: 100%;
-        height: 2px;
-        background: url('../../../assets/img/处置中_线.png') no-repeat;
-        background-size: 100% 100%;
+         width: 100%;
+        background: linear-gradient(90deg, rgba(59, 220, 255, 0) 0%, rgba(59, 220, 255, 0.6) 34%, rgba(59, 220, 255, 0) 100%);
+        border-radius: 0px 0px 0px 0px;
+        height: 1px;
       }
     }
   }

+ 3 - 3
src/views/left/comp/dispose/echarts/echartsOption.js

@@ -171,14 +171,14 @@ export const getPublicHealthEmergencyEchartsOption = () => {
         show: false // ✅ 隐藏刻度线
       },
       axisLabel: {
-        show: true,      // ✅ 确保文字显示
-        interval: 0,     // ✅ 所有标签都显示
+        show: true,
+        interval: 0,
         color: '#9da8b8',
         fontSize: 12,
         lineHeight: 16,
         margin: 10,
         formatter: function (value) {
-          const maxCharPerLine = 5
+          const maxCharPerLine = 4
           const maxLines = 2
           const words = value.match(new RegExp(`.{1,${maxCharPerLine}}`, 'g')) || []
           if (words.length <= maxLines) {