diff --git a/ant-design-vue-jeecg/package.json b/ant-design-vue-jeecg/package.json index f0a0b70..b9f9519 100644 --- a/ant-design-vue-jeecg/package.json +++ b/ant-design-vue-jeecg/package.json @@ -32,7 +32,10 @@ "lodash.get": "^4.4.2", "lodash.pick": "^4.4.0", "md5": "^2.2.1", + "moment": "^2.29.4", "nprogress": "^0.2.0", + "postcss-px2rem": "^0.3.0", + "px2rem-loader": "^0.1.9", "qs": "^6.10.3", "tinymce": "^5.10.3", "viser-vue": "^2.4.8", diff --git a/ant-design-vue-jeecg/src/views/newLayout/myTask/list/assignment.vue b/ant-design-vue-jeecg/src/views/newLayout/myTask/list/assignment.vue index ec83f43..57bd9f1 100644 --- a/ant-design-vue-jeecg/src/views/newLayout/myTask/list/assignment.vue +++ b/ant-design-vue-jeecg/src/views/newLayout/myTask/list/assignment.vue @@ -176,19 +176,14 @@
- {{ item.startTime }} - - {{ item.expectedEndTime }} + {{ item.startTime | timeFilter }} - + {{ item.expectedEndTime | timeFilter }}
- {{ item.publishTime }} - - {{ - `${ - item.submitTime !== '1970-01-01' - ? item.submitTime - : '待提交' - }` - }} + {{ item.publishTime | timeFilter }} + - + {{ item.submitTime | timeFilter }}
- {{ item.startTime }} - - {{ item.expectedEndTime }} + {{ item.startTime | timeFilter }} - + {{ item.expectedEndTime | timeFilter }}
- {{ item.publishTime }} - - {{ - `${ - item.submitTime !== '1970-01-01' - ? item.submitTime - : '待提交' - }` - }} + {{ item.publishTime | timeFilter }} - + {{ item.submitTime | timeFilter }}
- {{ item.startTime }} - - {{ item.expectedEndTime }} + {{ item.startTime | timeFilter }} - + {{ item.expectedEndTime | timeFilter }}
- {{ item.publishTime }} - - {{ - `${ - item.submitTime !== '1970-01-01' - ? item.submitTime - : '待提交' - }` - }} + {{ item.publishTime | timeFilter }} - + {{ item.submitTime | timeFilter }}
- {{ item.startTime }} - - {{ item.expectedEndTime }} + {{ item.startTime | timeFilter }} - + {{ item.expectedEndTime | timeFilter }}
- {{ item.publishTime }} - - {{ - `${ - item.submitTime !== '1970-01-01' - ? item.submitTime - : '待提交' - }` - }} + {{ item.publishTime | timeFilter }} + - + {{ item.submitTime | timeFilter }}
{ - let date = new Date(time) - let Y = date.getFullYear() - let M = String(date.getMonth() + 1).padStart(2, '0') - let D = String(date.getDate()).padStart(2, '0') - let newDate = [Y, M, D].join('-') - return newDate + // let date = new Date(time) + // let Y = date.getFullYear() + // let M = String(date.getMonth() + 1).padStart(2, '0') + // let D = String(date.getDate()).padStart(2, '0') + // let newDate = [Y, M, D].join('-') + // return newDate + return moment(item.startTime * 1000).format('YYYY-MM-DD HH:mm:ss') } const changeStyle = (arr) => { let newArr = arr.map((item) => { item.headpic = getFileAccessHttpUrl(item.headpic) item.taskPic = getFileAccessHttpUrl(item.taskPic) item.taskFile = getFileAccessHttpUrl(item.taskFile) - item.expectedEndTime = changeTime(item.expectedEndTime) - item.startTime = changeTime(item.startTime) - item.submitTime = changeTime(item.submitTime) - item.publishTime = changeTime(item.publishTime) + // item.expectedEndTime = moment(item.expectedEndTime).format('YYYY-MM-DD') + // item.expectedEndTime = changeTime(item.expectedEndTime) + // item.startTime = moment(item.startTime).format('YYYY-MM-DD') + // item.submitTime =moment(item.startTime).format('YYYY-MM-DD') + // item.publishTime = changeTime(item.publishTime) }) return newArr } @@ -1190,6 +1171,11 @@ export default { this.completedScroll() this.auditedScroll() this.updateWorkStatus() + }, + filters: { + timeFilter: function (value) { + return moment(value).format('YYYY-MM-DD') + } } }