1.0.11 合并冲突后优化

package.json

@@ -1,7 +1,7 @@
 {
   "name": "client-trace-v3",
   "description": "client-trace-v3",
-  "version": "1.0.10",
+  "version": "1.0.11",
   "author": "yangzhijie <yangzhijie1488@163.com>",
   "scripts": {
     "dev": "webpack serve --config ./webpack.dev.js",
@@ -15,7 +15,6 @@
   "peerDependencies": {
     "ant-design-vue": "^3.2.15",
     "gantt": "^3.1.1",
-    "dayjs": "^1.11.10",
     "moment": "^2.29.4",
     "pc-component-v3": "^1.0.64",
     "v-tooltip": "^4.0.0-beta.17",

public/index.html

@@ -27,6 +27,7 @@
   <script src="/static/bootstrap-treeview/bootstrap-treeview.js"></script>
   <script src="/static/summernote/dist/summernote.min.js"></script>
   <script src="/static/summernote/dist/lang/summernote-zh-CN.min.js"></script>
+	<script src="/static/dayjs/dayjs.min.js"></script>
 
   <script src="/static/dhtmlxgantt/dhtmlxgantt.js"></script>
   <script src="/static/dhtmlxgantt/locale/locale_cn.js"></script>

src/trace/TraceComment.vue

@@ -7,7 +7,7 @@
 <template>
   <div>
     <div v-for="items in traceComments" :key="items" class="media">
-      <h4 class="media-heading">
+      <h4 class="media-heading headDiv">
         {{ items.createdName
         }}<a class="fa-pull-right" @click="edit(items)">编辑</a>
       </h4>
@@ -155,5 +155,10 @@ export default {
 };
 </script>
 
-<style>
+<style scoped>
+.headDiv{
+  display: flex;
+  justify-content: space-between;
+  font-size: 14px;
+}
 </style>

src/trace/TraceTimeLineEdit.vue

@@ -77,6 +77,11 @@ import Common from '../common/Common.js';
 import zhCN from 'ant-design-vue/es/locale/zh_CN';
 import dayjs from 'dayjs';
 import 'dayjs/locale/zh-cn';
+import weekday from 'dayjs/plugin/weekday';
+import localeData from 'dayjs/plugin/localeData';
+ 
+dayjs.extend(weekday);
+dayjs.extend(localeData);
 dayjs.locale('zh-cn');
 export default {
   components: {},

src/trace/TraceUpdate.vue

@@ -114,7 +114,13 @@ import { message } from 'ant-design-vue';
 import zhCN from 'ant-design-vue/es/locale/zh_CN';
 import dayjs from 'dayjs';
 import 'dayjs/locale/zh-cn';
+import weekday from 'dayjs/plugin/weekday';
+import localeData from 'dayjs/plugin/localeData';
+ 
+dayjs.extend(weekday);
+dayjs.extend(localeData);
 dayjs.locale('zh-cn');
+
 export default {
   components: {
     UpladFile,
@@ -365,6 +371,7 @@ export default {
         TraceResource.uniqueByTraceId(_self.traceId).then(
           successData => {
             _self.traceDto = successData;
+            _self.planFinishedDate = dayjs(successData.planFinishedDate,'YYYY-MM-DD HH:mm:ss');
             if (
               successData != undefined &&
               successData.audioSrcs != undefined