土壤监测弹框优化样式

src/api/request.js

@@ -2,7 +2,7 @@ import axios from "axios";
 import router from '@/router'
 const requests = axios.create({
     baseURL:"/lh-api",
-    timeout:5000,
+    timeout:20000,
 });
 
 

src/components/SoilDialog.vue

@@ -12,7 +12,7 @@
       <div class="tz_cov_chanye" style="height: 770px"   v-loading="loading" element-loading-background="rgba(0, 0, 0, 0.5)" >
         <img src="@/assets/image/zhwl/guanbi.png" class="guanbiann" @click="closeDialog" alt=""/>
         <div class="tz_cov_topchanye">
-          <span class="tz_cov_top_tit">长期定位监测</span>
+          <span class="tz_cov_top_tit">{{soilDataId.name}}</span>
         </div>
         <el-row class="tz_cov_topyqjs">
           <el-col :span="9">
@@ -20,7 +20,7 @@
               <span class="tcxitit">实时监测信息</span>
               <div class="qxsjssjcTc" >
                 <div class="qxsjssjc_left">
-                  <el-col :span="24" :class="`showTitle ${index > 7?'showTitle2':''}`" style="padding: 0px;width: 146px;"
+                  <el-col :span="24" :class="`showTitle ${index > 7?'showTitle2':''}`" style="padding: 0px;width: 146px; z-index: 99;"
                           v-for="(item, index) in tableHead" :key="index" :data-item="JSON.stringify(item)">
                     <div class="jcsjtclist" style="overflow: hidden"  @click="switchData(item)">
                       <el-row :gutter="20">
@@ -116,11 +116,12 @@ import { _colors } from '@/utils/color.js'
 
 export default {
   props: {
-    soilDataId: String
+    soilDataId: Object,
   },
   components: {},
   data() {
     return {
+      dTitle: '长期定位监测',
       urlimg: 'https://fxnsp.zgzhny.com/lh-api/sys/common/static/',
       urlimg2: 'https://farm.ilhzn.cn/jeecg-boot/sys/common/static/',
       deployType: 'soil',
@@ -135,7 +136,7 @@ export default {
         summrayMode: 'monthDays'
       },
       postParam: {
-        deployIds: [this.soilDataId],
+        deployIds: [this.soilDataId.ids],
         startTime: null,
         endTime: null,
         summrayMode: 'monthDays',
@@ -691,11 +692,11 @@ export default {
   }
 
   .tctrimg {
-    width: 16%;
-    height: 450px;;
+    width: 26%;
+    height: 538px;
     position: absolute;
-    left: 11%;
-    top: 120px;
+    left: 7%;
+    top: 74px;
     z-index: 1;
   }
 

src/pages/Home/index.vue

@@ -192,7 +192,8 @@
               <img src="@/assets/image/kuang_youxia.png" class="in2con_zyx" alt="">
               <img src="@/assets/image/sanguang.png" class="sanguang2" alt="">
               <img src="@/assets/image/sanguang.png" class="sanguangbt2" alt="">
-              <div>
+              <div v-loading="tabsLoading" element-loading-text=" "
+                   element-loading-background="rgba(0, 0, 0, 0.8)">
                 <span class="zywr_titshow">重要污染物治理效果</span>
                 <el-tooltip class="item" effect="dark"
                             :content="dataTypeEchart?'监测值为正常历史监测数据。':'对比值为下游监测站数据减去上游监测站数据。'"
@@ -210,14 +211,14 @@
                   </el-option>
                 </el-select>
                 <el-tabs type="card" @tab-click="handleClick" v-show="dataTypeEchart">
-                  <el-tab-pane v-for="(item,index) in stationInfoList" :label="item.stationName" lazy>
+                  <el-tab-pane v-for="(item,index) in stationInfoList" :label="item.stationShortName?item.stationShortName:item.stationName" lazy>
                     <template>
                       <div :id="`myChartDiv${index}`" style="height:12vw;width:100%;"></div>
                     </template>
                   </el-tab-pane>
                 </el-tabs>
                 <el-tabs type="card" @tab-click="handleClick" v-show="!dataTypeEchart">
-                  <el-tab-pane v-for="(item,index) in riverList" :label="item.stationName.split('-')[0]" lazy>
+                  <el-tab-pane v-for="(item,index) in riverList" :label="(item.stationShortName?item.stationShortName:item.stationName).split('-')[0]" lazy>
                     <template>
                       <div :id="`myChartDiv2${index}`" style="height:12vw;width:100%;"></div>
                     </template>
@@ -535,7 +536,8 @@ export default {
         label: '12个月'
       }],
       soidShowFlag: false,
-      soilDataId: ''
+      soilDataId: '',
+      tabsLoading: false,
     };
   },
   created() {
@@ -764,6 +766,7 @@ export default {
               icon: this.urlimg + item.picUrl,
               position: [item.longitude, item.latitude],
               offset: new AMap.Pixel(item.width, item.height),//偏移量
+              title: item.name,
               extData: {
                 ids: item.ids,
                 extPics: item.extPics,
@@ -780,9 +783,9 @@ export default {
                 console.log('livestock or orient', this.qyinformation)
               })
               this.markersOrient.push(marker)
-            } else if(item.type == 'soil'){
+            } else if(item.type == 'soil'){//土壤弹窗，长期监测站
               marker.on('click', e => {
-                this.soilDataId = e.target.getExtData().ids
+                this.soilDataId = e.target.getExtData()
                 this.soidShowFlag = true
                 console.log('soil click',  )
               })
@@ -830,6 +833,7 @@ export default {
       }, 300);
     },
     handleClick(tab, event) {
+      this.tabsLoading = true;
       this.echartIndex = tab.index - 0;
       if (this.summryAllData) {
         this.$nextTick(() => { // 加载echarts图
@@ -977,6 +981,8 @@ export default {
         //为echarts对象加载数据
         this.echartInit[domKey].setOption(optionLine);
       })
+
+      this.tabsLoading = false;
     },
     // 实时时间
     getNowTime() {

src/pages/MywrList/index.vue

@@ -318,13 +318,11 @@ import ScaleBox from 'vue2-scale-box'
 import {getStationDetail, getStationDisplay, getIndexSummry, survItemSummary, getMaintainLog, stationInfo} from '@/api';
 import vueSeamlessScroll from 'vue-seamless-scroll'
 import hefentianqi from '@/pages/weather/weather.vue'
-import SoilDialog from "@/components/SoilDialog.vue";
 import SingleEchartDialog from "@/components/SingleEchartDialog.vue";
 
 export default {
   components: {
     SingleEchartDialog,
-    SoilDialog,
     vueSeamlessScroll,
     hefentianqi,
     ScaleBox