1.0.14 优化

package.json

@@ -1,7 +1,7 @@
 {
   "name": "client-trace-v3",
   "description": "client-trace-v3",
-  "version": "1.0.11",
+  "version": "1.0.14",
   "author": "yangzhijie <yangzhijie1488@163.com>",
   "scripts": {
     "dev": "webpack serve --config ./webpack.dev.js",

src/App.vue

@@ -1,6 +1,6 @@
 <template>
   <div id="app">
-    <a-config-provider :locale="zhCN">
+    <a-config-provider :locale="locale">
       <router-view />
     </a-config-provider>
   </div>
@@ -15,6 +15,11 @@ import 'dayjs/locale/zh-cn';
 dayjs.locale('zh-cn');
 export default {
   name: 'App',
+  data:function(){
+    return {
+      locale:zhCN,
+    };
+  },
 };
 </script>
 

src/trace/TraceTimeLineCreate.vue

@@ -125,9 +125,9 @@ export default {
       if (
         content != null &&
         content != '' &&
-        dates != null &&
-        dates != undefined &&
-        dates != ''
+        _self.planFinishedDate != null &&
+        _self.planFinishedDate != undefined &&
+        _self.planFinishedDate != ''
       ) {
         _self.loading = true;
         $.ajax({

src/trace/TraceTimeLineEdit.vue

@@ -142,7 +142,9 @@ export default {
         },
         success: function (data) {
           _self.traceTimeLine = data;
-          _self.planFinishedDate = dayjs(data.endDate,'YYYY-MM-DD HH:mm:ss');
+          if(data.endDate !== '' && data.endDate){
+            _self.planFinishedDate = dayjs(data.endDate,'YYYY-MM-DD HH:mm:ss');
+          }
           _self.loadSelectUserName();
           _self.loading = false;
         },
@@ -162,7 +164,6 @@ export default {
       var content = _self.traceTimeLine.content;
       _self.traceTimeLine.endDate = _self.dateConvert(_self.planFinishedDate);
       var dates = _self.traceTimeLine.endDate;
-
       if (
         content != null &&
         content != '' &&

src/trace/TraceUpdate.vue

@@ -45,7 +45,7 @@
         />
         <div class="form-group">
           <label for="projectName">时间节点</label>
-          <Treeselect
+          <ATreeselect
             ref="treeSelect"
             :multiple="false"
             :options="projectTaskDtos"
@@ -109,6 +109,7 @@ import TraceCommon from './TraceCommon.js';
 import { Notify } from 'pc-component-v3';
 
 import Treeselect from '../widget/TreeSelect.vue';
+import ATreeselect from '../widget/ATreeSelect.vue';
 import AudioField from '../widget/AudioField.vue';
 import { message } from 'ant-design-vue';
 import zhCN from 'ant-design-vue/es/locale/zh_CN';
@@ -126,6 +127,7 @@ export default {
     UpladFile,
 
     Treeselect,
+    ATreeselect,
     AudioField,
   },
   data: function () {
@@ -371,7 +373,9 @@ export default {
         TraceResource.uniqueByTraceId(_self.traceId).then(
           successData => {
             _self.traceDto = successData;
-            _self.planFinishedDate = dayjs(successData.planFinishedDate,'YYYY-MM-DD HH:mm:ss');
+            if(successData.planFinishedDate){
+              _self.planFinishedDate = dayjs(successData.planFinishedDate,'YYYY-MM-DD HH:mm:ss');
+            }
             if (
               successData != undefined &&
               successData.audioSrcs != undefined
@@ -453,7 +457,7 @@ export default {
           Common.addTokenToRequest(request);
         },
         success: function (data) {
-          _self.projectTaskDtos = data;
+          _self.projectTaskDtos = _self.convertToTreedata(data);
           console.log(_self.projectTaskDtos);
         },
         error: function (XMLHttpRequest, textStatus, errorThrown) {
@@ -461,6 +465,23 @@ export default {
         },
       });
     },
+    convertToTreedata: function (data) {
+      // console.log(data);
+      var returnData = [];
+      for (var i = 0; i < data.length; i++) {
+        var tempObj = {
+          title: data[i].label,
+          value: data[i].id,
+          key: data[i].id,
+        };
+        if ('children' in data[i] && data[i].children !== null) {
+          tempObj.children = this.convertToTreedata(data[i].children);
+        }
+        //push到数据数组中
+        returnData.push(tempObj);
+      }
+      return returnData;
+    },
     // 日期处理函数
     plusZero: function (n) {
       return n >= 10 ? n : '0' + n;