提交修改6-20

src/components/Dialog/mapDialog.vue

@@ -680,6 +680,7 @@ function echarts1() {
         stack: 'Total',
         smooth: true,
         data: ydata.value,
+        barMaxWidth: 30
       },
     ],
   };

src/views/map/Map.vue

@@ -56,7 +56,7 @@ import { useMapStore } from '/@/store/modules/map';
 import LINGZHI from '../../assets/json/lingzhi.js';
 import { getStrUnicode } from '/@/utils/fnUtils.ts';
 import detailsInfo from '/@/views/map/detailsInfo/index.vue';
-import ybjJson from '../../../public/static/ybj.json';
+import ybjJson from '/public/static/ybj.json';
 import toolBox from './toolBox.vue';
 import changeMap from './changeMap.vue';
 import legendImg from './legend.vue';
@@ -1526,13 +1526,13 @@ export default defineComponent({
       //   }
 
       //控制河流和河流尾迹线
-      // if (type && level > 9) {
-      //   map.showOverlay('geojson_line_dxh', false);
-      //   eventBus.emit('TailBaseLine', false);
-      // } else if (type) {
-      //   map.showOverlay('geojson_line_dxh', true);
-      //   eventBus.emit('TailBaseLine', true);
-      // }
+      if (type && level > 9) {
+      // map.showOverlay('geojson_line_dxh', false);
+      // eventBus.emit('TailBaseLine', false);
+      } else if (type) {
+      map.showOverlay('geojson_line_dxh', true);
+      eventBus.emit('TailBaseLine', true);
+      }
 
       // //地灾工程文字控制
       // if (level > 13) {

src/views/map/TailBaseLine.vue

@@ -11,7 +11,7 @@ import { PolylineTrailLinkMaterialProperty } from '/@/utils/util.ts';
 
 import trailPng from '/@/assets/images/trail.png';
 import { ref } from 'vue';
-import ybjJson from '../../../public/static/ybj.json';
+import ybjJson from '/public/static/ybj.json';
 import eventBus from '/@/utils/eventBus';
 export default {
   name: 'tailBaseLine',

src/views/map/changeMap.vue

@@ -8,9 +8,9 @@
       <div @click="setClass(1)" @mouseover="getTip('站点雨量图')" @mouseout="closetip" :class="bkclick[1] ? 'divclick' : ''">
         <img src="../../assets/images/changeMap/zhandian.png" />
       </div>
-      <div @click="setClass(2)" @mouseover="getTip('分区雨量图')" @mouseout="closetip" :class="bkclick[2] ? 'divclick' : ''">
+      <!-- <div @click="setClass(2)" @mouseover="getTip('分区雨量图')" @mouseout="closetip" :class="bkclick[2] ? 'divclick' : ''">
         <img src="../../assets/images/changeMap/fenqu.png" />
-      </div>
+      </div> -->
       <div @click="setClass(3)" @mouseover="getTip('站点温度图')" @mouseout="closetip" :class="bkclick[3] ? 'divclick' : ''">
         <img src="../../assets/images/changeMap/wendu.png" />
       </div>
@@ -515,27 +515,27 @@ const getTip = (i) => {
   infoShow.value = true;
   if (mapStore.sideMenu) {
     if (i == '面雨量分布图') {
-      px.value = `right: 480px;top: 370px;`;
+      px.value = ` right: ${windowRight.value+50}px;top: 400px;`;
     } else if (i == '站点雨量图') {
-      px.value = ` right: 480px;top: 400px;`;
+      px.value = ` right: ${windowRight.value+50}px;top: 430px;`;
     } else if (i == '分区雨量图') {
-      px.value = ` right: 480px;top: 480px;`;
+      px.value = ` right: ${windowRight.value+50}px;top: 450px;`;
     } else if (i == '站点温度图') {
-      px.value = ` right: 480px;top: 450px;`;
+      px.value = ` right: ${windowRight.value+50}px;top: 460px;`;
     } else if (i == '站点风速风向图') {
-      px.value = ` right: 480px;top: 480px;`;
+      px.value = ` right: ${windowRight.value+50}px;top: 490px;`;
     }
   } else {
     if (i == '面雨量分布图') {
-      px.value = ` right: 70px;top: 370px;`;
-    } else if (i == '站点雨量图') {
       px.value = ` right: 70px;top: 400px;`;
+    } else if (i == '站点雨量图') {
+      px.value = ` right: 70px;top: 430px;`;
     } else if (i == '分区雨量图') {
-      px.value = ` right: 70px;top: 480px;`;
-    } else if (i == '站点温度图') {
       px.value = ` right: 70px;top: 450px;`;
+    } else if (i == '站点温度图') {
+      px.value = ` right: 70px;top: 460px;`;
     } else if (i == '站点风速风向图') {
-      px.value = ` right: 70px;top: 480px;`;
+      px.value = ` right: 70px;top: 490px;`;
     }
   }
 };
@@ -547,9 +547,10 @@ const closetip = () => {
 .toolmap {
   position: absolute;
   right: 370px;
-  top: 370px;
+  top: 400px;
   width: 36px;
-  height: 140px;
+  // height: 140px;
+  height: 125px;
   border-radius: 149px;
   opacity: 1;
   z-index: 10;

src/views/map/layerControl/TailBaseLine.vue

@@ -11,7 +11,7 @@ import { PolylineTrailLinkMaterialProperty } from '/@/utils/util.ts';
 
 import trailPng from '/@/assets/images/trail.png';
 import { ref } from 'vue';
-import ybjJson from '../../../../public/static/ybj.json';
+import ybjJson from '/public/static/ybj.json';
 import eventBus from '/@/utils/eventBus';
 export default {
   name: 'tailBaseLine',

src/views/map/toolBox.vue

@@ -12,28 +12,28 @@
       <div @click="setClass(1)" @mouseover="getTip('图层控制')" @mouseout="closetip" :class="bkclick[1] ? 'divclick' : ''">
         <img src="../../assets/images/toolBox/tuceng.png" />
       </div>
-      <div @click="setClass(2)" @mouseover="getTip('底图切换')" @mouseout="closetip" :class="bkclick[2] ? 'divclick' : ''">
+      <!-- <div @click="setClass(2)" @mouseover="getTip('底图切换')" @mouseout="closetip" :class="bkclick[2] ? 'divclick' : ''">
         <img src="../../assets/images/toolBox/ditu.png" />
-      </div>
-      <div>
+      </div> -->
+      <!-- <div>
         <img src="../../assets/images/toolBox/line.png" style="height: 1px" />
-      </div>
-      <div @click="setClass(3)" @mouseover="getTip('距离测量')" @mouseout="closetip" :class="bkclick[3] ? 'divclick' : ''">
+      </div> -->
+      <!-- <div @click="setClass(3)" @mouseover="getTip('距离测量')" @mouseout="closetip" :class="bkclick[3] ? 'divclick' : ''">
         <img src="../../assets/images/toolBox/celiang.png" />
       </div>
       <div @click="setClass(4)" @mouseover="getTip('面积测量')" @mouseout="closetip" :class="bkclick[4] ? 'divclick' : ''">
         <img src="../../assets/images/toolBox/mianji.png" />
-      </div>
+      </div> -->
       <div @click="setClass(5)" @mouseover="getTip('截图')" @mouseout="closetip" :class="bkclick[5] ? 'divclick' : ''">
         <img src="../../assets/images/toolBox/jietu.png" />
       </div>
       <div @click="setClass(6)" @mouseover="getTip('收藏')" @mouseout="closetip" :class="bkclick[6] ? 'divclick' : ''">
         <img src="../../assets/images/toolBox/shoucang.png" />
       </div>
-      <div @click="setClass(8)" @mouseover="getTip('重要测站监测信息')" @mouseout="closetip" :class="bkclick[8] ? '' : ''">
+      <!-- <div @click="setClass(8)" @mouseover="getTip('重要测站监测信息')" @mouseout="closetip" :class="bkclick[8] ? '' : ''">
         <img src="../../assets/images/toolBox/open-impoint.png" v-if="!bkclick[8]" />
         <img src="../../assets/images/toolBox/close-impoint.png" v-if="bkclick[8]" />
-      </div>
+      </div> -->
       <div @click="setClass(7)" @mouseover="getTip('面板收起')" @mouseout="closetip" :class="bkclick[7] ? 'divclick' : ''">
         <img src="../../assets/images/toolBox/souqi.png" />
       </div>
@@ -535,23 +535,23 @@ export default defineComponent({
       this.infoShow = true;
       if (this.mapStore.sideMenu) {
         if (i == '初始范围') {
-          this.px = ` right: 480px;top: 540px;`;
+          this.px = ` right: ${this.windowRight+50}px;top: 540px;`;
         } else if (i == '图层控制') {
-          this.px = ` right: 480px;top: 570px;`;
+          this.px = ` right: ${this.windowRight+50}px;top: 570px;`;
         } else if (i == '底图切换') {
-          this.px = ` right: 480px;top: 600px;`;
+          this.px = ` right: ${this.windowRight+50}px;top: 600px;`;
         } else if (i == '距离测量') {
-          this.px = ` right: 480px;top: 630px;`;
+          this.px = ` right: ${this.windowRight+50}px;top: 630px;`;
         } else if (i == '面积测量') {
-          this.px = ` right: 480px;top: 660px;`;
+          this.px = ` right: ${this.windowRight+50}px;top: 660px;`;
         } else if (i == '截图') {
-          this.px = ` right: 480px;top: 690px;`;
+          this.px = ` right: ${this.windowRight+50}px;top: 600px;`;
         } else if (i == '收藏') {
-          this.px = ` right: 480px;top: 710px;`;
+          this.px = ` right: ${this.windowRight+50}px;top: 630px;`;
         } else if (i == '面板收起') {
-          this.px = ` right: 480px;top: 750px;`;
+          this.px = ` right: ${this.windowRight+50}px;top: 660px;`;
         } else if (i == '重要测站监测信息') {
-          this.px = ` right: 480px;top: 730px;`;
+          this.px = ` right: ${this.windowRight+50}px;top: 730px;`;
         }
       } else {
         if (i == '初始范围') {
@@ -565,11 +565,11 @@ export default defineComponent({
         } else if (i == '面积测量') {
           this.px = ' right: 70px;top: 660px;';
         } else if (i == '截图') {
-          this.px = ' right: 70px;top: 690px;';
+          this.px = ' right: 70px;top: 600px;';
         } else if (i == '收藏') {
-          this.px = ' right: 70px;top: 710px;';
+          this.px = ' right: 70px;top: 630px;';
         } else if (i == '面板收起') {
-          this.px = ' right: 70px;top: 750px;';
+          this.px = ' right: 70px;top: 660px;';
         } else if (i == '重要测站监测信息') {
           this.px = ' right: 70px;top: 730px;';
         }
@@ -1028,7 +1028,8 @@ checkbox-group .checkbox {
   right: 370px;
   top: 540px;
   width: 36px;
-  min-height: 230px;
+  // min-height: 230px;
+  min-height: 150px;
   border-radius: 149px;
   opacity: 1;
   z-index: 10;

src/views/meteorological/components/nephogram.vue

@@ -1,7 +1,7 @@
 <template>
   <div class="main">
     <div class="main_in">
-      <weatherTitle :title="'卫星云图-风云四号'" refreshName="metRefreshName" />
+      <weatherTitle :title="'卫星云图'" refreshName="metRefreshName" />
       <div style="width: 100%; height: 198px">
         <div @click="subNode()" id="mo-map1">
           <img :src="onHour.activeObj.img" />

src/views/meteorological/index.vue

@@ -140,7 +140,7 @@ let satelliteData = reactive({
 });
 let allData = {};
 const dialogvisable = ref(false);
-const title = ref('卫星云图-风云四号');
+const title = ref('卫星云图');
 // 监听是否点击卫星云图
 eventBus.on('nophogramClick', (arr, All) => {
   allData = All;

src/views/weatherHome/components/alarm.vue

@@ -406,7 +406,7 @@ onMounted(async () => {
     div:nth-child(2) {
       /* 水位告警 */
       font-family: Source Han Sans CN;
-      font-size: 12px;
+      font-size: 14px;
       font-weight: 350;
       color: #b8f1f7;
     }
@@ -628,9 +628,8 @@ onMounted(async () => {
     border: 1px solid #0084E9 !important;
   }
 }
-
 .alarm-content-box {
-  font-size: 16px;
+  font-size: 17px;
   .title {
     display: flex;
     background-color: rgba(43, 135, 248, .2);
@@ -741,6 +740,9 @@ onMounted(async () => {
   }
 }
 .alarm-tabs{
-  padding: 0 20px
+  padding: 0 20px;
+  ::v-deep(.ant-tabs-nav-container){
+    font-size: 16px !important;
+  }
 }
 </style>

src/views/weatherHome/components/rainCondition.vue

@@ -9,7 +9,7 @@
         refreshName="rainRefreshName"
         :selectList="[
           { name: '今日', value: 0 },
-          { name: '昨日', value: 1 },
+          { name: '昨日', value: 'yesterday' },
           // { name: '近3小时', value: 3 },
           // { name: '近6小时', value: 6 },
           // { name: '近12小时', value: 12 },

src/views/weatherHome/components/stationStatistics.vue

@@ -280,7 +280,7 @@ function isOkFn(type) {
 
   &>div {
     width: 50%;
-    font-size: 14px;
+    font-size: 16px;
     background: linear-gradient(181deg, #3ddfff 25%, #287eff 99%);
     -webkit-background-clip: text;
     -webkit-text-fill-color: transparent;
@@ -294,7 +294,7 @@ function isOkFn(type) {
       background-clip: text;
       text-fill-color: transparent;
       display: inline-block;
-      min-width: 80px;
+      min-width: 95px;
     }
 
     span {