package.json

@@ -31,7 +31,6 @@
     "file-saver": "^2.0.2",
     "gantt-elastic": "^1.0.11",
     "gantt-elastic-header": "^0.1.11",
-    "gantt-schedule-timeline-calendar": "^2.6.7",
     "html2canvas": "^1.0.0-rc.3",
     "jodit": "^3.2.58",
     "js-cookie": "2.2.0",
@@ -45,7 +44,6 @@
     "v-jsoneditor": "^1.2.2",
     "vue": "2.6.10",
     "vue-fullcalendar": "^1.0.9",
-    "vue-gantt-schedule-timeline-calendar": "^1.0.32",
     "vue-json-viewer": "^2.2.8",
     "vue-qr": "^2.2.1",
     "vue-router": "3.0.6",

src/views/workbench/person/index.vue

@@ -2,18 +2,20 @@
   <el-container direction="vertical" class="workbench_penson">
     <el-main class="layout_main header" style="padding: 20px 30px">
       <div class="realname">{{ realname }}</div>
-      <div
-        v-for="(item,index) in teamInfo"
-        v-show="index < 2 || teamInfoShow"
-        :key="index"
-        class="teamInfo"
-      >{{ item.teamName + '的' + getUserRoleInTeam(username,item) }}</div>
-      <div
-        v-if="teamInfo.length>2 && !teamInfoShow"
-        style="margin-top: 20px"
-        class="more"
-        @click.native="teamInfoShow = true"
-      >更多</div>
+      <div v-if="teamInfo">
+        <div
+          v-for="(item,index) in teamInfo"
+          v-show="index < 2 || teamInfoShow"
+          :key="index"
+          class="teamInfo"
+        >{{ item.teamName + '的' + getUserRoleInTeam(username,item) }}</div>
+        <div
+          v-if="teamInfo.length>2 && !teamInfoShow"
+          style="margin-top: 20px"
+          class="more"
+          @click.native="teamInfoShow = true"
+        >更多</div>
+      </div>
     </el-main>
     <el-container style="margin-top: 10px" class="middle">
       <el-aside width="32.8%" style="margin-right: 10px" class="layout_aside">
@@ -252,7 +254,7 @@ export default {
       teamInfoShow: false,
       teamAndMemberEnum: {},
       teamAndMemberMap: {},
-      teamInfo: [],
+      teamInfo: null,
       userInfo: {},
       username: localStorage.getItem('username'),
       realname: localStorage.getItem('realname'),
@@ -270,7 +272,10 @@ export default {
   methods: {
     init() {
       this.showTeamAndMemberEnum()
-      this.queryTeamInfoList(this.username)
+        .then(res => {
+          this.queryTeamInfoList(this.username)
+        })
+
       this.queryWorkList()
     },
     dateClick(arg) {
@@ -375,7 +380,7 @@ export default {
     handleTabsClick() {},
     // 获取角色信息枚举类
     showTeamAndMemberEnum() {
-      workbenchApi.showTeamAndMemberEnum().then(res => {
+      return workbenchApi.showTeamAndMemberEnum().then(res => {
         this.teamAndMemberEnum = res.data
         if (this.teamAndMemberEnum) {
           for (const i in this.teamAndMemberEnum) {
@@ -389,6 +394,7 @@ export default {
             }
           }
         }
+        return res
       })
     },
     // 获取用户团队列表