diff --git a/common/service/service.js b/common/service/service.js index 00c54e7..584488a 100644 --- a/common/service/service.js +++ b/common/service/service.js @@ -48,7 +48,7 @@ http.interceptor.request((config, cancel) => { /* 请求之前拦截器 */ 'app-id' : uni.getAccountInfoSync().miniProgram.appId, "client-type" : "MA", 'third-session' : uni.getStorageSync('third_session')||'123', - 'X-Tenant-Id' : '1001' + 'X-Tenant-Id' : '1003' } /* if (!token) { // 如果token不存在，调用cancel 会取消本次请求，但是该函数的catch() 仍会执行 diff --git a/manifest.json b/manifest.json index 4dacfce..28dcf2a 100644 --- a/manifest.json +++ b/manifest.json @@ -1,5 +1,5 @@ { - "name" : "武乡面源污染监测平台", + "name" : "稷山县县面源污染监测平台", "appid" : "__UNI__A58A5D7", "description" : "", "versionName" : "2.2.22", @@ -84,7 +84,7 @@ "quickapp" : {}, /* 快应用特有相关 */ "mp-weixin" : { - "appid" : "wx9eda310e459cc7b9", + "appid" : "wxca651c881cfb603f", "setting" : { "urlCheck" : false, "es6" : true, diff --git a/packDetail/pages/Site/detail.vue b/packDetail/pages/Site/detail.vue index e3029f6..a31947c 100644 --- a/packDetail/pages/Site/detail.vue +++ b/packDetail/pages/Site/detail.vue @@ -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 } }); @@ -328,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 }) diff --git a/packDetail/pages/Site/index.vue b/packDetail/pages/Site/index.vue index 3a8f61c..d868239 100644 --- a/packDetail/pages/Site/index.vue +++ b/packDetail/pages/Site/index.vue @@ -96,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 } }); @@ -144,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; @@ -176,7 +168,6 @@ }) }, lower() { - console.log("最后一页了，取消下拉功能"); // 最后一页了，取消下拉功能 if (this.isLastpage) { return @@ -186,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 @@ -199,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; diff --git a/packDetail/pages/Site/sjdetail.vue b/packDetail/pages/Site/sjdetail.vue index 1142585..7d55396 100644 --- a/packDetail/pages/Site/sjdetail.vue +++ b/packDetail/pages/Site/sjdetail.vue @@ -132,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, '数据全部') } } } @@ -141,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; @@ -169,7 +160,6 @@ }) }, lower() { - console.log("最后一页了，取消下拉功能"); // 最后一页了，取消下拉功能 if (this.isLastpage) { return @@ -179,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 @@ -201,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, '数据全部') } } } @@ -214,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; diff --git a/packDetail/pages/analysis/index.vue b/packDetail/pages/analysis/index.vue index c0433ea..663eee3 100644 --- a/packDetail/pages/analysis/index.vue +++ b/packDetail/pages/analysis/index.vue @@ -40,11 +40,11 @@ - + - @@ -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,335 +424,178 @@ 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 + // 更新当前选中的索引 + 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') + + if (this.riqinumber === 'yearMonth') { + this.dateqs = String(year) + } else if (this.riqinumber === 'monthDays') { + this.dateqs = year + '-' + month } 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.dateqs = year + '-' + month + '-' + day } - - this.qushicov(); + 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() { - let data = { - summrayMode: this.riqinumber, - startTime: this.dateqs, - stationCode:this.stationCode, - } - this.$http.post('/applet/survDeviceDeploy/waterIntegrateStatistic', data).then(iem => { - let lynum = iem.data.data - - setTimeout(() => { - let categories = []; - let displayCategories = []; // 用于显示的X轴数据 - let series = []; - let allValues = []; // 收集所有数值 - - if (lynum.tableHead && lynum.tableHead.length > 0) { - categories = lynum.tableIndex; - - // 计算要显示的X轴数据：第一个、中间、最后一个 - if (categories.length > 0) { - const first = categories[0]; - const middle = categories[Math.floor(categories.length / 2)]; - const last = categories[categories.length - 3]; - - // 创建显示用的categories数组，只在这三个位置有值，其他为空字符串 - displayCategories = categories.map((item, index) => { - if (index === 0 || index === Math.floor(categories.length / 2) || index === categories.length - 2) { - return item; - } - return ''; - }); - } - - 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; - }); - - series.push({ - name: header.eleDesc, - data: seriesData - }); - }); - - // 动态计算Y轴范围 - 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); // 确保最小值不小于0 - - // 更新opts中的yAxis配置 - this.opts = { - ...this.opts, - yAxis: { - gridType: "dash", - dashLength: 2, - data: [ - { - min: yAxisMin, - max: yAxisMax - } - ] - } - }; - } - - let res = { - categories: displayCategories, // 使用处理后的显示数据 - series: series - }; - this.chartData = JSON.parse(JSON.stringify(res)); - }, 500); - }) - }, - // 获取折线图 - gettj() { + // 如果没有站点编码，使用默认值或等待 if (!this.stationCode) { - this.stationCode = 'S_1' + 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 + } } - 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 + + let data = { + summrayMode: this.riqinumber, + startTime: this.dateqs, + 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 = [] + let series = [] + let allValues = [] + + // 处理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 - 1] + + displayCategories = categories.map((item, index) => { + if (index === 0 || index === Math.floor(categories.length / 2) || index === categories.length - 1) { + return item } - }, - 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 + 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 + }) + + series.push({ + name: header.eleDesc || header.name || '指标', + data: seriesData + }) + }) + + // 动态计算Y轴范围 + 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) + + this.opts = { + ...this.opts, + yAxis: { + gridType: "dash", + dashLength: 2, + data: [ + { + min: yAxisMin, + max: yAxisMax || 100 + } + ] } - }, - 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 - }, - ] + } + } + + this.chartData = { + categories: displayCategories, + series: series + } + 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 @@ diff --git a/packDetail1/pages/device/index.vue b/packDetail1/pages/device/index.vue index 212fc87..c95b27e 100644 --- a/packDetail1/pages/device/index.vue +++ b/packDetail1/pages/device/index.vue @@ -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; diff --git a/packDetail1/pages/device/index1.vue b/packDetail1/pages/device/index1.vue index 7fc3a28..be64714 100644 --- a/packDetail1/pages/device/index1.vue +++ b/packDetail1/pages/device/index1.vue @@ -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({ diff --git a/packDetail1/pages/device/index2.vue b/packDetail1/pages/device/index2.vue index 2520726..7dfc798 100644 --- a/packDetail1/pages/device/index2.vue +++ b/packDetail1/pages/device/index2.vue @@ -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...'); + } else { // 动态引入较大类库避免影响页面展示 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()) diff --git a/packDetail1/pages/device/playback.vue b/packDetail1/pages/device/playback.vue index eba4ea6..833e025 100644 --- a/packDetail1/pages/device/playback.vue +++ b/packDetail1/pages/device/playback.vue @@ -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(); }, diff --git a/packDetail1/pages/operations/list.vue b/packDetail1/pages/operations/list.vue index acb3347..64c33ea 100644 --- a/packDetail1/pages/operations/list.vue +++ b/packDetail1/pages/operations/list.vue @@ -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) // 如果是取消选中，就把checked置为false,如果是选中，就给添加一个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') } // 过滤出数组中checked为true的项目，如果和原alllist长度相等，就全选显示 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({ diff --git a/pages.json b/pages.json index 01db334..a4e49a2 100644 --- a/pages.json +++ b/pages.json @@ -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" } @@ -212,7 +212,7 @@ { "path": "pages/sjdyj/index", "style": { - "navigationBarTitleText": "智能告警", + "navigationBarTitleText": "智能预警", "navigationStyle": "default", "navigationBarBackgroundColor":"#0F6EFF" } diff --git a/pages/index/index.vue b/pages/index/index.vue index f2916d5..d641f17 100644 --- a/pages/index/index.vue +++ b/pages/index/index.vue @@ -1,6 +1,6 @@