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

src/api/emergencyCommandMap/JointDuty.ts

@@ -75,7 +75,6 @@ export function selectTask(data) {
     method: 'get',
     params: {
       sortBy: 'creation_time'
-
     }
   });
 }

src/components/NearbyVideos/index.vue

@@ -133,7 +133,7 @@ const handleClose = () => {
   display: flex;
   align-items: center;
   color: #eaf3fc;
-  font-size: 36px;
+  font-size: 38px;
   .custom-select {
     width: 370px;
     margin-left: 20px;

src/views/globalMap/RightMenu/ReservoirMonitor.vue

@@ -314,7 +314,7 @@ const getVideoList = () => {
       background-clip: text;
       /* 把当前元素设置为行内块，以便能够应用背景 */
       display: inline-block;
-      font-family: 'YouSheBiaoTiHei';
+      font-family: 'BEBAS-1';
       font-size: 40px;
     }
   }
@@ -399,7 +399,7 @@ const getVideoList = () => {
 .table-wrap {
   height: 400px;
   // margin-top: 10px;
-  font-size: 28px;
+  font-size: 36px;
   background-color: #102043;
   color: #fff;
   .table-title {

src/views/globalMap/RightMenu/RiverMonitor.vue

@@ -229,7 +229,7 @@ const handleShowDialog = (row) => {
     }
     .info-content {
       padding: 0 37px 26px 37px;
-      font-size: 32px;
+      font-size: 38px;
       color: #a8ccde;
     }
     .info-item {
@@ -392,7 +392,7 @@ const handleShowDialog = (row) => {
     -webkit-background-clip: text;
     /* 非Webkit内核浏览器需要使用标准前缀 */
     background-clip: text;
-    font-family: 'YouSheBiaoTiHei';
+    font-family: 'BEBAS-1';
     /* 设置线性渐变，从红色渐变到蓝色 */
     background-image: linear-gradient(to bottom, #ffffff 50%, #3075d3 100%);
     font-size: 48px;

src/views/globalMap/RightMenu/WarningInfo.vue

@@ -323,7 +323,7 @@ export default defineComponent({
   background-repeat: no-repeat; /* 禁止背景图重复 */
   background-position: center; /* 背景图居中 */
   color: #fff;
-  font-size: 30px; /* 根据需要调整字体大小 */
+  font-size: 38px; /* 根据需要调整字体大小 */
   display: flex;
   align-items: center;
   justify-content: center;
@@ -437,7 +437,7 @@ export default defineComponent({
 }
 
 .count-level {
-  font-size: 18px; /* 根据需要调整字体大小 */
+  font-size: 26px; /* 根据需要调整字体大小 */
   top: 100px; /* 根据需要调整位置 */
   color: #fdfcfc;
   position: absolute;

src/views/globalMap/RightMenu/echartOptions.ts

@@ -8,7 +8,7 @@ export const option1 = {
     type: 'category',
     axisLabel: {
       color: '#A8CCDE',
-      fontSize: 18
+      fontSize: 32
     },
     axisTick: false,
     data: []
@@ -21,7 +21,7 @@ export const option1 = {
     },
     axisLabel: {
       color: '#A8CCDE',
-      fontSize: 18
+      fontSize: 32
     }
   },
   series: [
@@ -110,7 +110,7 @@ export const option2 = {
         //坐标轴刻度标签的相关设置
         textStyle: {
           color: '#A8CCDE',
-          fontSize: 24
+          fontSize: 32
         }
       },
       splitLine: {
@@ -130,7 +130,7 @@ export const option2 = {
       name: '水位：m',
       nameTextStyle: {
         color: '#A8CCDE',
-        fontSize: 24,
+        fontSize: 32,
         padding: [10, 0]
       },
       min: 0,
@@ -147,7 +147,7 @@ export const option2 = {
         show: true,
         textStyle: {
           color: '#A8CCDE',
-          fontSize: 24
+          fontSize: 32
         }
       },
       axisTick: {
@@ -503,7 +503,7 @@ export const option7 = {
         'textStyle': {
           color: '#a7ccdf',
           fontFamily: '微软雅黑',
-          fontSize: 24
+          fontSize: 32
         }
       }
     }
@@ -515,7 +515,7 @@ export const option7 = {
         'textStyle': {
           color: '#a7ccdf',
           fontFamily: '微软雅黑',
-          fontSize: 24
+          fontSize: 32
         }
       },
       'splitLine': {