diff --git a/pages/statistics/modules/AttackEvent/AttackEvent.js b/pages/statistics/modules/AttackEvent/AttackEvent.js index 79a1df1..2811cb3 100644 --- a/pages/statistics/modules/AttackEvent/AttackEvent.js +++ b/pages/statistics/modules/AttackEvent/AttackEvent.js @@ -48,6 +48,13 @@ Component({ wx.navigateTo({ url: '/subpages/statistics/pages/problem/problem?type='+this.data.tabValue+'&data='+JSON.stringify(data) }) + }, + toNumber(data){ + let token=wx.getStorageSync('token') + let iceventid=data.currentTarget.dataset.iceventid + wx.navigateTo({ + url: '/pages/webView/webView?worktoken='+token+'&iceventid='+iceventid+'&AttackEvent='+'https://epmet-preview.elinkservice.cn/epmet-work-h5/#/HotlineDetail', + }) } }, diff --git a/pages/statistics/modules/AttackEvent/AttackEvent.wxml b/pages/statistics/modules/AttackEvent/AttackEvent.wxml index c694af6..d6993e0 100644 --- a/pages/statistics/modules/AttackEvent/AttackEvent.wxml +++ b/pages/statistics/modules/AttackEvent/AttackEvent.wxml @@ -1,13 +1,20 @@ - - + + 工单号:{{item.icEventId}} - {{item.satisfactionName}} + + {{item.solved}} + + + + {{item.satisfactionName}} + + {{item.eventContent}} diff --git a/pages/statistics/modules/AttackEvent/AttackEvent.wxss b/pages/statistics/modules/AttackEvent/AttackEvent.wxss index b263a4a..fb32746 100644 --- a/pages/statistics/modules/AttackEvent/AttackEvent.wxss +++ b/pages/statistics/modules/AttackEvent/AttackEvent.wxss @@ -75,12 +75,19 @@ justify-content: space-between; overflow: hidden; /* 隐藏超出部分 */ text-overflow: ellipsis; /* 显示省略号 */ } -.content_workOrde{ +.content_workOrde { font-family: PingFang SC; -font-weight: 500; -font-size: 26rpx; -color: #FC5231; -line-height: 42rpx; + font-weight: 500; + font-size: 26rpx; + color: #FC5231; + line-height: 42rpx; +} +.content_workOrde1 { + font-family: PingFang SC; + font-weight: 500; + font-size: 26rpx; + color: #FFA312; + line-height: 42rpx; } .workOrde{ margin-left: 20rpx; diff --git a/pages/statistics/modules/HotlineRates/HotlineRates.js b/pages/statistics/modules/HotlineRates/HotlineRates.js index 94e898a..f2e07fd 100644 --- a/pages/statistics/modules/HotlineRates/HotlineRates.js +++ b/pages/statistics/modules/HotlineRates/HotlineRates.js @@ -43,12 +43,11 @@ Component({ }, methods: { toNumber(data) { - console.log(data.currentTarget.dataset,"dskljflksdfjl"); let type=data.currentTarget.dataset.type let staffId=data.currentTarget.dataset.staffid let token=wx.getStorageSync('token') wx.navigateTo({ - url: '/pages/webView/webView?worktoken='+token+'&staffId='+staffId+'&type='+type+'&day='+this.data.day+'&day2='+this.data.day2, + url: '/pages/webView/webView?worktoken='+token+'&staffId='+staffId+'&type='+type+'&day='+this.data.day+'&day2='+this.data.day2+'&Hotline='+'https://epmet-preview.elinkservice.cn/epmet-work-h5/#/Hotline', }) }, onChange(e) { diff --git a/pages/statistics/modules/HotlineRates/HotlineRates.wxml b/pages/statistics/modules/HotlineRates/HotlineRates.wxml index 116fb04..c0cba28 100644 --- a/pages/statistics/modules/HotlineRates/HotlineRates.wxml +++ b/pages/statistics/modules/HotlineRates/HotlineRates.wxml @@ -30,13 +30,8 @@ - - {{item.operateName }} {{item.assignOrgName}} diff --git a/pages/statistics/statistics.js b/pages/statistics/statistics.js index 2ea561f..7407a14 100644 --- a/pages/statistics/statistics.js +++ b/pages/statistics/statistics.js @@ -55,5 +55,12 @@ Page({ this.setData({ tabValue: detail }) + }, + gotoAttack(){ + let worktoken=wx.getStorageSync('token') + console.log(worktoken,"执行一次"); + wx.navigateTo({ + url: '/pages/webView/webView?worktoken='+worktoken+'&AttackEvent='+'https://epmet-preview.elinkservice.cn/#/AttackEvent', + }) } }) \ No newline at end of file diff --git a/pages/statistics/statistics.wxml b/pages/statistics/statistics.wxml index af053ff..4743b64 100644 --- a/pages/statistics/statistics.wxml +++ b/pages/statistics/statistics.wxml @@ -61,7 +61,7 @@ 攻坚事件 - + 更多 diff --git a/pages/webView/webView.js b/pages/webView/webView.js index 5229f98..6507ea3 100644 --- a/pages/webView/webView.js +++ b/pages/webView/webView.js @@ -6,34 +6,63 @@ * @FilePath: \epmet-work-mp\pages\webView\webView.js * @Description: 这是默认设置,请设置`customMade`, 打开koroFileHeader查看配置 进行设置: https://github.com/OBKoro1/koro1FileHeader/wiki/%E9%85%8D%E7%BD%AE */ -const app = getApp() +const App = getApp() Page({ data: { worktoken: '', staffId:"", type:"", day:"", - day2:"" + day2:"", + iceventid:"", + Hotline:"", + url:"", }, onLoad: function (options) { + let agencyId=App.globalData.user.agencyId + console.log(App.globalData.user.agencyId,"App.globalData.user.agencyId"); + console.log(options,"dslkjfsldfk"); if (options.token) { this.setData({ worktoken: `${options.worktoken}`, }); - console.log('url', this.data.worktoken); } else { - console.log(options, "dslfjlksd"); - this.setData({ - worktoken: decodeURIComponent(options.worktoken), - staffId: options.staffId, - type: `${options.type}`, - day: options.day, - day2: options.day2 - }) + if (options.Hotline) { + if (options.staffId){ + const url = `${options.Hotline}?worktoken=${decodeURIComponent(options.worktoken)}&staffId=${options.staffId}&type=${options.type}&day=${options.day}&day2=${options.day2}`; + console.log('生成的 URL:', url); + this.setData({ + url: url + }) + console.log(this.data.url,"ds;lkjdflks"); + }else{ + const url = `${options.Hotline}?worktoken=${decodeURIComponent(options.worktoken)}`; + console.log('生成的 URL:', url); + this.setData({ + url: url + }) + } + }else{ + if (options.iceventid) { + const url = `${options.AttackEvent}?worktoken=${decodeURIComponent(options.worktoken)}&iceventid=${options.iceventid}`; + console.log('生成的 URL:', url); + this.setData({ + url: url + }) + }else{ + const url = `${options.AttackEvent}?worktoken=${decodeURIComponent(options.worktoken)}`; + console.log('生成的 URL:', url); + this.setData({ + url: url + }) + } + + } + } - const url = `https://epmet-preview.elinkservice.cn/epmet-work-h5/#/Hotline?worktoken=${this.data.worktoken}&staffId=${this.data.staffId}&type=${this.data.type}&day=${this.data.day}&day2=${this.data.day2}`; - console.log('生成的 URL:', url); + + }, onShow() { this.onLoad() diff --git a/pages/webView/webView.wxml b/pages/webView/webView.wxml index dfc5c48..0c502fd 100644 --- a/pages/webView/webView.wxml +++ b/pages/webView/webView.wxml @@ -1,3 +1,3 @@ - + diff --git a/pages/work2/work2.js b/pages/work2/work2.js index 54fb7f9..a10b447 100644 --- a/pages/work2/work2.js +++ b/pages/work2/work2.js @@ -122,11 +122,10 @@ Page({ }, onHotlineCompletion(){ let token=wx.getStorageSync('token') - console.log(token,"jhgjgjjhbj"); - console.log('https://epmet-preview.elinkservice.cn/epmet-work-h5/#/Hotline?worktoken='+token) wx.navigateTo({ - url: '/pages/webView/webView?worktoken='+token, + url: '/pages/webView/webView?worktoken='+token+'&Hotline='+'https://epmet-preview.elinkservice.cn/epmet-work-h5/#/Hotline', }) + } // onAddHouse(){