Compare commits

...

5 Commits
main ... jixian

Author SHA1 Message Date
978184212@qq.com eb7c194ea9 修改细节内容 2026-07-23 19:25:06 +08:00
978184212@qq.com 7ec7cea507 修改后台提出的细节问题,地图,设备信息 2026-07-23 10:23:37 +08:00
978184212@qq.com 54fbe9b3e9 修改APPid 2026-07-01 14:50:36 +08:00
978184212@qq.com 6674ed8584 视频监控样式调整 2026-06-03 10:10:03 +08:00
wgx 8447475eb9 优化登录、优化图片加载失败等 2026-05-09 18:51:26 +08:00
36 changed files with 1252 additions and 2375 deletions

12
App.vue
View File

@ -190,20 +190,12 @@
},
onLoad() {
if(!uni.getStorageSync('third_session')){
uni.reLaunch({
url:'/packDetail/pages/login/login'
})
}else{
uni.reLaunch({
url:'/pages/index/index'
})
}
console.log('App onLoad!')
},
onShow: function() {
},
onHide: function() {
console.log('App Hide')
console.log('App Hide1')
}
}

View File

@ -1,5 +1,6 @@
import { http } from '@/common/service/service.js'
import configService from '@/common/service/config.service.js';
import indexData from "@/pages/index/indexData";
const apiService = {
/**
@ -37,7 +38,55 @@ const apiService = {
}else{
return configService.staticDomainURL + "/" + avatar;
}
},
// 检查登录并执行api.checkLogin(()=>{}, () => {});
checkLogin(successCallback,failCallback){
let that = this;
if (uni.getStorageSync('userInfo') && uni.getStorageSync('third_session')) {
if(successCallback){
successCallback();
}
} else {
uni.login({
success: function(res) {
let params = {}
params.jsCode = res.code
that.wxlogin(params).then(res => {
that.loginCallback(res, successCallback, failCallback);
})
}
});
}
},
loginCallback(res, successCallback, failCallback){
let that = this;
if (res.data.code == 0) {
let userInfo = res.data.data;
if (!userInfo.id) {
console.error('登录失败',userInfo)
that.loginFail();
if(failCallback){
failCallback();
}
} else {
console.warn('登录成功',userInfo)
uni.setStorageSync('userInfo', userInfo);
uni.setStorageSync('third_session', userInfo.thirdSession);
if(successCallback){
successCallback();
}
}
} else {
that.loginFail();
if(failCallback){
failCallback();
}
}
},
loginFail () {
uni.removeStorageSync('third_session')
uni.removeStorageSync('userInfo');
},
};
export default apiService;

View File

@ -22,10 +22,12 @@ let apiUrl = configService.apiUrl;
const http = new Request()
http.setConfig((config) => { /* 设置全局配置 */
config.baseUrl = apiUrl /* 根域名不同 */
config.baseUrl = apiUrl; /* 根域名不同 */
config.header = {
...config.header
}
};
console.log(config)
// config.headers['X-Access-Token'] = localStorage.getItem("token")
return config
})
@ -43,9 +45,10 @@ http.interceptor.request((config, cancel) => { /* 请求之前拦截器 */
config.header = {
...config.header,
// 'X-Access-Token':getTokenStorage()
'app-id':uni.getAccountInfoSync().miniProgram.appId,
"client-type":"MA",
'third-session':uni.getStorageSync('third_session')
'app-id' : uni.getAccountInfoSync().miniProgram.appId,
"client-type" : "MA",
'third-session' : uni.getStorageSync('third_session')||'123',
'X-Tenant-Id' : '1002'
}
/*
if (!token) { // 如果token不存在调用cancel 会取消本次请求但是该函数的catch() 仍会执行

File diff suppressed because one or more lines are too long

View File

@ -1,6 +1,6 @@
{
"name" : "汾西小流域面源污染监测",
"appid" : "__UNI__44A8AB0",
"name" : "吉县面源污染监测平台",
"appid" : "__UNI__A58A5D7",
"description" : "",
"versionName" : "2.2.22",
"versionCode" : 233,
@ -84,7 +84,7 @@
"quickapp" : {},
/* */
"mp-weixin" : {
"appid" : "wx54f76f700fe3a498",
"appid" : "wxc078890f8668ed2e",
"setting" : {
"urlCheck" : false,
"es6" : true,

View File

@ -102,7 +102,7 @@
</view>
<view class="jczb_bot">
<view>
<view class="jccontent" v-if="orientlist.length != 0">
<view class="jccontent" v-if="orientlist && orientlist.length != 0">
<view class="titles">
重要污染物监测
</view>
@ -120,7 +120,7 @@
</view>
</view>
</view>
<view class="jccontent" v-if="livelist.length != 0">
<view class="jccontent" v-if="livelist && livelist.length != 0">
<view class="titles">
重要污染物监测
</view>
@ -260,14 +260,12 @@
},
onLoad(options) {
this.item = JSON.parse(decodeURIComponent(options.item));
console.log("...........",this.item)
uni.getSystemInfo({
success: res => {
var pxToRpxScale = 750 / res.windowWidth
var ktxStatusHeight = res.statusBarHeight * pxToRpxScale
var navigationHeight = 44 * pxToRpxScale
this.height = res.windowHeight * pxToRpxScale//px rpx
console.log(this.height,ktxStatusHeight,navigationHeight)
this.scorllheight = this.height
}
});
@ -306,6 +304,7 @@
let items = item.deployCode.split('-')
var obj = {
url: "https://m.ilhzn.cn/#/pages/cameraView/ysyCamera",
// url: "https://m.ilhzn.cn/#/pages/cameraView/cameraView",
deployDes: item.deployDes + '-' + '',
ysToken: this.token,
deviceIotUrl: item.deviceUrl
@ -327,7 +326,6 @@
})
},
tosjdetail(item,index){
console.log(item,'gegwg')
uni.navigateTo({
url:'/packDetail/pages/Site/sjdetail?item=' + encodeURIComponent(JSON.stringify(item)) + '&stationCode='+this.details.stationCode + '&stationName=' + this.details.stationName
})

View File

@ -8,7 +8,8 @@
<view class="list_item" v-for="(item,index) in List" :key="index" @click="todetail(item,index)">
<view class="list_item_top">
<view class="list_item_left">
<image v-if="item.stationType == 'livestock'" src="../../static/zhandian_icon_xuqin.png" mode=""></image>
<image v-if="item.stationType == 'livestock1'" src="../../static/zhandian_icon_xuqin.png" mode=""></image>
<image v-else-if="item.stationType == 'watershed1'" src="../../static/zhandian_icon_xuqin.png" mode=""></image>
<image v-else src="../../static/zd.png" mode=""></image>
<view class="item_right" v-if="item.stationName">
<view class="right_top">
@ -95,7 +96,6 @@
var ktxStatusHeight = res.statusBarHeight * pxToRpxScale
var navigationHeight = 44 * pxToRpxScale
this.height = res.windowHeight * pxToRpxScale//px rpx
console.log(this.height,ktxStatusHeight,navigationHeight)
this.scorllheight = this.height
}
});
@ -143,27 +143,20 @@
this.List[i].survDataCount = (this.List[i].survDataCount /100000000).toFixed(1) + '亿'
}
}
console.log(this.List,'35415')
if(res.data.data.total != 0){
this.allNum = Number(res.data.data.total)/Number(this.pageSize)+'';
console.log(this.allNum,'总页数')
if(this.allNum.indexOf('.') == -1) {
this.allNum = this.allNum;
console.log(this.allNum,'if')
} else {
this.allNum = parseInt(Number(this.allNum)+1);
console.log(this.allNum,'else')
}
console.log(this.pageNo,this.allNum,'156156')
if(this.pageNo == this.allNum) {
this.isLastpage = true;
this.loadStatus='nomore'
console.log(this.isLastpage,'true','nomore')
} else {
this.isLastpage = false;
// this.isLoadMore=true
this.loadStatus = 'more'
console.log(this.isLastpage,'false')
}
}else{
this.isLastpage = true;
@ -175,7 +168,6 @@
})
},
lower() {
console.log("最后一页了,取消下拉功能");
//
if (this.isLastpage) {
return
@ -185,7 +177,6 @@
this.intervalId = setInterval(() => {
num = num+1;
},1000)
console.log(this.intervalId,num)
this.pageNo = this.pageNo + 1;
let params = {}
params.pageNo = this.pageNo
@ -198,12 +189,10 @@
if(this.pageNo == this.allNum) {
this.isLastpage = true;
this.loadStatus='nomore'
console.log(this.isLastpage,'true')
} else {
this.isLastpage = false;
// this.isLoadMore=true
this.loadStatus = 'more'
console.log(this.isLastpage,'false')
}
}else{
this.isLastpage = true;

View File

@ -1,12 +1,12 @@
<template>
<view class="container">
<uni-nav-bar :fixed="true" left-icon="left" background-color="#0F6EFF" @clickLeft="back()" status-bar
:title="details.name" />
<view class="contant">
:title="details.name"/>
<view class="contant" v-if="details.icon || details.name">
<view class="list_item">
<view class="list_item_top">
<view class="list_item_left">
<image :src="details.icon" mode=""></image>
<image :src="baseUrl + '/' + details.icon" mode=""></image>
<view class="item_right">
<view class="right_top" v-if="details.name">
监测指标-{{details.name}}
@ -64,12 +64,14 @@
<script>
import uniEcCanvas from '../../components/uni-ec-canvas/uni-ec-canvas.vue'
import * as echarts from '../../components/uni-ec-canvas/echarts.js'
import configService from "@/common/service/config.service";
export default {
components: {
uniEcCanvas,
},
data() {
return {
baseUrl:configService.staticDomainURL,
items: {},
details: {},
list: [],
@ -130,8 +132,6 @@
value: (Math.floor(Object.values(data[i])[k] * 100) / 100).toFixed(2),
dataDateTime:data[i].dataDateTime
})
console.log(data[i].codelist, '数据')
console.log(data, '数据全部')
}
}
}
@ -139,26 +139,19 @@
}
// this.list = data
this.list = this.list.concat(data)
// console.log(this.list, 'all')
if(res.data.data.total != 0){
this.allNum = Number(res.data.data.total)/Number(this.pageSize)+'';
console.log(this.allNum,'总页数')
if(this.allNum.indexOf('.') == -1) {
this.allNum = this.allNum;
console.log(this.allNum,'if')
} else {
this.allNum = parseInt(Number(this.allNum)+1);
console.log(this.allNum,'else')
}
console.log(this.pageNo,this.allNum,'156156')
if(this.pageNo == this.allNum) {
this.isLastpage = true;
this.loadStatus='nomore'
console.log(this.isLastpage,'true','nomore')
} else {
this.isLastpage = false;
this.loadStatus = 'more'
console.log(this.isLastpage,'false')
}
}else{
this.isLastpage = true;
@ -167,7 +160,6 @@
})
},
lower() {
console.log("最后一页了,取消下拉功能");
//
if (this.isLastpage) {
return
@ -177,7 +169,6 @@
this.intervalId = setInterval(() => {
num = num+1;
},1000)
console.log(this.intervalId,num)
this.pageNo = this.pageNo + 1;
let params = {}
params.pollutionCode = this.details.code
@ -199,8 +190,6 @@
value: (Math.floor(Object.values(data[i])[k] * 100) / 100).toFixed(2),
dataDateTime:data[i].dataDateTime
})
console.log(data[i].codelist, '数据')
console.log(data, '数据全部')
}
}
}
@ -212,12 +201,10 @@
if(this.pageNo == this.allNum) {
this.isLastpage = true;
this.loadStatus='nomore'
console.log(this.isLastpage,'true')
} else {
this.isLastpage = false;
// this.isLoadMore=true
this.loadStatus = 'more'
console.log(this.isLastpage,'false')
}
}else{
this.isLastpage = true;

View File

@ -40,11 +40,11 @@
</picker>
</view>
</view>
<!-- 在template部分找到年月日选择器部分修改为以下代码 -->
<!-- 年月日选择器 -->
<view class="uni-form-item uni-column">
<radio-group class="radio-group" @change="radioChange">
<label class="radio-label" v-for="(item, index) in timList" :key="item.value">
<radio :value="item.value" :checked="index === current" class="radio-item" />
<label class="radio-label" v-for="(item, index) in timList" :key="item.value" :class="{ 'checked': current === index }">
<radio :value="item.value" :checked="index === current" class="radio-item" color="#0f6efe" />
<view class="radio-text">{{item.name}}</view>
</label>
</radio-group>
@ -126,16 +126,19 @@
height: 0,
scorllheight: 0,
zt: '',
date: new Date().getFullYear(),
date: new Date().getFullYear().toString(),
array: [],
index: '',
index1: '',
index: 0,
index1: 0,
array1: [],
arrays: [],
list: [],
tabList: ['站点名称', '告警指标', '指标值', '告警时间'],
pjlist: [],
chartData: {},
chartData: {
categories: [],
series: []
},
opts: {
color: ["#1890FF","#91CB74","#FAC858","#EE6666","#73C0DE","#3CA272","#FC8452","#9A60B4","#ea7ccc"],
padding: [15,10,0,15],
@ -144,9 +147,8 @@
enableScroll: false,
legend: {},
xAxis: {
disabled: false, // X
// itemCount
gridType: 'dash', //
disabled: false,
gridType: 'dash',
dashLength: 2,
},
yAxis: {
@ -176,8 +178,8 @@
allNum: '',
isLastpage: '',
intervalId: null,
loadStatus: 'more', //more-loading-nomore-
isLoadMore: false, //
loadStatus: 'more',
isLoadMore: false,
show: false,
show1: false,
top: 0,
@ -190,8 +192,7 @@
zxtdata: [],
timList: [{
value: 'yearMonth',
name: '年',
checked: 'true'
name: '年'
},
{
value: 'monthDays',
@ -203,9 +204,11 @@
},
],
current: 0,
dateqs:new Date().getFullYear(),
datetwo:currentDate,
riqinumber:'yearMonth',
dateqs: new Date().getFullYear().toString(),
datetwo: currentDate,
riqinumber: 'yearMonth',
startDate: '2000-01-01',
endDate: '2030-12-31'
}
},
onLoad() {
@ -214,7 +217,7 @@
var pxToRpxScale = 750 / res.windowWidth
var ktxStatusHeight = res.statusBarHeight * pxToRpxScale
var navigationHeight = 44 * pxToRpxScale
this.height = res.windowHeight * pxToRpxScale //px rpx
this.height = res.windowHeight * pxToRpxScale
this.scorllheight = this.height
}
});
@ -224,10 +227,14 @@
this.importWyw()
this.getazsurvMulchRecord()
this.getyjList()
// this.gettj()
this.qushicov()
},
methods: {
//
cutMoneyFiter(val) {
if (!val && val !== 0) return 0
return val
},
//
importWyw() {
this.array = []
this.arrays = []
@ -247,12 +254,22 @@
})
this.array.push(res.data.data[i].stationName)
}
//
if (this.array.length > 0) {
this.stationCode = this.arrays[0]?.value || ''
//
setTimeout(() => {
this.qushicov()
}, 300)
}
}).catch(err => {
console.log('获取站点列表失败', err)
})
},
//
//
getazsurvMulchRecord() {
this.arrays = []
this.array1 = ['全部监测设备', ]
this.array1 = ['全部监测设备']
this.arrays1 = [{
label: '全部监测设备',
value: ''
@ -269,6 +286,8 @@
})
this.array1.push(res.data.data[i].fullDeviceName)
}
}).catch(err => {
console.log('获取设备列表失败', err)
})
},
//
@ -295,11 +314,18 @@
data[i].shi = data[i].times[3];
data[i].fen = data[i].times[4];
data[i].miao = data[i].times[5];
data[i].datetime = data[i].yue + '-' + data[i].ri + ' ' + data[i].shi + ':' + data[i]
.fen
if (data[i].alertContent.indexOf('监测数据名称:') != -1) {
data[i].datetime = data[i].yue + '-' + data[i].ri + ' ' + data[i].shi + ':' + data[i].fen
if (data[i].alertContent && data[i].alertContent.indexOf('监测数据名称:') != -1) {
data[i].alertContent = data[i].alertContent.replace('监测数据名称:', '')
}
// alertContent
if (typeof data[i].alertContent === 'string') {
data[i].alertContent = [{
name: '告警',
val: data[i].alertContent,
unit: ''
}]
}
}
this.list = this.list.concat(data)
this.total = res.data.data.total
@ -315,7 +341,6 @@
this.loadStatus = 'nomore'
} else {
this.isLastpage = false;
// this.isLoadMore=true
this.loadStatus = 'more'
}
} else {
@ -325,11 +350,13 @@
}
uni.hideLoading();
this.isRefresher = false
}).catch(err => {
uni.hideLoading();
console.log('获取预警列表失败', err)
})
},
//
lower() {
//
if (this.isLastpage) {
return
}
@ -357,11 +384,17 @@
data[i].shi = data[i].times[3];
data[i].fen = data[i].times[4];
data[i].miao = data[i].times[5];
data[i].datetime = data[i].yue + '-' + data[i].ri + ' ' + data[i].shi + ':' + data[i]
.fen
if (data[i].alertContent.indexOf('监测数据名称:') != -1) {
data[i].datetime = data[i].yue + '-' + data[i].ri + ' ' + data[i].shi + ':' + data[i].fen
if (data[i].alertContent && data[i].alertContent.indexOf('监测数据名称:') != -1) {
data[i].alertContent = data[i].alertContent.replace('监测数据名称:', '')
}
if (typeof data[i].alertContent === 'string') {
data[i].alertContent = [{
name: '告警',
val: data[i].alertContent,
unit: ''
}]
}
}
this.list = this.list.concat(data)
if (res.data.data.total != 0) {
@ -370,7 +403,6 @@
this.loadStatus = 'nomore'
} else {
this.isLastpage = false;
// this.isLoadMore=true
this.loadStatus = 'more'
}
} else {
@ -378,6 +410,8 @@
this.loadStatus = 'nomore'
}
}
}).catch(err => {
console.log('加载更多预警失败', err)
})
},
//
@ -390,94 +424,129 @@
this.pjnr = data[i].detailValue
}
}
}).catch(err => {
console.log('获取评价失败', err)
})
},
//
radioChange(e){
radioChange(e) {
this.riqinumber = e.detail.value
this.bindDateqsChange(this.datetwo,'twotime')
},
//
bindDateqsChange(e,tiem) {
if (tiem=='twotime') {
let selectedDate = e
if (this.riqinumber === 'monthDays') {
this.dateqs = selectedDate.slice(0, 7); // YYYY-MM
} else if (this.riqinumber === 'yearMonth') {
this.dateqs = selectedDate.slice(0, 4); // YYYY
} else {
this.dateqs = selectedDate; // YYYY-MM-DD
}
} else {
let selectedDate = e.detail.value;
if (this.riqinumber === 'monthDays') {
this.dateqs = selectedDate.slice(0, 7); // YYYY-MM
} else if (this.riqinumber === 'yearMonth') {
this.dateqs = selectedDate.slice(0, 4); // YYYY
} else {
this.dateqs = selectedDate; // YYYY-MM-DD
}
//
this.timList.forEach((item, index) => {
if (item.value === e.detail.value) {
this.current = index
}
})
//
let currentDate = new Date()
let year = currentDate.getFullYear()
let month = String(currentDate.getMonth() + 1).padStart(2, '0')
let day = String(currentDate.getDate()).padStart(2, '0')
this.qushicov();
if (this.riqinumber === 'yearMonth') {
this.dateqs = String(year)
} else if (this.riqinumber === 'monthDays') {
this.dateqs = year + '-' + month
} else {
this.dateqs = year + '-' + month + '-' + day
}
this.qushicov()
},
//
bindDateqsChange(e) {
let selectedDate = e.detail.value
if (this.riqinumber === 'yearMonth') {
this.dateqs = selectedDate.slice(0, 4)
} else if (this.riqinumber === 'monthDays') {
this.dateqs = selectedDate.slice(0, 7)
} else {
this.dateqs = selectedDate
}
this.qushicov()
},
//
qushicov() {
// 使
if (!this.stationCode) {
console.log('站点编码为空,使用默认站点')
if (this.arrays.length > 0) {
this.stationCode = this.arrays[0].value
} else {
//
setTimeout(() => {
if (this.arrays.length > 0) {
this.stationCode = this.arrays[0].value
this.qushicov()
}
}, 500)
return
}
}
let data = {
summrayMode: this.riqinumber,
startTime: this.dateqs,
stationCode:this.stationCode,
stationCode: this.stationCode,
}
console.log('请求趋势数据参数:', data)
this.$http.post('/applet/survDeviceDeploy/waterIntegrateStatistic', data).then(iem => {
let lynum = iem.data.data
console.log('趋势数据返回:', lynum)
//
if (!lynum || !lynum.tableHead || !lynum.tableData2 || lynum.tableHead.length === 0) {
console.log('趋势数据为空')
this.chartData = {
categories: [],
series: []
}
return
}
setTimeout(() => {
let categories = [];
let displayCategories = []; // X
let series = [];
let allValues = []; //
let categories = []
let displayCategories = []
let series = []
let allValues = []
if (lynum.tableHead && lynum.tableHead.length > 0) {
categories = lynum.tableIndex;
// X
// X
categories = lynum.tableIndex || []
if (categories.length > 0) {
const first = categories[0];
const middle = categories[Math.floor(categories.length / 2)];
const last = categories[categories.length - 3];
const first = categories[0]
const middle = categories[Math.floor(categories.length / 2)]
const last = categories[categories.length - 1]
// categories
displayCategories = categories.map((item, index) => {
if (index === 0 || index === Math.floor(categories.length / 2) || index === categories.length - 2) {
return item;
if (index === 0 || index === Math.floor(categories.length / 2) || index === categories.length - 1) {
return item
}
return '';
});
return ''
})
}
// series
lynum.tableHead.forEach((header, index) => {
const seriesData = lynum.tableData2.map(row => {
const value = row[index] === "0" ? 0 : parseFloat(row[index]) || 0;
allValues.push(value); //
return value;
});
const seriesData = (lynum.tableData2 || []).map(row => {
const value = row[index] === "0" ? 0 : parseFloat(row[index]) || 0
allValues.push(value)
return value
})
series.push({
name: header.eleDesc,
name: header.eleDesc || header.name || '指标',
data: seriesData
});
});
})
})
// Y
const maxValue = Math.max(...allValues);
const minValue = Math.min(...allValues);
if (allValues.length > 0) {
const maxValue = Math.max(...allValues)
const minValue = Math.min(...allValues)
const padding = maxValue * 0.1 || 10
const yAxisMax = maxValue + padding
const yAxisMin = Math.max(0, minValue - padding)
//
const padding = maxValue * 0.1; // 10%
const yAxisMax = maxValue + padding;
const yAxisMin = Math.max(0, minValue - padding); // 0
// optsyAxis
this.opts = {
...this.opts,
yAxis: {
@ -486,239 +555,47 @@
data: [
{
min: yAxisMin,
max: yAxisMax
max: yAxisMax || 100
}
]
}
};
}
}
let res = {
categories: displayCategories, // 使
this.chartData = {
categories: displayCategories,
series: series
};
this.chartData = JSON.parse(JSON.stringify(res));
}, 500);
})
},
// 线
gettj() {
if (!this.stationCode) {
this.stationCode = 'S_1'
}
this.$http.post('/applet/wxclient/getPplutionSummry?stationCode=' + this.stationCode).then(res => {
this.zxtdata = res.data.data[0]
this.ec.option.legend.data = ['总磷', '总氮', '硝态氮']
this.ec.option.color = ['#19D58A', '#FFC53B', '#3BA0FF']
this.ec.option.series = [{
name: '总磷',
type: 'line',
stack: 'Total1',
areaStyle: { //
color: {
type: 'linear',
x: 0,
y: 0,
x2: 0,
y2: 1,
colorStops: [{
offset: 0,
color: 'rgba(25, 213, 138, 1)' // 0%
}, {
offset: 1,
color: 'rgba(255, 255, 255, 1)' // 100%
}],
global: false // false
}
},
emphasis: {
focus: 'series'
},
data: this.zxtdata.TPSummry
},
{
name: '总氮',
type: 'line',
stack: 'Total2',
areaStyle: { //
color: {
type: 'linear',
x: 0,
y: 0,
x2: 0,
y2: 1,
colorStops: [{
offset: 0,
color: 'rgba(255, 197, 59, 1)' // 0%
}, {
offset: 1,
color: 'rgba(255, 255, 255, 1)' // 100%
}],
global: false // false
}
},
emphasis: {
focus: 'series'
},
data: this.zxtdata.TNSummry
},
{
name: '硝态氮',
type: 'line',
stack: 'Total3',
areaStyle: { //
color: {
type: 'linear',
x: 0,
y: 0,
x2: 0,
y2: 1,
colorStops: [{
offset: 0,
color: 'rgba(59, 160, 255, 1)' // 0%
}, {
offset: 1,
color: 'rgba(255, 255, 255, 1)' // 100%
}],
global: false // false
}
},
emphasis: {
focus: 'series'
},
data: this.zxtdata.NOSummry
},
]
if (this.array[this.index].indexOf('畜禽') != -1) {
this.ec.option.legend.data = ['总磷', '总氮', 'COD', '氨氮']
this.ec.option.color = ['#19D58A', '#FFC53B', '#3BA0FF', '#FF3B3B']
this.ec.option.series = [{
name: '总磷',
type: 'line',
stack: 'Total1',
areaStyle: { //
color: {
type: 'linear',
x: 0,
y: 0,
x2: 0,
y2: 1,
colorStops: [{
offset: 0,
color: 'rgba(25, 213, 138, 1)' // 0%
}, {
offset: 1,
color: 'rgba(255, 255, 255, 1)' // 100%
}],
global: false // false
}
},
emphasis: {
focus: 'series'
},
data: this.zxtdata.TPSummry
},
{
name: '总氮',
type: 'line',
stack: 'Total2',
areaStyle: { //
color: {
type: 'linear',
x: 0,
y: 0,
x2: 0,
y2: 1,
colorStops: [{
offset: 0,
color: 'rgba(255, 197, 59, 1)' // 0%
}, {
offset: 1,
color: 'rgba(255, 255, 255, 1)' // 100%
}],
global: false // false
}
},
emphasis: {
focus: 'series'
},
data: this.zxtdata.TNSummry
},
{
name: 'COD',
type: 'line',
stack: 'Total3',
areaStyle: { //
color: {
type: 'linear',
x: 0,
y: 0,
x2: 0,
y2: 1,
colorStops: [{
offset: 0,
color: 'rgba(59, 160, 255, 1)' // 0%
}, {
offset: 1,
color: 'rgba(255, 255, 255, 1)' // 100%
}],
global: false // false
}
},
emphasis: {
focus: 'series'
},
data: this.zxtdata.CODSummry
},
{
name: '氨氮',
type: 'line',
stack: 'Total4',
areaStyle: { //
color: {
type: 'linear',
x: 0,
y: 0,
x2: 0,
y2: 1,
colorStops: [{
offset: 0,
color: 'rgba(255, 59, 59, 1)' // 0%
}, {
offset: 1,
color: 'rgba(255, 255, 255, 1)' // 100%
}],
global: false // false
}
},
emphasis: {
focus: 'series'
},
data: this.zxtdata.NHSummry
},
]
console.log('图表数据:', this.chartData)
}, 300)
}).catch(err => {
console.log('趋势数据请求失败', err)
this.chartData = {
categories: [],
series: []
}
})
},
// 线
bindPickerChange: function(e) {
this.index = e.detail.value
this.stationName = this.array[this.index]
let stationName = this.array[this.index]
for (var i = 0; i < this.arrays.length; i++) {
if (this.stationName == this.arrays[i].label) {
if (stationName == this.arrays[i].label) {
this.stationCode = this.arrays[i].value
break
}
}
// this.gettj()
this.qushicov()
},
//
bindPickerChange1: function(e) {
this.index1 = e.detail.value
this.stationName1 = this.array1[this.index1]
for (var i = 0; i < this.arrays.length; i++) {
for (var i = 0; i < this.arrays1.length; i++) {
if (this.stationName1 == this.arrays1[i].label) {
this.stationCode1 = this.arrays1[i].value
break
}
}
if (this.stationName1 == '全部监测设备') {
@ -739,7 +616,6 @@
let year = date.getFullYear();
let month = date.getMonth() + 1;
let day = date.getDate();
if (type === 'start') {
year = year - 10;
} else if (type === 'end') {
@ -755,12 +631,10 @@
<style lang="scss">
page {
// height: 100%;
background-color: #0f6efe;
}
.container {
// height: 100%;
padding: 0 32rpx;
box-sizing: border-box;
overflow-y: scroll;
@ -796,7 +670,6 @@
}
.ybecharts image {
// position: absolute;
width: 90%;
height: 100%;
}
@ -1009,21 +882,18 @@
.tabitem:first-child {
width: 31%;
// text-align: center
}
.tabitem:nth-child(2) {
width: 27%;
// text-align: center
}
.tabitem:nth-child(3) {
width: 19%;
// text-align: center
}
.tabitem:nth-child(4) {
flex: 1 // text-align: center
flex: 1
}
.scroll-Y {
@ -1083,10 +953,6 @@
}
}
// .lists_item:first-child {
// padding-top: 0;
// }
.jczbs {
width: 32%;
font-size: 24rpx;
@ -1096,7 +962,6 @@
white-space: nowrap;
overflow: hidden;
text-overflow: ellipsis;
// text-align: center
}
.zbz {
@ -1108,7 +973,6 @@
white-space: nowrap;
overflow: hidden;
text-overflow: ellipsis;
// text-align: center
}
.sbsj {
@ -1117,8 +981,6 @@
font-weight: 400;
color: #667482;
flex: 1;
// text-align: center
// text-align: right;
}
.szqss {
@ -1134,12 +996,9 @@
white-space: nowrap;
overflow: hidden;
text-overflow: ellipsis;
// text-align: center
}
.load {
// height: 50rpx;
// line-height: 50rpx;
text-align: center;
color: #c6c6c6;
}
@ -1147,14 +1006,13 @@
.pagebot {
height: 100rpx;
}
//
.radio-group {
display: flex;
justify-content: space-around;
// margin: 20rpx 32rpx 0;
border-radius: 20rpx;
padding: 8rpx;
// width: 60%;
.radio-label {
display: flex;
align-items: center;
@ -1169,7 +1027,6 @@
background: rgba(15, 110, 254, 0.1);
}
//
&.checked {
background: #0f6efe;
@ -1183,7 +1040,6 @@
transform: scale(0.8);
margin-right: 8rpx;
//
&[checked] {
color: #ffffff;
}

View File

@ -178,7 +178,6 @@
text:res.data.data[i].itemText,
value:res.data.data[i].itemValue
})
console.log(this.hobby)
}
})
},
@ -207,7 +206,6 @@
text:res.data.data[i].itemText,
value:res.data.data[i].itemValue
})
console.log(this.hobby3)
}
})
},
@ -217,17 +215,14 @@
},
//
change1(e){
console.log(e)
this.details.breedVariety = e.detail.value
},
//
change2(e){
console.log(e)
this.details.controlMode = e.detail.value
},
//
change3(e){
console.log(e)
this.details.useMode = e.detail.value
},
//

View File

@ -119,7 +119,6 @@
text:res.data.data[i].itemText,
value:res.data.data[i].itemValue
})
console.log(this.hobby)
}
})
},
@ -155,7 +154,6 @@
text:res.data.data[i].itemText,
value:res.data.data[i].itemValue
})
console.log(this.hobby3)
}
for(var i=0;i<this.hobby3.length;i++){
if(this.details.useMode){

View File

@ -179,7 +179,6 @@
text:res.data.data[i].itemText,
value:res.data.data[i].itemValue
})
console.log(this.hobby)
}
})
},
@ -208,7 +207,6 @@
text:res.data.data[i].itemText,
value:res.data.data[i].itemValue
})
console.log(this.hobby3)
}
})
},
@ -218,17 +216,14 @@
},
//
change1(e){
console.log(e)
this.details.breedVariety = e.detail.value
},
//
change2(e){
console.log(e)
this.details.controlMode = e.detail.value
},
//
change3(e){
console.log(e)
this.details.useMode = e.detail.value
},
//

View File

@ -129,7 +129,6 @@
var ktxStatusHeight = res.statusBarHeight * pxToRpxScale
var navigationHeight = 44 * pxToRpxScale
this.height = res.windowHeight * pxToRpxScale//px rpx
console.log(this.height,ktxStatusHeight,navigationHeight)
this.scorllheight = this.height - 182
}
});
@ -142,14 +141,12 @@
var ktxStatusHeight = res.statusBarHeight * pxToRpxScale
var navigationHeight = 44 * pxToRpxScale
this.height = res.windowHeight * pxToRpxScale//px rpx
console.log(this.height,ktxStatusHeight,navigationHeight)
this.scorllheight = this.height - 182
}
});
let pages = getCurrentPages();
let currPage = pages[pages.length - 1]; //
this.reload = currPage.data.reload
console.log(this.reload,'Ge')
if(this.reload){
this.farmName = ''
this.breedVariety = ''
@ -175,7 +172,6 @@
value:res.data.data[i].itemValue
})
this.array.push(res.data.data[i].itemText)
console.log(this.array)
}
})
},
@ -210,24 +206,18 @@
this.List = this.List.concat(data)
if(res.data.data.total != 0){
this.allNum = Number(res.data.data.total)/Number(this.pageSize)+'';
console.log(this.allNum,'总页数')
if(this.allNum.indexOf('.') == -1) {
this.allNum = this.allNum;
console.log(this.allNum,'if')
} else {
this.allNum = parseInt(Number(this.allNum)+1);
console.log(this.allNum,'else')
}
console.log(this.pageNo,this.allNum,'156156')
if(this.pageNo == this.allNum) {
this.isLastpage = true;
this.loadStatus='nomore'
console.log(this.isLastpage,'true','nomore')
} else {
this.isLastpage = false;
// this.isLoadMore=true
this.loadStatus = 'more'
console.log(this.isLastpage,'false')
}
}else{
this.isLastpage = true;
@ -240,7 +230,6 @@
},
//
lower() {
console.log("最后一页了,取消下拉功能");
//
if (this.isLastpage) {
return
@ -250,7 +239,6 @@
this.intervalId = setInterval(() => {
num = num+1;
},1000)
console.log(this.intervalId,num)
this.pageNo = this.pageNo + 1;
let params = {}
params.pageNo = this.pageNo
@ -266,12 +254,10 @@
if(this.pageNo == this.allNum) {
this.isLastpage = true;
this.loadStatus='nomore'
console.log(this.isLastpage,'true')
} else {
this.isLastpage = false;
// this.isLoadMore=true
this.loadStatus = 'more'
console.log(this.isLastpage,'false')
}
}else{
this.isLastpage = true;
@ -281,7 +267,6 @@
})
},
bindPickerChange: function(e) {
console.log('picker发送选择改变携带值为', e.detail.value)
this.index = e.detail.value
this.breedVariety = this.arrays[this.index].value
this.breedVariety1 = this.arrays[this.index].text
@ -312,12 +297,10 @@
},
//
caozuo(item){
console.log(item)
var that = this
uni.showActionSheet({
itemList: ['编辑', '删除'],
success: function (res) {
console.log('选中了第' + (res.tapIndex + 1) + '个按钮');
if((res.tapIndex + 1) == 1){
uni.navigateTo({
url:'/packDetail/pages/fwtz/edit?item='+ encodeURIComponent(JSON.stringify(item))
@ -328,8 +311,6 @@
content: '是否删除数据?',
success: function (res) {
if (res.confirm) {
console.log('用户点击确定');
console.log(item.id,1)
that.$http.delete(that.deleteUrl+'?id='+item.id).then(res =>{
if(res.data.code == 0){
uni.showToast({

View File

@ -35,7 +35,7 @@
</view>
</view>
</view>
<text class="botmTetx">Copyright <text style="font-size: 30rpx;padding:0rpx 7rpx;"> © </text> 汾西县农业农村局</text>
<text class="botmTetx">Copyright <text style="font-size: 30rpx;padding:0rpx 7rpx;"> © </text> 吉县现代农业发展中心</text>
<!-- <view class="loginpage">
<image class="bigimg" src="../../static/dls.jpg" mode=""></image>
<view class="padding text-center margin-top">
@ -80,7 +80,7 @@ export default {
thirdLoginInfo: "",
thirdLoginState: false,
bindingPhoneModal: false,
login: false,
login: true,
thirdUserUuid: '',
url: {
bindingThirdPhone: '/sys/thirdLogin/bindingThirdPhone'
@ -100,26 +100,20 @@ export default {
var that = this
uni.login({
success: function (res) {
console.log(res.code)
that.code = res.code
let params = {}
params.jsCode = that.code
console.log(params, 152)
api.wxlogin(params).then(res => {
console.log(res, 165)
if (res.data.code == 0) {
let userInfo = res.data.data;
uni.setStorageSync('third_session', userInfo.thirdSession);
console.log(that.login, '状态')
if (userInfo.id) {
that.login = false
uni.reLaunch({
url: '/pages/index/index'
})
} else if (!userInfo.id) {
that.login = true
}
}
// api.loginCallback(res, ()=>{
// that.login = false
// uni.reLaunch({
// url: '/pages/index/index'
// })
// }, ()=>{
// that.login = true
// });
})
}
});
@ -150,7 +144,6 @@ export default {
})
},
TypeInput(e) {
console.log(e, 415)
// ;
const inputType = /[\W]/g //
this.$nextTick(function () {
@ -158,7 +151,6 @@ export default {
})
},
tologins() {
console.log(this.userInfoLoginDTO.password, this.userInfoLoginDTO.userName, '密码用户')
if (!this.userInfoLoginDTO.userName) {
uni.showToast({
title: '请输入账号',
@ -176,23 +168,21 @@ export default {
return
}
this.$http.post('/applet/userInfo/logins', this.userInfoLoginDTO).then(res => {
if (res.data.code == 0) {
api.loginCallback(res, ()=>{
uni.setStorageSync('constant', res.data.data)
uni.setStorageSync('password', this.userInfoLoginDTO.password)
uni.setStorageSync('userName', this.userInfoLoginDTO.userName)
uni.reLaunch({
url: '/pages/index/index'
})
} else {
}, ()=>{
uni.removeStorageSync('constant')
uni.showToast({
title: res.data.msg,
icon: 'none',
duration: 2000
})
// this.userInfoLoginDTO.password = ''
// this.userInfoLoginDTO.userName = ''
}
});
})
}
}

View File

@ -167,7 +167,6 @@
var ktxStatusHeight = res.statusBarHeight * pxToRpxScale
var navigationHeight = 44 * pxToRpxScale
this.height = res.windowHeight * pxToRpxScale//px rpx
console.log(this.height,ktxStatusHeight,navigationHeight)
this.scorllheight = this.height - 120
}
});
@ -199,21 +198,17 @@
this.$set(item, 'checked', true)
})
this.checkList = this.alllist
console.log(this.checkList,156)
}
},
checkSelectItem(e, item) {
console.log(item,156)
// checkedfalse,checked=true
if (item.checked == true) {
this.$set(item, 'checked', false)
this.checkList = this.checkList.filter(items => (items.value !== item.value))
console.log(this.checkList,'true')
} else {
this.$set(item, 'checked', true)
this.checkList.push(item)
console.log(this.checkList,'false')
}
// checkedtruealllist
let newArr = this.alllist.filter(item => (item.checked == true))
@ -222,7 +217,6 @@
} else {
this.checkTrue = false;
}
console.log(this.checkList,41561456)
},
submit(){
uni.navigateBack({

View File

@ -1,7 +1,7 @@
<template>
<view class="container">
<!-- 顶部选项卡 -->
<view class="topScroll">
<!-- <view class="topScroll">
<scroll-view scroll-x="true" class="scroll">
<view class="scroll-item" v-for="(item,index) in topItems" :key="index" @click="chooseClick(item,index)"
:class="{'scroll-item2':isActive == index}">
@ -10,7 +10,7 @@
</view>
</view>
</scroll-view>
</view>
</view> -->
<!-- 监测站告警 -->
<block v-if="isActive == 0">
@ -135,12 +135,13 @@
arrays: [],
isRefresher: false, //
reload: '',
topItems: [{
dictLabel: '监测站告警'
},
{
dictLabel: '异常趋势图'
}
topItems: [
// {
// dictLabel: ''
// },
// {
// dictLabel: ''
// }
],
value: 0,
rangeList: [],
@ -938,8 +939,8 @@
.zwsj {
height: calc(100vh - 100rpx);
display: flex;
align-items: center;
justify-content: center;
// align-items: center;
// justify-content: center;
}
.inzwsj {
@ -947,8 +948,8 @@
}
.zwsjimg {
width: 200rpx;
height: 200rpx;
width: 100%;
height: 240rpx;
}
.zwsjtext {

View File

@ -66,7 +66,6 @@
var navigationHeight = 44 * pxToRpxScale
this.height = res.windowHeight * pxToRpxScale//px rpx
this.contentheight = this.height - ktxStatusHeight - navigationHeight - 150
console.log(this.contentheight,123132)
}
});
},
@ -105,7 +104,6 @@
});
},
radioChange(value){
console.log(value)
this.constant.sex = value.detail.value
},
submit() {

View File

@ -1,6 +1,6 @@
<template>
<view class="container">
<uni-nav-bar :fixed="true" left-icon="left" background-color="#0F6EFF" @clickLeft="back()" status-bar :title="item.stationName"/>
<uni-nav-bar :fixed="true" left-icon="left" background-color="#0F6EFF" @clickLeft="back()" status-bar :title="item.deployDes"/>
<view class="liebiaos">
<view class="list_item">
<view class="list_item_top">
@ -128,7 +128,6 @@
}
},
onLoad(options) {
console.log(JSON.parse(decodeURIComponent(options.item)))
this.item = JSON.parse(decodeURIComponent(options.item));
},
onShow() {

View File

@ -85,7 +85,6 @@
var ktxStatusHeight = res.statusBarHeight * pxToRpxScale
var navigationHeight = 44 * pxToRpxScale
this.height = res.windowHeight * pxToRpxScale//px rpx
console.log(this.height,ktxStatusHeight,navigationHeight)
this.scorllheight = this.height
}
});
@ -102,8 +101,22 @@
this.$http.get('/applet/survStationInfo/deviceList'),
this.$http.get('/applet/survStationInfo/fdeviceList')
]).then(([res1, res2]) => {
//
this.list = res1.data.data.concat(res2.data.data);
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);

View File

@ -9,7 +9,7 @@
<image v-if="it[0].stationType == 'livestock'" src="../../static/zhandian_icon_xuqin.png" mode=""></image>
<view class="item_right">
<view class="right_top">
{{it[0].stationName}}
{{it[0].stationName?it[0].stationName:'无设备信息'}}
</view>
<view class="right_bot">
<image src="../../static/shebei_icon_shebei.png" mode=""></image>
@ -84,7 +84,6 @@
var ktxStatusHeight = res.statusBarHeight * pxToRpxScale
var navigationHeight = 44 * pxToRpxScale
this.height = res.windowHeight * pxToRpxScale//px rpx
console.log(this.height,ktxStatusHeight,navigationHeight)
this.scorllheight = this.height
}
});
@ -101,7 +100,6 @@
})
},
todetail(item,index){
console.log(item,12)
uni.navigateTo({
url:'/packDetail/pages/vidio/detail?item=' + encodeURIComponent(JSON.stringify(item))
})

Binary file not shown.

Before

Width:  |  Height:  |  Size: 58 KiB

After

Width:  |  Height:  |  Size: 64 KiB

BIN
packDetail/static/dls2.jpg Normal file

Binary file not shown.

After

Width:  |  Height:  |  Size: 58 KiB

View File

@ -23,7 +23,7 @@
</view>
</view> -->
</view>
<text class="botmTetx">Copyright <text style="font-size: 30rpx;padding:0rpx 7rpx;"> © </text> 汾西县农业农村局</text>
<text class="botmTetx">Copyright <text style="font-size: 30rpx;padding:0rpx 7rpx;"> © </text> 吉县现代农业发展中心</text>
</view>
</view>
</template>
@ -112,6 +112,6 @@
left: 50%;
transform: translate(-50%);
color: #999;
width: 52%;
width: 60%;
}
</style>

View File

@ -11,7 +11,7 @@
</view>
</view>
</view>
<view class="bot_box">
<view class="bot_box" :class="{'single-item': item.depUrlArr && item.depUrlArr.length === 1}">
<view class="bot_left" v-for="(it,i) in item.depUrlArr" :key="i" @click="todetail(it,i,item)">
<view class="botleft_bot">
<view class="">
@ -71,7 +71,6 @@
var ktxStatusHeight = res.statusBarHeight * pxToRpxScale
var navigationHeight = 44 * pxToRpxScale
this.height = res.windowHeight * pxToRpxScale //px rpx
console.log(this.height, ktxStatusHeight, navigationHeight)
this.scorllheight = this.height
}
});
@ -85,7 +84,6 @@
var ktxStatusHeight = res.statusBarHeight * pxToRpxScale
var navigationHeight = 44 * pxToRpxScale
this.height = res.windowHeight * pxToRpxScale //px rpx
console.log(this.height, ktxStatusHeight, navigationHeight)
this.scorllheight = this.height
}
});
@ -112,24 +110,18 @@
this.List = this.List.concat(data)
if (data.length != 0) {
this.allNum = Number(data.length) / Number(this.pageSize) + '';
console.log(this.allNum, '总页数')
if (this.allNum.indexOf('.') == -1) {
this.allNum = this.allNum;
console.log(this.allNum, 'if')
} else {
this.allNum = parseInt(Number(this.allNum) + 1);
console.log(this.allNum, 'else')
}
console.log(this.pageNo, this.allNum, '156156')
if (this.pageNo == this.allNum) {
this.isLastpage = true;
this.loadStatus = 'nomore'
console.log(this.isLastpage, 'true', 'nomore')
} else {
this.isLastpage = false;
// this.isLoadMore=true
this.loadStatus = 'more'
console.log(this.isLastpage, 'false')
}
} else {
this.isLastpage = true;
@ -141,7 +133,6 @@
})
},
lower() {
console.log("最后一页了,取消下拉功能");
//
if (this.isLastpage) {
return
@ -151,7 +142,6 @@
this.intervalId = setInterval(() => {
num = num + 1;
}, 1000)
console.log(this.intervalId, num)
this.pageNo = this.pageNo + 1;
let params = {}
params.pageNo = this.pageNo
@ -166,12 +156,10 @@
if (this.pageNo == this.allNum) {
this.isLastpage = true;
this.loadStatus = 'nomore'
console.log(this.isLastpage, 'true')
} else {
this.isLastpage = false;
// this.isLoadMore=true
this.loadStatus = 'more'
console.log(this.isLastpage, 'false')
}
} else {
this.isLastpage = true;
@ -234,6 +222,7 @@
font-size: 28rpx;
padding: 20rpx 0;
color: #8b95ea;
margin-top: 20rpx;
}
.top_box {
@ -253,6 +242,21 @@
flex-wrap: wrap;
}
/* 当只有一个子元素时的样式优化 */
.bot_box.single-item {
justify-content: center;
}
.bot_box.single-item .bot_left {
width: 100%;
height: 370rpx;
}
.bot_box.single-item .bot_left .botleft_top {
width: 100%;
height: 300rpx;
}
.bot_left {
width: 48%;
border: 4rpx solid #f0f0f0;

View File

@ -2326,7 +2326,6 @@
uni.sendSocketMessage({
data: JSON.stringify(param)
});
console.log('websocket发送给服务端的消息:', param);
socketTask.close({
code: 1000,
success: (res) => {
@ -2337,7 +2336,6 @@
// push
pusherStateChange: function (e) {
console.log('>>> live-pusher onPushStateChange:', e.detail.code);
const code = e.detail.code;
let content = '';
switch (code) {
@ -2440,13 +2438,11 @@
},
stopPush() {
console.log('停止推流');
this.pushVideoContext.stop();
this.pushVideo=false
},
startPush() {
console.log('开始推流,推流地址为:', this.pushUrl);
uni.showToast({
title: '开始推流,推流地址为:'
});
@ -2458,7 +2454,6 @@
},
error(e) {
console.log('live-player', e);
console.error('live-player error:', e.detail.errMsg);
if (e.detail.errCode == 10001) {
uni.showToast({

View File

@ -34,19 +34,13 @@
var player = null;
export default {
created() {
console.log(1111111111111111111111)
// this.initPlayer()
},
mounted() {
console.log('mounted...');
if (typeof window.EZUIKit !== 'undefined') {
console.log('defined EZUIKit...');
this.initPlayer();
} else {
console.log('undefined EZUIKit...');
//
const script = document.createElement('script')
// view www www
@ -62,7 +56,6 @@
windowWidth,
windowHeight
} = uni.getSystemInfoSync();
console.log('initPlayer...');
return
fetch('https://zy.sxzooh.com/zh-api/applet/ysyun/getYsToken')
// .then(response => response.json())

View File

@ -226,10 +226,8 @@ export default {
},
onLoad: function (options) {
livePlayerContext = uni.createLivePlayerContext('livePlayer');
console.log('获取参数', options);
//
const currentPage = getCurrentPages();
console.log(currentPage.nv_length);
// url
const { accessToken, deviceSerial, channelNo, date, switch1Checked } = options;
@ -238,7 +236,6 @@ export default {
this.deviceSerial=deviceSerial,
this.channelNo=channelNo,
this.page=currentPage.nv_length
console.log(date);
//
if (date) {
this.date=date,
@ -261,10 +258,8 @@ export default {
*/
onShareAppMessage: function (res) {
const { accessToken, deviceSerial, channelNo, date, switch1Checked } = this;
console.log(switch1Checked);
if (res.from === 'button') {
//
console.log(res.target);
this.panelStatus=0
}
return {
@ -298,7 +293,6 @@ export default {
//
switch1Change: function (e) {
console.log('当前存储类型', e.detail);
if (e.detail.value == false) {
this.switchText='云存储',
this.switch1Checked=false,
@ -327,10 +321,8 @@ export default {
//
uni.getSystemInfo({
success(res) {
console.log('当前操作系统:', res.system);
const sys = res.system;
type = sys.split(' ');
console.log(type);
if (type[0] == 'iOS') {
that.toDay=date.replace(/\-/g, '/')
} else {
@ -351,7 +343,6 @@ export default {
//
getTimeLine: function () {
const { recType, date, accessToken, deviceSerial, channelNo, timelineTimer, currentTimer } = this;
console.log('获取到的accessToken, accessToken', accessToken);
var that = this;
let currentDate = null;
let timestampCurrent = null;
@ -381,7 +372,6 @@ export default {
},
success: (res) => {
console.log('获取播放时间片段', res.data);
if (res.data.code == 200) {
if (res.data.data != null) {
var result = res.data.data;
@ -408,7 +398,6 @@ export default {
et: et
});
}
console.log('availArr:', availArr);
this.dateLine=availArr
} else {
this.dialogNodataTitle='暂无数据',
@ -447,7 +436,6 @@ export default {
let stTime = e.detail.stTime;
let etTime = e.detail.etTime;
const { type, date, accessToken, deviceSerial, channelNo, videoSrc } = this;
console.log('当前播放时间', stTime, etTime);
let startTime = null;
let stopTime = null;
startTime = date + ' ' + stTime;
@ -481,7 +469,6 @@ export default {
},
success: (res) => {
console.log('获取到的播放地址:', res.data);
if (res.data.code == '200' && res.data.data && res.data.data.url) {
const playUrl = res.data.data.url;
this.videoSrc=playUrl
@ -489,7 +476,6 @@ export default {
this.handleStop();
//
this.handlePlay();
console.log('当前播放地址:', this.videoSrc);
} else if (res.data.code == '20007') {
debugger;
this.dialogTitle='获取播放地址失败',
@ -519,7 +505,6 @@ export default {
this.dialogTitle='获取播放地址失败',
this.dialogContent=res.data.msg,
this.dialogShow=true
console.log('获取rtmp播放地址失败');
}
}
});
@ -549,7 +534,6 @@ export default {
_this.fullScreen=true
}
});
console.log('开启全屏');
},
unfullScreen() {
@ -559,7 +543,6 @@ export default {
_this.fullScreen=false
}
});
console.log('开启全屏');
},
ToggleObjectFit() {
@ -576,7 +559,6 @@ export default {
},
handlePlay(callback) {
console.log('handelPlay', this.playVideo, this.isHD);
this.checkNetWork();
livePlayerContext.play({
success: () => {
@ -594,7 +576,6 @@ export default {
title: '网络异常',
icon: 'none'
});
console.log('开始播放失败');
this.videoNetWorkError=true
this.showVideoControls=false
this.videoLoadingStatus=100
@ -603,7 +584,6 @@ export default {
},
handleStop(callback) {
console.log('stop');
const { list } = this;
livePlayerContext.stop({
success: () => {
@ -622,7 +602,6 @@ export default {
},
autoHideControl() {
console.log('showHdSelect', this.showHDSelect);
const _this = this;
clearTimeout(this.autoHideTimer);
this.autoHideTimer = setTimeout(() => {
@ -640,7 +619,6 @@ export default {
handleHD(e) {
var showHDSelect = this.showHDSelect;
console.log('handleHD', showHDSelect);
this.showHDSelect=!showHDSelect
},
@ -658,7 +636,6 @@ export default {
},
statechange(e) {
console.log('live-player code:', e.detail.code, e.detail);
const { code } = e.detail;
let { videoLoadingStatus, list, panelStatus } = this;
switch (code) {
@ -726,7 +703,6 @@ export default {
},
error(e) {
console.log('live-player', e);
console.error('live-player error:', e.detail.errMsg);
if (e.detail.errCode == 10001) {
uni.showToast({
@ -738,7 +714,6 @@ export default {
},
onVideoTap(e) {
console.log('点击视频');
const { deviceOffline, showVideoControls, panelStatus, videoNetWorkError } = this;
if (deviceOffline || panelStatus === 4 || videoNetWorkError) {
return false;
@ -755,10 +730,8 @@ export default {
screenShoot(e) {
const { playVideo, videoLoadingStatus } = this;
if (!playVideo || videoLoadingStatus != 100) {
console.log('非播放状态下点击截图');
return false;
}
console.log('开始截图');
// livePlayerContext.snapshot('raw');
let that = this;
uni.getSetting({
@ -786,13 +759,10 @@ export default {
livePlayerContext
.snapshot('raw')
.then((data) => {
console.log('data', data);
if (data) {
console.log(data);
uni.saveImageToPhotosAlbum({
filePath: data.tempImagePath,
success(res) {
console.log('保存成功', res);
uni.showToast({
title: '截图已保存至手机相册',
icon: 'none'
@ -850,7 +820,6 @@ export default {
//
bindDateChange: function (e) {
console.log('picker发送选择改变携带值为', e.detail.value);
this.date=e.detail.value
this.getTimeLine();
},

View File

@ -167,7 +167,6 @@
var ktxStatusHeight = res.statusBarHeight * pxToRpxScale
var navigationHeight = 44 * pxToRpxScale
this.height = res.windowHeight * pxToRpxScale//px rpx
console.log(this.height,ktxStatusHeight,navigationHeight)
this.scorllheight = this.height - 120
}
});
@ -199,21 +198,17 @@
this.$set(item, 'checked', true)
})
this.checkList = this.alllist
console.log(this.checkList,156)
}
},
checkSelectItem(e, item) {
console.log(item,156)
// checkedfalse,checked=true
if (item.checked == true) {
this.$set(item, 'checked', false)
this.checkList = this.checkList.filter(items => (items.value !== item.value))
console.log(this.checkList,'true')
} else {
this.$set(item, 'checked', true)
this.checkList.push(item)
console.log(this.checkList,'false')
}
// checkedtruealllist
let newArr = this.alllist.filter(item => (item.checked == true))
@ -222,7 +217,6 @@
} else {
this.checkTrue = false;
}
console.log(this.checkList,41561456)
},
submit(){
uni.navigateBack({

2
package-lock.json generated
View File

@ -1,5 +1,5 @@
{
"name": "HJApplet",
"name": "FenXiNspUniapp",
"lockfileVersion": 2,
"requires": true,
"packages": {

View File

@ -4,7 +4,7 @@
{
"path": "pages/index/index",
"style": {
"navigationBarTitleText": "汾西小流域面源污染监测",
"navigationBarTitleText": "吉县小流域面源污染监测",
"navigationStyle": "custom"
}
},
@ -156,7 +156,7 @@
{
"path": "pages/operations/index",
"style": {
"navigationBarTitleText": "站点运维",
"navigationBarTitleText": "运维记录",
"navigationStyle": "default",
"navigationBarBackgroundColor":"#0F6EFF"
}
@ -164,7 +164,7 @@
{
"path": "pages/operations/detail",
"style": {
"navigationBarTitleText": "站点运维详情",
"navigationBarTitleText": "运维记录详情",
"navigationStyle": "default",
"navigationBarBackgroundColor":"#0F6EFF"
}
@ -172,7 +172,7 @@
{
"path": "pages/operations/add",
"style": {
"navigationBarTitleText": "新增站点运维",
"navigationBarTitleText": "新增运维记录",
"navigationStyle": "default",
"navigationBarBackgroundColor":"#0F6EFF"
}
@ -180,7 +180,7 @@
{
"path": "pages/operations/edit",
"style": {
"navigationBarTitleText": "编辑站点运维",
"navigationBarTitleText": "编辑运维记录",
"navigationStyle": "default",
"navigationBarBackgroundColor":"#0F6EFF"
}
@ -196,7 +196,7 @@
{
"path": "pages/analysis/index",
"style": {
"navigationBarTitleText": "统计分析",
"navigationBarTitleText": "监测数据统计分析",
"navigationStyle": "default",
"navigationBarBackgroundColor":"#0F6EFF"
}
@ -212,7 +212,7 @@
{
"path": "pages/sjdyj/index",
"style": {
"navigationBarTitleText": "预警信息",
"navigationBarTitleText": "智能预警",
"navigationStyle": "default",
"navigationBarBackgroundColor":"#0F6EFF"
}

File diff suppressed because it is too large Load Diff

449
pages/index/indexData.js Normal file
View File

@ -0,0 +1,449 @@
const indexData = {
bigswiperList : [{
"id": "1692474977070829569",
"infoId": "1692474921957675010",
"detailCode": "图1",
"detailValue": "图",
"detailValue2": "1",
"propsValue1": null,
"propsValue2": null,
"detailPics": "temp/20230818174636_1692352452041.jpg",
"detailExtPics": null,
"detailNote": null,
"isShow": "1",
"sortNo": 1,
"tenantId": null,
"reVision": 0,
"createdBy": "hjadmin",
"createTime": "2023-08-18 17:54:14",
"updatedBy": null,
"isDel": 0,
"updatedTime": null
}, {
"id": "1692475023417888770",
"infoId": "1692474921957675010",
"detailCode": "图2",
"detailValue": "图",
"detailValue2": "2",
"propsValue1": null,
"propsValue2": null,
"detailPics": "temp/20230818174638_1692352462933.png",
"detailExtPics": null,
"detailNote": null,
"isShow": "1",
"sortNo": 1,
"tenantId": null,
"reVision": 0,
"createdBy": "hjadmin",
"createTime": "2023-08-18 17:54:25",
"updatedBy": null,
"isDel": 0,
"updatedTime": null
}],
wrwlist : [{
"unit": "℃",
"code": "dataAirTemp",
"color": "#22BB8A",
"icon": "sys/icon/shebei_icon_qixiang.png",
"description": "大气温度"
}, {
"unit": "%RH",
"code": "dataAirWet",
"color": "#EE701C",
"icon": "sys/icon/zhandian_icon_kongqishidu.png",
"description": "大气湿度"
}, {
"unit": "hPa",
"code": "dataAirPress",
"color": "#52AC2A",
"icon": "sys/icon/zhandian_icon_daqiyali.png",
"description": "大气压力"
}, {
"unit": "mm",
"code": "dataRainFall",
"color": "#2BADB9",
"icon": "sys/icon/zhandian_icon_jiangyuliang.png",
"description": "雨量"
}, {
"unit": "mm",
"code": "dataRainTotal",
"color": "#102B6A",
"icon": "sys/icon/zhandian_icon_jiangyuliang.png",
"description": "雨量累计"
}, {
"unit": "m/s",
"code": "dataWindSpeed",
"color": "#7CD6CF",
"icon": "sys/icon/zhandian_icon_fengsu.png",
"description": "风速"
}, {
"unit": "°",
"code": "dataWindDirection",
"color": "#26A3CC",
"icon": "sys/icon/zhandian_icon_fengxiang.png",
"description": "风向"
}, {
"unit": "MJ/m2",
"code": "dataSunTotal",
"color": "#6C48C7",
"icon": "sys/icon/zhandian_icon_taiyangquanfushe.png",
"description": "辐射累计"
}, {
"unit": "W/m2",
"code": "dataSunFallout",
"color": "#22BB8A",
"icon": "sys/icon/zhandian_icon_taiyangquanfushe.png",
"description": "太阳全辐射"
}, {
"unit": "%",
"code": "dataSoilWet",
"color": "#6495ED",
"icon": "sys/icon/zhandian_icon_turangshidu.png",
"description": "20CM土壤湿度"
}, {
"unit": "%",
"code": "dataSoilWet2",
"color": "#4169E1",
"icon": "sys/icon/zhandian_icon_turangshidu.png",
"description": "40CM土壤湿度"
}, {
"unit": "%",
"code": "dataSoilWet3",
"color": "#0000CD",
"icon": "sys/icon/zhandian_icon_turangshidu.png",
"description": "60CM土壤湿度"
}, {
"unit": "℃",
"code": "dataSoilTemp",
"color": "#C71585",
"icon": "sys/icon/zhandian_icon_turangwendu.png",
"description": "20CM土壤温度"
}, {
"unit": "℃",
"code": "dataSoilTemp2",
"color": "#FF1493",
"icon": "sys/icon/zhandian_icon_turangwendu.png",
"description": "40CM土壤温度"
}, {
"unit": "℃",
"code": "dataSoilTemp3",
"color": "#FF69B4",
"icon": "sys/icon/zhandian_icon_turangwendu.png",
"description": "60CM土壤温度"
}, {
"unit": "uS/cm",
"code": "dataSoilDdl",
"color": "#92D0D0",
"icon": "sys/icon/zhandian_icon_ec.png",
"description": "20CM电导率"
}, {
"unit": "uS/cm",
"code": "dataSoilDdl2",
"color": "#73A2A2",
"icon": "sys/icon/zhandian_icon_ec.png",
"description": "40CM电导率"
}, {
"unit": "uS/cm",
"code": "dataSoilDdl3",
"color": "#567777",
"icon": "sys/icon/zhandian_icon_ec.png",
"description": "60CM电导率"
}, {
"unit": "",
"code": "dataSoilSalt",
"color": "#4F5555",
"icon": "sys/icon/zhandian_icon_ec.png",
"description": "土壤盐分"
}, {
"unit": "%",
"code": "dataSoilWetMark",
"color": "#6495ED",
"icon": "sys/icon/zhandian_icon_turangshidu.png",
"description": "土壤湿度"
}, {
"unit": "℃",
"code": "dataSoilMark",
"color": "#C71585",
"icon": "sys/icon/zhandian_icon_turangwendu.png",
"description": "土壤温度"
}, {
"unit": "uS/cm",
"code": "dataSoilDdlMark",
"color": "#92D0D0",
"icon": "sys/icon/zhandian_icon_ec.png",
"description": "电导率"
}, {
"unit": "mg/L",
"code": "dataWaterTp",
"color": "#C8CC00",
"icon": "sys/icon/shebei_icon_tp.png",
"description": "总磷"
}, {
"unit": "mg/L",
"code": "dataWaterTn",
"color": "#009DB2",
"icon": "sys/icon/shebei_icon_tn.png",
"description": "总氮"
}, {
"unit": "mg/L",
"code": "dataWaterNo",
"color": "#72BAA7",
"icon": "sys/icon/shebei_icon_no3n.png",
"description": "硝态氮"
}, {
"unit": "mg/L",
"code": "dataWaterNh",
"color": "#225A1F",
"icon": "sys/icon/shebei_icon_nh3n.png",
"description": "氨氮"
}, {
"unit": "mg/L",
"code": "dataWaterCod",
"color": "#FDB933",
"icon": "sys/icon/shebei_icon_cod.png",
"description": "化学需氧量"
}, {
"unit": "mg/m³",
"code": "dataOu",
"color": "#f47a75",
"icon": "sys/icon/zhandian_icon_ou.png",
"description": "臭气浓度"
}, {
"unit": "mg/m³",
"code": "dataNh3",
"color": "#d05c7c",
"icon": "sys/icon/zhandian_icon_nh3.png",
"description": "氨气"
}, {
"unit": "mg/m³",
"code": "dataH2s",
"color": "#d05c9f",
"icon": "sys/icon/zhandian_icon_h2s.png",
"description": "硫化氢"
}, {
"unit": "mg/m³",
"code": "dataTvoc",
"color": "#f06464",
"icon": "sys/icon/zhandian_icon_tvoc.png",
"description": "总挥发性有机物"
}, {
"unit": "台",
"code": "default",
"color": "#DEAB8A",
"icon": "",
"description": "默认"
}],
list : [{
"name": "总氮",
"unit": "mg/L",
"value": "2.0000",
"color": "#009DB2",
"trend": null,
"survItem": null,
"dataDateTime": "2025-05-23 19:33:23",
"stationName": "小流域监测站1#站",
"stationCode": "S_1",
"stationType": null,
"dataCounts": 1045510
}, {
"name": "总磷",
"unit": "mg/L",
"value": "1.0061",
"color": "#C8CC00",
"trend": null,
"survItem": null,
"dataDateTime": "2025-05-23 19:33:23",
"stationName": "小流域监测站1#站",
"stationCode": "S_1",
"stationType": null,
"dataCounts": 1045510
}, {
"name": "硝态氮",
"unit": "mg/L",
"value": "5.2110",
"color": "#72BAA7",
"trend": null,
"survItem": null,
"dataDateTime": "2025-05-23 19:33:23",
"stationName": "小流域监测站1#站",
"stationCode": "S_1",
"stationType": null,
"dataCounts": 1045510
}, {
"name": "总氮",
"unit": "mg/L",
"value": "2.1114",
"color": "#009DB2",
"trend": null,
"survItem": null,
"dataDateTime": "2025-05-23 19:33:50",
"stationName": "小流域监测站1#站",
"stationCode": "S_2",
"stationType": null,
"dataCounts": 1045510
}, {
"name": "总磷",
"unit": "mg/L",
"value": "0.9864",
"color": "#C8CC00",
"trend": null,
"survItem": null,
"dataDateTime": "2025-05-23 19:33:50",
"stationName": "小流域监测站1#站",
"stationCode": "S_2",
"stationType": null,
"dataCounts": 1045510
}, {
"name": "硝态氮",
"unit": "mg/L",
"value": "1.2373",
"color": "#72BAA7",
"trend": null,
"survItem": null,
"dataDateTime": "2025-05-23 19:33:50",
"stationName": "小流域监测站1#站",
"stationCode": "S_2",
"stationType": null,
"dataCounts": 1045510
}, {
"name": "总氮",
"unit": "mg/L",
"value": "49.6451",
"color": "#009DB2",
"trend": null,
"survItem": null,
"dataDateTime": "2025-05-23 19:33:36",
"stationName": "畜禽1号站",
"stationCode": "S_3",
"stationType": null,
"dataCounts": 1045510
}, {
"name": "总磷",
"unit": "mg/L",
"value": "10.1785",
"color": "#C8CC00",
"trend": null,
"survItem": null,
"dataDateTime": "2025-05-23 19:33:36",
"stationName": "畜禽1号站",
"stationCode": "S_3",
"stationType": null,
"dataCounts": 1045510
}, {
"name": "氨氮",
"unit": "mg/L",
"value": "49.9502",
"color": "#225A1F",
"trend": null,
"survItem": null,
"dataDateTime": "2025-05-23 19:33:36",
"stationName": "畜禽1号站",
"stationCode": "S_3",
"stationType": null,
"dataCounts": 1045510
}, {
"name": "化学需氧量",
"unit": "mg/L",
"value": "501.5000",
"color": "#FDB933",
"trend": null,
"survItem": null,
"dataDateTime": "2025-05-23 19:33:36",
"stationName": "畜禽1号站",
"stationCode": "S_3",
"stationType": null,
"dataCounts": 1045510
}, {
"name": "总氮",
"unit": "mg/L",
"value": "50.6921",
"color": "#009DB2",
"trend": null,
"survItem": null,
"dataDateTime": "2025-05-23 19:00:00",
"stationName": "畜禽2号站",
"stationCode": "S_4",
"stationType": null,
"dataCounts": 1045510
}, {
"name": "总磷",
"unit": "mg/L",
"value": "0.2719",
"color": "#C8CC00",
"trend": null,
"survItem": null,
"dataDateTime": "2025-05-23 19:00:00",
"stationName": "畜禽2号站",
"stationCode": "S_4",
"stationType": null,
"dataCounts": 1045510
}, {
"name": "氨氮",
"unit": "mg/L",
"value": "48.9038",
"color": "#225A1F",
"trend": null,
"survItem": null,
"dataDateTime": "2025-05-23 19:00:00",
"stationName": "畜禽2号站",
"stationCode": "S_4",
"stationType": null,
"dataCounts": 1045510
}, {
"name": "化学需氧量",
"unit": "mg/L",
"value": "498.3486",
"color": "#FDB933",
"trend": null,
"survItem": null,
"dataDateTime": "2025-05-23 19:00:00",
"stationName": "畜禽2号站",
"stationCode": "S_4",
"stationType": null,
"dataCounts": 1045510
}],
menu: [
{
name: '监测站点',
img: require('../../static/home_icon_jiance.png'),
path: '/packDetail/pages/Site/index'
}, {
name: '智能预警',
img: require('../../static/scd.png'),
path: '/packDetail/pages/sjdyj/index'
},
{
name: '视频监控',
img: require('../../static/home_icon_shipin.png'),
path: '/packDetail1/pages/device/index'
},
{
name: '运维记录',
img: require('../../static/home_icon_yunwei.png'),
path: '/packDetail/pages/operations/index'
},
{
name: '农业废弃物',
img: require('../../static/home_icon_feiqiwu.png'),
path: '/packDetail/pages/waste/index'
},
{
name: '粪污台账',
img: require('../../static/home_icon_fenwu.png'),
path: '/packDetail/pages/fwtz/index'
},
{
name: '设备管理',
img: require('../../static/home_icon_shebei.png'),
path: '/packDetail/pages/vidio/index'
},
{
name: '统计分析',
img: require('../../static/home_icon_shuju.png'),
path: '/packDetail/pages/analysis/index'
},
]
};
export default indexData;

View File

@ -1,457 +0,0 @@
<template>
<view class="container">
<map id="map" ref="map" style="width: 100%; height:2000rpx;" scale="13" :markers="markers" longitude="111.436625"
latitude="36.771975" show-location @markertap="markertap" @callouttap="callouttap">
</map>
<view class="zdxq">
<view class="zdxqitem" @click="switch2Change('团柏河')">
<image src="../../static/zhandian_nongtian_dingwei.png" mode=""></image>
<view class="textss">
团柏河典型小流域监测站
</view>
<!-- <view class="crildon" :style="!issscd?'background:#00ff37':'background: #ccc;'"></view> -->
</view>
<view class="zdxqitem" @click="switch2Change('对竹河')">
<image src="../../static/zhandian_xuqin_dingwei.png" mode=""></image>
<view class="textss">
对竹河典型小流域监测站
</view>
<!-- <view class="crildon" :style="!isssscd?'background:#00ff37':'background: #ccc;'"></view> -->
</view>
<view class="zdxqitem" @click="switch2Change('土壤')">
<image src="../../static/iconsheturangzs.png" mode=""></image>
<view class="textss">
土壤监测
</view>
</view>
</view>
</view>
</template>
<script>
import api from '@/api/api'
import configService from '@/common/service/config.service.js';
export default {
data() {
return {
baseUrl:configService.staticDomainURL,
markers: [],
list: [],
issscd: false, // (false)
isssscd: false, // (false)
stationInfo: [],
cusLocation: [],
stationlist: [],
stationTwolist:[],
mapCtx: null //
};
},
onLoad() {
this.$nextTick(() => {
this.getList()
})
},
onReady() {
// onReady
this.mapCtx = uni.createMapContext('map', this);
},
onShow() {
if (!uni.getStorageSync('third_session')) {
uni.reLaunch({
url: '/packDetail/pages/login/login'
})
}
},
methods: {
getList() {
this.markers = []
this.list = []
this.stationInfo = []
this.cusLocation = []
this.stationlist = []
this.stationTwolist = []
uni.showLoading({
title: '加载中'
});
this.$http.get('/applet/survStationInfo/stationMap').then(res => {
// stationInfo deviceList
const combinedList = [...res.data.data.stationInfo, ...res.data.data.deviceList];
this.stationlist = combinedList;
this.stationTwolist = [...res.data.data.stationInfo];
console.log("合并后的stationlist+++++", this.stationlist);
//
this.stationlist.forEach((item, index) => {
item.id = index;
// deviceList stationInfo
const markerItem = {
id: item.id,
latitude: Number(item.latitude || item.stationLatitude),
longitude: Number(item.longitude || item.stationLongitude),
stationType: item.stationType || 'device', // deviceList stationType 'device'
sortNo: item.sortNo || index,
stationName: item.name || item.stationName,
stationCode: item.ids || item.stationCode || item.id,
//
groupName: item.groupName || '',
//
deviceType: item.type || null
};
this.list.push(markerItem);
//
if (item.stationType === 'cusLocaltion') {
this.cusLocation.push(item);
}
if (item.stationType === 'orient' || item.stationType === 'livestock') {
this.stationInfo.push(item);
}
});
this.issscd = false
this.isssscd = false
this.qiyeChange()
this.list1query()
this.addDeviceMarkers() //
//
setTimeout(() => {
this.adjustMapToFitAllMarkers();
}, 500);
uni.hideLoading();
})
},
//
addDeviceMarkers() {
this.stationlist.forEach((item, index) => {
// deviceList type stationType
if (item.type && !item.stationType) {
let iconPath = '';
let width = 35;
let height = 35;
//
switch(item.type) {
case 'soil':
iconPath = this.baseUrl + '/icon/device/soil.png';
width = 40;
height = 40;
break;
case 'camera':
iconPath = this.baseUrl + '/icon/device/cam.png';
width = 45;
height = 45;
break;
default:
iconPath = this.baseUrl + '/icon/device/default.png';
}
const markerItem = {
id: item.id,
iconPath: iconPath,
latitude: Number(item.latitude),
longitude: Number(item.longitude),
width: width,
height: height,
customCallout: {
anchorY: 0,
anchorX: 0,
display: 'ALWAYS'
},
stationType: 'device',
stationName: item.name,
stationCode: item.ids,
deviceType: item.type,
joinCluster: true
};
this.markers.push(markerItem);
}
});
},
//
adjustMapToFitAllMarkers() {
if (this.mapCtx && this.list.length > 0) {
this.mapCtx.includePoints({
points: this.list.map(item => ({
latitude: item.latitude,
longitude: item.longitude
})),
padding: [40, 40, 40, 40] //
});
}
},
//
adjustMapToRegion(regionName) {
let points = [];
if (regionName === '团柏河') {
//
points = this.stationTwolist
.filter(item => item.groupName === '团柏河')
.map(item => ({
latitude: Number(item.stationLatitude),
longitude: Number(item.stationLongitude)
}));
} else if (regionName === '对竹河') {
//
points = this.stationTwolist
.filter(item => item.groupName === '对竹河')
.map(item => ({
latitude: Number(item.stationLatitude),
longitude: Number(item.stationLongitude)
}));
}
if (points.length > 0 && this.mapCtx) {
this.mapCtx.includePoints({
points: points,
padding: [60, 60, 60, 60] //
});
}
},
markertap(e) {
const index = e.detail.markerId
const marker = this.markers.find(m => m.id === index);
if (marker) {
if (['orient', 'livestock'].includes(marker.stationType)) {
uni.navigateTo({
url: `/packDetail/pages/Site/detail?item=${encodeURIComponent(JSON.stringify(marker))}`
})
} else if (marker.stationType === 'device') {
//
uni.showToast({
title: `设备: ${marker.stationName}`,
icon: 'none'
});
//
}
}
},
callouttap(e) {
const index = e.detail.markerId
const marker = this.markers.find(m => m.id === index);
if (marker) {
if (['orient', 'livestock'].includes(marker.stationType)) {
uni.navigateTo({
url: `/packDetail/pages/Site/detail?item=${encodeURIComponent(JSON.stringify(marker))}`
})
} else if (marker.stationType === 'device') {
//
uni.showToast({
title: `设备: ${marker.stationName}`,
icon: 'none'
});
}
}
},
qiyeChange() {
for (let i = 0; i < this.cusLocation.length; i++) {
const item = this.cusLocation[i];
item.iconPath = '/static/qiyeIcon.png';
item.latitude = Number(item.stationLatitude);
item.longitude = Number(item.stationLongitude);
item.width = 35;
item.height = 52;
const markerItem = {
id: item.id,
iconPath: item.iconPath,
latitude: item.latitude,
longitude: item.longitude,
width: item.width,
height: item.height,
customCallout: {
anchorY: 0,
anchorX: 0,
display: 'ALWAYS'
},
stationType: item.stationType,
stationName: item.stationName,
stationCode: item.stationCode,
joinCluster: true
};
this.markers.push(markerItem);
}
},
switch2Change(name) {
if (name === "团柏河") {
this.issscd = !this.issscd;
} else {
this.isssscd = !this.isssscd;
}
//
if ((name === "团柏河" && !this.issscd) || (name === "对竹河" && !this.isssscd)) {
// 绿
setTimeout(() => {
this.adjustMapToRegion(name);
}, 300);
} else {
//
setTimeout(() => {
this.adjustMapToFitAllMarkers();
}, 300);
}
},
list1query() {
// orient
this.markers = this.markers.filter(item => item.stationType !== 'orient');
if (!this.issscd) {
for (let i = 0; i < this.stationlist.length; i++) {
const item = this.stationlist[i];
if (item.stationType === 'orient') {
item.iconPath = this.baseUrl +'/'+ item.stationIcon;
item.latitude = Number(item.stationLatitude);
item.longitude = Number(item.stationLongitude);
item.width = 172;
item.height = 148;
const markerItem = {
id: item.id,
iconPath: item.iconPath,
latitude: item.latitude,
longitude: item.longitude,
width: item.width,
height: item.height,
customCallout: {
anchorY: 0,
anchorX: 0,
display: 'ALWAYS'
},
stationType: item.stationType,
stationName: item.stationName,
stationCode: item.stationCode,
joinCluster: true
};
this.markers.push(markerItem);
}
}
}
},
}
}
</script>
<style lang="scss">
/* 样式保持不变 */
.bgimg {
position: fixed;
// z-index: -99;
top: 0;
left: 0;
width: 100%;
height: 100%;
}
.customCallout {
width: 349rpx;
height: 49rpx;
color: #fff;
font-size: 24rpx;
text-shadow: 1rpx 2rpx 0rpx #0D1934;
font-weight: bold;
// background-image: url('@/static/zhandian_icon_nongtian_title.png');
background-repeat: no-repeat;
background-size: 100%;
display: flex;
align-items: center;
justify-content: center;
}
.customCallout1 {
width: 349rpx;
height: 49rpx;
color: #fff;
font-size: 24rpx;
text-shadow: 1rpx 2rpx 0rpx #0D1934;
font-weight: bold;
// background-image: url('@/static/zhandian_icon_xuqin_title.png');
background-repeat: no-repeat;
background-size: 100%;
display: flex;
align-items: center;
justify-content: center;
}
.zdxq {
position: fixed;
left: 33rpx;
bottom: 36rpx;
}
.zdxqitem {
padding: 8rpx 0 7rpx 17rpx;
display: flex;
align-items: center;
justify-content: space-between;
font-size: 22rpx;
font-family: Source Han Sans SC;
font-weight: 500;
color: #FFFFFF;
text-shadow: 0rpx 1rpx 0rpx rgba(4, 49, 52, 0.55);
width: 359rpx;
background: rgba(0, 0, 0, 0.52);
border: 1px solid #4B677C;
border-radius: 6rpx;
margin-bottom: 10rpx;
position: relative;
}
.crildon {
width: 10rpx;
height: 10rpx;
border-radius: 50%;
margin-right: 15rpx;
}
.zdxqitem:last-child {
margin-bottom: 0;
}
.zdxqitem image {
width: 33rpx;
height: 50rpx;
margin-right: 15rpx;
}
.zdxqitem:first-child image {
width: 30rpx;
height: 40rpx;
margin-right: 15rpx;
}
.textss {
flex: 1;
text-align: left;
}
.imgs {
position: absolute;
width: 100%;
height: 100%;
z-index: -9;
}
.switchs {
position: fixed;
top: 36rpx;
right: 40rpx;
display: flex;
align-items: center;
}
</style>

View File

@ -1,27 +1,34 @@
<template>
<view class="container">
<map id="map" ref="map" style="width: 100%; height: calc(100vh + 50rpx);" scale="13" :markers="markers" longitude="111.436625"
latitude="36.771975" show-location @markertap="markertap" @callouttap="callouttap">
<map id="map" ref="map" style="width: 100%; height: calc(100vh + 50rpx);" :scale="mapScale" :markers="markers"
longitude="112.83100231396601" latitude="36.872032399813556" show-location show-compass show-scale
@markertap="markertap">
</map>
<view class="zdxq">
<view class="zdxqitem" @click="switch2Change('团柏河')">
<image src="../../static/zhandian_nongtian_dingwei.png" mode=""></image>
<view class="textss">
团柏河监测站
</view>
</view>
<view class="zdxqitem" @click="switch2Change('对竹河')">
<view class="zdxqitem" @click="switch2Change('livestock')">
<image src="../../static/zhandian_xuqin_dingwei.png" mode=""></image>
<view class="textss">
对竹河监测站
畜禽污染监测站
</view>
</view>
<view class="zdxqitem" @click="switch2Change('土壤')">
<view class="zdxqitem" @click="switch2Change('orient')">
<image src="../../static/zhandian_nongtian_dingwei.png" mode=""></image>
<view class="textss">
农田污染监测站
</view>
</view>
<!-- <view class="zdxqitem" @click="switch2Change('watershed')">
<image src="../../static/zhandian_xiaoliuyu_dingwei.png" mode=""></image>
<view class="textss">
小流域监测站
</view>
</view>
<view class="zdxqitem" @click="switch2Change('soil')">
<image src="../../static/iconsheturangzs.png" mode=""></image>
<view class="textss">
长期定位监测点
</view>
</view>
</view> -->
</view>
</view>
</template>
@ -38,132 +45,291 @@
latitude: 36.5,
longitude: 111.7
},
scale: 14,
mapScale: 13,
markers: [],
list: [],
issscd: false, // (false)
isssscd: false, // (false)
isSoilShow: false, // (false)
stationInfo: [],
cusLocation: [],
stationlist: [],
stationTwolist: [],
markersZIndex: 1,
lastTap: '',
stationList: [],
cusLocationList: [],
soilStationList: [],
allStationList: [],
stationTwoList: [],
mapCtx: null //
};
},
onLoad() {
this.$nextTick(() => {
this.getList()
})
},
onLoad() {},
onReady() {
// onReady
this.mapCtx = uni.createMapContext('map', this);
},
onShow() {
if(uni.getStorageSync('third_session')){
uni.login({
success: function (res) {
this.code = res.code
let params = {}
params.jsCode = this.code
api.wxlogin(params).then(res=>{
if(res.data.code == 0){
let userInfo = res.data.data;
// uni.setStorageSync('third_session', userInfo.thirdSession);
if(!userInfo.id){
api.checkLogin(() => {
this.$nextTick(() => {
this.getList()
})
}, () => {
uni.reLaunch({
url:'/packDetail/pages/login/login'
url: '/packDetail/pages/login/login'
})
}
}
})
}
});
}else if(!uni.getStorageSync('third_session')){
uni.reLaunch({
url:'/packDetail/pages/login/login'
})
}
},
methods: {
// kaihs
getList() {
this.markers = []
this.list = []
this.stationInfo = []
this.cusLocation = []
this.stationlist = []
this.stationTwolist = []
this.stationList = []
this.cusLocationList = []
this.soilStationList = []
this.allStationList = []
this.stationTwoList = []
uni.showLoading({
title: '加载中'
});
this.$http.get('/applet/survStationInfo/stationMap').then(res => {
// stationInfo deviceList
const combinedList = [...res.data.data.stationInfo, ...res.data.data.deviceList];
this.stationlist = combinedList;
this.stationTwolist = [...res.data.data.stationInfo];
console.log("合并后的stationlist+++++", this.stationlist);
//
this.stationlist.forEach((item, index) => {
//
this.stationList = [...res.data.data.stationInfo];
this.cusLocationList = [...res.data.data.cusLocation];
this.soilStationList = [...res.data.data.deviceList];
this.allStationList.push(...this.stationList);
this.allStationList.push(...this.cusLocationList);
this.allStationList.push(...this.soilStationList);
this.allStationList.forEach((item, index) => {
item.id = index;
// deviceList stationInfo
const markerItem = {
id: item.id,
latitude: Number(item.latitude || item.stationLatitude),
longitude: Number(item.longitude || item.stationLongitude),
stationType: item.stationType || 'device', // deviceList stationType 'device'
sortNo: item.sortNo || index,
stationName: item.name || item.stationName,
stationCode: item.ids || item.stationCode || item.id,
//
groupName: item.groupName || '',
//
deviceType: item.type || null
};
this.list.push(markerItem);
//
if (item.stationType === 'cusLocaltion') {
this.cusLocation.push(item);
}
if (item.stationType === 'orient' || item.stationType === 'livestock') {
this.stationInfo.push(item);
}
});
this.issscd = false
this.isssscd = false
this.isSoilShow = false
this.qiyeChange()
this.list1query()
this.addDeviceMarkers() //
//
setTimeout(() => {
this.adjustMapToFitAllMarkers();
}, 500);
//
this.enterpriseRender();
this.stationRender();
this.monitorRender()
// 使
this.ensureAllMarkersVisible();
uni.hideLoading();
}).catch(err => {
uni.hideLoading();
uni.showToast({
title: '数据加载失败',
icon: 'none'
});
console.error('加载地图数据失败:', err);
})
},
ensureAllMarkersVisible() {
//
if (!this.mapCtx) {
this.mapCtx = uni.createMapContext('map', this);
}
//
const validPoints = this.markers
.filter(item => {
const lat = Number(item.latitude);
const lng = Number(item.longitude);
return !isNaN(lat) && !isNaN(lng) && lat !== 0 && lng !== 0;
})
.map(item => ({
latitude: Number(item.latitude),
longitude: Number(item.longitude)
}));
if (validPoints.length === 0) {
console.warn('没有有效的坐标点');
// 使
if (this.center.latitude && this.center.longitude) {
this.mapCtx.moveToLocation({
latitude: this.center.latitude,
longitude: this.center.longitude,
scale: 10
});
}
return;
}
console.log('有效坐标点数量:', validPoints.length);
// 1使 includePoints
try {
this.mapCtx.includePoints({
points: validPoints,
padding: [80, 80, 80, 80], //
success: () => {
console.log('地图视野调整成功');
},
fail: (err) => {
console.error('includePoints失败:', err);
// 使
this.fallbackAdjustMap(validPoints);
}
});
} catch (e) {
console.error('调整地图视野异常:', e);
this.fallbackAdjustMap(validPoints);
}
// 2
setTimeout(() => {
if (this.mapCtx) {
try {
this.mapCtx.includePoints({
points: validPoints,
padding: [80, 80, 80, 80]
});
} catch (e) {
console.error('第二次调整失败:', e);
}
}
}, 500);
// 3
setTimeout(() => {
if (this.mapCtx) {
try {
this.mapCtx.includePoints({
points: validPoints,
padding: [120, 100, 100, 100]
});
} catch (e) {
console.error('第三次调整失败:', e);
}
}
}, 1000);
},
fallbackAdjustMap(validPoints) {
if (!validPoints || validPoints.length === 0) return;
try {
//
const lats = validPoints.map(p => p.latitude);
const lngs = validPoints.map(p => p.longitude);
const minLat = Math.min(...lats);
const maxLat = Math.max(...lats);
const minLng = Math.min(...lngs);
const maxLng = Math.max(...lngs);
//
const centerLat = (minLat + maxLat) / 2;
const centerLng = (minLng + maxLng) / 2;
//
const latDiff = maxLat - minLat;
const lngDiff = maxLng - minLng;
const maxDiff = Math.max(latDiff, lngDiff);
let scale = 13;
if (maxDiff > 2) scale = 6;
else if (maxDiff > 1) scale = 8;
else if (maxDiff > 0.5) scale = 10;
else if (maxDiff > 0.2) scale = 11;
else if (maxDiff > 0.1) scale = 12;
else scale = 13;
console.log('备用方案 - 中心点:', centerLat, centerLng, '缩放:', scale);
//
this.mapCtx.moveToLocation({
latitude: centerLat,
longitude: centerLng,
scale: scale
});
} catch (e) {
console.error('备用方案失败:', e);
}
},
enterpriseRender() {
for (let i = 0; i < this.cusLocationList.length; i++) {
const item = this.cusLocationList[i];
const lat = Number(item.stationLatitude);
const lng = Number(item.stationLongitude);
//
if (isNaN(lat) || isNaN(lng) || lat === 0 || lng === 0) {
console.warn('企业点位坐标无效:', item.stationName, lat, lng);
continue;
}
const markerItem = {
id: item.id || `enterprise_${i}`,
iconPath: '/static/qiyeIcon.png',
latitude: lat,
longitude: lng,
width: 35,
height: 52,
customCallout: {
anchorY: 0,
anchorX: 0,
display: 'ALWAYS'
},
stationType: item.stationType,
stationName: item.stationName,
stationCode: item.stationCode,
joinCluster: false,
zIndex: this.markersZIndex,
};
this.markers.push(markerItem);
}
},
stationRender() {
if (!this.issscd) {
for (let i = 0; i < this.stationList.length; i++) {
const item = this.stationList[i];
const lat = Number(item.stationLatitude);
const lng = Number(item.stationLongitude);
//
if (isNaN(lat) || isNaN(lng) || lat === 0 || lng === 0) {
console.warn('站房点位坐标无效:', item.stationName, lat, lng);
continue;
}
const markerItem = {
id: item.id || `station_${i}`,
iconPath: this.baseUrl + '/' + item.stationIcon,
latitude: lat,
longitude: lng,
width: 239,
height: 186,
customCallout: {
anchorY: 0,
anchorX: 0,
display: 'ALWAYS'
},
stationType: item.stationType,
stationName: item.stationName,
stationCode: item.stationCode,
joinCluster: false,
zIndex: this.markersZIndex,
};
this.markers.push(markerItem);
}
}
},
monitorRender() {
this.soilStationList.forEach((item, index) => {
const lat = Number(item.latitude);
const lng = Number(item.longitude);
//
if (isNaN(lat) || isNaN(lng) || lat === 0 || lng === 0) {
console.warn('监测点位坐标无效:', item.name, lat, lng);
return;
}
//
addDeviceMarkers() {
this.stationlist.forEach((item, index) => {
// deviceList type stationType
if (item.type && !item.stationType) {
let iconPath = '';
let width = 35;
let height = 35;
//
switch(item.type) {
switch (item.type) {
case 'soil':
iconPath = this.baseUrl + '/icon/device/soil.png';
width = 32;
@ -179,10 +345,10 @@
}
const markerItem = {
id: item.id,
id: item.id || `device_${index}`,
iconPath: iconPath,
latitude: Number(item.latitude),
longitude: Number(item.longitude),
latitude: lat,
longitude: lng,
width: width,
height: height,
customCallout: {
@ -194,103 +360,12 @@
stationName: item.name,
stationCode: item.ids,
deviceType: item.type,
joinCluster: false //
joinCluster: false,
zIndex: this.markersZIndex,
};
this.markers.push(markerItem);
}
});
},
// setFitView
adjustMapToFitAllMarkers() {
if (this.mapCtx && this.list.length > 0) {
this.mapCtx.includePoints({
points: this.list.map(item => ({
latitude: item.latitude,
longitude: item.longitude
})),
padding: [60, 60, 60, 60] //
});
}
},
//
adjustMapToRegion(regionName) {
let points = [];
if (regionName === '团柏河') {
//
points = this.stationTwolist
.filter(item => item.groupName === '团柏河')
.map(item => ({
latitude: Number(item.stationLatitude),
longitude: Number(item.stationLongitude)
}));
} else if (regionName === '对竹河') {
//
points = this.stationTwolist
.filter(item => item.groupName === '对竹河')
.map(item => ({
latitude: Number(item.stationLatitude),
longitude: Number(item.stationLongitude)
}));
} else if (regionName === '土壤') {
//
points = this.stationlist
.filter(item => item.type === 'soil' || item.deviceType === 'soil')
.map(item => ({
latitude: Number(item.latitude || item.stationLatitude),
longitude: Number(item.longitude || item.stationLongitude)
}));
}
if (points.length > 0 && this.mapCtx) {
this.mapCtx.includePoints({
points: points,
padding: [80, 110, 80, 110] //
});
} else if (points.length === 0) {
//
uni.showToast({
title: `未找到${regionName}相关的监测点`,
icon: 'none'
});
}
},
// setFitView
preciseMapAdjustment(regionName) {
if (!this.mapCtx) return;
//
const regionConfigs = {
'团柏河': {
latitude: 36.5, //
longitude: 111.7, //
scale: 14
},
'对竹河': {
latitude: 36.4, //
longitude: 111.6, //
scale: 14
},
'土壤': {
latitude: 36.45, //
longitude: 111.65, //
scale: 13
}
};
const config = regionConfigs[regionName];
if (config) {
this.mapCtx.moveToLocation({
latitude: config.latitude,
longitude: config.longitude,
scale: config.scale
});
}
},
markertap(e) {
const index = e.detail.markerId
const marker = this.markers.find(m => m.id === index);
@ -306,122 +381,69 @@
}
}
},
switch2Change(name) { //
//
let that = this;
if (name === that.lastTap) {
that.adjustMapToFitAllMarkers();
that.lastTap = '';
} else {
//
that.adjustMapToRegion(name);
that.lastTap = name;
callouttap(e) {
const index = e.detail.markerId
const marker = this.markers.find(m => m.id === index);
if (marker) {
if (['orient', 'livestock'].includes(marker.stationType)) {
uni.navigateTo({
url: `/packDetail/pages/Site/detail?item=${encodeURIComponent(JSON.stringify(marker))}`
})
} else if (marker.stationType === 'device') {
uni.showToast({
title: `设备: ${marker.stationName}`,
icon: 'none'
}
},
// setFitView
adjustMapToFitAllMarkers() {
if (this.mapCtx && this.markers.length > 0) {
this.mapCtx.includePoints({
points: this.markers.map(item => ({
latitude: item.latitude,
longitude: item.longitude
})),
padding: [60, 60, 60, 60] //
});
}
},
adjustMapToRegion(regionName) {
//
//stationType: "orient"
//stationType: "livestock"
//stationType: "watershed"
let that = this;
let points = [];
let markers = [];
if (regionName === 'orient' || regionName === 'livestock' || regionName === 'watershed') {
//
markers = this.markers.filter(item => item.stationType === regionName);
} else if (regionName === 'soil') {
//
markers = this.markers.filter(item => item.type === 'soil' || item.deviceType === 'soil');
}
console.log(this.markers)
if (markers.length > 0) {
points = markers.map(item => {
item.zIndex = (that.markersZIndex++);
return {
latitude: Number(item.latitude || item.stationLatitude),
longitude: Number(item.longitude || item.stationLongitude)
}
});
}
if (points.length > 0 && this.mapCtx) {
this.mapCtx.includePoints({
points: points,
padding: [80, 110, 80, 110] //
});
} else if (points.length === 0) {
//
// uni.showToast({
// title: `${regionName}`,
// icon: 'none'
// });
}
},
qiyeChange() {
for (let i = 0; i < this.cusLocation.length; i++) {
const item = this.cusLocation[i];
item.iconPath = '/static/qiyeIcon.png';
item.latitude = Number(item.stationLatitude);
item.longitude = Number(item.stationLongitude);
item.width = 35;
item.height = 52;
const markerItem = {
id: item.id,
iconPath: item.iconPath,
latitude: item.latitude,
longitude: item.longitude,
width: item.width,
height: item.height,
customCallout: {
anchorY: 0,
anchorX: 0,
display: 'ALWAYS'
},
stationType: item.stationType,
stationName: item.stationName,
stationCode: item.stationCode,
joinCluster: false //
};
this.markers.push(markerItem);
}
},
switch2Change(name) {
//
const stateMap = {
'团柏河': 'issscd',
'对竹河': 'isssscd',
'土壤': 'isSoilShow'
};
if (stateMap[name]) {
this[stateMap[name]] = !this[stateMap[name]];
}
//
const shouldFocus = {
'团柏河': !this.issscd,
'对竹河': !this.isssscd,
'土壤': !this.isSoilShow
};
if (shouldFocus[name]) {
//
setTimeout(() => {
this.adjustMapToRegion(name);
// 使this.preciseMapAdjustment(name);
}, 300);
} else {
//
setTimeout(() => {
this.adjustMapToFitAllMarkers();
}, 300);
}
},
list1query() {
// orient
this.markers = this.markers.filter(item => item.stationType !== 'orient');
if (!this.issscd) {
for (let i = 0; i < this.stationlist.length; i++) {
const item = this.stationlist[i];
if (item.stationType === 'orient') {
item.iconPath = this.baseUrl +'/'+ item.stationIcon;
item.latitude = Number(item.stationLatitude);
item.longitude = Number(item.stationLongitude);
item.width = 239;
item.height = 186;
const markerItem = {
id: item.id,
iconPath: item.iconPath,
latitude: item.latitude,
longitude: item.longitude,
width: item.width,
height: item.height,
customCallout: {
anchorY: 0,
anchorX: 0,
display: 'ALWAYS'
},
stationType: item.stationType,
stationName: item.stationName,
stationCode: item.stationCode,
joinCluster: false //
};
this.markers.push(markerItem);
}
}
}
}
}
}
</script>

View File

@ -31,7 +31,7 @@
<view class="boxitem_left">
<image src="../../static/me_icon_shebei.png" mode=""></image>
<view class="zl">
站点运维
运维记录
</view>
</view>
<image src="../../static/me_icon_in.png" mode=""></image>
@ -78,31 +78,14 @@
});
},
onShow() {
if(uni.getStorageSync('third_session')){
uni.login({
success: function (res) {
this.code = res.code
let params = {}
params.jsCode = this.code
api.wxlogin(params).then(res=>{
if(res.data.code == 0){
let userInfo = res.data.data;
// uni.setStorageSync('third_session', userInfo.thirdSession);
if(!userInfo.id){
api.checkLogin(()=>{
this.getuserInfo();
}, () => {
uni.reLaunch({
url:'/packDetail/pages/login/login'
})
}
}
})
}
});
}else if(!uni.getStorageSync('third_session')){
uni.reLaunch({
url:'/packDetail/pages/login/login'
})
}
this.getuserInfo()
},
methods: {
getuserInfo(){

Binary file not shown.

After

Width:  |  Height:  |  Size: 1.9 KiB