Merge branch 'data-page' of http://120.46.222.128:10021/elink-star/epmet-work-mp into data-page-lingshan

# Conflicts:
#	pages/statistics/modules/AttackEvent/AttackEvent.js
#	pages/statistics/modules/AttackEvent/AttackEvent.wxml
#	pages/statistics/modules/AttackEvent/AttackEvent.wxss
#	pages/statistics/modules/HotlineRates/HotlineRates.js
#	pages/statistics/modules/HotlineRates/HotlineRates.wxml
#	pages/statistics/statistics.wxml
#	pages/webView/webView.js
#	pages/webView/webView.wxml

pages/statistics/modules/AttackEvent/AttackEvent.js

@@ -35,7 +35,7 @@ Component({
             icEventList(params).then(res => {
               console.log(res,"sdkjldsf");
                 this.setData({
-                    data: res.data
+                  tableList: res.data.list
                 })
             })
         },
@@ -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',
+        })
         }
     },
 

pages/statistics/modules/AttackEvent/AttackEvent.wxml

@@ -1,25 +1,25 @@
 <view class="problem-list">
-    <view class="problem-item" bind:tap="gotopage" data-obj="{{item}}" wx:for="{{data[tabValue]}}" wx:key="index" wx:if="{{index<3}}">
-           <view class="frequency">
+    <view class="problem-item" data-obj="{{item}}" wx:for="{{tableList}}" wx:key="index" wx:if="{{index<3}}">
+           <view class="frequency" bind:tap="toNumber"  data-icEventId="{{item.icEventId}}" >
             <view class="frequency_title">
               <image style="height: 36rpx; width: 36rpx;" src="https://elink-esua-epdc.oss-cn-qingdao.aliyuncs.com/epmet-saas/dev/20250107/98ae411b86df48529139259c58c8e748.png"></image>
-              <view  class="workOrde">工单号:{{item.amount}}</view>
+              <view  class="workOrde">工单号:{{item.icEventId}}</view>
             </view>
+            <view class="frequency_content">
+              <view class="content_categoryAllName">{{item.categoryAllName?item.categoryAllName:""}}</view>
+              <view style="display: flex; flex-direction: row;">
+                <view wx:if="{{item.solved=='未解决'}}"   class="content_workOrde1">{{item.solved}}</view>
+                <view wx:if="{{item.satisfactionName=='不满意'}}"   class="content_workOrde1">、</view>
               </view>
-            <view class="right-con">
-              <view class="right-con-txt">
-                {{item.content}}
+          
+              <view wx:if="{{item.satisfactionName=='不满意'}}"   class="content_workOrde">{{item.satisfactionName}}</view>
+           
+              
             </view>
-              <view class="right-con-address">
-                <block wx:if="{{tabValue === 'mobileEvent'}}">
-                  <image src="../../../../images/statistics/avatar.png" mode="widthFix" class="icon" />
-                  <text class="right-con-address-txt"> {{item.mobile}}</text>
-                </block>
-                <block wx:else>
-                  <image src="../../../../images/statistics/address.png" mode="widthFix" class="icon" />
-                  <text class="right-con-address-txt"> {{item.name ? item.name : ''}} {{item.address}}</text>
-                </block>
+            <view class="frequency_footer">
+              <view class="content_eventContent">{{item.eventContent}}</view>
             </view>
             </view>
+    
     </view>
 </view>

pages/statistics/modules/AttackEvent/AttackEvent.wxss

@@ -31,10 +31,8 @@
 .frequency {
   margin-right: 20rpx;
   border-radius: 20rpx;
-    text-align: center;
   display: flex;
-    align-items: center;
-
+  flex-direction: column;
 }
 .frequency_title{
 display: flex;
@@ -43,6 +41,54 @@
 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;
+}
+.content_workOrde1 {
+  font-family: PingFang SC;
+  font-weight: 500;
+  font-size: 26rpx;
+  color: #FFA312;
+  line-height: 42rpx;
+}
 .workOrde{
 margin-left: 20rpx;
 }

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();
@@ -14,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({
@@ -23,32 +23,134 @@ 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:"returnTotal",
+            value:4
+          },
+          {
+            label:"overTimeTotal",
+            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: { 
+      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
+        })[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=2
+          this.setData({
+            sortList:this.data.sortList,
+            orderBy:evenNumbers+"Down"
+          }
+          )
+        }
+        this.getEventList()
+      },
+      
       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) {
@@ -91,7 +193,9 @@ 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',
                 usableFlag: true,
@@ -101,10 +205,11 @@ 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)
                 // })
+                wx.hideToast()
                 this.setData({
                     list: res.data
                 })

pages/statistics/modules/HotlineRates/HotlineRates.wxml

@@ -1,42 +1,39 @@
 <view class="container">
 <view class="screen">
-    <picker
-            mode="date"
-            model:value="{{ day }}"
-            fields="day"
-            bind:change="onChange"
-    >
+    <picker mode="date" model:value="{{ day }}" fields="day" bind:change="onChange">
       <view class="picker">
         <text>{{ day }}</text>
         <image src="../../../../images/statistics/down.png" mode="widthFix" />
       </view>
-
     </picker>
-    <picker
-            mode="date"
-            model:value="{{ day2 }}"
-            fields="day"
-            bind:change="onChange2"
-    >
+    <picker mode="date" model:value="{{ day2 }}" fields="day" bind:change="onChange2">
       <view class="picker">
         <text>{{ day2 }}</text>
         <image src="../../../../images/statistics/down.png" mode="widthFix" />
       </view>
-
     </picker>
-    
     <view class="btn" bindtap="onSearch">
       查询
     </view>
 </view>
+<view class="sort" >
+<view wx:for="{{sortList}}" class="sort_header" bind:tap="toSort" data-SortList="{{item}}">
+  <view  data-type="Receiving">
+    <view style="color:#666 ;font-size: 26rpx;">{{item.lable}}</view>
+  </view>
+  <div class="sort_image" >
+    <image wx:if="{{item.type==1}}" style="width: 16rpx; height: 16rpx;" src="https://elink-esua-epdc.oss-cn-qingdao.aliyuncs.com/epmet-saas/dev/20250110/4d67c378231b40dead3df7fb544897cc.png"></image>
+    <image wx:if="{{item.type==2}}" style="width: 15rpx; height: 15rpx;" src="https://elink-esua-epdc.oss-cn-qingdao.aliyuncs.com/epmet-saas/dev/20250110/f2a094e24dbe496d90e56a5d891515bc.png"></image>
+    <image wx:if="{{item.type==0}}" style="width: 16rpx; height: 16rpx;" src="https://elink-esua-epdc.oss-cn-qingdao.aliyuncs.com/epmet-saas/dev/20250110/a674d56b1847477abd5a11b9cc4e4482.png"></image>
+    <image wx:if="{{item.type==0}}" style="width: 15rpx; height: 15rpx;" src="https://elink-esua-epdc.oss-cn-qingdao.aliyuncs.com/epmet-saas/dev/20250110/cfa447095aba4d26aa3655d1e81e00a1.png"></image>
+  </div>
+</view>
+
+</view>
+              
     <view class="stay-list" wx:if="{{list.length}}">
-        <!-- <view class="stay-item" wx:for="{{list}}" bind:tap="gotopage" data-id="{{item.icEventId || item.demandRecId}}">
-            <view class="date">{{item.happenTime || item.reportTime}}</view>
-            <view class="tit-text">{{item.eventContent || item.content}}</view>
-        </view> -->
         <view class="hotline-rate"  wx:for="{{list}}" wx:for-index="idx" wx-if="{{idx<showitem}}" wx:if="{{item.operateName}}">
             <view class="name">
-                <!-- <view class="ranking">{{idx+1}}</view> -->
                 <view class="leader-name" wx-if="{{curVal=='1'}}">{{item.operateName }}</view>
                 <view class="leader-name" wx-if="{{curVal=='2'}}">{{item.assignOrgName}}</view>
             </view>
@@ -48,7 +45,7 @@
                 <!-- <view class="child">
                     <view class="lab">未回复</view>
                     <view class="val">0</view>
-                </view> -->
+                </view>
                 <view class="child" bind:tap="toNumber" data-staffId="{{item.operateOrgLeader}}" data-type="notSatisfied">
                     <view class="lab">不满意</view>
                     <view class="val">{{item.notSatisfiedTotal}}</view>

pages/statistics/modules/HotlineRates/HotlineRates.wxss

@@ -118,3 +118,18 @@
     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;
+}

pages/statistics/statistics.js

@@ -19,7 +19,7 @@ Page({
         }],
         monthIndex: 0,
         stayVal: '1',
-        curVal: '1',
+        curVal: '2',
         tabValue: ''
     },
     onLoad(options) {
@@ -55,5 +55,11 @@ Page({
         this.setData({
             tabValue: detail
         })
+    },
+    gotoAttack(){
+        let worktoken=wx.getStorageSync('token')
+        wx.navigateTo({
+          url: '/pages/webView/webView?worktoken='+worktoken+'&AttackEvent='+'https://epmet-preview.elinkservice.cn/epmet-work-h5/#/AttackEvent',
+    })
     }
 })

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");
+      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({
-        worktoken: decodeURIComponent(options.worktoken),
-        staffId: options.staffId,
-        type: `${options.type}`,
-        day: options.day,
-        day2: options.day2
+          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
           })
-        
         }
-    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}`;
+      }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
+          })
+        }
+     
+      }
+     
+        
+    }
+
+
   },
   onShow() {
     this.onLoad()

pages/webView/webView.wxml

@@ -1,3 +1,3 @@
 <!-- <view>https://epmet-preview.elinkservice.cn/epmet-work-h5/#/Hotline?worktoken={{worktoken}}</view> -->
-<web-view src="https://epmet-preview.elinkservice.cn/epmet-work-h5/#/Hotline?worktoken={{worktoken}}&staffId={{staffId}}&type={{type}}&day={{day}}&&day2={{day2}}">
+<web-view src="{{url}}">
 </web-view>

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(){