diff --git a/common/service/service.js b/common/service/service.js index 00c54e7..2660df0 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' : '1002' } /* if (!token) { // 如果token不存在，调用cancel 会取消本次请求，但是该函数的catch() 仍会执行 diff --git a/manifest.json b/manifest.json index b8afb50..236dc4b 100644 --- a/manifest.json +++ b/manifest.json @@ -1,5 +1,5 @@ { - "name" : "武乡面源污染监测平台", + "name" : "吉县面源污染监测平台", "appid" : "__UNI__A58A5D7", "description" : "", "versionName" : "2.2.22", diff --git a/packDetail/pages/Site/detail.vue b/packDetail/pages/Site/detail.vue index 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/fwtz/add.vue b/packDetail/pages/fwtz/add.vue index e17a940..c04e533 100644 --- a/packDetail/pages/fwtz/add.vue +++ b/packDetail/pages/fwtz/add.vue @@ -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 }, // 提交 diff --git a/packDetail/pages/fwtz/detail.vue b/packDetail/pages/fwtz/detail.vue index 90dc195..e58e7f2 100644 --- a/packDetail/pages/fwtz/detail.vue +++ b/packDetail/pages/fwtz/detail.vue @@ -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 { 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({ diff --git a/packDetail/pages/login/login.vue b/packDetail/pages/login/login.vue index bb6b400..63ff5a7 100644 --- a/packDetail/pages/login/login.vue +++ b/packDetail/pages/login/login.vue @@ -35,7 +35,7 @@ - Copyright © 武乡县农业农村局 + Copyright © 吉县现代农业发展中心 - Copyright © 武乡县农业农村局 + Copyright © 吉县现代农业发展中心 @@ -112,6 +112,6 @@ left: 50%; transform: translate(-50%); color: #999; - width: 52%; + width: 60%; } 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..6baf09a 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..a4311ee 100644 --- a/pages/index/index.vue +++ b/pages/index/index.vue @@ -1,6 +1,6 @@