xieqy 1 year ago
parent
commit
642f90c1e9

+ 2 - 2
src/views/comprehensivePage/dataPanelModule/overviewData/leftPanel/FloodPointCondition.vue

@@ -16,7 +16,7 @@
           <el-carousel-item v-for="(item, index) in floodPointList" :key="index" style="height: 100%; width: 100%">
             <div class="sta-content">
               <div class="sta-item">
-                <div class="si-title">{{ item.waterName }}</div>
+                <div class="si-title" :title="item.waterName">{{ item.waterName }}</div>
                 <div class="si-content">
                   <div class="sic-num">
                     <span>{{ item.waterNum }}</span> <span>次</span>
@@ -25,7 +25,7 @@
                 </div>
               </div>
               <div class="sta-item">
-                <div class="si-title">{{ item.rainName }}</div>
+                <div class="si-title" :title="item.waterName">{{ item.rainName }}</div>
                 <div class="si-content">
                   <div class="sic-num">
                     <span>{{ item.rainNum }}</span> <span>天</span>

+ 4 - 1
src/views/saSubsystem/StatisticalAnalysis/IndexTrendAnalysis/widget.vue

@@ -58,7 +58,7 @@
             start-placeholder="开始日期"
             end-placeholder="结束日期"
             size="mini"
-            style="width: 300px; margin-right: 20px"
+            style="margin-right: 20px"
           >
           </el-date-picker>
           <label>统计方式:</label>
@@ -410,6 +410,9 @@ $bcolor: #f8f8f8;
   position: relative;
   flex-flow: column;
   border-bottom: 1px solid #dedede;
+  label {
+    white-space: nowrap;
+  }
   .mt-top {
     display: flex;
     align-items: center;

+ 2 - 2
src/views/saSubsystem/StatisticalAnalysis/WaterloggingAnalysis/widget.vue

@@ -50,8 +50,8 @@
             range-separator="至"
             start-placeholder="开始日期"
             end-placeholder="结束日期"
-            size="small"
-            style="width: 300px; margin-right: 20px"
+            size="mini"
+            style="margin-right: 20px"
           >
           </el-date-picker>
           <el-button type="primary" size="small" class="search-button" @click="getData()">统计</el-button>

+ 1 - 1
src/views/saSubsystem/StatisticalAnalysis/WqStandardAnalysis/widget.vue

@@ -57,7 +57,7 @@
             start-placeholder="开始日期"
             end-placeholder="结束日期"
             size="mini"
-            style="width: 300px; margin-right: 20px"
+            style="margin-right: 20px"
           >
           </el-date-picker>
           <label>统计方式:</label>

+ 5 - 2
src/views/saSubsystem/component/charts/CompositeBarChart.vue

@@ -109,8 +109,10 @@ export default class CompositeBarChart extends Vue {
         containLabel: true
       },
       tooltip: {
-        trigger: 'axis'
+        trigger: 'axis',
+        confine: true
       },
+      dataZoom: [{ type: 'inside' }],
       legend: {
         data: ['最高水位', '累积降雨量'],
         left: 'center',
@@ -161,7 +163,7 @@ export default class CompositeBarChart extends Vue {
           name: '累计降雨量(mm)',
           nameLocation: 'start',
           nameTextStyle: {
-            padding: [0, -15, 0, 0],
+            padding: [0, -50, 0, 0],
             align: 'right',
             color: '#666666',
             fontWeight: '500',
@@ -313,6 +315,7 @@ export default class CompositeBarChart extends Vue {
       label {
         @include font();
         cursor: pointer;
+        white-space: nowrap;
       }
     }
   }

+ 8 - 2
src/views/saSubsystem/component/charts/IndexLineChart.vue

@@ -1,8 +1,8 @@
 <template>
   <div style="height: 100%; width: 100%">
     <div class="chart-title">
-      <div class="name">
-        {{ `${chartData.siteName}:${chartData.indexName}${chartData.unit ? `(${chartData.unit})` : ''}` }}
+      <div class="name" :title="title">
+        {{ title }}
       </div>
       <div class="operation">
         <!-- <el-button size="mini" plain @click="initChart()">
@@ -58,6 +58,11 @@ export default class IndexLineChart extends Vue {
   refetchData(active: boolean) {
     if (active) this.onResize()
   }
+  get title() {
+    return `${this.chartData.siteName}:${this.chartData.indexName}${
+      this.chartData.unit ? `(${this.chartData.unit})` : ''
+    }`
+  }
   myChart = null
   isShowTable = false
   tableData = []
@@ -283,6 +288,7 @@ export default class IndexLineChart extends Vue {
       label {
         @include font();
         cursor: pointer;
+        white-space: nowrap;
       }
     }
   }