From d10939ada790ad14df8f26c7c4459b8e9a1fb599 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E6=98=AF=E5=B0=8F=E7=8E=8B=E5=91=80=5C24601?= <819653817@qq.com> Date: Tue, 7 Jan 2025 17:14:43 +0800 Subject: [PATCH 1/6] =?UTF-8?q?=E6=94=BB=E5=9D=9A?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../modules/HotlineRates/HotlineRates.js | 10 ++++++++ .../modules/HotlineRates/HotlineRates.wxml | 20 +++++++++------ pages/statistics/statistics.json | 3 ++- pages/statistics/statistics.wxml | 11 +++++++- pages/webView/webView.js | 25 +++++++++++++------ pages/webView/webView.wxml | 4 +-- utils/api.js | 4 +-- 7 files changed, 56 insertions(+), 21 deletions(-) diff --git a/pages/statistics/modules/HotlineRates/HotlineRates.js b/pages/statistics/modules/HotlineRates/HotlineRates.js index 908e1ae..94e898a 100644 --- a/pages/statistics/modules/HotlineRates/HotlineRates.js +++ b/pages/statistics/modules/HotlineRates/HotlineRates.js @@ -42,6 +42,15 @@ Component({ this.getList() }, 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, + }) + }, onChange(e) { this.setData({ day: e.detail.value @@ -126,3 +135,4 @@ Component({ } } }); + diff --git a/pages/statistics/modules/HotlineRates/HotlineRates.wxml b/pages/statistics/modules/HotlineRates/HotlineRates.wxml index 0d0e648..4f5a2c3 100644 --- a/pages/statistics/modules/HotlineRates/HotlineRates.wxml +++ b/pages/statistics/modules/HotlineRates/HotlineRates.wxml @@ -41,25 +41,31 @@ {{item.assignOrgName}} - + 收件数 {{item.total}} 未回复 0 - - + --> + 不满意 {{item.notSatisfiedTotal}} - + 未解决 {{item.unresolveTotal}} - - 超期退件 - {{item.overTimeTotal}} + + 退件次数 + {{item.returnTotal?item.returnTotal:0}} + + + 超期退件 + {{item.overTimeTotal}} diff --git a/pages/statistics/statistics.json b/pages/statistics/statistics.json index dda9c82..345c049 100644 --- a/pages/statistics/statistics.json +++ b/pages/statistics/statistics.json @@ -11,6 +11,7 @@ "EventPrediction": "./modules/EventPrediction/EventPrediction", "CrowdPortrait": "./modules/CrowdPortrait/CrowdPortrait", "custom-tab-bar":"../../components/custom-tab-bar", - "HotlineRates": "./modules/HotlineRates/HotlineRates" + "HotlineRates": "./modules/HotlineRates/HotlineRates", + "AttackEvent":"./modules/AttackEvent/AttackEvent" } } \ No newline at end of file diff --git a/pages/statistics/statistics.wxml b/pages/statistics/statistics.wxml index 4fa8d74..af053ff 100644 --- a/pages/statistics/statistics.wxml +++ b/pages/statistics/statistics.wxml @@ -58,7 +58,16 @@ - + + + 攻坚事件 + + 更多 + + + + + 集中突出问题 diff --git a/pages/webView/webView.js b/pages/webView/webView.js index 52bd0e2..5229f98 100644 --- a/pages/webView/webView.js +++ b/pages/webView/webView.js @@ -9,22 +9,31 @@ const app = getApp() Page({ data: { - worktoken: '' + worktoken: '', + staffId:"", + type:"", + day:"", + day2:"" }, onLoad: function (options) { - console.log(options); - console.log( decodeURIComponent(options.worktoken)); if (options.token) { this.setData({ - worktoken: `${options.worktoken}` - }) - console.log('url',this.data.worktoken) + worktoken: `${options.worktoken}`, + }); + console.log('url', this.data.worktoken); } else { + console.log(options, "dslfjlksd"); this.setData({ - worktoken: decodeURIComponent(options.worktoken) - // url:`${options.url}?deptName=${options.deptName}&gridId=${options.gridId}` + worktoken: decodeURIComponent(options.worktoken), + staffId: options.staffId, + type: `${options.type}`, + day: options.day, + day2: options.day2 }) + } + 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 d0509c7..dfc5c48 100644 --- a/pages/webView/webView.wxml +++ b/pages/webView/webView.wxml @@ -1,3 +1,3 @@ - - \ No newline at end of file + + diff --git a/utils/api.js b/utils/api.js index 99077a0..8152962 100644 --- a/utils/api.js +++ b/utils/api.js @@ -457,8 +457,8 @@ function Enterpriseambiguity(parm){ return fly.post(`actual/base/companyInfo/page`,parm) } //热线接办列表 -function icEventList(){ - return fly.post(`governance/icEvent/list`) +function icEventList(parm){ + return fly.post(`governance/icEvent/list`,parm) } //居民搜索热点 function hotResidentSearch(){ From 516d7e1cc113d8d86f40ac657247ebc615162102 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E6=98=AF=E5=B0=8F=E7=8E=8B=E5=91=80=5C24601?= <819653817@qq.com> Date: Tue, 7 Jan 2025 18:15:42 +0800 Subject: [PATCH 2/6] =?UTF-8?q?=E6=94=BB=E5=9D=9A=E4=BA=8B=E4=BB=B6?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../modules/AttackEvent/AttackEvent.js | 54 +++++++ .../modules/AttackEvent/AttackEvent.json | 6 + .../modules/AttackEvent/AttackEvent.wxml | 18 +++ .../modules/AttackEvent/AttackEvent.wxss | 136 ++++++++++++++++++ .../modules/HotlineRates/HotlineRates.wxml | 2 +- 5 files changed, 215 insertions(+), 1 deletion(-) create mode 100644 pages/statistics/modules/AttackEvent/AttackEvent.js create mode 100644 pages/statistics/modules/AttackEvent/AttackEvent.json create mode 100644 pages/statistics/modules/AttackEvent/AttackEvent.wxml create mode 100644 pages/statistics/modules/AttackEvent/AttackEvent.wxss diff --git a/pages/statistics/modules/AttackEvent/AttackEvent.js b/pages/statistics/modules/AttackEvent/AttackEvent.js new file mode 100644 index 0000000..79a1df1 --- /dev/null +++ b/pages/statistics/modules/AttackEvent/AttackEvent.js @@ -0,0 +1,54 @@ +import {icEventList} from "../../../../utils/api"; +Component({ + properties: {}, + data: { + tableList: [], + tabValue: 'addressEvent', + data: {} + }, + ready() { + this.getData() + }, + methods: { + getData() { + let params = { + agencyId: "", // 代理商ID + deliveryStatus: "", // 交付状态 + departId: "", // 部门ID + endTime: "", // 结束时间 + eventContent: "", // 事件内容 + firstIdList: [], // 第一个ID列表，可能是数组类型 + handleStatus: "", // 处理状态 + limitEndTime: "", // 限制结束时间 + limitStartTime: "", // 限制开始时间 + mobile: "", // 手机号 + name: "", // 姓名 + operationType: "", // 操作类型 + pageNo: 1, // 页码，默认第一页 + pageSize: "20", // 每页条数，作为字符串传递 + selectType: "gjk", // 选择类型，可能是用于过滤 + sourceType: "", // 来源类型 + startTime: "", // 开始时间 + status: "", // 状态 + workOrderNum: "" // 工单号 + } + icEventList(params).then(res => { + console.log(res,"sdkjldsf"); + this.setData({ + tableList: res.data.list + }) + }) + }, + gotopage(e) { + console.log(e) + let data = e.currentTarget.dataset.obj + if (data.content) { + delete data.content + } + wx.navigateTo({ + url: '/subpages/statistics/pages/problem/problem?type='+this.data.tabValue+'&data='+JSON.stringify(data) + }) + } + }, + +}); diff --git a/pages/statistics/modules/AttackEvent/AttackEvent.json b/pages/statistics/modules/AttackEvent/AttackEvent.json new file mode 100644 index 0000000..1681017 --- /dev/null +++ b/pages/statistics/modules/AttackEvent/AttackEvent.json @@ -0,0 +1,6 @@ +{ + "component": true, + "usingComponents": { + "Tabs": "../../../../components/Tabs" + } +} \ No newline at end of file diff --git a/pages/statistics/modules/AttackEvent/AttackEvent.wxml b/pages/statistics/modules/AttackEvent/AttackEvent.wxml new file mode 100644 index 0000000..c694af6 --- /dev/null +++ b/pages/statistics/modules/AttackEvent/AttackEvent.wxml @@ -0,0 +1,18 @@ + + + + + + 工单号:{{item.icEventId}} + + + {{item.categoryAllName}} + {{item.satisfactionName}} + + + {{item.eventContent}} + + + + + diff --git a/pages/statistics/modules/AttackEvent/AttackEvent.wxss b/pages/statistics/modules/AttackEvent/AttackEvent.wxss new file mode 100644 index 0000000..b263a4a --- /dev/null +++ b/pages/statistics/modules/AttackEvent/AttackEvent.wxss @@ -0,0 +1,136 @@ +.tag-list { + display: flex; + margin: 0 -8rpx; + justify-content: space-between; + margin-bottom: 15px; +} +.tag-list .tag { + padding: 10rpx 20rpx; + font-size: 28rpx; + margin: 0 8rpx; + color: #3A80E7; + background: #F1F6FF; + border: 1px solid #3A80E7; + border-radius: 1000rpx; +} +.tag-list .tag.cur { + background: #3A80E7; + color: #ffff; +} + +.problem-item { + background: #F7F7F7; + border-radius: 20rpx; + padding: 30rpx 20rpx; + display: flex; + flex-direction: column; + margin-top: 15px; +} + + +.frequency { + margin-right: 20rpx; + border-radius: 20rpx; + display: flex; + flex-direction: column; +} +.frequency_title{ +display: flex; +flex-direction: row; +font-size:30rpx; +color: #000000; +font-weight: bold; +} +.frequency_content{ +display: flex; +flex-direction: row; +margin-top: 10rpx; +justify-content: space-between; +} + +.content_categoryAllName{ + width: 70%; + white-space: nowrap; /* 防止文本换行 */ + overflow: hidden; /* 隐藏超出的文本 */ + text-overflow: ellipsis; /* 如果文本超出容器，显示省略号 */ + font-size: 26rpx; + color: #999999; + line-height: 40rpx; +} +.frequency_footer{ + display: flex; + flex-direction: row; + margin-top: 10rpx; + justify-content: space-between; + font-family: PingFang SC; + font-weight: 500; + font-size: 32rpx; + color: #333333; + line-height: 42rpx; + } + .content_eventContent{ + display: -webkit-box; /* 必须设置为 box 模式 */ + -webkit-line-clamp: 2; /* 限制显示两行 */ + -webkit-box-orient: vertical; /* 设置排列方向为垂直 */ + overflow: hidden; /* 隐藏超出部分 */ + text-overflow: ellipsis; /* 显示省略号 */ + } +.content_workOrde{ + font-family: PingFang SC; +font-weight: 500; +font-size: 26rpx; +color: #FC5231; +line-height: 42rpx; +} +.workOrde{ +margin-left: 20rpx; +} + + +.frequency.orange { + background: #FFEBE2; + color: #FC7031; +} +.frequency.purple { + background: #E2E2FF; + color: #8482F7; +} +.frequency.blue { + background: #D3EDFF; + color: #4AA2E2; +} + + +.right-con { + flex: 0 0 calc(100% - 100rpx); + width: calc(100% - 100rpx); +} + +.right-con .right-con-txt { + font-size: 30rpx; + color: #333333; + line-height: 42rpx; + overflow: hidden; + text-overflow: ellipsis; + display: -webkit-box; + -webkit-line-clamp: 2; + -webkit-box-orient: vertical; + height: 84rpx; +} +.right-con-address { + display: flex; + align-items: center; + margin-right: 14rpx; + margin-top: 30rpx; +} +.right-con-address .icon { + width: 24rpx; + height: 30rpx; +} + +.right-con-address .right-con-address-txt { + font-size: 28rpx; + font-weight: 500; + color: #999999; + line-height: 40rpx; +} \ No newline at end of file diff --git a/pages/statistics/modules/HotlineRates/HotlineRates.wxml b/pages/statistics/modules/HotlineRates/HotlineRates.wxml index 4f5a2c3..116fb04 100644 --- a/pages/statistics/modules/HotlineRates/HotlineRates.wxml +++ b/pages/statistics/modules/HotlineRates/HotlineRates.wxml @@ -48,7 +48,7 @@ 未回复 0 - --> + 不满意 {{item.notSatisfiedTotal}} From b4a453782ce35f898a721f62dc591e6bd184c3e6 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E6=98=AF=E5=B0=8F=E7=8E=8B=E5=91=80=5C24601?= <819653817@qq.com> Date: Thu, 9 Jan 2025 14:50:28 +0800 Subject: [PATCH 3/6] =?UTF-8?q?=E5=B0=8F=E7=A8=8B=E5=BA=8F=E8=B7=B3h5.?= =?UTF-8?q?=E6=94=BB=E5=9D=9A?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../modules/AttackEvent/AttackEvent.js | 7 +++ .../modules/AttackEvent/AttackEvent.wxml | 13 ++++- .../modules/AttackEvent/AttackEvent.wxss | 17 ++++-- .../modules/HotlineRates/HotlineRates.js | 3 +- .../modules/HotlineRates/HotlineRates.wxml | 5 -- pages/statistics/statistics.js | 7 +++ pages/statistics/statistics.wxml | 2 +- pages/webView/webView.js | 55 ++++++++++++++----- pages/webView/webView.wxml | 2 +- pages/work2/work2.js | 5 +- 10 files changed, 83 insertions(+), 33 deletions(-) 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.categoryAllName}} - {{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(){ From f81e4cc7b902da7fb5d621d1dae57aa4977d4e0f Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E6=98=AF=E5=B0=8F=E7=8E=8B=E5=91=80=5C24601?= <819653817@qq.com> Date: Mon, 13 Jan 2025 14:58:10 +0800 Subject: [PATCH 4/6] =?UTF-8?q?=E6=94=BB=E5=9D=9A=E4=BA=8B=E4=BB=B6?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../modules/AttackEvent/AttackEvent.wxml | 2 +- .../modules/HotlineRates/HotlineRates.js | 106 +++++++++++++++++- .../modules/HotlineRates/HotlineRates.wxml | 54 ++++----- .../modules/HotlineRates/HotlineRates.wxss | 15 +++ pages/statistics/statistics.js | 5 +- 5 files changed, 148 insertions(+), 34 deletions(-) diff --git a/pages/statistics/modules/AttackEvent/AttackEvent.wxml b/pages/statistics/modules/AttackEvent/AttackEvent.wxml index d6993e0..c534093 100644 --- a/pages/statistics/modules/AttackEvent/AttackEvent.wxml +++ b/pages/statistics/modules/AttackEvent/AttackEvent.wxml @@ -6,7 +6,7 @@ 工单号:{{item.icEventId}} - {{item.categoryAllName}} + {{item.categoryAllName?item.categoryAllName:""}} {{item.solved}} 、 diff --git a/pages/statistics/modules/HotlineRates/HotlineRates.js b/pages/statistics/modules/HotlineRates/HotlineRates.js index f2e07fd..0486a9b 100644 --- a/pages/statistics/modules/HotlineRates/HotlineRates.js +++ b/pages/statistics/modules/HotlineRates/HotlineRates.js @@ -6,7 +6,6 @@ const formatCurrentAndLastMonthDay = () => { const year = today.getFullYear(); const month = today.getMonth() + 1; const day = today.getDate(); - // 上个月的日期 const lastMonthDate = new Date(year, month - 1, day); const lastYear = lastMonthDate.getFullYear(); @@ -23,25 +22,122 @@ Component({ type: String, value: '1', observer: function () { + const { currentDay, lastMonthDay } = formatCurrentAndLastMonthDay(); + console.log(currentDay, lastMonthDay, "sdflkjdslfkj"); + this.setData({ + day: lastMonthDay, + day2: currentDay + }) + console.log(this.data.day, this.data.day2, "123"); this.getList(); } } }, data: { + orderBy:"", + sortList:[ + { + lable:"收件数", + value:1, + type:0 //0为正常排序， 1为正序，2为倒叙 + }, + { + lable:"不满意", + value:2, + type:0 + }, + { + lable:"未解决", + value:3, + type:0 + }, + { + lable:"退件次数", + value:4, + type:0 + }, + { + lable:"超期退件", + value:5, + type:0 + }, + ], list: [], + sortNameList: [ + { + label:"total", + value:1 + }, + { + label:"notSatisfiedTotal", + value:2 + }, + { + label:"unresolveTotal", + value:3 + }, + { + label:"overTimeTotal", + value:4 + }, + { + label:"returnTotal", + value:5 + }, + ], day: '', day2: '', showitem: 3, }, ready() { const { currentDay, lastMonthDay } = formatCurrentAndLastMonthDay(); + console.log(currentDay,lastMonthDay,"sdflkjdslfkj"); this.setData({ day:lastMonthDay, day2: currentDay }) + console.log(this.data.day,this.data.day2,"123"); this.getList() }, - methods: { + methods: { + toSort(value){ + let sortlist= value.currentTarget.dataset.sortlist + const evenNumbers= this.data.sortNameList.filter(item=>{ + return item.value===sortlist.value + })[0].label + if (this.data.sortList[sortlist.value-1].type==1) { + this.data.sortList[sortlist.value-1].type=2 + this.setData({ + sortList:this.data.sortList, + orderBy:evenNumbers+"Down" + } + ) + }else if (this.data.sortList[sortlist.value-1].type==2) { + let sortlist= value.currentTarget.dataset.sortlist + this.data.sortList[sortlist.value-1].type=1 + this.setData({ + sortList:this.data.sortList, + orderBy:evenNumbers+"Up" + + } + ) + }else{ + this.data.sortList.map(item=>{ + if (item.type==1||item.type==2) { + item.type=0 + } + }) + let sortlist= value.currentTarget.dataset.sortlist + this.data.sortList[sortlist.value-1].type=1 + this.setData({ + sortList:this.data.sortList, + orderBy:evenNumbers+"Up" + } + ) + } + this.getEventList() + }, + toNumber(data) { let type=data.currentTarget.dataset.type let staffId=data.currentTarget.dataset.staffid @@ -90,9 +186,11 @@ Component({ } }, getEventList(deptFlag) { + console.log(this.data.day,this.data.day2,"这里的值"); let parm = { + orderBy: this.data.orderBy, startDate: this.data.day.toString() + ' ' + '00:00:00', - endDate: this.data.day2.toString() + ' ' + '23:59:59', + endDate: this.data.day2.toString() + ' ' + '23:59:59', usableFlag: true, } @@ -100,7 +198,7 @@ Component({ parm.recountFlag=1 } event12345Rates(parm).then(res => { - console.log('++++++++++++',res.data) + console.log(res.data) // res.data.list.forEach(item => { // item.reportTime = this.formatTime(item.reportTime) // }) diff --git a/pages/statistics/modules/HotlineRates/HotlineRates.wxml b/pages/statistics/modules/HotlineRates/HotlineRates.wxml index c0cba28..56ed51f 100644 --- a/pages/statistics/modules/HotlineRates/HotlineRates.wxml +++ b/pages/statistics/modules/HotlineRates/HotlineRates.wxml @@ -1,34 +1,36 @@ - - - {{ day }} - - - + + + {{ day }} + + - - - {{ day2 }} - - - + + + {{ day2 }} + + - - 查询 + 查询 + + + + {{item.lable}} + +
+ + + + +
+ + + + @@ -56,11 +58,11 @@ bind:tap="toNumber" data-staffId="{{item.operateOrgLeader}}" data-type="returnTotal" > 退件次数 - {{item.returnTotal?item.returnTotal:0}} + {{item.returnTotal?item.overTimeTotal:0}} 超期退件 - {{item.overTimeTotal}} + {{item.returnTotal}} diff --git a/pages/statistics/modules/HotlineRates/HotlineRates.wxss b/pages/statistics/modules/HotlineRates/HotlineRates.wxss index e7dc874..be7c6f1 100644 --- a/pages/statistics/modules/HotlineRates/HotlineRates.wxss +++ b/pages/statistics/modules/HotlineRates/HotlineRates.wxss @@ -117,4 +117,19 @@ height:40px; line-height:40px; color:blue; +} +.sort{ + display: flex; + justify-content: space-between; + align-content: space-around; + margin-bottom: 20rpx +} +.sort_header{ + display: flex; + align-items: center; +} +.sort_image { + display: flex; + flex-direction: column; + margin-left: 10rpx; } \ No newline at end of file diff --git a/pages/statistics/statistics.js b/pages/statistics/statistics.js index 7407a14..976d06c 100644 --- a/pages/statistics/statistics.js +++ b/pages/statistics/statistics.js @@ -19,7 +19,7 @@ Page({ }], monthIndex: 0, stayVal: '1', - curVal: '1', + curVal: '2', tabValue: '' }, onLoad(options) { @@ -58,9 +58,8 @@ Page({ }, gotoAttack(){ let worktoken=wx.getStorageSync('token') - console.log(worktoken,"执行一次"); wx.navigateTo({ - url: '/pages/webView/webView?worktoken='+worktoken+'&AttackEvent='+'https://epmet-preview.elinkservice.cn/#/AttackEvent', + url: '/pages/webView/webView?worktoken='+worktoken+'&AttackEvent='+'https://epmet-preview.elinkservice.cn/epmet-work-h5/#/AttackEvent', }) } }) \ No newline at end of file From 587bf74e3c6554fe4f11e19fd7cb99a34a773fc9 Mon Sep 17 00:00:00 2001 From: huxiaolei <286388969@qq.com> Date: Mon, 13 Jan 2025 17:00:11 +0800 Subject: [PATCH 5/6] =?UTF-8?q?=E4=BC=98=E5=8C=96=E5=9B=9B=E7=8E=87?= =?UTF-8?q?=E6=8E=92=E5=BA=8F?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../modules/HotlineRates/HotlineRates.js | 14 +++++++++++--- 1 file changed, 11 insertions(+), 3 deletions(-) diff --git a/pages/statistics/modules/HotlineRates/HotlineRates.js b/pages/statistics/modules/HotlineRates/HotlineRates.js index 0486a9b..a52fac4 100644 --- a/pages/statistics/modules/HotlineRates/HotlineRates.js +++ b/pages/statistics/modules/HotlineRates/HotlineRates.js @@ -13,7 +13,8 @@ const formatCurrentAndLastMonthDay = () => { const lastDay = lastMonthDate.getDate(); return { currentDay: [year, month, day].map(formatNumber).join('-'), - lastMonthDay: [lastYear, lastMonth-1, lastDay].map(formatNumber).join('-'), + //lastMonthDay: [lastYear, lastMonth-1, lastDay].map(formatNumber).join('-'), + lastMonthDay: [lastYear, 1, 1].map(formatNumber).join('-'), }; }; Component({ @@ -101,6 +102,12 @@ Component({ }, methods: { toSort(value){ + wx.showToast({ + title: '正在计算排序', + icon: 'loading', + duration: 7000, + mask: true + }) let sortlist= value.currentTarget.dataset.sortlist const evenNumbers= this.data.sortNameList.filter(item=>{ return item.value===sortlist.value @@ -128,10 +135,10 @@ Component({ } }) let sortlist= value.currentTarget.dataset.sortlist - this.data.sortList[sortlist.value-1].type=1 + this.data.sortList[sortlist.value-1].type=2 this.setData({ sortList:this.data.sortList, - orderBy:evenNumbers+"Up" + orderBy:evenNumbers+"Down" } ) } @@ -202,6 +209,7 @@ Component({ // res.data.list.forEach(item => { // item.reportTime = this.formatTime(item.reportTime) // }) + wx.hideToast() this.setData({ list: res.data }) From d687023218e2e276fa7069a363f36c4889d621e6 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E6=98=AF=E5=B0=8F=E7=8E=8B=E5=91=80=5C24601?= <819653817@qq.com> Date: Wed, 15 Jan 2025 16:30:51 +0800 Subject: [PATCH 6/6] =?UTF-8?q?=E6=8E=92=E5=BA=8F=E9=97=AE=E9=A2=98?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- pages/statistics/modules/HotlineRates/HotlineRates.js | 4 ++-- pages/statistics/modules/HotlineRates/HotlineRates.wxml | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/pages/statistics/modules/HotlineRates/HotlineRates.js b/pages/statistics/modules/HotlineRates/HotlineRates.js index a52fac4..cf1843c 100644 --- a/pages/statistics/modules/HotlineRates/HotlineRates.js +++ b/pages/statistics/modules/HotlineRates/HotlineRates.js @@ -78,11 +78,11 @@ Component({ value:3 }, { - label:"overTimeTotal", + label:"returnTotal", value:4 }, { - label:"returnTotal", + label:"overTimeTotal", value:5 }, ], diff --git a/pages/statistics/modules/HotlineRates/HotlineRates.wxml b/pages/statistics/modules/HotlineRates/HotlineRates.wxml index 56ed51f..bf538d4 100644 --- a/pages/statistics/modules/HotlineRates/HotlineRates.wxml +++ b/pages/statistics/modules/HotlineRates/HotlineRates.wxml @@ -58,11 +58,11 @@ bind:tap="toNumber" data-staffId="{{item.operateOrgLeader}}" data-type="returnTotal" > 退件次数 - {{item.returnTotal?item.overTimeTotal:0}} + {{item.returnTotal?item.returnTotal:0}} 超期退件 - {{item.returnTotal}} + {{item.overTimeTotal}}