From eb7ae3a6136e52823b69cfa6a9e11165a31da6e1 Mon Sep 17 00:00:00 2001 From: cclu <1106109051@qq.com> Date: Fri, 19 May 2023 13:38:39 +0800 Subject: [PATCH] =?UTF-8?q?=E8=80=83=E6=A0=B8=E8=80=83=E8=AF=84?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- common/utils.js | 14 +----- pages/examine/index.vue | 102 ++++++++++++++++++++-------------------- 2 files changed, 51 insertions(+), 65 deletions(-) diff --git a/common/utils.js b/common/utils.js index 1673e6c..c0f928f 100644 --- a/common/utils.js +++ b/common/utils.js @@ -179,7 +179,7 @@ function addUserBehavior(obj) { } obj.visitChannels = store.state.visitChannels let userDate = store.state.userData - console.log('userDate',userDate) + console.log('userDate123',userDate) let req = { userName:userDate.UserName, phoneNumber:userDate.Membership_Phone, @@ -336,15 +336,11 @@ function handleReduceAMonth(nowTime,newTime){ let howDay = this.getThisMonthDay(`${y}-${m}`) let newHowDay = this.getThisMonthDay(`${newY}-${newM}`) - console.log('d',d) - console.log('newHowDay',newHowDay) const nowDate = new Date() let nowM =nowDate.getMonth() + 1 let nowD = nowDate.getDate() - console.log('nowD',nowD) if (d === newHowDay){ if (dnewHowDay){ - console.log('222',`${newY}-${newM}-${newHowDay}`) return `${newY}-${newM}-${newHowDay}` }else{ - console.log('222',`${newY}-${newM}-${d}`) return `${newY}-${newM}-${d}` } }else{ - console.log('nowD',nowD) - console.log('d',d) if (nowD - {{selectAreaName}}

片区

+
- @@ -48,34 +47,43 @@ + - - {{item.SERVERPART_NAME}} - {{selectMonth%3===0?`${Math.abs(selectMonth/3)===1?'一':Math.abs(selectMonth/3)===2?'二':Math.abs(selectMonth/3)===3?'三':'四'}季度`:'月度'}} + + {{item.SERVERPART_NAME}} + {{selectMonth%3===0?`${Math.abs(selectMonth/3)===1?'一':Math.abs(selectMonth/3)===2?'二':Math.abs(selectMonth/3)===3?'三':'四'}季度`:'月度'}} + + + + + + {{subItem.REGION_NAME}}区 + + + {{subItem.SERVERPARTList[0].EXAMINE_SCORE }} + 分 + - - - - - {{subItem.REGION_NAME}}区 - - - {{subItem.SERVERPARTList[0].EXAMINE_SCORE }} - 分 - - - - - - {{subItem.SERVERPARTList[0].EXAMINE_DATE}} - - - - {{subItem.SERVERPARTList[0].EXAMINE_PERSON}} - - + + + + {{subItem.SERVERPARTList[0].EXAMINE_DATE}} + + + + {{subItem.SERVERPARTList[0].EXAMINE_PERSON}} + + + + + {{'——— 我是有底线的 ———'}} + + + +

暂无数据

+ @@ -117,6 +125,9 @@ + + {{'——— 我是有底线的 ———'}} +

暂无数据

@@ -163,6 +174,9 @@ + + {{'——— 我是有底线的 ———'}} +

暂无数据

@@ -262,8 +276,6 @@ export default { popupServiceShowList:[],// 显示的表单内容 popupServiceName:'',// 点击更多记录的表单名称 popupMeetDetail:{},// 弹出框的会议详情内容 - str1:'陈佳、赵卓雅、张三、陈佳、赵卓雅、陈佳、赵卓雅、张三、里斯、李青青', - str2:'这里是会议内容,这里是会议内容,这里是会议内容,这里是会议内容,这里是是会议内容,这里是会议内容,这里是会议内容,这里是会议内容这里是会议内容,这里是会议内容,这里是会议内容,这里是会议内容,这里是是会议内容' } }, onLoad(){ @@ -272,6 +284,7 @@ export default { this.windowHeight = systemInfo.windowHeight this.statusBarHeight = Number(systemInfo.statusBarHeight) this.menu = uni.getMenuButtonBoundingClientRect() + // 先拿到首页的时间 作为调用接口的统一时间 存的lastDay存当前月份的具体日期切换回本月的日期判断有用 this.searchTime = uni.getStorageSync('lastDay') this.lastDay = uni.getStorageSync('lastDay') // 拿到当前时间 @@ -285,6 +298,7 @@ export default { this.getAreaList() }, onReady(){ + // 只有在页面已经渲染好了 才能把选中的日期 移到可视区域里面 var _this = this; _this.getThisMonth() }, @@ -313,7 +327,6 @@ export default { this.popupServiceList = obj.list // 页面上展示的数组 this.popupServiceShowList = this.popupServiceList[0] - console.log('this.popupServiceShowList',this.popupServiceShowList) // 方位选项卡的数组判断 let list = [] obj.list.forEach((item,index)=>{ @@ -322,7 +335,6 @@ export default { this.popupTab = list }else if (value===3){ this.popupMeetDetail = obj.list[0].SERVERPARTList[0] - console.log('this.popupMeetDetail',this.popupMeetDetail) } // 弹出框显示 this.showPop = true @@ -338,13 +350,10 @@ export default { this.selectMonth = value // 当前时间 const nowDate = new Date() - let nowYear = nowDate.getFullYear() let nowMonth = nowDate.getMonth() + 1 - let nowDay = nowDate.getDate() // 搜索时间 const date = new Date(this.searchTime) let y = date.getFullYear() - let m = date.getMonth() + 1 // 如果当前的时间 和 选中的时间一样 那么 搜索的时间就是当前时间的前一天 否则就是当前月份的最后一天 if (nowMonth === this.selectMonth){ this.searchTime = this.lastDay @@ -361,9 +370,9 @@ export default { const selectTime = new Date(this.selectDate) let selectY = selectTime.getFullYear() let selectM = selectTime.getMonth() + 1 - let selectD = selectTime.getDate() - 4>0?selectTime.getDate() - 4:1 + // 要让选中的日期展示在最右边 不展示最左边 + let selectD = selectTime.getDate() - 4 > 0?selectTime.getDate() - 4:1 this.currentDate = 'item' + `${selectY}-${selectM}-${selectD}` - if (this.selectTab===1){ // 选中的是考核管理 调用拿到考核管理的列表 this.getManagerList() @@ -409,8 +418,8 @@ export default { let d = date.getDate() const selectDay = new Date(time) let selectM = selectDay.getMonth() +1 - let selectd = selectDay.getDate() - if (d