diff --git a/src/api/request.js b/src/api/request.js index 6726fb1..e8dd0ed 100644 --- a/src/api/request.js +++ b/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, }); diff --git a/src/components/SoilDialog.vue b/src/components/SoilDialog.vue index 1d18132..35081ba 100644 --- a/src/components/SoilDialog.vue +++ b/src/components/SoilDialog.vue @@ -12,7 +12,7 @@
- 长期定位监测 + {{soilDataId.name}}
@@ -20,7 +20,7 @@ 实时监测信息
-
@@ -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; } diff --git a/src/pages/Home/index.vue b/src/pages/Home/index.vue index 1665740..5261c94 100644 --- a/src/pages/Home/index.vue +++ b/src/pages/Home/index.vue @@ -192,7 +192,8 @@ -
+
重要污染物治理效果 - + - + @@ -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() { diff --git a/src/pages/MywrList/index.vue b/src/pages/MywrList/index.vue index 72e230e..abee282 100644 --- a/src/pages/MywrList/index.vue +++ b/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