diff --git a/manifest.json b/manifest.json index 2a40987..bd5b36e 100644 --- a/manifest.json +++ b/manifest.json @@ -1,5 +1,5 @@ { - "name" : "河津市农业面源污染监测系统", + "name" : "农业面源污染监测系统", "appid" : "__UNI__A58A5D7", "description" : "", "versionName" : "2.2.22", diff --git a/packDetail/pages/Site/detail.vue b/packDetail/pages/Site/detail.vue index a31947c..c6e0084 100644 --- a/packDetail/pages/Site/detail.vue +++ b/packDetail/pages/Site/detail.vue @@ -291,6 +291,7 @@ this.livelist = res.data.data.liveSurvData this.stinklist = res.data.data.stinkSurvData this.survCamera = res.data.data.survCamera + this.survItemList = res.data.data.stationInfo.survColorItems } uni.hideLoading(); }) diff --git a/packDetail/pages/Site/index.vue b/packDetail/pages/Site/index.vue index d868239..9cf7270 100644 --- a/packDetail/pages/Site/index.vue +++ b/packDetail/pages/Site/index.vue @@ -8,8 +8,8 @@ - - + + diff --git a/packDetail/pages/vidio/index.vue b/packDetail/pages/vidio/index.vue index ab9186c..e2363f7 100644 --- a/packDetail/pages/vidio/index.vue +++ b/packDetail/pages/vidio/index.vue @@ -91,37 +91,22 @@ this.getList() }, methods:{ - getList(){ + getList() { uni.showLoading({ title: '加载中' }); - // 使用 Promise.all 同时发起两个请求 - Promise.all([ - this.$http.get('/applet/survStationInfo/deviceList'), - this.$http.get('/applet/survStationInfo/fdeviceList') - ]).then(([res1, res2]) => { - const data1 = res1?.data?.data || []; - - // 安全获取第二个接口的数据 - let data2 = []; - if (res2?.data?.data && Array.isArray(res2.data.data) && res2.data.data.length > 0) { - data2 = res2.data.data[0] || []; - } - - // data2 有数据才合并 - this.list = data2.length > 0 ? data1.concat(data2) : data1; - - // 可选:打印日志方便调试 - if (data2.length === 0) { - console.log('第二个接口无数据,跳过合并'); - } - - uni.hideLoading(); - }).catch(error => { - console.error('请求失败:', error); - uni.hideLoading(); - }); + // 只请求第一个接口 + this.$http.get('/applet/survStationInfo/deviceList') + .then(res => { + const data1 = res?.data?.data || []; + this.list = data1; + uni.hideLoading(); + }) + .catch(error => { + console.error('请求失败:', error); + uni.hideLoading(); + }); }, todetail(item,index){ uni.navigateTo({ diff --git a/packDetail/static/dls.jpg b/packDetail/static/dls.jpg index 6941311..926de76 100644 Binary files a/packDetail/static/dls.jpg and b/packDetail/static/dls.jpg differ diff --git a/pages.json b/pages.json index ee3a776..e58c39d 100644 --- a/pages.json +++ b/pages.json @@ -4,7 +4,7 @@ { "path": "pages/index/index", "style": { - "navigationBarTitleText": "河津市农业面源污染监测系统", + "navigationBarTitleText": "农业面源污染监测系统", "navigationStyle": "custom" } }, diff --git a/pages/index/index.vue b/pages/index/index.vue index 406f044..8355420 100644 --- a/pages/index/index.vue +++ b/pages/index/index.vue @@ -1,6 +1,6 @@