小bug

src/api/request.js

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

src/components/SoilDialog.vue

@@ -122,7 +122,7 @@ export default {
   data() {
     return {
       dTitle: '长期定位监测',
-      urlimg: 'https://fxnsp.zgzhny.com/lh-api/sys/common/static/',
+      urlimg: 'https://fxnsp.sxcooh.com/lh-api/sys/common/static/',
       urlimg2: 'https://farm.ilhzn.cn/jeecg-boot/sys/common/static/',
       deployType: 'soil',
       allData: null,

src/pages/CqyzList/index.vue

@@ -9,7 +9,7 @@
   		<div class="main2">
 			<video class="fullscreenvideo"  id="bgvid"  playsinline="" autoplay="" muted="" loop="">
 <!--				<source src="@/assets/image/bg2.mp4" type="video/mp4">-->
-				<source src="http://fxnsp.zgzhny.com/lh-api/sys/common/static/v/bg2.mp4" type="video/mp4">
+				<source src="https://fxnsp.sxcooh.com/lh-api/sys/common/static/v/bg2.mp4" type="video/mp4">
 			</video>
 			<div class="nav">
 				<span class="nav_ti nav_mag">{{DetailList.stationName}}</span>
@@ -172,7 +172,7 @@
 								<img src="@/assets/image/title_bg.png" class="in1con_lf_titimg" alt="">
 							</div>
 <!--							<img src="@/assets/image/zhpjimg2.png" class="zhpjimg2" alt="">-->
-							<img src="http://fxnsp.zgzhny.com/lh-api/sys/common/static/bs/zhpjimg2.png" class="zhpjimg2" alt="">
+							<img src="https://fxnsp.sxcooh.com/lh-api/sys/common/static/bs/zhpjimg2.png" class="zhpjimg2" alt="">
 							<span class="zhpjtit" >{{DisplayListdetailList.detailValue}}</span>
 						</div>
 					</div>
@@ -359,7 +359,7 @@ export default {
   name: "CqyzList",
   data(){
     return {
-		urlimg:'https://fxnsp.zgzhny.com/lh-api/sys/common/static/',
+		urlimg:'https://fxnsp.sxcooh.com/lh-api/sys/common/static/',
 		player: null,
 		enableZ:false, //默认关闭电子放大
 		play: false, //默认停止播放

src/pages/Home/index.vue

@@ -483,7 +483,7 @@ export default {
       markersSoil: [],
       markersOther: [],
       lastClickIcon: '',
-      urlimg: 'https://fxnsp.zgzhny.com/lh-api/sys/common/static/',
+      urlimg: 'https://fxnsp.sxcooh.com/lh-api/sys/common/static/',
       mapTypeFlag: true,
       nowTime: '',
       briefconCode: "",

src/pages/Home/index_map.vue11123

@@ -505,7 +505,7 @@ export default {
   },
   data(){
     return {
-	  urlimg:'https://fxnsp.zgzhny.com/lh-api/sys/common/static/',
+	  urlimg:'https://fxnsp.sxcooh.com/lh-api/sys/common/static/',
 	  isShow: true,
       nowTime: '',
 	  briefconCode:"",

src/pages/Login/index.vue

@@ -4,7 +4,7 @@
     <video autoplay loop muted preload
       style="width: 100%; height: 100%; object-fit: fill">
 <!--      <source src="@/assets/image/loginback.mp4">-->
-      <source src="http://fxnsp.zgzhny.com/lh-api/sys/common/static/v/loginback.mp4">
+      <source src="https://fxnsp.sxcooh.com/lh-api/sys/common/static/v/loginback.mp4">
     </video>
     <img src="@/assets/image/logintltle.png" alt="" class="logintltle">
     <el-form

src/pages/MywrList/index.vue

@@ -10,7 +10,7 @@
     <div class="main2" v-if="stationDetail">
       <video class="fullscreenvideo" id="bgvid" playsinline="" autoplay="" muted="" loop="">
         <!--				<source src="@/assets/image/bg2.mp4" type="video/mp4">-->
-        <source src="http://fxnsp.zgzhny.com/lh-api/sys/common/static/v/bg2.mp4" type="video/mp4">
+        <source src="https://fxnsp.sxcooh.com/lh-api/sys/common/static/v/bg2.mp4" type="video/mp4">
       </video>
       <div class="nav">
         <span class="nav_ti nav_mag">{{ stationDetail.stationName }}</span>
@@ -175,7 +175,7 @@
         </div>
         <div class="switchStation">
           <el-select v-model="stationCode" placeholder="切换站点" @change="switchStation" >
-            <el-option v-for="item in stationList" :key="item.stationCode" :label="item.stationName" :value="item.stationCode"></el-option>
+            <el-option v-for="item in stationList" :key="item.stationCode" :label="item.stationShortName||item.stationName" :value="item.stationCode"></el-option>
           </el-select>
         </div>
         <div class="leftBox right baseBoxHjleft" style="width:22.5%">
@@ -192,7 +192,7 @@
                 <img src="@/assets/image/title_bg.png" class="in1con_lf_titimg" alt="">
               </div>
               <!--							<img src="@/assets/image/zhpjimg2.png" class="zhpjimg2" alt="">-->
-              <img src="http://fxnsp.zgzhny.com/lh-api/sys/common/static/bs/zhpjimg2.png" class="zhpjimg2" alt="">
+              <img src="https://fxnsp.sxcooh.com/lh-api/sys/common/static/bs/zhpjimg2.png" class="zhpjimg2" alt="">
               <span class="zhpjtit">{{ DisplayListdetailList.detailValue }}</span>
             </div>
           </div>
@@ -336,7 +336,7 @@ export default {
       singleEchartDialogShowFlag: false,
       singleEchartData: null,
       stationCode: '',
-      urlimg: 'https://fxnsp.zgzhny.com/lh-api/sys/common/static/',
+      urlimg: 'https://fxnsp.sxcooh.com/lh-api/sys/common/static/',
       player: {},
       timer: {},
       interval: {},
@@ -352,8 +352,7 @@ export default {
       fullscreen: false, //全屏
       qczddialogTableVisible: false,
       waterData: {},
-      summryAllData: null,
-      echartIndex: 0,
+      summryAllDataJson: null,
       maintainLogList: [],
       dateType: 'monthDays',
       dateTypeOptions: [ {
@@ -431,55 +430,37 @@ export default {
       })
     },
     changeDateType() {
-      // this.summryAllData = null;
       this.initChartData();
     },
     initChartData() {
-      this.riverList = [];
-      this.summryAllData = [];
-      getIndexSummry({summrayMode: this.dateType, statsionCode: this.stationCode}).then(res => {
+      let that = this;
+      this.summryAllDataJson = {};
+      getIndexSummry({summrayMode: this.dateType, stationCode: this.stationCode}).then(res => {
         if (res.code === 200) {
-          this.summryAllData = res.result;
-          let len = this.summryAllData.length;
-          this.summryAllData.map((item1, index) => {
-            if (index % 2 === 0 && item1['datas'] && (index + 1) < len) {
-              let data1 = item1['datas'];
-              let keys = Object.keys(data1);
-              let data2 = this.summryAllData[index + 1]['datas'];
-              let data3 = {}
-              let item3 = JSON.parse(JSON.stringify(item1));
-              if (data2) {
-                keys.map(key => {
-                  if (data1[key] instanceof Array) {
-                    data3[key] = []
-                    data1[key].map((itemSub, index) => {
-                      data3[key].push((data2[key][index] - data1[key][index]).toFixed(2))
-                    })
-                  }
-                })
-                item3['datas'] = data3;
-                this.riverList.push(item3);
-              }
-            }
+          res.result.map(item => {
+            that.summryAllDataJson[item.stationCode] = item;
           });
-          this.initEchartDom(this.echartIndex)
+          this.initEchartDom()
         }
       })
     },
     // 折线图数据
-    initEchartDom(index) {
+    initEchartDom(times) {
       this.$nextTick(() => {
         let domKey = `myChartDiv0`;
         let divDom = document.getElementById(domKey);
         if (!divDom) {
-          console.log('没找到dom：', domKey, divDom)
+          console.warn('没找到dom,两秒后重试：', domKey, divDom)
+          if(times!==2){
+            setTimeout(()=>{this.initEchartDom(2)}, 1500);
+          }
           return;
         }
         if(this.echartObj){
           this.echartObj.dispose();
         }
         this.echartObj = this.$echarts.init(divDom);
-        let data = this.summryAllData[index];
+        let data = this.summryAllDataJson[this.stationCode];
         console.log('开始初始化echart：' )
         let dataObj = [];
         let i = 0;
@@ -719,12 +700,7 @@ export default {
       stationInfo().then(res => {
         this.stationInfoList = res.result
         if (this.stationInfoList) {
-          res.result.map(item => {
-            this.stationList.push({
-              stationCode: item.stationCode,
-              stationName: item.stationName,
-            })
-          })
+          this.stationList = res.result
         }
       })
     },
@@ -2429,7 +2405,7 @@ a:hover {
   right: 450px;
   cursor:pointer;
   z-index: 2000;
-  width: 180px
+  width: 170px
 }
 </style>