提交修改

src/views/comprehensivePage/baseMapModule/mapToolsModule/ToolsWidget.vue

@@ -257,9 +257,9 @@ export default class ToolsWidget extends Vue {
       &::before {
         content: '\e80c';
         position: absolute;
-        bottom: 0.052083rem /* 10/192 */;
-        right: 0.052083rem /* 10/192 */;
-        font-size: 0.135417rem /* 26/192 */;
+        bottom: 0.52083rem /* 10/192 */;
+        right: 0.52083rem /* 10/192 */;
+        font-size: 0.35417rem /* 26/192 */;
       }
     }
 

src/views/zhpt/superviseSystem/supervise/monitorCenter/cardItem.vue

@@ -5,7 +5,9 @@
         <div class="sn-info">
           <span>{{ site.name }}</span>
           <span>{{ ' ' }}&nbsp;&nbsp;</span>
-          <span :style="'color:' + (site.siteStatus === 0 ? '#08ae5e' : '#FA2D2D')">{{ site.statusName ? site.statusName :'无' }}</span>
+          <span :style="'color:' + (site.siteStatus === 0 ? '#08ae5e' : '#FA2D2D')">{{
+            site.statusName ? site.statusName : '无'
+          }}</span>
         </div>
         <div class="sn-operation">
           <img v-if="site.statusName === '离线'" :src="offline" />
@@ -14,7 +16,7 @@
       </div>
 
       <div class="sweage-info" v-if="site.info.length > 0">
-        <div class="si-overview">
+        <div class="sweage-overview">
           <el-row :gutter="10">
             <el-col :span="8" v-for="info in site.info" :key="info.itCd">
               <el-radio v-model="radio" :label="info.itCd" size="mini">
@@ -31,7 +33,7 @@
         </div>
 
         <div class="si-chart">
-          <StatisticalLineChart :site="site" :indexCode='radio'/>
+          <StatisticalLineChart :site="site" :indexCode="radio" />
         </div>
       </div>
       <el-empty
@@ -47,14 +49,7 @@
   <script lang='ts'>
 import { Vue, Component, Prop, Watch } from 'vue-property-decorator'
 import StatisticalLineChart from './StatisticalLineChart.vue'
-import {
-  iconChart,
-  iconDevice,
-  iconSignal,
-  expandIcon,
-  shrinkIcon,
-  offline
-} from '../../common/settings'
+import { iconChart, iconDevice, iconSignal, expandIcon, shrinkIcon, offline } from '../../common/settings'
 //流量综合管理
 @Component({ name: 'monitorCenter', components: { StatisticalLineChart } })
 export default class monitorCenter extends Vue {
@@ -150,14 +145,17 @@ export default class monitorCenter extends Vue {
       display: flex;
       flex-flow: column;
       padding: 0 10px;
-      .si-overview {
-        @include center();
+      .sweage-overview {
+        // @include center();
         justify-content: space-between;
         border-bottom: 1px solid #dedede;
         width: 100%;
         padding: 10px 0;
         height: auto;
         min-height: 60px;
+        max-height: 100px;
+        overflow-y: scroll;
+        overflow-x: hidden;
         span {
           @include fontSet();
           white-space: nowrap;

src/views/zhpt/waterlogging/waterloggingMap/widget.vue

@@ -48,7 +48,7 @@
                 <div class="info">
                   <span>当前水位: </span>
                   <span style="cursor: pointer; color: #2d89eb" @click="() => waterLevelClick(waterLogging)">
-                    {{ waterLogging.currWaterLevel }}m
+                    {{ waterLogging.currWaterLevel + waterLogging.unit}}
                   </span>
                 </div>
               </div>
@@ -242,7 +242,7 @@ export default class waterloggingMap extends Vue {
         item.label = `离线(${list.length})`
       }
     })
-
+    debugger
     const data = result.map((item, index) => {
       return {
         code: item.code ? item.code : '', //视频ID
@@ -267,7 +267,8 @@ export default class waterloggingMap extends Vue {
             )
           : 0, //警戒百分比 = (警戒水位 / 满水水位) * 100
         x: item.x,
-        y: item.y
+        y: item.y,
+        unit:item.index.unit
       }
     })
     this.waterLoggingData = data