From 51a98024076eb6491a1dc21774d21c1d91381f04 Mon Sep 17 00:00:00 2001 From: cclu <1106109051@qq.com> Date: Thu, 18 May 2023 19:15:42 +0800 Subject: [PATCH] update --- common/utils.js | 76 ++- pages/commercialBI/yearPlan.vue | 248 +++---- pages/examine/index.vue | 841 +++++++++++++++++++++--- static/images/examine/NS.svg | 20 - static/images/examine/bg.png | Bin 110298 -> 0 bytes static/images/examine/close.svg | 11 - static/images/examine/fixed.svg | 54 -- static/images/examine/serviceItemBg.svg | 20 - static/images/examine/time.svg | 13 - static/images/examine/user.svg | 13 - 10 files changed, 962 insertions(+), 334 deletions(-) delete mode 100644 static/images/examine/NS.svg delete mode 100644 static/images/examine/bg.png delete mode 100644 static/images/examine/close.svg delete mode 100644 static/images/examine/fixed.svg delete mode 100644 static/images/examine/serviceItemBg.svg delete mode 100644 static/images/examine/time.svg delete mode 100644 static/images/examine/user.svg diff --git a/common/utils.js b/common/utils.js index d9b713f..a401968 100644 --- a/common/utils.js +++ b/common/utils.js @@ -287,6 +287,78 @@ function playVideo(opt) { return new EZUIPlayer(opt) } + +// 输入年份和月份 输出该月的天数 是一个数组 格式为 *月**日 +function getThisMonthDateList(value){ + let date = new Date(value) + let y = date.getFullYear() + let m = date.getMonth() + 1 + let howDay; + let flag = false + if( y%4 ===0 && y%100!==0 || y%400===0 ){ + flag = true + } + switch (m){ + case 1: case 3: case 5: case 7: case 8: case 10: case 12: + howDay=31 + break + case 4: case 6: case 9: case 11: + howDay=30 + break + case 2 : + if(flag){ + howDay=29 + }else{ + howDay = 28 + } + break + } + let list = [] + for (let i = 0;i <= howDay,++i;) { + if (i>howDay){ + break + }else{ + list.push({label:`${m}月${i}日`,value:`${y}-${m}-${i}`}) + } + } + return list +} +// 传入 老的时间和要变成的时间 老时间要日期 新时间不用 月份为1无效 +function handleReduceAMonth(nowTime,newTime){ + const oldDate = new Date(nowTime) + let y = oldDate.getFullYear() + let m = oldDate.getMonth() + 1 + let d = oldDate.getDate() + + const newDate = new Date(newTime) + let newY = newDate.getFullYear() + let newM = newDate.getMonth() + 1 + + let howDay = this.getThisMonthDay(`${y}-${m}`) + let newHowDay = this.getThisMonthDay(`${newY}-${newM}`) + + if (d === howDay){ + console.log('111',`${y}-${newM}-${newHowDay}`) + return `${newY}-${newM}-${newHowDay}` + }else{ + if (newM===2){ + if (d>newHowDay){ + console.log('222',`${newY}-${newM}-${newHowDay}`) + return `${newY}-${newM}-${newHowDay}` + }else{ + console.log('222',`${newY}-${newM}-${d}`) + return `${newY}-${newM}-${d}` + } + }else{ + console.log('333',`${y}-${newM}-${d}`) + return `${newY}-${newM}-${d}` + } + } +} + + + + export default { netChange, cutDate, @@ -302,5 +374,7 @@ export default { getFieldEnumByField, // 获取枚举参数 // calculateDistance, // bMapToQQMap, - playVideo + playVideo, + getThisMonthDateList, + handleReduceAMonth } diff --git a/pages/commercialBI/yearPlan.vue b/pages/commercialBI/yearPlan.vue index df85617..33047b2 100644 --- a/pages/commercialBI/yearPlan.vue +++ b/pages/commercialBI/yearPlan.vue @@ -1,127 +1,127 @@ - + + + + + + + + + + + + + + + + - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/pages/examine/index.vue b/pages/examine/index.vue index 998b2de..561cc39 100644 --- a/pages/examine/index.vue +++ b/pages/examine/index.vue @@ -2,12 +2,12 @@ - + - + 考评考核 @@ -16,13 +16,13 @@
-
- +
+ - 皖中 + {{selectAreaName}}

片区

- +
@@ -37,74 +37,180 @@ + + + {{item.label}} + + {{item.label}} - - + + - 新桥服务区 - {{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}}区 - 89 + {{subItem.SERVERPARTList[0].EXAMINE_SCORE }} 分 - - 2023/05/11 14:21:03 + + {{subItem.SERVERPARTList[0].EXAMINE_DATE}} - - 陈佳、赵卓雅、张三、李文文、胡静 - - - - - - - - 南区 - - - 89 - 分 - - - - - - 2023/05/11 14:21:03 - - - - 陈佳、赵卓雅、张三、李文文、胡静 + + {{subItem.SERVERPARTList[0].EXAMINE_PERSON}} - + + + + + {{item.SERVERPART_NAME}} + + 更多记录 + + + + + + + + {{subItem.REGION_NAME}}区 + ({{subItem.SERVERPARTList.length}}) + + + + + +

{{subItem.SERVERPARTList[0].PATROL_PERSON}}

+

检查人

+ + +

{{subItem.SERVERPARTList[0].PATROL_DATE}}

+

检查日期

+ + +

{{subItem.SERVERPARTList[0].PATROL_ROUTE}}

+

路线

+ + + +

图片

+ + + + + + + +

暂无数据

+ + + + + +

{{item.SERVERPART_NAME}}

+ + + + 会议内容 + + + + {{item.list[0].SERVERPARTList[0].MEETING_PLACE}} + + + + + + {{item.list[0].SERVERPARTList[0].MEETING_DATE}} + + + + {{item.list[0].SERVERPARTList[0].MEETING_PERSONS.slice(0,16)}}{{`等${10}人`}} + + {{item.list[0].SERVERPARTList[0].MEETING_PERSONS}} + + + + {{item.list[0].SERVERPARTList[0].MEETING_CONTENT}} + + {{item.list[0].SERVERPARTList[0].MEETING_CONTENT}} + + + + + + +

暂无数据

+ + + - + - 选择片区 - + {{ selectTab===1?'选择片区':selectTab===2?`${popupServiceName}`:'会议内容' }} + - - {{item.label}}片区 + + {{item.label}}片区 + + + + {{item.label}} + + + + +

{{item.PATROL_PERSON}}

+

检查人

+ + +

{{item.PATROL_DATE}}

+

检查日期

+ + +

{{item.PATROL_ROUTE}}

+

路线

+ + + +

图片

+ + + + + + + + {{popupMeetDetail.MEETING_DATE}} + + + + {{popupMeetDetail.MEETING_PERSONS}} + + + + {{popupMeetDetail.MEETING_CONTENT}} + @@ -112,13 +218,17 @@