diff --git a/.hbuilderx/launch.json b/.hbuilderx/launch.json index 1e1eb6a2..40e5e805 100644 --- a/.hbuilderx/launch.json +++ b/.hbuilderx/launch.json @@ -19,7 +19,7 @@ "type" : "uniCloud" }, { - "playground" : "standard", + "playground" : "custom", "type" : "uni-app:app-android" } ] diff --git a/App.vue b/App.vue index 4d39cdf5..be41e9c2 100644 --- a/App.vue +++ b/App.vue @@ -160,14 +160,30 @@ }, false); plus.push.addEventListener('click', function(msg) { // TODO - console.log('====================', payload) + console.log('888====================', msg.payload) + console.log('777====================', payload) + let msgData = msg.payload; setTimeout(() => { // uni.navigateTo({ // url: payload // }) - uni.navigateTo({ - url: '/pages/messageCenter/messageCenter' - }) + console.log(msgData) + if(msgData.type == 10){ // 安全 + uni.navigateTo({ + url: '/pages/projectEnd/safeSame/details?id='+msgData.data.id+'&type=' + msgData.data.status + }) + } else if(msgData.type == 11){ // 质量 + uni.navigateTo({ + url: '/pages/projectEnd/qualityManage/details?id='+msgData.data.id+'&type=' + msgData.data.status + }) + } else if(msgData.type == 8){ // AI + uni.navigateTo({ + url: "/pages/alarmPage/disposition/disposition?item="+ encodeURIComponent(JSON.stringify(msgData.data)) + }); + } + // uni.navigateTo({ + // url: '/pages/messageCenter/messageCenter' + // }) }, 1000) }, false); // #endif diff --git a/main.js b/main.js index 45aead11..f910c51e 100644 --- a/main.js +++ b/main.js @@ -38,9 +38,9 @@ if (process.env.NODE_ENV === 'development') { // Vue.prototype.url_config = 'http://47.93.215.234:9809/' // 鞍钢正式地址(弃用) // Vue.prototype.url_config = 'http://42.180.188.17:9809/' // 鞍钢正式地址 // Vue.prototype.url_config = 'http://47.93.215.234:11211/' // 鞍钢测试地址 - Vue.prototype.url_config = 'http://182.90.224.237:51234/' //雄哥内网穿透地址 + // Vue.prototype.url_config = 'http://182.90.224.237:51234/' //雄哥内网穿透地址 // Vue.prototype.url_config = 'http://jxj.zhgdyun.com:61212/' //杰哥内网穿透地址 - // Vue.prototype.url_config = 'http://192.168.34.221:9111/' //郭圣雄本地 + Vue.prototype.url_config = 'http://192.168.34.221:9111/' //郭圣雄本地 // Vue.prototype.url_config = 'http://192.168.34.155:19111/' //彭洁本地 // Vue.prototype.work_url = 'http://47.93.215.234:19997' // 工作流线上地址(弃用) Vue.prototype.work_url = 'http://42.180.188.17:19997' // 工作流线上地址