dyl

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",

ant-design-vue-jeecg/src/views/newLayout/myTask/list/assignment.vue

@@ -176,19 +176,14 @@
                 <div class="date">
                   <div class="cycle">
                     <label>任务周期：</label>
-                    <span> {{ item.startTime }}</span> -
-                    <span>{{ item.expectedEndTime }}</span>
+                    <span> {{ item.startTime | timeFilter }}</span> -
+                    <span>{{ item.expectedEndTime | timeFilter }}</span>
                   </div>
                   <div class="publish">
                     <label>发布提交：</label>
-                    <span>{{ item.publishTime }}</span> -
-                    <span>{{
-                      `${
-                        item.submitTime !== '1970-01-01'
-                          ? item.submitTime
-                          : '待提交'
-                      }`
-                    }}</span>
+                    <span>{{ item.publishTime | timeFilter }}</span>
+                    -
+                    <span>{{ item.submitTime | timeFilter }}</span>
                   </div>
                   <div class="expected_duration">
                     <label>预计时长：</label
@@ -324,19 +319,13 @@
                 <div class="date">
                   <div class="cycle">
                     <label>任务周期：</label>
-                    <span> {{ item.startTime }}</span> -
-                    <span>{{ item.expectedEndTime }}</span>
+                    <span> {{ item.startTime | timeFilter }}</span> -
+                    <span>{{ item.expectedEndTime | timeFilter }}</span>
                   </div>
                   <div class="publish">
                     <label>发布提交：</label>
-                    <span>{{ item.publishTime }}</span> -
-                    <span>{{
-                      `${
-                        item.submitTime !== '1970-01-01'
-                          ? item.submitTime
-                          : '待提交'
-                      }`
-                    }}</span>
+                    <span>{{ item.publishTime | timeFilter }}</span> -
+                    <span>{{ item.submitTime | timeFilter }}</span>
                   </div>
                   <div class="expected_duration">
                     <label>预计时长：</label
@@ -456,19 +445,13 @@
                 <div class="date">
                   <div class="cycle">
                     <label>任务周期：</label>
-                    <span> {{ item.startTime }}</span> -
-                    <span>{{ item.expectedEndTime }}</span>
+                    <span> {{ item.startTime | timeFilter }}</span> -
+                    <span>{{ item.expectedEndTime | timeFilter }}</span>
                   </div>
                   <div class="publish">
                     <label>发布提交：</label>
-                    <span>{{ item.publishTime }}</span> -
-                    <span>{{
-                      `${
-                        item.submitTime !== '1970-01-01'
-                          ? item.submitTime
-                          : '待提交'
-                      }`
-                    }}</span>
+                    <span>{{ item.publishTime | timeFilter }}</span> -
+                    <span>{{ item.submitTime | timeFilter }}</span>
                   </div>
                   <div class="expected_duration">
                     <label>预计时长：</label
@@ -584,19 +567,14 @@
                 <div class="date">
                   <div class="cycle">
                     <label>任务周期：</label>
-                    <span> {{ item.startTime }}</span> -
-                    <span>{{ item.expectedEndTime }}</span>
+                    <span> {{ item.startTime | timeFilter }}</span> -
+                    <span>{{ item.expectedEndTime | timeFilter }}</span>
                   </div>
                   <div class="publish">
                     <label>发布提交：</label>
-                    <span>{{ item.publishTime }}</span> -
-                    <span>{{
-                      `${
-                        item.submitTime !== '1970-01-01'
-                          ? item.submitTime
-                          : '待提交'
-                      }`
-                    }}</span>
+                    <span>{{ item.publishTime | timeFilter }}</span>
+                    -
+                    <span>{{ item.submitTime | timeFilter }}</span>
                   </div>
                   <div class="expected_duration">
                     <label>预计时长：</label
@@ -684,23 +662,26 @@ import { Container, Draggable } from 'vue-smooth-dnd'
 import TaskModal from '@/views/task/modules/TaskModal'
 import { mixinDevice } from '@/utils/mixin'
 import { JeecgListMixin } from '@/mixins/JeecgListMixin'
+import moment from 'moment'
 const changeTime = (time) => {
-  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')
+    }
   }
 }
 </script>