From 7a5531594ae34d635d32d16a5f960281a24fc3bc Mon Sep 17 00:00:00 2001
From: song <srf428110@163.com>
Date: Fri, 13 Aug 2021 11:29:46 +0800
Subject: [PATCH 01/14] =?UTF-8?q?perf:=20=E6=95=B4=E7=90=86=E4=BB=A3?=
 =?UTF-8?q?=E7=A0=81?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 CHANGELOG.md                                  |  1 +
 src/components/TimeLine/component/TimeBox.vue |  1 -
 .../TimeLine/component/TimeStatus.vue         | 24 ++++---------------
 3 files changed, 6 insertions(+), 20 deletions(-)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 6c7f484..0303d86 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -103,6 +103,7 @@
  - | 提示信息显示bug及日常任务收缩问题 | [f2f06c5](https://dd.tall.wiki/gitea/ccsens_fe/TALL-MUI-3/commits/f2f06c5)
  - | 插件bug解决 | [41257eb](https://dd.tall.wiki/gitea/ccsens_fe/TALL-MUI-3/commits/41257eb)
  - | 收到消息修改任务状态 | [c378063](https://dd.tall.wiki/gitea/ccsens_fe/TALL-MUI-3/commits/c378063)
+ - | 日历无任务时添加小绿点,时间轴刻度无任务不显示时分 | [0f90868](https://dd.tall.wiki/gitea/ccsens_fe/TALL-MUI-3/commits/0f90868)
  - | 日常任务html数据查验 | [880ce5c](https://dd.tall.wiki/gitea/ccsens_fe/TALL-MUI-3/commits/880ce5c)
  - | 日常任务插件遍历时的key值修改 | [cd26285](https://dd.tall.wiki/gitea/ccsens_fe/TALL-MUI-3/commits/cd26285)
  - | 日常任务插件面板高度修改 | [249f9e4](https://dd.tall.wiki/gitea/ccsens_fe/TALL-MUI-3/commits/249f9e4)
diff --git a/src/components/TimeLine/component/TimeBox.vue b/src/components/TimeLine/component/TimeBox.vue
index 4889bdb..fb72904 100644
--- a/src/components/TimeLine/component/TimeBox.vue
+++ b/src/components/TimeLine/component/TimeBox.vue
@@ -25,7 +25,6 @@
               v-if="showSkeleton"
             >
               <view slot="body">
-                <!-- TODO: 逻辑不完善 -->
                 <view>
                   <skeleton :banner="false" :loading="true" :row="4" animate class="mt-2 u-line-2 skeleton"></skeleton>
                 </view>
diff --git a/src/components/TimeLine/component/TimeStatus.vue b/src/components/TimeLine/component/TimeStatus.vue
index 8a566d6..3143810 100644
--- a/src/components/TimeLine/component/TimeStatus.vue
+++ b/src/components/TimeLine/component/TimeStatus.vue
@@ -10,33 +10,19 @@
         :active-color="orderStyle.color"
         bg-color="rgba(255,255,255,0)"
         border-width="4"
-        width="66"
-        v-if="task.process !== 4"
+        :width="task.process !== 4 ? 66 : 50"
       >
         <view class="u-progress-content">
           <view class="u-progress-dot"></view>
           <view class="u-progress-info">
-            <u-icon :name="orderStyle.icon" v-if="orderStyle.icon" size="15px"></u-icon>
+            <span v-if="orderStyle.icon">
+              <u-icon :name="orderStyle.icon" v-if="task.process !== 4" size="15px"></u-icon>
+              <u-icon :name="orderStyle.icon" v-else size="15px"></u-icon>
+            </span>
             <template v-else>{{ computeDurationText() }}</template>
           </view>
         </view>
       </u-circle-progress>
-      <!-- 新增任务 -->
-      <u-circle-progress
-        :percent="+orderStyle.persent"
-        :active-color="orderStyle.color"
-        bg-color="rgba(255,255,255,0)"
-        border-width="4"
-        width="50"
-        v-else
-      >
-        <view class="u-progress-content">
-          <view class="u-progress-dot"></view>
-          <view class="u-progress-info">
-            <u-icon :name="orderStyle.icon" size="15px"></u-icon>
-          </view>
-        </view>
-      </u-circle-progress>
     </view>
   </view>
 </template>

From c5e17c0a7440ad10d577e115eb0ea465f6b51336 Mon Sep 17 00:00:00 2001
From: song <srf428110@163.com>
Date: Fri, 13 Aug 2021 16:57:05 +0800
Subject: [PATCH 02/14] =?UTF-8?q?fix:=20=E8=B7=B3=E8=BD=AC=E8=AF=A6?=
 =?UTF-8?q?=E6=83=85=E9=A1=B5=E8=BF=94=E5=9B=9E=E8=B7=AF=E5=BE=84=E4=BF=AE?=
 =?UTF-8?q?=E6=94=B9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 CHANGELOG.md                                  |  1 +
 src/components/Roles/Roles.vue                |  5 ++--
 src/components/TimeLine/component/TimeBox.vue |  8 ++---
 .../TimeLine/component/TimeStatus.vue         |  2 +-
 src/pages/project/project.vue                 | 29 ++++++++++++++-----
 src/store/task/mutations.js                   |  1 +
 6 files changed, 31 insertions(+), 15 deletions(-)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 0303d86..379092f 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -154,6 +154,7 @@
 --|--|--
  - | 修改定期任务骨架屏高度 | [909a734](https://dd.tall.wiki/gitea/ccsens_fe/TALL-MUI-3/commits/909a734)
  - | 插件查询及展示 | [4dba770](https://dd.tall.wiki/gitea/ccsens_fe/TALL-MUI-3/commits/4dba770)
+ - | 整理代码 | [7a55315](https://dd.tall.wiki/gitea/ccsens_fe/TALL-MUI-3/commits/7a55315)
  - | 日历的更改 | [7353ac8](https://dd.tall.wiki/gitea/ccsens_fe/TALL-MUI-3/commits/7353ac8)
  - | 测试接口 | [215e074](https://dd.tall.wiki/gitea/ccsens_fe/TALL-MUI-3/commits/215e074)
  - | 组件文件夹新建 | [22bfe7b](https://dd.tall.wiki/gitea/ccsens_fe/TALL-MUI-3/commits/22bfe7b)
diff --git a/src/components/Roles/Roles.vue b/src/components/Roles/Roles.vue
index ab6eaa5..1de30b1 100644
--- a/src/components/Roles/Roles.vue
+++ b/src/components/Roles/Roles.vue
@@ -56,9 +56,9 @@ export default {
   },
 
   methods: {
-    ...mapActions('task', ['handleRegularTask']),
+    ...mapActions('task', ['handleRegularTask', 'getPermanent']),
     ...mapMutations('role', ['setRoleId']),
-    ...mapMutations('task', ['setPermanents', 'setDailyTasks', 'clearEndFlag']),
+    ...mapMutations('task', ['setPermanents', 'setDailyTasks', 'clearEndFlag', 'setTimeNode']),
 
     // 设置滚动位置
     setCurrentRole(index) {
@@ -85,6 +85,7 @@ export default {
     // 时间基准点不用管 project监听了roleId 里处理了
     changeRole(id, index) {
       try {
+        console.log('切换角色');
         // 清除多余的script
         this.clearPluginScript();
         this.$nextTick(() => {
diff --git a/src/components/TimeLine/component/TimeBox.vue b/src/components/TimeLine/component/TimeBox.vue
index fb72904..c7a3a92 100644
--- a/src/components/TimeLine/component/TimeBox.vue
+++ b/src/components/TimeLine/component/TimeBox.vue
@@ -19,7 +19,6 @@
               :show-foot="false"
               :show-head="false"
               :style="{ height: setHeight(task.panel) }"
-              @click="onClickTask(+task.planStart)"
               class="h-16"
               margin="0"
               v-if="showSkeleton"
@@ -35,12 +34,11 @@
               :show-foot="false"
               :show-head="false"
               :style="{ height: setHeight(task.panel) }"
-              @click="onClickTask(+task.planStart)"
               class="h-16"
               margin="0"
               v-if="tasks && tasks.length && task.process !== 4 && !showSkeleton"
+              @click="onClickTask(+task.planStart)"
             >
-              <!-- v-if="task.plugins && task.plugins.length" -->
               <!-- 任务面板插件 -->
               <view slot="body">
                 <view class="p-0 u-col-between">
@@ -92,7 +90,7 @@ export default {
 
   methods: {
     ...mapActions('task', ['getGlobal']),
-    ...mapMutations('task', ['setTipsContent', 'setTipsContent', 'setTimeNode']),
+    ...mapMutations('task', ['setTipsContent', 'setTipsContent']),
 
     // 设置任务面板高度
     setHeight(panel) {
@@ -110,6 +108,8 @@ export default {
     onClickTask(planStart) {
       const param = { roleId: this.roleId, timeNode: planStart, timeUnit: this.timeUnit };
       this.getGlobal(param);
+      this.$t.storage.setStorageSync('timeNode', planStart);
+      this.$t.storage.setStorageSync('roleId', this.roleId);
     },
 
     // 设置网格布局
diff --git a/src/components/TimeLine/component/TimeStatus.vue b/src/components/TimeLine/component/TimeStatus.vue
index 3143810..30fbedb 100644
--- a/src/components/TimeLine/component/TimeStatus.vue
+++ b/src/components/TimeLine/component/TimeStatus.vue
@@ -163,7 +163,7 @@ export default {
       const { realStart, planDuration } = this.task;
       const leftTime = +realStart + +planDuration - Date.now(); // 剩余时间
       const { num, time } = this.$t.time.computeDurationText(leftTime);
-      console.log('time', time); // DEBUG:
+      // console.log('time', time); // DEBUG:
       this.$nextTick(() => {
         if (!time) return;
         this.timer = setTimeout(() => {
diff --git a/src/pages/project/project.vue b/src/pages/project/project.vue
index 99098f1..b40233a 100644
--- a/src/pages/project/project.vue
+++ b/src/pages/project/project.vue
@@ -44,8 +44,8 @@ export default {
     timeNode(val) {
       if (val && this.roleId) {
         // 根据时间和角色查找日常任务
-        this.getGlobalData();
-        this.getInitTasks();
+        // this.getGlobalData();
+        // this.getInitTasks();
       }
     },
 
@@ -57,7 +57,11 @@ export default {
      */
     roleId(val) {
       if (val) {
-        this.setTimeNode(Date.now());
+        // 如果storage里有timeNode,修改store里的timeNode
+        this.setTimeNode(+this.$t.storage.getStorageSync('timeNode') || Date.now());
+        // 清空storage
+        this.$t.storage.setStorageSync('timeNode', '');
+        console.log('当角色发生变化时: ', this.timeNode);
         // 根据角色查找永久的日常任务
         this.getPermanent(val);
       }
@@ -106,13 +110,19 @@ export default {
           // 没有项目id参数
           this.$t.ui.showToast('缺少项目信息参数');
         } else {
+          // 如果storage里有timeNode,修改store里的timeNode
+          this.setTimeNode(this.$t.storage.getStorageSync('timeNode') - 0);
+          // 清空storage
+          this.$t.storage.setStorageSync('timeNode', '');
+          console.log('timeNode: ', this.$t.storage.getStorageSync('timeNode'), this.timeNode);
           // 根据项目id获取项目信息
           await this.getProjectById({ projectId: options.p });
           // 根据项目id获取角色列表
           await this.getRoles({ projectId: options.p });
           this.setInitialRoleId(this.visibleRoles);
-          // 获取初始定期任务
-          // await this.getInitTasks();
+          // 根据时间和角色查找日常任务
+          await this.getGlobalData();
+          await this.getInitTasks();
         }
       } catch (error) {
         console.error('project init function:', error);
@@ -126,7 +136,7 @@ export default {
       await this.getTasks({ queryType: 1 });
 
       // 预加载 上下的定期任务
-      if (this.tasks && this.tasks.length && this.tasks.plugins && this.tasks.plugins.length) {
+      if (this.tasks && this.tasks.length && this.tasks.id) {
         this.$nextTick(() => {
           const { tasks, timeGranularity } = this;
           this.getTasks({ timeNode: +tasks[0].planStart, queryType: 0, queryNum: 6 });
@@ -146,8 +156,11 @@ export default {
     setInitialRoleId(visibleList) {
       const index = visibleList.findIndex(item => item.mine === '1');
       const currentRole = index > 0 ? visibleList[index] : visibleList[0];
-      const currentRoleId = currentRole ? currentRole.id : '';
+      const storageRoleId = this.$t.storage.getStorageSync('roleId');
+      const currentRoleId = storageRoleId ? storageRoleId : currentRole ? currentRole.id : '';
       this.setRoleId(currentRoleId);
+      // 清空storage
+      this.$t.storage.setStorageSync('roleId', '');
     },
 
     /**
@@ -170,7 +183,7 @@ export default {
           queryNum: query.queryNum || 3,
           queryType: query.queryType,
         };
-
+        console.log('params: ', params);
         await this.getRegulars(params);
         this.setShowSkeleton(false);
       } catch (error) {
diff --git a/src/store/task/mutations.js b/src/store/task/mutations.js
index 18c10a9..d5cad9b 100644
--- a/src/store/task/mutations.js
+++ b/src/store/task/mutations.js
@@ -52,6 +52,7 @@ const mutations = {
    */
   setTimeNode(state, data) {
     state.timeNode = data;
+    console.log('state.timeNode : ', state.timeNode);
   },
 
   /**

From d75134c256ec84d4df7de20dfbcedf253d3e7cb5 Mon Sep 17 00:00:00 2001
From: wally <18603454788@163.com>
Date: Fri, 13 Aug 2021 16:59:07 +0800
Subject: [PATCH 03/14] =?UTF-8?q?style:=20=E4=BB=A3=E7=A0=81=E5=AE=A1?=
 =?UTF-8?q?=E6=9F=A5?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 CHANGELOG.md                         | 93 ++--------------------------
 src/components/TimeLine/TimeLine.vue |  4 +-
 src/components/Title/Title.vue       | 19 +++---
 src/pages/project/project.vue        |  9 ++-
 src/store/socket/actions.js          |  5 +-
 5 files changed, 23 insertions(+), 107 deletions(-)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 8b299f7..190d1c0 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -48,51 +48,6 @@
  - | 项目api url设置 | 6cd5245
  - | 项目列表, 项目url | 32e005b
  - | 首页项目样式改变 | 8514c85
- calendar, tall.js | 上下滑动切换日历的模式,tall.js中domain根据环境变量切换 | [364e25d](https://dd.tall.wiki/gitea/ccsens_fe/TALL-MUI-3/commits/364e25d)
- - | db store | [6414c4f](https://dd.tall.wiki/gitea/ccsens_fe/TALL-MUI-3/commits/6414c4f)
- default plugin | 添加默认插件;项目列表;全局项目最大高度设置 | [ed1d87b](https://dd.tall.wiki/gitea/ccsens_fe/TALL-MUI-3/commits/ed1d87b)
- - | indexedDB | [687394e](https://dd.tall.wiki/gitea/ccsens_fe/TALL-MUI-3/commits/687394e)
- pinch | alloy finger实现图片的pinch放大缩小 | [de01343](https://dd.tall.wiki/gitea/ccsens_fe/TALL-MUI-3/commits/de01343)
- plugin | 插件添加了token及param参数 | [aeb0292](https://dd.tall.wiki/gitea/ccsens_fe/TALL-MUI-3/commits/aeb0292)
- - | post 封装 | [da52e94](https://dd.tall.wiki/gitea/ccsens_fe/TALL-MUI-3/commits/da52e94)
- - | tall插件封装 | [1bcb920](https://dd.tall.wiki/gitea/ccsens_fe/TALL-MUI-3/commits/1bcb920)
- task status | 任务状态切换未完 | [7ffd135](https://dd.tall.wiki/gitea/ccsens_fe/TALL-MUI-3/commits/7ffd135)
- - | ws storage | [21b3a06](https://dd.tall.wiki/gitea/ccsens_fe/TALL-MUI-3/commits/21b3a06)
- - | 上传逻辑变化 | [3ff1dc2](https://dd.tall.wiki/gitea/ccsens_fe/TALL-MUI-3/commits/3ff1dc2)
- - | 任务状态时间显示 | [56f5183](https://dd.tall.wiki/gitea/ccsens_fe/TALL-MUI-3/commits/56f5183)
- - | 任务进行中状态数字 | [27b7326](https://dd.tall.wiki/gitea/ccsens_fe/TALL-MUI-3/commits/27b7326)
- - | 全局插件及默认插件位置修改 | [6c80d08](https://dd.tall.wiki/gitea/ccsens_fe/TALL-MUI-3/commits/6c80d08)
- - | 向右箭头图标变化 | [8e9ca55](https://dd.tall.wiki/gitea/ccsens_fe/TALL-MUI-3/commits/8e9ca55)
- - | 字体大小更改 | [82cfdd4](https://dd.tall.wiki/gitea/ccsens_fe/TALL-MUI-3/commits/82cfdd4)
- - | 存token | [b8a178d](https://dd.tall.wiki/gitea/ccsens_fe/TALL-MUI-3/commits/b8a178d)
- - | 定期任务面板骨架屏添加 | [b2698c0](https://dd.tall.wiki/gitea/ccsens_fe/TALL-MUI-3/commits/b2698c0)
- 富文本插件 | 富文本插件demo测试 | [ed3d644](https://dd.tall.wiki/gitea/ccsens_fe/TALL-MUI-3/commits/ed3d644)
- - | 导入wbs | [1224fcb](https://dd.tall.wiki/gitea/ccsens_fe/TALL-MUI-3/commits/1224fcb)
- - | 导入项目,更新项目 | [5e06adf](https://dd.tall.wiki/gitea/ccsens_fe/TALL-MUI-3/commits/5e06adf)
- - | 导入项目后提示并打开项目详情页 | [410f527](https://dd.tall.wiki/gitea/ccsens_fe/TALL-MUI-3/commits/410f527)
- - | 引入dayjs | [29b8b93](https://dd.tall.wiki/gitea/ccsens_fe/TALL-MUI-3/commits/29b8b93)
- - | 提交到本地 | [9cbe411](https://dd.tall.wiki/gitea/ccsens_fe/TALL-MUI-3/commits/9cbe411)
- - | 插件参数处理调整 | [a3e68d3](https://dd.tall.wiki/gitea/ccsens_fe/TALL-MUI-3/commits/a3e68d3)
- - | 插件数据获取 | [5b91bdc](https://dd.tall.wiki/gitea/ccsens_fe/TALL-MUI-3/commits/5b91bdc)
- - | 日历定位;合并 | [ea3f937](https://dd.tall.wiki/gitea/ccsens_fe/TALL-MUI-3/commits/ea3f937)
- - | 日常任务插件调整 | [c1881f9](https://dd.tall.wiki/gitea/ccsens_fe/TALL-MUI-3/commits/c1881f9)
- - | 时间基准线，默认插件 | [a33ba1e](https://dd.tall.wiki/gitea/ccsens_fe/TALL-MUI-3/commits/a33ba1e)
- - | 时间轴修改状态时提示框增加 | [e841392](https://dd.tall.wiki/gitea/ccsens_fe/TALL-MUI-3/commits/e841392)
- - | 时间轴界面 | [33927e9](https://dd.tall.wiki/gitea/ccsens_fe/TALL-MUI-3/commits/33927e9)
- - | 标题栏变化 | [3898cfe](https://dd.tall.wiki/gitea/ccsens_fe/TALL-MUI-3/commits/3898cfe)
- - | 标题栏变化 | [c0fcd9d](https://dd.tall.wiki/gitea/ccsens_fe/TALL-MUI-3/commits/c0fcd9d)
- - | 标题栏角色栏全局任务组件新建 | [0500cb4](https://dd.tall.wiki/gitea/ccsens_fe/TALL-MUI-3/commits/0500cb4)
- - | 模拟接口测试 | [69e7931](https://dd.tall.wiki/gitea/ccsens_fe/TALL-MUI-3/commits/69e7931)
- - | 添加时间轴上下滚动 | [2b81bbc](https://dd.tall.wiki/gitea/ccsens_fe/TALL-MUI-3/commits/2b81bbc)
- - | 点击日历日期查询项目列表 | [c458385](https://dd.tall.wiki/gitea/ccsens_fe/TALL-MUI-3/commits/c458385)
- - | 角色栏实现 | [94cd671](https://dd.tall.wiki/gitea/ccsens_fe/TALL-MUI-3/commits/94cd671)
- - | 设置小红点 | [9316bcb](https://dd.tall.wiki/gitea/ccsens_fe/TALL-MUI-3/commits/9316bcb)
- - | 距调整pc端 | [5069aa1](https://dd.tall.wiki/gitea/ccsens_fe/TALL-MUI-3/commits/5069aa1)
- - | 配置默认插件接口 | [f0c177d](https://dd.tall.wiki/gitea/ccsens_fe/TALL-MUI-3/commits/f0c177d)
- - | 面变化首页变化 | [5e860f1](https://dd.tall.wiki/gitea/ccsens_fe/TALL-MUI-3/commits/5e860f1)
- - | 项目api url设置 | [6cd5245](https://dd.tall.wiki/gitea/ccsens_fe/TALL-MUI-3/commits/6cd5245)
- - | 项目列表, 项目url | [32e005b](https://dd.tall.wiki/gitea/ccsens_fe/TALL-MUI-3/commits/32e005b)
- - | 首页项目样式改变 | [8514c85](https://dd.tall.wiki/gitea/ccsens_fe/TALL-MUI-3/commits/8514c85)
 
 
 ### 🎨 代码样式
@@ -149,6 +104,7 @@
  - | 提示信息显示bug及日常任务收缩问题 | f2f06c5
  - | 插件bug解决 | 41257eb
  - | 收到消息修改任务状态 | c378063
+ - | 日历无任务时添加小绿点,时间轴刻度无任务不显示时分 | 0f90868
  - | 日常任务html数据查验 | 880ce5c
  - | 日常任务插件遍历时的key值修改 | cd26285
  - | 日常任务插件面板高度修改 | 249f9e4
@@ -161,45 +117,6 @@
  - | 角色栏修改 | 19228d6
  - | 解决时间轴报错 | da1eece
  - | 骨架屏替换 | e9fdd71
- ID1000343 | 解决向下预加载查询参数时间没+1颗粒度;以及滚动加载颗粒度写死的问题 | [940603a](https://dd.tall.wiki/gitea/ccsens_fe/TALL-MUI-3/commits/940603a), closes [#ID1000343](https://dd.tall.wiki/gitea/ccsens_fe/TALL-MUI-3/issues/ID1000343)
- plugin | 插件解析机制完善 | [0f5a27d](https://dd.tall.wiki/gitea/ccsens_fe/TALL-MUI-3/commits/0f5a27d)
- project title | 项目标题修改; 切换角色移除script | [5c20017](https://dd.tall.wiki/gitea/ccsens_fe/TALL-MUI-3/commits/5c20017)
- roles | 修复默认显示不是我的角色的问题 | [b69f94f](https://dd.tall.wiki/gitea/ccsens_fe/TALL-MUI-3/commits/b69f94f)
- role | 切换角色的逻辑修正完善 | [4ae534f](https://dd.tall.wiki/gitea/ccsens_fe/TALL-MUI-3/commits/4ae534f)
- task任务逻辑完善 | 减少初始global及regular的不必要请求 | [bd4bd38](https://dd.tall.wiki/gitea/ccsens_fe/TALL-MUI-3/commits/bd4bd38)
- - | 上下滑动加载定期任务 | [4090d89](https://dd.tall.wiki/gitea/ccsens_fe/TALL-MUI-3/commits/4090d89)
- - | 上下滚动时间轴 | [d533a01](https://dd.tall.wiki/gitea/ccsens_fe/TALL-MUI-3/commits/d533a01)
- - | 下拉加载定期任务传参，时间格式化修改 | [0b95a0e](https://dd.tall.wiki/gitea/ccsens_fe/TALL-MUI-3/commits/0b95a0e)
- - | 任务开始时间延迟插件 | [992a313](https://dd.tall.wiki/gitea/ccsens_fe/TALL-MUI-3/commits/992a313)
- - | 修改main | [749ae9a](https://dd.tall.wiki/gitea/ccsens_fe/TALL-MUI-3/commits/749ae9a)
- - | 修改小红点传参 | [87b20fd](https://dd.tall.wiki/gitea/ccsens_fe/TALL-MUI-3/commits/87b20fd)
- - | 修改报错 | [531c14d](https://dd.tall.wiki/gitea/ccsens_fe/TALL-MUI-3/commits/531c14d)
- - | 修改接口路径 | [df6acf2](https://dd.tall.wiki/gitea/ccsens_fe/TALL-MUI-3/commits/df6acf2)
- - | 修改角色栏组件 | [a54c601](https://dd.tall.wiki/gitea/ccsens_fe/TALL-MUI-3/commits/a54c601)
- - | 切换到默认项目角色没有激活状态的bug | [438d448](https://dd.tall.wiki/gitea/ccsens_fe/TALL-MUI-3/commits/438d448)
- - | 切换日历时查询小红点 | [7091789](https://dd.tall.wiki/gitea/ccsens_fe/TALL-MUI-3/commits/7091789)
- - | 定期任务接口 | [aa4981c](https://dd.tall.wiki/gitea/ccsens_fe/TALL-MUI-3/commits/aa4981c)
- - | 定期任务插件 | [92b3254](https://dd.tall.wiki/gitea/ccsens_fe/TALL-MUI-3/commits/92b3254)
- - | 定期任务未加载时,显示空的时间轴并能上下滑动 | [ce38093](https://dd.tall.wiki/gitea/ccsens_fe/TALL-MUI-3/commits/ce38093)
- - | 定期任务骨架屏修改 | [8ff72dd](https://dd.tall.wiki/gitea/ccsens_fe/TALL-MUI-3/commits/8ff72dd)
- - | 平车演示临时去掉项目快捷方式的toast提示 | [e0b2c23](https://dd.tall.wiki/gitea/ccsens_fe/TALL-MUI-3/commits/e0b2c23)
- - | 手动展开日常任务 | [0a4a622](https://dd.tall.wiki/gitea/ccsens_fe/TALL-MUI-3/commits/0a4a622)
- - | 提示信息显示bug及日常任务收缩问题 | [f2f06c5](https://dd.tall.wiki/gitea/ccsens_fe/TALL-MUI-3/commits/f2f06c5)
- - | 插件bug解决 | [41257eb](https://dd.tall.wiki/gitea/ccsens_fe/TALL-MUI-3/commits/41257eb)
- - | 收到消息修改任务状态 | [c378063](https://dd.tall.wiki/gitea/ccsens_fe/TALL-MUI-3/commits/c378063)
- - | 日历无任务时添加小绿点,时间轴刻度无任务不显示时分 | [0f90868](https://dd.tall.wiki/gitea/ccsens_fe/TALL-MUI-3/commits/0f90868)
- - | 日常任务html数据查验 | [880ce5c](https://dd.tall.wiki/gitea/ccsens_fe/TALL-MUI-3/commits/880ce5c)
- - | 日常任务插件遍历时的key值修改 | [cd26285](https://dd.tall.wiki/gitea/ccsens_fe/TALL-MUI-3/commits/cd26285)
- - | 日常任务插件面板高度修改 | [249f9e4](https://dd.tall.wiki/gitea/ccsens_fe/TALL-MUI-3/commits/249f9e4)
- - | 时间轴上下滑动 | [4d0ae46](https://dd.tall.wiki/gitea/ccsens_fe/TALL-MUI-3/commits/4d0ae46)
- - | 时间轴上下滚动数据加载bug修改 | [e82ede4](https://dd.tall.wiki/gitea/ccsens_fe/TALL-MUI-3/commits/e82ede4)
- - | 时间轴插件 | [225d3cc](https://dd.tall.wiki/gitea/ccsens_fe/TALL-MUI-3/commits/225d3cc)
- - | 时间轴无任务时时间刻度加载修改 | [4921672](https://dd.tall.wiki/gitea/ccsens_fe/TALL-MUI-3/commits/4921672)
- - | 时间轴骨架屏修改 | [ca78d02](https://dd.tall.wiki/gitea/ccsens_fe/TALL-MUI-3/commits/ca78d02)
- - | 角色显示状态修改 | [7d3b906](https://dd.tall.wiki/gitea/ccsens_fe/TALL-MUI-3/commits/7d3b906)
- - | 角色栏修改 | [19228d6](https://dd.tall.wiki/gitea/ccsens_fe/TALL-MUI-3/commits/19228d6)
- - | 解决时间轴报错 | [da1eece](https://dd.tall.wiki/gitea/ccsens_fe/TALL-MUI-3/commits/da1eece)
- - | 骨架屏替换 | [e9fdd71](https://dd.tall.wiki/gitea/ccsens_fe/TALL-MUI-3/commits/e9fdd71)
 
 
 ### 📝 文档
@@ -214,8 +131,6 @@
  - | 暂时移除了jest浏览器配置 | 5088d01
  - | 添加测试，测试utils/time.js的computeDurationText | e758010
  - | 禁用任务开始操作 | b5425db
- - | 添加测试，测试utils/time.js的computeDurationText | [e758010](https://dd.tall.wiki/gitea/ccsens_fe/TALL-MUI-3/commits/e758010)
- - | 禁用任务开始操作 | [b5425db](https://dd.tall.wiki/gitea/ccsens_fe/TALL-MUI-3/commits/b5425db)
 
 
 ### 🔨 代码重构
@@ -228,6 +143,7 @@
  template | eslint prettier sass uview tailwindcss | 9c966a1
  tips | 修改任务状态方法重构 | b57d3ac
  tip | 任务状态显示及tip组件数据的重构 | 78a5750
+ title.vue | 移除测试的repeat; 样式细节调整 | c32d2bd
  - | 下滑时间轴添加备注 | 4fd20e3
  - | 任务状态重构 | 4693655
  - | 删除多余的weekmode store里的东西 | 0841fe0
@@ -241,6 +157,7 @@
 --|--|--
  - | 修改定期任务骨架屏高度 | 909a734
  - | 插件查询及展示 | 4dba770
+ - | 整理代码 | 7a55315
  - | 日历的更改 | 7353ac8
  - | 测试接口 | 215e074
  - | 组件文件夹新建 | 22bfe7b
@@ -272,6 +189,4 @@
  - | style:index | 978f272
  - | !2 基础模板v1.1.0 | f5e61dd
  - | init | c0f1deb
- - | style:index | [978f272](https://dd.tall.wiki/gitea/ccsens_fe/TALL-MUI-3/commits/978f272)
- - | !2 基础模板v1.1.0 | [f5e61dd](https://dd.tall.wiki/gitea/ccsens_fe/TALL-MUI-3/commits/f5e61dd)
- - | init | [c0f1deb](https://dd.tall.wiki/gitea/ccsens_fe/TALL-MUI-3/commits/c0f1deb)
+
diff --git a/src/components/TimeLine/TimeLine.vue b/src/components/TimeLine/TimeLine.vue
index 5f582a2..756d18b 100644
--- a/src/components/TimeLine/TimeLine.vue
+++ b/src/components/TimeLine/TimeLine.vue
@@ -58,7 +58,7 @@ export default {
       const startTime = this.tasks[0].planStart - 0;
       if ((this.tasks[0].plugins && this.tasks[0].plugins.length === 0) || this.topEnd) {
         // 没有数据时 自动加载数据
-        console.warn('滚动到顶部没有数据时: ');
+        // console.warn('滚动到顶部没有数据时: ');
         const addTasks = [
           {
             panel: {},
@@ -100,7 +100,7 @@ export default {
       const startTime = tasks[tasks.length - 1].planStart - 0;
       if ((tasks[0].plugins && tasks[0].plugins.length === 0) || this.bottomEnd) {
         // 没有数据时 自动加载数据
-        console.warn('滚动到底部没有数据时: ');
+        // console.warn('滚动到底部没有数据时: ');
         const addTasks = [
           {
             panel: {},
diff --git a/src/components/Title/Title.vue b/src/components/Title/Title.vue
index 1641c1a..0cfa13d 100644
--- a/src/components/Title/Title.vue
+++ b/src/components/Title/Title.vue
@@ -1,7 +1,7 @@
 <template>
   <view>
-    <u-navbar :is-back="showBack" class="overflow-hidden">
-      <view class="flex justify-start flex-1 pr-3 font-bold min-0">
+    <u-navbar :custom-back="onBack" class="overflow-hidden">
+      <view class="flex justify-start flex-1 px-3 font-bold min-0">
         <view class="truncate">{{ project.name }}</view>
       </view>
       <view class="mr-2" slot="right">
@@ -26,15 +26,16 @@ export default {
     ...mapGetters('user', ['userId']),
   },
 
-  created() {
-    this.initBackIcon();
-  },
-
   methods: {
-    // 初始化是否显示返回按钮
-    initBackIcon() {
+    // 点击返回按钮
+    onBack() {
+      // eslint-disable-next-line no-undef
       const pages = getCurrentPages(); // 获取页面栈数组
-      this.showBack = pages.length > 1;
+      if (pages.length > 1) {
+        uni.navigateBack();
+      } else {
+        this.$u.route('/', { u: this.userId });
+      }
     },
 
     // LWBS提示
diff --git a/src/pages/project/project.vue b/src/pages/project/project.vue
index 99098f1..89c7b9c 100644
--- a/src/pages/project/project.vue
+++ b/src/pages/project/project.vue
@@ -111,8 +111,6 @@ export default {
           // 根据项目id获取角色列表
           await this.getRoles({ projectId: options.p });
           this.setInitialRoleId(this.visibleRoles);
-          // 获取初始定期任务
-          // await this.getInitTasks();
         }
       } catch (error) {
         console.error('project init function:', error);
@@ -126,15 +124,16 @@ export default {
       await this.getTasks({ queryType: 1 });
 
       // 预加载 上下的定期任务
-      if (this.tasks && this.tasks.length && this.tasks.plugins && this.tasks.plugins.length) {
+      if (this.tasks && this.tasks.length && this.tasks[0].id) {
         this.$nextTick(() => {
           const { tasks, timeGranularity } = this;
-          this.getTasks({ timeNode: +tasks[0].planStart, queryType: 0, queryNum: 6 });
+          this.getTasks({ timeNode: +tasks[0].planStart, queryType: 0, queryNum: 6 }); // 向上拿数据
           // 向下查的时候要再最后一个任务的开始时间的基础上 多加一个时间颗粒度
           const nextQueryTime = +this.$t.time.add(+tasks[tasks.length - 1].planStart, 1, timeGranularity);
-          this.getTasks({ timeNode: nextQueryTime, queryType: 1, queryNum: 6 });
+          this.getTasks({ timeNode: nextQueryTime, queryType: 1, queryNum: 6 }); // 向下拿数据
         });
       } else {
+        // 没有任务 上下显示时间刻度
         // 向上加载
         this.setUpTasks();
         // 向下加载
diff --git a/src/store/socket/actions.js b/src/store/socket/actions.js
index b4f8309..f7f3e87 100644
--- a/src/store/socket/actions.js
+++ b/src/store/socket/actions.js
@@ -21,8 +21,9 @@ const actions = {
 
   // 监听ws打开
   onSocketOpen({ dispatch, commit, state }) {
+    // eslint-disable-next-line no-unused-vars
     state.socket.onOpen(res => {
-      console.log('ws open: ', res);
+      // console.log('ws open: ', res);
       commit('setConnected', true);
       prevTime = Date.now();
       // this.auth();
@@ -101,7 +102,7 @@ const actions = {
 
   // 监听关闭事件
   onSocketClose({ dispatch, commit, state }) {
-    console.log('onSocketClose');
+    // console.log('onSocketClose');
     state.socket.onClose(() => {
       commit('setConnected', false);
       if (sendHeartTimer) clearInterval(sendHeartTimer);

From 2cfc09a1b8303f275e8a777f70ab1a013ade94a4 Mon Sep 17 00:00:00 2001
From: wally <18603454788@163.com>
Date: Fri, 13 Aug 2021 17:12:54 +0800
Subject: [PATCH 04/14] =?UTF-8?q?style:=20=E7=BB=86=E8=8A=82=E8=B0=83?=
 =?UTF-8?q?=E6=95=B4?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 CHANGELOG.md                  | 13 +++----------
 src/pages/project/project.vue |  4 ++--
 2 files changed, 5 insertions(+), 12 deletions(-)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index c097af1..95dbfc8 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -54,6 +54,7 @@
 范围|描述|commitId
 --|--|--
  - | calendar注释 | a2ec112
+ - | 代码审查 | d75134c
  - | 代码格式细节调整 | cb2532b
  - | 任务快捷方式图标增加 | 4aba872
  - | 修改角色样式 | 73e268e
@@ -116,6 +117,7 @@
  - | 角色显示状态修改 | 7d3b906
  - | 角色栏修改 | 19228d6
  - | 解决时间轴报错 | da1eece
+ - | 跳转详情页返回路径修改 | c5e17c0
  - | 骨架屏替换 | e9fdd71
 
 
@@ -165,16 +167,6 @@
  - | 组件文件夹新建 | 1421504
  - | 角色栏文字颜色修改 | 215c6b3
  - | 解决警告 | c932b09
- - | 修改定期任务骨架屏高度 | [909a734](https://dd.tall.wiki/gitea/ccsens_fe/TALL-MUI-3/commits/909a734)
- - | 插件查询及展示 | [4dba770](https://dd.tall.wiki/gitea/ccsens_fe/TALL-MUI-3/commits/4dba770)
- - | 整理代码 | [7a55315](https://dd.tall.wiki/gitea/ccsens_fe/TALL-MUI-3/commits/7a55315)
- - | 日历的更改 | [7353ac8](https://dd.tall.wiki/gitea/ccsens_fe/TALL-MUI-3/commits/7353ac8)
- - | 测试接口 | [215e074](https://dd.tall.wiki/gitea/ccsens_fe/TALL-MUI-3/commits/215e074)
- - | 组件文件夹新建 | [22bfe7b](https://dd.tall.wiki/gitea/ccsens_fe/TALL-MUI-3/commits/22bfe7b)
- - | 组件文件夹新建 | [17bb8c9](https://dd.tall.wiki/gitea/ccsens_fe/TALL-MUI-3/commits/17bb8c9)
- - | 组件文件夹新建 | [1421504](https://dd.tall.wiki/gitea/ccsens_fe/TALL-MUI-3/commits/1421504)
- - | 角色栏文字颜色修改 | [215c6b3](https://dd.tall.wiki/gitea/ccsens_fe/TALL-MUI-3/commits/215c6b3)
- - | 解决警告 | [c932b09](https://dd.tall.wiki/gitea/ccsens_fe/TALL-MUI-3/commits/c932b09)
 
 
 ### chore
@@ -199,3 +191,4 @@
  - | style:index | 978f272
  - | !2 基础模板v1.1.0 | f5e61dd
  - | init | c0f1deb
+
diff --git a/src/pages/project/project.vue b/src/pages/project/project.vue
index 2beb6b6..e6b9226 100644
--- a/src/pages/project/project.vue
+++ b/src/pages/project/project.vue
@@ -44,8 +44,8 @@ export default {
     timeNode(val) {
       if (val && this.roleId) {
         // 根据时间和角色查找日常任务
-        // this.getGlobalData();
-        // this.getInitTasks();
+        this.getGlobalData();
+        this.getInitTasks();
       }
     },
 

From 033fca06fcdc971262b05e2f867bfd47c68d4e3e Mon Sep 17 00:00:00 2001
From: song <srf428110@163.com>
Date: Fri, 13 Aug 2021 17:14:26 +0800
Subject: [PATCH 05/14] =?UTF-8?q?fix:=20=E7=9B=91=E5=90=AC=E6=97=B6?=
 =?UTF-8?q?=E9=97=B4=E5=9F=BA=E6=9C=AC=E7=82=B9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 CHANGELOG.md                  | 287 +++++++++++++++++-----------------
 src/pages/project/project.vue |   4 +-
 2 files changed, 142 insertions(+), 149 deletions(-)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index c097af1..211eeba 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -3,168 +3,160 @@
 ### 🌟 新功能
 范围|描述|commitId
 --|--|--
- calendar, tall.js | 上下滑动切换日历的模式,tall.js中domain根据环境变量切换 | 364e25d
- - | db store | 6414c4f
- default plugin | 添加默认插件;项目列表;全局项目最大高度设置 | ed1d87b
- - | indexedDB | 687394e
- pinch | alloy finger实现图片的pinch放大缩小 | de01343
- plugin | 插件添加了token及param参数 | aeb0292
- - | post 封装 | da52e94
- - | tall插件封装 | 1bcb920
- task status | 任务状态切换未完 | 7ffd135
- - | ws storage | 21b3a06
- - | 上传逻辑变化 | 3ff1dc2
- - | 任务状态时间显示 | 56f5183
- - | 任务进行中状态数字 | 27b7326
- - | 全局插件及默认插件位置修改 | 6c80d08
- - | 向右箭头图标变化 | 8e9ca55
- - | 字体大小更改 | 82cfdd4
- - | 存token | b8a178d
- - | 定期任务面板骨架屏添加 | b2698c0
- 富文本插件 | 富文本插件demo测试 | ed3d644
- - | 导入wbs | 1224fcb
- - | 导入项目,更新项目 | 5e06adf
- - | 导入项目后提示并打开项目详情页 | 410f527
- - | 引入dayjs | 29b8b93
- - | 提交到本地 | 9cbe411
- - | 插件参数处理调整 | a3e68d3
- - | 插件数据获取 | 5b91bdc
- - | 日历定位;合并 | ea3f937
- - | 日常任务插件调整 | c1881f9
- - | 时间基准线，默认插件 | a33ba1e
- - | 时间轴修改状态时提示框增加 | e841392
- - | 时间轴界面 | 33927e9
- - | 标题栏变化 | 3898cfe
- - | 标题栏变化 | c0fcd9d
- - | 标题栏角色栏全局任务组件新建 | 0500cb4
- - | 模拟接口测试 | 69e7931
- - | 添加时间轴上下滚动 | 2b81bbc
- - | 点击日历日期查询项目列表 | c458385
- - | 角色栏实现 | 94cd671
- - | 设置小红点 | 9316bcb
- - | 距调整pc端 | 5069aa1
- - | 配置默认插件接口 | f0c177d
- - | 面变化首页变化 | 5e860f1
- - | 项目api url设置 | 6cd5245
- - | 项目列表, 项目url | 32e005b
- - | 首页项目样式改变 | 8514c85
+ calendar, tall.js | 上下滑动切换日历的模式,tall.js中domain根据环境变量切换 | [364e25d](https://dd.tall.wiki/gitea/ccsens_fe/TALL-MUI-3/commits/364e25d)
+ - | db store | [6414c4f](https://dd.tall.wiki/gitea/ccsens_fe/TALL-MUI-3/commits/6414c4f)
+ default plugin | 添加默认插件;项目列表;全局项目最大高度设置 | [ed1d87b](https://dd.tall.wiki/gitea/ccsens_fe/TALL-MUI-3/commits/ed1d87b)
+ - | indexedDB | [687394e](https://dd.tall.wiki/gitea/ccsens_fe/TALL-MUI-3/commits/687394e)
+ pinch | alloy finger实现图片的pinch放大缩小 | [de01343](https://dd.tall.wiki/gitea/ccsens_fe/TALL-MUI-3/commits/de01343)
+ plugin | 插件添加了token及param参数 | [aeb0292](https://dd.tall.wiki/gitea/ccsens_fe/TALL-MUI-3/commits/aeb0292)
+ - | post 封装 | [da52e94](https://dd.tall.wiki/gitea/ccsens_fe/TALL-MUI-3/commits/da52e94)
+ - | tall插件封装 | [1bcb920](https://dd.tall.wiki/gitea/ccsens_fe/TALL-MUI-3/commits/1bcb920)
+ task status | 任务状态切换未完 | [7ffd135](https://dd.tall.wiki/gitea/ccsens_fe/TALL-MUI-3/commits/7ffd135)
+ - | ws storage | [21b3a06](https://dd.tall.wiki/gitea/ccsens_fe/TALL-MUI-3/commits/21b3a06)
+ - | 上传逻辑变化 | [3ff1dc2](https://dd.tall.wiki/gitea/ccsens_fe/TALL-MUI-3/commits/3ff1dc2)
+ - | 任务状态时间显示 | [56f5183](https://dd.tall.wiki/gitea/ccsens_fe/TALL-MUI-3/commits/56f5183)
+ - | 任务进行中状态数字 | [27b7326](https://dd.tall.wiki/gitea/ccsens_fe/TALL-MUI-3/commits/27b7326)
+ - | 全局插件及默认插件位置修改 | [6c80d08](https://dd.tall.wiki/gitea/ccsens_fe/TALL-MUI-3/commits/6c80d08)
+ - | 向右箭头图标变化 | [8e9ca55](https://dd.tall.wiki/gitea/ccsens_fe/TALL-MUI-3/commits/8e9ca55)
+ - | 字体大小更改 | [82cfdd4](https://dd.tall.wiki/gitea/ccsens_fe/TALL-MUI-3/commits/82cfdd4)
+ - | 存token | [b8a178d](https://dd.tall.wiki/gitea/ccsens_fe/TALL-MUI-3/commits/b8a178d)
+ - | 定期任务面板骨架屏添加 | [b2698c0](https://dd.tall.wiki/gitea/ccsens_fe/TALL-MUI-3/commits/b2698c0)
+ 富文本插件 | 富文本插件demo测试 | [ed3d644](https://dd.tall.wiki/gitea/ccsens_fe/TALL-MUI-3/commits/ed3d644)
+ - | 导入wbs | [1224fcb](https://dd.tall.wiki/gitea/ccsens_fe/TALL-MUI-3/commits/1224fcb)
+ - | 导入项目,更新项目 | [5e06adf](https://dd.tall.wiki/gitea/ccsens_fe/TALL-MUI-3/commits/5e06adf)
+ - | 导入项目后提示并打开项目详情页 | [410f527](https://dd.tall.wiki/gitea/ccsens_fe/TALL-MUI-3/commits/410f527)
+ - | 引入dayjs | [29b8b93](https://dd.tall.wiki/gitea/ccsens_fe/TALL-MUI-3/commits/29b8b93)
+ - | 提交到本地 | [9cbe411](https://dd.tall.wiki/gitea/ccsens_fe/TALL-MUI-3/commits/9cbe411)
+ - | 插件参数处理调整 | [a3e68d3](https://dd.tall.wiki/gitea/ccsens_fe/TALL-MUI-3/commits/a3e68d3)
+ - | 插件数据获取 | [5b91bdc](https://dd.tall.wiki/gitea/ccsens_fe/TALL-MUI-3/commits/5b91bdc)
+ - | 日历定位;合并 | [ea3f937](https://dd.tall.wiki/gitea/ccsens_fe/TALL-MUI-3/commits/ea3f937)
+ - | 日常任务插件调整 | [c1881f9](https://dd.tall.wiki/gitea/ccsens_fe/TALL-MUI-3/commits/c1881f9)
+ - | 时间基准线，默认插件 | [a33ba1e](https://dd.tall.wiki/gitea/ccsens_fe/TALL-MUI-3/commits/a33ba1e)
+ - | 时间轴修改状态时提示框增加 | [e841392](https://dd.tall.wiki/gitea/ccsens_fe/TALL-MUI-3/commits/e841392)
+ - | 时间轴界面 | [33927e9](https://dd.tall.wiki/gitea/ccsens_fe/TALL-MUI-3/commits/33927e9)
+ - | 标题栏变化 | [3898cfe](https://dd.tall.wiki/gitea/ccsens_fe/TALL-MUI-3/commits/3898cfe)
+ - | 标题栏变化 | [c0fcd9d](https://dd.tall.wiki/gitea/ccsens_fe/TALL-MUI-3/commits/c0fcd9d)
+ - | 标题栏角色栏全局任务组件新建 | [0500cb4](https://dd.tall.wiki/gitea/ccsens_fe/TALL-MUI-3/commits/0500cb4)
+ - | 模拟接口测试 | [69e7931](https://dd.tall.wiki/gitea/ccsens_fe/TALL-MUI-3/commits/69e7931)
+ - | 添加时间轴上下滚动 | [2b81bbc](https://dd.tall.wiki/gitea/ccsens_fe/TALL-MUI-3/commits/2b81bbc)
+ - | 点击日历日期查询项目列表 | [c458385](https://dd.tall.wiki/gitea/ccsens_fe/TALL-MUI-3/commits/c458385)
+ - | 角色栏实现 | [94cd671](https://dd.tall.wiki/gitea/ccsens_fe/TALL-MUI-3/commits/94cd671)
+ - | 设置小红点 | [9316bcb](https://dd.tall.wiki/gitea/ccsens_fe/TALL-MUI-3/commits/9316bcb)
+ - | 距调整pc端 | [5069aa1](https://dd.tall.wiki/gitea/ccsens_fe/TALL-MUI-3/commits/5069aa1)
+ - | 配置默认插件接口 | [f0c177d](https://dd.tall.wiki/gitea/ccsens_fe/TALL-MUI-3/commits/f0c177d)
+ - | 面变化首页变化 | [5e860f1](https://dd.tall.wiki/gitea/ccsens_fe/TALL-MUI-3/commits/5e860f1)
+ - | 项目api url设置 | [6cd5245](https://dd.tall.wiki/gitea/ccsens_fe/TALL-MUI-3/commits/6cd5245)
+ - | 项目列表, 项目url | [32e005b](https://dd.tall.wiki/gitea/ccsens_fe/TALL-MUI-3/commits/32e005b)
+ - | 首页项目样式改变 | [8514c85](https://dd.tall.wiki/gitea/ccsens_fe/TALL-MUI-3/commits/8514c85)
 
 
 ### 🎨 代码样式
 范围|描述|commitId
 --|--|--
- - | calendar注释 | a2ec112
- - | 代码格式细节调整 | cb2532b
- - | 任务快捷方式图标增加 | 4aba872
- - | 修改角色样式 | 73e268e
- - | 删除calendar中多余的console | e339eec
- - | 删除console.log | 5064a38
- - | 删除index中没用的alert代码 | 9c9eec7
- - | 删除mock,console;upload添加loading | 99d42e2
- - | 删除多余字段 | 5ae3973
- - | 删除插件携带的多余文件 | 0f392bb
- - | 删除没用代码 | 34b20e1
- - | 图标修改 | 54bca09
- - | 无基本变化 | 21ac4bb
- - | 日常任务修改 | dfa7ee2
- - | 更新代码 | 8c27e68
- - | 更新代码 | 1f40a76
- - | 格式细节调整 | b907a03
- - | 添加插件数据 | 2f11b42
- - | 组件新建 | 89c0035
+ - | calendar注释 | [a2ec112](https://dd.tall.wiki/gitea/ccsens_fe/TALL-MUI-3/commits/a2ec112)
+ - | 代码审查 | [d75134c](https://dd.tall.wiki/gitea/ccsens_fe/TALL-MUI-3/commits/d75134c)
+ - | 代码格式细节调整 | [cb2532b](https://dd.tall.wiki/gitea/ccsens_fe/TALL-MUI-3/commits/cb2532b)
+ - | 任务快捷方式图标增加 | [4aba872](https://dd.tall.wiki/gitea/ccsens_fe/TALL-MUI-3/commits/4aba872)
+ - | 修改角色样式 | [73e268e](https://dd.tall.wiki/gitea/ccsens_fe/TALL-MUI-3/commits/73e268e)
+ - | 删除calendar中多余的console | [e339eec](https://dd.tall.wiki/gitea/ccsens_fe/TALL-MUI-3/commits/e339eec)
+ - | 删除console.log | [5064a38](https://dd.tall.wiki/gitea/ccsens_fe/TALL-MUI-3/commits/5064a38)
+ - | 删除index中没用的alert代码 | [9c9eec7](https://dd.tall.wiki/gitea/ccsens_fe/TALL-MUI-3/commits/9c9eec7)
+ - | 删除mock,console;upload添加loading | [99d42e2](https://dd.tall.wiki/gitea/ccsens_fe/TALL-MUI-3/commits/99d42e2)
+ - | 删除多余字段 | [5ae3973](https://dd.tall.wiki/gitea/ccsens_fe/TALL-MUI-3/commits/5ae3973)
+ - | 删除插件携带的多余文件 | [0f392bb](https://dd.tall.wiki/gitea/ccsens_fe/TALL-MUI-3/commits/0f392bb)
+ - | 删除没用代码 | [34b20e1](https://dd.tall.wiki/gitea/ccsens_fe/TALL-MUI-3/commits/34b20e1)
+ - | 图标修改 | [54bca09](https://dd.tall.wiki/gitea/ccsens_fe/TALL-MUI-3/commits/54bca09)
+ - | 无基本变化 | [21ac4bb](https://dd.tall.wiki/gitea/ccsens_fe/TALL-MUI-3/commits/21ac4bb)
+ - | 日常任务修改 | [dfa7ee2](https://dd.tall.wiki/gitea/ccsens_fe/TALL-MUI-3/commits/dfa7ee2)
+ - | 更新代码 | [8c27e68](https://dd.tall.wiki/gitea/ccsens_fe/TALL-MUI-3/commits/8c27e68)
+ - | 更新代码 | [1f40a76](https://dd.tall.wiki/gitea/ccsens_fe/TALL-MUI-3/commits/1f40a76)
+ - | 格式细节调整 | [b907a03](https://dd.tall.wiki/gitea/ccsens_fe/TALL-MUI-3/commits/b907a03)
+ - | 添加插件数据 | [2f11b42](https://dd.tall.wiki/gitea/ccsens_fe/TALL-MUI-3/commits/2f11b42)
+ - | 组件新建 | [89c0035](https://dd.tall.wiki/gitea/ccsens_fe/TALL-MUI-3/commits/89c0035)
 
 
 ### 🐛 Bug 修复
 范围|描述|commitId
 --|--|--
- ID1000343 | 解决向下预加载查询参数时间没+1颗粒度;以及滚动加载颗粒度写死的问题 | 940603a, closes #ID1000343
- plugin | 插件解析机制完善 | 0f5a27d
- project title | 项目标题修改; 切换角色移除script | 5c20017
- roles | 修复默认显示不是我的角色的问题 | b69f94f
- role | 切换角色的逻辑修正完善 | 4ae534f
- task任务逻辑完善 | 减少初始global及regular的不必要请求 | bd4bd38
- - | title.vue根据页面栈显示返回按钮；标题文本超出显示... | 0cbacf4
- - | 上下滑动加载定期任务 | 4090d89
- - | 上下滚动时间轴 | d533a01
- - | 下拉加载定期任务传参，时间格式化修改 | 0b95a0e
- - | 任务开始时间延迟插件 | 992a313
- - | 修改main | 749ae9a
- - | 修改小红点传参 | 87b20fd
- - | 修改报错 | 531c14d
- - | 修改接口路径 | df6acf2
- - | 修改角色栏组件 | a54c601
- - | 切换到默认项目角色没有激活状态的bug | 438d448
- - | 切换日历时查询小红点 | 7091789
- - | 定期任务接口 | aa4981c
- - | 定期任务插件 | 92b3254
- - | 定期任务未加载时,显示空的时间轴并能上下滑动 | ce38093
- - | 定期任务骨架屏修改 | 8ff72dd
- - | 平车演示临时去掉项目快捷方式的toast提示 | e0b2c23
- - | 手动展开日常任务 | 0a4a622
- - | 提示信息显示bug及日常任务收缩问题 | f2f06c5
- - | 插件bug解决 | 41257eb
- - | 收到消息修改任务状态 | c378063
- - | 日历无任务时添加小绿点,时间轴刻度无任务不显示时分 | 0f90868
- - | 日常任务html数据查验 | 880ce5c
- - | 日常任务插件遍历时的key值修改 | cd26285
- - | 日常任务插件面板高度修改 | 249f9e4
- - | 时间轴上下滑动 | 4d0ae46
- - | 时间轴上下滚动数据加载bug修改 | e82ede4
- - | 时间轴插件 | 225d3cc
- - | 时间轴无任务时时间刻度加载修改 | 4921672
- - | 时间轴骨架屏修改 | ca78d02
- - | 角色显示状态修改 | 7d3b906
- - | 角色栏修改 | 19228d6
- - | 解决时间轴报错 | da1eece
- - | 骨架屏替换 | e9fdd71
+ ID1000343 | 解决向下预加载查询参数时间没+1颗粒度;以及滚动加载颗粒度写死的问题 | [940603a](https://dd.tall.wiki/gitea/ccsens_fe/TALL-MUI-3/commits/940603a), closes [#ID1000343](https://dd.tall.wiki/gitea/ccsens_fe/TALL-MUI-3/issues/ID1000343)
+ plugin | 插件解析机制完善 | [0f5a27d](https://dd.tall.wiki/gitea/ccsens_fe/TALL-MUI-3/commits/0f5a27d)
+ project title | 项目标题修改; 切换角色移除script | [5c20017](https://dd.tall.wiki/gitea/ccsens_fe/TALL-MUI-3/commits/5c20017)
+ roles | 修复默认显示不是我的角色的问题 | [b69f94f](https://dd.tall.wiki/gitea/ccsens_fe/TALL-MUI-3/commits/b69f94f)
+ role | 切换角色的逻辑修正完善 | [4ae534f](https://dd.tall.wiki/gitea/ccsens_fe/TALL-MUI-3/commits/4ae534f)
+ task任务逻辑完善 | 减少初始global及regular的不必要请求 | [bd4bd38](https://dd.tall.wiki/gitea/ccsens_fe/TALL-MUI-3/commits/bd4bd38)
+ - | title.vue根据页面栈显示返回按钮；标题文本超出显示... | [0cbacf4](https://dd.tall.wiki/gitea/ccsens_fe/TALL-MUI-3/commits/0cbacf4)
+ - | 上下滑动加载定期任务 | [4090d89](https://dd.tall.wiki/gitea/ccsens_fe/TALL-MUI-3/commits/4090d89)
+ - | 上下滚动时间轴 | [d533a01](https://dd.tall.wiki/gitea/ccsens_fe/TALL-MUI-3/commits/d533a01)
+ - | 下拉加载定期任务传参，时间格式化修改 | [0b95a0e](https://dd.tall.wiki/gitea/ccsens_fe/TALL-MUI-3/commits/0b95a0e)
+ - | 任务开始时间延迟插件 | [992a313](https://dd.tall.wiki/gitea/ccsens_fe/TALL-MUI-3/commits/992a313)
+ - | 修改main | [749ae9a](https://dd.tall.wiki/gitea/ccsens_fe/TALL-MUI-3/commits/749ae9a)
+ - | 修改小红点传参 | [87b20fd](https://dd.tall.wiki/gitea/ccsens_fe/TALL-MUI-3/commits/87b20fd)
+ - | 修改报错 | [531c14d](https://dd.tall.wiki/gitea/ccsens_fe/TALL-MUI-3/commits/531c14d)
+ - | 修改接口路径 | [df6acf2](https://dd.tall.wiki/gitea/ccsens_fe/TALL-MUI-3/commits/df6acf2)
+ - | 修改角色栏组件 | [a54c601](https://dd.tall.wiki/gitea/ccsens_fe/TALL-MUI-3/commits/a54c601)
+ - | 切换到默认项目角色没有激活状态的bug | [438d448](https://dd.tall.wiki/gitea/ccsens_fe/TALL-MUI-3/commits/438d448)
+ - | 切换日历时查询小红点 | [7091789](https://dd.tall.wiki/gitea/ccsens_fe/TALL-MUI-3/commits/7091789)
+ - | 定期任务接口 | [aa4981c](https://dd.tall.wiki/gitea/ccsens_fe/TALL-MUI-3/commits/aa4981c)
+ - | 定期任务插件 | [92b3254](https://dd.tall.wiki/gitea/ccsens_fe/TALL-MUI-3/commits/92b3254)
+ - | 定期任务未加载时,显示空的时间轴并能上下滑动 | [ce38093](https://dd.tall.wiki/gitea/ccsens_fe/TALL-MUI-3/commits/ce38093)
+ - | 定期任务骨架屏修改 | [8ff72dd](https://dd.tall.wiki/gitea/ccsens_fe/TALL-MUI-3/commits/8ff72dd)
+ - | 平车演示临时去掉项目快捷方式的toast提示 | [e0b2c23](https://dd.tall.wiki/gitea/ccsens_fe/TALL-MUI-3/commits/e0b2c23)
+ - | 手动展开日常任务 | [0a4a622](https://dd.tall.wiki/gitea/ccsens_fe/TALL-MUI-3/commits/0a4a622)
+ - | 提示信息显示bug及日常任务收缩问题 | [f2f06c5](https://dd.tall.wiki/gitea/ccsens_fe/TALL-MUI-3/commits/f2f06c5)
+ - | 插件bug解决 | [41257eb](https://dd.tall.wiki/gitea/ccsens_fe/TALL-MUI-3/commits/41257eb)
+ - | 收到消息修改任务状态 | [c378063](https://dd.tall.wiki/gitea/ccsens_fe/TALL-MUI-3/commits/c378063)
+ - | 日历无任务时添加小绿点,时间轴刻度无任务不显示时分 | [0f90868](https://dd.tall.wiki/gitea/ccsens_fe/TALL-MUI-3/commits/0f90868)
+ - | 日常任务html数据查验 | [880ce5c](https://dd.tall.wiki/gitea/ccsens_fe/TALL-MUI-3/commits/880ce5c)
+ - | 日常任务插件遍历时的key值修改 | [cd26285](https://dd.tall.wiki/gitea/ccsens_fe/TALL-MUI-3/commits/cd26285)
+ - | 日常任务插件面板高度修改 | [249f9e4](https://dd.tall.wiki/gitea/ccsens_fe/TALL-MUI-3/commits/249f9e4)
+ - | 时间轴上下滑动 | [4d0ae46](https://dd.tall.wiki/gitea/ccsens_fe/TALL-MUI-3/commits/4d0ae46)
+ - | 时间轴上下滚动数据加载bug修改 | [e82ede4](https://dd.tall.wiki/gitea/ccsens_fe/TALL-MUI-3/commits/e82ede4)
+ - | 时间轴插件 | [225d3cc](https://dd.tall.wiki/gitea/ccsens_fe/TALL-MUI-3/commits/225d3cc)
+ - | 时间轴无任务时时间刻度加载修改 | [4921672](https://dd.tall.wiki/gitea/ccsens_fe/TALL-MUI-3/commits/4921672)
+ - | 时间轴骨架屏修改 | [ca78d02](https://dd.tall.wiki/gitea/ccsens_fe/TALL-MUI-3/commits/ca78d02)
+ - | 角色显示状态修改 | [7d3b906](https://dd.tall.wiki/gitea/ccsens_fe/TALL-MUI-3/commits/7d3b906)
+ - | 角色栏修改 | [19228d6](https://dd.tall.wiki/gitea/ccsens_fe/TALL-MUI-3/commits/19228d6)
+ - | 解决时间轴报错 | [da1eece](https://dd.tall.wiki/gitea/ccsens_fe/TALL-MUI-3/commits/da1eece)
+ - | 跳转详情页返回路径修改 | [c5e17c0](https://dd.tall.wiki/gitea/ccsens_fe/TALL-MUI-3/commits/c5e17c0)
+ - | 骨架屏替换 | [e9fdd71](https://dd.tall.wiki/gitea/ccsens_fe/TALL-MUI-3/commits/e9fdd71)
 
 
 ### 📝 文档
 范围|描述|commitId
 --|--|--
- - | README.md | ab0eb05
+ - | README.md | [ab0eb05](https://dd.tall.wiki/gitea/ccsens_fe/TALL-MUI-3/commits/ab0eb05)
 
 
 ### 🔧 测试
 范围|描述|commitId
 --|--|--
- - | 暂时移除了jest浏览器配置 | 5088d01
- - | 添加测试，测试utils/time.js的computeDurationText | e758010
- - | 禁用任务开始操作 | b5425db
+ - | 暂时移除了jest浏览器配置 | [5088d01](https://dd.tall.wiki/gitea/ccsens_fe/TALL-MUI-3/commits/5088d01)
+ - | 添加测试，测试utils/time.js的computeDurationText | [e758010](https://dd.tall.wiki/gitea/ccsens_fe/TALL-MUI-3/commits/e758010)
+ - | 禁用任务开始操作 | [b5425db](https://dd.tall.wiki/gitea/ccsens_fe/TALL-MUI-3/commits/b5425db)
 
 
 ### 🔨 代码重构
 范围|描述|commitId
 --|--|--
- calendar | 日历细节调整 | 1a8d6bf
- - | project 代码健壮性完善 | a3202c5
- store/home | 删除store/home | db8a3b4
- task beginTime | 格式化任务开始时间 | fbc0301
- template | eslint prettier sass uview tailwindcss | 9c966a1
- tips | 修改任务状态方法重构 | b57d3ac
- tip | 任务状态显示及tip组件数据的重构 | 78a5750
- title.vue | 移除测试的repeat; 样式细节调整 | c32d2bd
- - | 下滑时间轴添加备注 | 4fd20e3
- - | 任务状态重构 | 4693655
- - | 删除多余的weekmode store里的东西 | 0841fe0
- - | 删除多余的技术验证界面 | 542ae5b
- - | 界面样式调整 | 4367249
- - | 重构store分层 | 5f6fff8
+ calendar | 日历细节调整 | [1a8d6bf](https://dd.tall.wiki/gitea/ccsens_fe/TALL-MUI-3/commits/1a8d6bf)
+ - | project 代码健壮性完善 | [a3202c5](https://dd.tall.wiki/gitea/ccsens_fe/TALL-MUI-3/commits/a3202c5)
+ store/home | 删除store/home | [db8a3b4](https://dd.tall.wiki/gitea/ccsens_fe/TALL-MUI-3/commits/db8a3b4)
+ task beginTime | 格式化任务开始时间 | [fbc0301](https://dd.tall.wiki/gitea/ccsens_fe/TALL-MUI-3/commits/fbc0301)
+ template | eslint prettier sass uview tailwindcss | [9c966a1](https://dd.tall.wiki/gitea/ccsens_fe/TALL-MUI-3/commits/9c966a1)
+ tips | 修改任务状态方法重构 | [b57d3ac](https://dd.tall.wiki/gitea/ccsens_fe/TALL-MUI-3/commits/b57d3ac)
+ tip | 任务状态显示及tip组件数据的重构 | [78a5750](https://dd.tall.wiki/gitea/ccsens_fe/TALL-MUI-3/commits/78a5750)
+ title.vue | 移除测试的repeat; 样式细节调整 | [c32d2bd](https://dd.tall.wiki/gitea/ccsens_fe/TALL-MUI-3/commits/c32d2bd)
+ - | 下滑时间轴添加备注 | [4fd20e3](https://dd.tall.wiki/gitea/ccsens_fe/TALL-MUI-3/commits/4fd20e3)
+ - | 任务状态重构 | [4693655](https://dd.tall.wiki/gitea/ccsens_fe/TALL-MUI-3/commits/4693655)
+ - | 删除多余的weekmode store里的东西 | [0841fe0](https://dd.tall.wiki/gitea/ccsens_fe/TALL-MUI-3/commits/0841fe0)
+ - | 删除多余的技术验证界面 | [542ae5b](https://dd.tall.wiki/gitea/ccsens_fe/TALL-MUI-3/commits/542ae5b)
+ - | 界面样式调整 | [4367249](https://dd.tall.wiki/gitea/ccsens_fe/TALL-MUI-3/commits/4367249)
+ - | 重构store分层 | [5f6fff8](https://dd.tall.wiki/gitea/ccsens_fe/TALL-MUI-3/commits/5f6fff8)
 
 
 ### 🚀 性能优化
 范围|描述|commitId
 --|--|--
- - | 修改定期任务骨架屏高度 | 909a734
- - | 插件查询及展示 | 4dba770
- - | 整理代码 | 7a55315
- - | 日历的更改 | 7353ac8
- - | 测试接口 | 215e074
- - | 组件文件夹新建 | 22bfe7b
- - | 组件文件夹新建 | 17bb8c9
- - | 组件文件夹新建 | 1421504
- - | 角色栏文字颜色修改 | 215c6b3
- - | 解决警告 | c932b09
  - | 修改定期任务骨架屏高度 | [909a734](https://dd.tall.wiki/gitea/ccsens_fe/TALL-MUI-3/commits/909a734)
  - | 插件查询及展示 | [4dba770](https://dd.tall.wiki/gitea/ccsens_fe/TALL-MUI-3/commits/4dba770)
  - | 整理代码 | [7a55315](https://dd.tall.wiki/gitea/ccsens_fe/TALL-MUI-3/commits/7a55315)
@@ -180,22 +172,23 @@
 ### chore
 范围|描述|commitId
 --|--|--
- - | api 封装 | 8dcb8a2
- - | env host修改 | a79a4a5
- - | merge globals | b0957cc
- - | merge wrr | 5ccc7a5
- - | mock | 51c24a5
- package manifest | 去掉了摇树 | f7c1dd4
- pwa 小程序 | 移除了pwa，alloyFinger添加平台判断 | 875fab4
- - | uview-ui | a9ea34b
- v3.0.1 | tall api 地址从1.0改成了3.0 | db5afd5
- 信息配置 | 配置eslint等配置 | 7421443
- - | 修复不能build的问题 | 0b7b91e
- - | 删除多余的构建的命令 | 3f4eb2f
+ - | api 封装 | [8dcb8a2](https://dd.tall.wiki/gitea/ccsens_fe/TALL-MUI-3/commits/8dcb8a2)
+ - | env host修改 | [a79a4a5](https://dd.tall.wiki/gitea/ccsens_fe/TALL-MUI-3/commits/a79a4a5)
+ - | merge globals | [b0957cc](https://dd.tall.wiki/gitea/ccsens_fe/TALL-MUI-3/commits/b0957cc)
+ - | merge wrr | [5ccc7a5](https://dd.tall.wiki/gitea/ccsens_fe/TALL-MUI-3/commits/5ccc7a5)
+ - | mock | [51c24a5](https://dd.tall.wiki/gitea/ccsens_fe/TALL-MUI-3/commits/51c24a5)
+ package manifest | 去掉了摇树 | [f7c1dd4](https://dd.tall.wiki/gitea/ccsens_fe/TALL-MUI-3/commits/f7c1dd4)
+ pwa 小程序 | 移除了pwa，alloyFinger添加平台判断 | [875fab4](https://dd.tall.wiki/gitea/ccsens_fe/TALL-MUI-3/commits/875fab4)
+ - | uview-ui | [a9ea34b](https://dd.tall.wiki/gitea/ccsens_fe/TALL-MUI-3/commits/a9ea34b)
+ v3.0.1 | tall api 地址从1.0改成了3.0 | [db5afd5](https://dd.tall.wiki/gitea/ccsens_fe/TALL-MUI-3/commits/db5afd5)
+ 信息配置 | 配置eslint等配置 | [7421443](https://dd.tall.wiki/gitea/ccsens_fe/TALL-MUI-3/commits/7421443)
+ - | 修复不能build的问题 | [0b7b91e](https://dd.tall.wiki/gitea/ccsens_fe/TALL-MUI-3/commits/0b7b91e)
+ - | 删除多余的构建的命令 | [3f4eb2f](https://dd.tall.wiki/gitea/ccsens_fe/TALL-MUI-3/commits/3f4eb2f)
 
 
 范围|描述|commitId
 --|--|--
- - | style:index | 978f272
- - | !2 基础模板v1.1.0 | f5e61dd
- - | init | c0f1deb
+ - | style:index | [978f272](https://dd.tall.wiki/gitea/ccsens_fe/TALL-MUI-3/commits/978f272)
+ - | !2 基础模板v1.1.0 | [f5e61dd](https://dd.tall.wiki/gitea/ccsens_fe/TALL-MUI-3/commits/f5e61dd)
+ - | init | [c0f1deb](https://dd.tall.wiki/gitea/ccsens_fe/TALL-MUI-3/commits/c0f1deb)
+
diff --git a/src/pages/project/project.vue b/src/pages/project/project.vue
index 2beb6b6..e6b9226 100644
--- a/src/pages/project/project.vue
+++ b/src/pages/project/project.vue
@@ -44,8 +44,8 @@ export default {
     timeNode(val) {
       if (val && this.roleId) {
         // 根据时间和角色查找日常任务
-        // this.getGlobalData();
-        // this.getInitTasks();
+        this.getGlobalData();
+        this.getInitTasks();
       }
     },
 

From c6688dbcbe8d3d1f740e0a4653081c20daf03f88 Mon Sep 17 00:00:00 2001
From: song <srf428110@163.com>
Date: Fri, 13 Aug 2021 18:35:10 +0800
Subject: [PATCH 06/14] =?UTF-8?q?fix:=20=E5=AE=9A=E6=9C=9F=E4=BB=BB?=
 =?UTF-8?q?=E5=8A=A1key=E5=80=BC=E4=BF=AE=E6=94=B9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 CHANGELOG.md                                  |  1 +
 src/components/TimeLine/TimeLine.vue          | 54 +++++++++++++++++--
 src/components/TimeLine/component/TimeBox.vue |  2 +-
 src/pages/project/project.vue                 |  7 ++-
 src/store/task/mutations.js                   | 48 +++++++++++++++++
 src/store/task/state.js                       |  1 +
 6 files changed, 107 insertions(+), 6 deletions(-)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 211eeba..7fdb4ba 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -114,6 +114,7 @@
  - | 时间轴插件 | [225d3cc](https://dd.tall.wiki/gitea/ccsens_fe/TALL-MUI-3/commits/225d3cc)
  - | 时间轴无任务时时间刻度加载修改 | [4921672](https://dd.tall.wiki/gitea/ccsens_fe/TALL-MUI-3/commits/4921672)
  - | 时间轴骨架屏修改 | [ca78d02](https://dd.tall.wiki/gitea/ccsens_fe/TALL-MUI-3/commits/ca78d02)
+ - | 监听时间基本点 | [033fca0](https://dd.tall.wiki/gitea/ccsens_fe/TALL-MUI-3/commits/033fca0)
  - | 角色显示状态修改 | [7d3b906](https://dd.tall.wiki/gitea/ccsens_fe/TALL-MUI-3/commits/7d3b906)
  - | 角色栏修改 | [19228d6](https://dd.tall.wiki/gitea/ccsens_fe/TALL-MUI-3/commits/19228d6)
  - | 解决时间轴报错 | [da1eece](https://dd.tall.wiki/gitea/ccsens_fe/TALL-MUI-3/commits/da1eece)
diff --git a/src/components/TimeLine/TimeLine.vue b/src/components/TimeLine/TimeLine.vue
index 756d18b..3b65aee 100644
--- a/src/components/TimeLine/TimeLine.vue
+++ b/src/components/TimeLine/TimeLine.vue
@@ -34,7 +34,7 @@ export default {
 
   computed: {
     ...mapState('role', ['visibleRoles']),
-    ...mapState('task', ['scrollTop', 'showTips', 'tasks', 'topEnd', 'bottomEnd']),
+    ...mapState('task', ['scrollTop', 'showTips', 'tasks', 'topEnd', 'bottomEnd', 'showSkeleton', 'randomId']),
     ...mapGetters('task', ['timeGranularity']),
   },
 
@@ -54,25 +54,49 @@ export default {
 
     // 滚动到顶部
     async handleScrollTop() {
-      if (!this.tasks || !this.tasks.length) return;
+      if (!this.tasks || !this.tasks.length || this.showSkeleton) return;
       const startTime = this.tasks[0].planStart - 0;
       if ((this.tasks[0].plugins && this.tasks[0].plugins.length === 0) || this.topEnd) {
         // 没有数据时 自动加载数据
         // console.warn('滚动到顶部没有数据时: ');
         const addTasks = [
           {
+            id: this.randomId,
+            panel: {},
+            plugins: [],
+            process: 4,
+            planStart: this.$t.time.add(startTime, -6, 'day').valueOf(),
+          },
+          {
+            id: this.randomId,
+            panel: {},
+            plugins: [],
+            process: 4,
+            planStart: this.$t.time.add(startTime, -5, 'day').valueOf(),
+          },
+          {
+            id: this.randomId,
+            panel: {},
+            plugins: [],
+            process: 4,
+            planStart: this.$t.time.add(startTime, -4, 'day').valueOf(),
+          },
+          {
+            id: this.randomId,
             panel: {},
             plugins: [],
             process: 4,
             planStart: this.$t.time.add(startTime, -3, 'day').valueOf(),
           },
           {
+            id: this.randomId,
             panel: {},
             plugins: [],
             process: 4,
             planStart: this.$t.time.add(startTime, -2, 'day').valueOf(),
           },
           {
+            id: this.randomId,
             panel: {},
             plugins: [],
             process: 4,
@@ -95,7 +119,7 @@ export default {
 
     // 滚动到底部
     async handleScrollBottom() {
-      if (!this.tasks || !this.tasks.length) return;
+      if (!this.tasks || !this.tasks.length || this.showSkeleton) return;
       const { tasks, timeGranularity } = this;
       const startTime = tasks[tasks.length - 1].planStart - 0;
       if ((tasks[0].plugins && tasks[0].plugins.length === 0) || this.bottomEnd) {
@@ -103,23 +127,47 @@ export default {
         // console.warn('滚动到底部没有数据时: ');
         const addTasks = [
           {
+            id: this.randomId,
             panel: {},
             plugins: [],
             process: 4,
             planStart: this.$t.time.add(startTime, 1, timeGranularity).valueOf(),
           },
           {
+            id: this.randomId,
             panel: {},
             plugins: [],
             process: 4,
             planStart: this.$t.time.add(startTime, 2, timeGranularity).valueOf(),
           },
           {
+            id: this.randomId,
             panel: {},
             plugins: [],
             process: 4,
             planStart: this.$t.time.add(startTime, 3, timeGranularity).valueOf(),
           },
+          {
+            id: this.randomId,
+            panel: {},
+            plugins: [],
+            process: 4,
+            planStart: this.$t.time.add(startTime, 4, timeGranularity).valueOf(),
+          },
+          {
+            id: this.randomId,
+            panel: {},
+            plugins: [],
+            process: 4,
+            planStart: this.$t.time.add(startTime, 5, timeGranularity).valueOf(),
+          },
+          {
+            id: this.randomId,
+            panel: {},
+            plugins: [],
+            process: 4,
+            planStart: this.$t.time.add(startTime, 6, timeGranularity).valueOf(),
+          },
         ];
         this.setDownTasks(addTasks);
       } else {
diff --git a/src/components/TimeLine/component/TimeBox.vue b/src/components/TimeLine/component/TimeBox.vue
index c7a3a92..a759856 100644
--- a/src/components/TimeLine/component/TimeBox.vue
+++ b/src/components/TimeLine/component/TimeBox.vue
@@ -2,7 +2,7 @@
   <view class="column">
     <!-- v-if="tasks && tasks.length" -->
     <view>
-      <view :key="index" v-for="(task, index) in tasks">
+      <view :key="task.id" v-for="task in tasks">
         <view class="flex">
           <TimeStatus :task="task" />
           <view class="flex items-center justify-between flex-1 ml-2 task-column">
diff --git a/src/pages/project/project.vue b/src/pages/project/project.vue
index e6b9226..ad85156 100644
--- a/src/pages/project/project.vue
+++ b/src/pages/project/project.vue
@@ -42,6 +42,7 @@ export default {
      * 永久日常任务不发生改变
      */
     timeNode(val) {
+      console.log('val: ', val);
       if (val && this.roleId) {
         // 根据时间和角色查找日常任务
         this.getGlobalData();
@@ -58,7 +59,9 @@ export default {
     roleId(val) {
       if (val) {
         // 如果storage里有timeNode,修改store里的timeNode
-        this.setTimeNode(+this.$t.storage.getStorageSync('timeNode') || Date.now());
+        this.setTimeNode(
+          +this.$t.storage.getStorageSync('timeNode') !== 0 ? +this.$t.storage.getStorageSync('timeNode') !== 0 : Date.now(),
+        );
         // 清空storage
         this.$t.storage.setStorageSync('timeNode', '');
         console.log('当角色发生变化时: ', this.timeNode);
@@ -133,7 +136,7 @@ export default {
       await this.getTasks({ queryType: 1 });
 
       // 预加载 上下的定期任务
-      if (this.tasks && this.tasks.length && this.tasks[0].id) {
+      if (this.tasks && this.tasks.length && this.tasks[0].detailId) {
         this.$nextTick(() => {
           const { tasks, timeGranularity } = this;
           this.getTasks({ timeNode: +tasks[0].planStart, queryType: 0, queryNum: 6 }); // 向上拿数据
diff --git a/src/store/task/mutations.js b/src/store/task/mutations.js
index d5cad9b..1994329 100644
--- a/src/store/task/mutations.js
+++ b/src/store/task/mutations.js
@@ -80,18 +80,42 @@ const mutations = {
       }
       const initData = [
         {
+          id: state.randomId,
+          panel: {},
+          plugins: [],
+          process: 4,
+          planStart: uni.$t.time.add(sTime, -6, 'day').valueOf(),
+        },
+        {
+          id: state.randomId,
+          panel: {},
+          plugins: [],
+          process: 4,
+          planStart: uni.$t.time.add(sTime, -5, 'day').valueOf(),
+        },
+        {
+          id: state.randomId,
+          panel: {},
+          plugins: [],
+          process: 4,
+          planStart: uni.$t.time.add(sTime, -4, 'day').valueOf(),
+        },
+        {
+          id: state.randomId,
           panel: {},
           plugins: [],
           process: 4,
           planStart: uni.$t.time.add(sTime, -3, 'day').valueOf(),
         },
         {
+          id: state.randomId,
           panel: {},
           plugins: [],
           process: 4,
           planStart: uni.$t.time.add(sTime, -2, 'day').valueOf(),
         },
         {
+          id: state.randomId,
           panel: {},
           plugins: [],
           process: 4,
@@ -124,23 +148,47 @@ const mutations = {
       }
       const initData = [
         {
+          id: state.randomId,
           panel: {},
           plugins: [],
           process: 4,
           planStart: uni.$t.time.add(sTime, 1, 'day').valueOf(),
         },
         {
+          id: state.randomId,
           panel: {},
           plugins: [],
           process: 4,
           planStart: uni.$t.time.add(sTime, 2, 'day').valueOf(),
         },
         {
+          id: state.randomId,
           panel: {},
           plugins: [],
           process: 4,
           planStart: uni.$t.time.add(sTime, 3, 'day').valueOf(),
         },
+        {
+          id: state.randomId,
+          panel: {},
+          plugins: [],
+          process: 4,
+          planStart: uni.$t.time.add(sTime, 4, 'day').valueOf(),
+        },
+        {
+          id: state.randomId,
+          panel: {},
+          plugins: [],
+          process: 4,
+          planStart: uni.$t.time.add(sTime, 5, 'day').valueOf(),
+        },
+        {
+          id: state.randomId,
+          panel: {},
+          plugins: [],
+          process: 4,
+          planStart: uni.$t.time.add(sTime, 6, 'day').valueOf(),
+        },
       ];
       state.tasks = [...state.tasks.concat(initData)];
     } else {
diff --git a/src/store/task/state.js b/src/store/task/state.js
index d453785..7aca908 100644
--- a/src/store/task/state.js
+++ b/src/store/task/state.js
@@ -25,6 +25,7 @@ const state = {
   // 定期任务
   tasks: [],
   showSkeleton: false, // 定期任务骨架屏
+  randomId: Math.floor(Math.random() * 100000000000000000000), // 随机id
 };
 
 export default state;

From d643af2cfa47e8fbe6826378542fe1e95c449045 Mon Sep 17 00:00:00 2001
From: song <srf428110@163.com>
Date: Tue, 17 Aug 2021 17:51:32 +0800
Subject: [PATCH 07/14] =?UTF-8?q?fix:=201.=E6=97=B6=E9=97=B4=E8=BD=B4?=
 =?UTF-8?q?=E6=95=B0=E6=8D=AE=E6=B8=B2=E6=9F=93=202.=E6=97=B6=E9=97=B4?=
 =?UTF-8?q?=E5=9F=BA=E5=87=86=E7=BA=BF?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 CHANGELOG.md                                  |  79 +---------
 src/components/Roles/Roles.vue                |   9 +-
 src/components/TimeLine/TimeLine.vue          | 144 ++++-------------
 src/components/TimeLine/component/TimeBox.vue |   3 +-
 src/mixins/timeline.js                        |  44 ++++++
 src/pages/project/project.vue                 | 144 ++++++++++++++---
 src/store/task/actions.js                     |  16 +-
 src/store/task/mutations.js                   | 149 ++++--------------
 src/store/task/state.js                       |   1 -
 src/utils/time.js                             |  12 ++
 10 files changed, 247 insertions(+), 354 deletions(-)
 create mode 100644 src/mixins/timeline.js

diff --git a/CHANGELOG.md b/CHANGELOG.md
index f4f1050..aa13ab5 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -1,4 +1,4 @@
-# 0.1.0 (2021-08-13)
+# 0.1.0 (2021-08-17)
 
 ### 🌟 新功能
 范围|描述|commitId
@@ -53,26 +53,6 @@
 ### 🎨 代码样式
 范围|描述|commitId
 --|--|--
- - | calendar注释 | a2ec112
- - | 代码审查 | d75134c
- - | 代码格式细节调整 | cb2532b
- - | 任务快捷方式图标增加 | 4aba872
- - | 修改角色样式 | 73e268e
- - | 删除calendar中多余的console | e339eec
- - | 删除console.log | 5064a38
- - | 删除index中没用的alert代码 | 9c9eec7
- - | 删除mock,console;upload添加loading | 99d42e2
- - | 删除多余字段 | 5ae3973
- - | 删除插件携带的多余文件 | 0f392bb
- - | 删除没用代码 | 34b20e1
- - | 图标修改 | 54bca09
- - | 无基本变化 | 21ac4bb
- - | 日常任务修改 | dfa7ee2
- - | 更新代码 | 8c27e68
- - | 更新代码 | 1f40a76
- - | 格式细节调整 | b907a03
- - | 添加插件数据 | 2f11b42
- - | 组件新建 | 89c0035
  - | calendar注释 | [a2ec112](https://dd.tall.wiki/gitea/ccsens_fe/TALL-MUI-3/commits/a2ec112)
  - | 代码审查 | [d75134c](https://dd.tall.wiki/gitea/ccsens_fe/TALL-MUI-3/commits/d75134c)
  - | 代码格式细节调整 | [cb2532b](https://dd.tall.wiki/gitea/ccsens_fe/TALL-MUI-3/commits/cb2532b)
@@ -93,52 +73,12 @@
  - | 格式细节调整 | [b907a03](https://dd.tall.wiki/gitea/ccsens_fe/TALL-MUI-3/commits/b907a03)
  - | 添加插件数据 | [2f11b42](https://dd.tall.wiki/gitea/ccsens_fe/TALL-MUI-3/commits/2f11b42)
  - | 组件新建 | [89c0035](https://dd.tall.wiki/gitea/ccsens_fe/TALL-MUI-3/commits/89c0035)
+ - | 细节调整 | [2cfc09a](https://dd.tall.wiki/gitea/ccsens_fe/TALL-MUI-3/commits/2cfc09a)
 
 
 ### 🐛 Bug 修复
 范围|描述|commitId
 --|--|--
- ID1000343 | 解决向下预加载查询参数时间没+1颗粒度;以及滚动加载颗粒度写死的问题 | 940603a, closes #ID1000343
- plugin | 插件解析机制完善 | 0f5a27d
- project title | 项目标题修改; 切换角色移除script | 5c20017
- roles | 修复默认显示不是我的角色的问题 | b69f94f
- role | 切换角色的逻辑修正完善 | 4ae534f
- task任务逻辑完善 | 减少初始global及regular的不必要请求 | bd4bd38
- - | title.vue根据页面栈显示返回按钮；标题文本超出显示... | 0cbacf4
- - | 上下滑动加载定期任务 | 4090d89
- - | 上下滚动时间轴 | d533a01
- - | 下拉加载定期任务传参，时间格式化修改 | 0b95a0e
- - | 任务开始时间延迟插件 | 992a313
- - | 修改main | 749ae9a
- - | 修改小红点传参 | 87b20fd
- - | 修改报错 | 531c14d
- - | 修改接口路径 | df6acf2
- - | 修改角色栏组件 | a54c601
- - | 切换到默认项目角色没有激活状态的bug | 438d448
- - | 切换日历时查询小红点 | 7091789
- - | 定期任务接口 | aa4981c
- - | 定期任务插件 | 92b3254
- - | 定期任务未加载时,显示空的时间轴并能上下滑动 | ce38093
- - | 定期任务骨架屏修改 | 8ff72dd
- - | 平车演示临时去掉项目快捷方式的toast提示 | e0b2c23
- - | 手动展开日常任务 | 0a4a622
- - | 提示信息显示bug及日常任务收缩问题 | f2f06c5
- - | 插件bug解决 | 41257eb
- - | 收到消息修改任务状态 | c378063
- - | 日历无任务时添加小绿点,时间轴刻度无任务不显示时分 | 0f90868
- - | 日常任务html数据查验 | 880ce5c
- - | 日常任务插件遍历时的key值修改 | cd26285
- - | 日常任务插件面板高度修改 | 249f9e4
- - | 时间轴上下滑动 | 4d0ae46
- - | 时间轴上下滚动数据加载bug修改 | e82ede4
- - | 时间轴插件 | 225d3cc
- - | 时间轴无任务时时间刻度加载修改 | 4921672
- - | 时间轴骨架屏修改 | ca78d02
- - | 角色显示状态修改 | 7d3b906
- - | 角色栏修改 | 19228d6
- - | 解决时间轴报错 | da1eece
- - | 跳转详情页返回路径修改 | c5e17c0
- - | 骨架屏替换 | e9fdd71
  ID1000343 | 解决向下预加载查询参数时间没+1颗粒度;以及滚动加载颗粒度写死的问题 | [940603a](https://dd.tall.wiki/gitea/ccsens_fe/TALL-MUI-3/commits/940603a), closes [#ID1000343](https://dd.tall.wiki/gitea/ccsens_fe/TALL-MUI-3/issues/ID1000343)
  plugin | 插件解析机制完善 | [0f5a27d](https://dd.tall.wiki/gitea/ccsens_fe/TALL-MUI-3/commits/0f5a27d)
  project title | 项目标题修改; 切换角色移除script | [5c20017](https://dd.tall.wiki/gitea/ccsens_fe/TALL-MUI-3/commits/5c20017)
@@ -157,6 +97,7 @@
  - | 修改角色栏组件 | [a54c601](https://dd.tall.wiki/gitea/ccsens_fe/TALL-MUI-3/commits/a54c601)
  - | 切换到默认项目角色没有激活状态的bug | [438d448](https://dd.tall.wiki/gitea/ccsens_fe/TALL-MUI-3/commits/438d448)
  - | 切换日历时查询小红点 | [7091789](https://dd.tall.wiki/gitea/ccsens_fe/TALL-MUI-3/commits/7091789)
+ - | 定期任务key值修改 | [c6688db](https://dd.tall.wiki/gitea/ccsens_fe/TALL-MUI-3/commits/c6688db)
  - | 定期任务接口 | [aa4981c](https://dd.tall.wiki/gitea/ccsens_fe/TALL-MUI-3/commits/aa4981c)
  - | 定期任务插件 | [92b3254](https://dd.tall.wiki/gitea/ccsens_fe/TALL-MUI-3/commits/92b3254)
  - | 定期任务未加载时,显示空的时间轴并能上下滑动 | [ce38093](https://dd.tall.wiki/gitea/ccsens_fe/TALL-MUI-3/commits/ce38093)
@@ -219,16 +160,6 @@
 ### 🚀 性能优化
 范围|描述|commitId
 --|--|--
- - | 修改定期任务骨架屏高度 | 909a734
- - | 插件查询及展示 | 4dba770
- - | 整理代码 | 7a55315
- - | 日历的更改 | 7353ac8
- - | 测试接口 | 215e074
- - | 组件文件夹新建 | 22bfe7b
- - | 组件文件夹新建 | 17bb8c9
- - | 组件文件夹新建 | 1421504
- - | 角色栏文字颜色修改 | 215c6b3
- - | 解决警告 | c932b09
  - | 修改定期任务骨架屏高度 | [909a734](https://dd.tall.wiki/gitea/ccsens_fe/TALL-MUI-3/commits/909a734)
  - | 插件查询及展示 | [4dba770](https://dd.tall.wiki/gitea/ccsens_fe/TALL-MUI-3/commits/4dba770)
  - | 整理代码 | [7a55315](https://dd.tall.wiki/gitea/ccsens_fe/TALL-MUI-3/commits/7a55315)
@@ -260,9 +191,7 @@
 
 范围|描述|commitId
 --|--|--
- - | style:index | 978f272
- - | !2 基础模板v1.1.0 | f5e61dd
- - | init | c0f1deb
  - | style:index | [978f272](https://dd.tall.wiki/gitea/ccsens_fe/TALL-MUI-3/commits/978f272)
  - | !2 基础模板v1.1.0 | [f5e61dd](https://dd.tall.wiki/gitea/ccsens_fe/TALL-MUI-3/commits/f5e61dd)
  - | init | [c0f1deb](https://dd.tall.wiki/gitea/ccsens_fe/TALL-MUI-3/commits/c0f1deb)
+
diff --git a/src/components/Roles/Roles.vue b/src/components/Roles/Roles.vue
index 1de30b1..524c0ef 100644
--- a/src/components/Roles/Roles.vue
+++ b/src/components/Roles/Roles.vue
@@ -58,7 +58,7 @@ export default {
   methods: {
     ...mapActions('task', ['handleRegularTask', 'getPermanent']),
     ...mapMutations('role', ['setRoleId']),
-    ...mapMutations('task', ['setPermanents', 'setDailyTasks', 'clearEndFlag', 'setTimeNode']),
+    ...mapMutations('task', ['setPermanents', 'setDailyTasks', 'clearEndFlag']),
 
     // 设置滚动位置
     setCurrentRole(index) {
@@ -92,13 +92,6 @@ export default {
           this.setRoleId(id);
           //改变index 即手动点击切换 我在此时将当前元素赋值给左边距 实现自动滚动
           this.setCurrentRole(index);
-          // 清空日常任务的数据
-          this.setPermanents([]);
-          this.setDailyTasks([]);
-          // 清空定期任务数据
-          // 到顶的标志复位
-          // 到底的标志复位
-          this.clearEndFlag();
         });
       } catch (error) {
         console.error('role.vue changeRole error: ', error);
diff --git a/src/components/TimeLine/TimeLine.vue b/src/components/TimeLine/TimeLine.vue
index 3b65aee..449b74e 100644
--- a/src/components/TimeLine/TimeLine.vue
+++ b/src/components/TimeLine/TimeLine.vue
@@ -4,9 +4,9 @@
 
   <scroll-view
     :lower-threshold="300"
-    :scrollTop="top"
-    :scrollY="true"
+    scroll-y="true"
     :upper-threshold="300"
+    :scroll-into-view="viewId"
     @scroll="scroll"
     @scrolltolower="handleScrollBottom"
     @scrolltoupper="handleScrollTop"
@@ -23,25 +23,26 @@
 // import Barrier from './component/Barrier.vue';
 import { mapState, mapMutations, mapGetters } from 'vuex';
 import TimeBox from './component/TimeBox.vue';
+import mixin from '@/mixins/timeline';
 
 export default {
   name: 'TimeLine',
   components: { TimeBox },
+  mixins: [mixin],
 
   data() {
-    return { top: 0 };
+    return {
+      top: 0,
+      viewId: '', // 距离顶部的距离
+    };
   },
 
   computed: {
     ...mapState('role', ['visibleRoles']),
-    ...mapState('task', ['scrollTop', 'showTips', 'tasks', 'topEnd', 'bottomEnd', 'showSkeleton', 'randomId']),
+    ...mapState('task', ['scrollTop', 'showTips', 'tasks', 'topEnd', 'bottomEnd', 'showSkeleton', 'timeNode']),
     ...mapGetters('task', ['timeGranularity']),
   },
 
-  mounted() {
-    this.setDatumPoint();
-  },
-
   methods: {
     ...mapMutations('task', ['setScrollTop', 'setShrink', 'setUpTasks', 'setDownTasks']),
 
@@ -58,52 +59,8 @@ export default {
       const startTime = this.tasks[0].planStart - 0;
       if ((this.tasks[0].plugins && this.tasks[0].plugins.length === 0) || this.topEnd) {
         // 没有数据时 自动加载数据
-        // console.warn('滚动到顶部没有数据时: ');
-        const addTasks = [
-          {
-            id: this.randomId,
-            panel: {},
-            plugins: [],
-            process: 4,
-            planStart: this.$t.time.add(startTime, -6, 'day').valueOf(),
-          },
-          {
-            id: this.randomId,
-            panel: {},
-            plugins: [],
-            process: 4,
-            planStart: this.$t.time.add(startTime, -5, 'day').valueOf(),
-          },
-          {
-            id: this.randomId,
-            panel: {},
-            plugins: [],
-            process: 4,
-            planStart: this.$t.time.add(startTime, -4, 'day').valueOf(),
-          },
-          {
-            id: this.randomId,
-            panel: {},
-            plugins: [],
-            process: 4,
-            planStart: this.$t.time.add(startTime, -3, 'day').valueOf(),
-          },
-          {
-            id: this.randomId,
-            panel: {},
-            plugins: [],
-            process: 4,
-            planStart: this.$t.time.add(startTime, -2, 'day').valueOf(),
-          },
-          {
-            id: this.randomId,
-            panel: {},
-            plugins: [],
-            process: 4,
-            planStart: this.$t.time.add(startTime, -1, 'day').valueOf(),
-          },
-        ];
-
+        console.warn('滚动到顶部没有数据时: ');
+        const addTasks = this.setTime(startTime, true);
         this.setUpTasks(addTasks);
       } else {
         // 有数据时
@@ -124,54 +81,12 @@ export default {
       const startTime = tasks[tasks.length - 1].planStart - 0;
       if ((tasks[0].plugins && tasks[0].plugins.length === 0) || this.bottomEnd) {
         // 没有数据时 自动加载数据
-        // console.warn('滚动到底部没有数据时: ');
-        const addTasks = [
-          {
-            id: this.randomId,
-            panel: {},
-            plugins: [],
-            process: 4,
-            planStart: this.$t.time.add(startTime, 1, timeGranularity).valueOf(),
-          },
-          {
-            id: this.randomId,
-            panel: {},
-            plugins: [],
-            process: 4,
-            planStart: this.$t.time.add(startTime, 2, timeGranularity).valueOf(),
-          },
-          {
-            id: this.randomId,
-            panel: {},
-            plugins: [],
-            process: 4,
-            planStart: this.$t.time.add(startTime, 3, timeGranularity).valueOf(),
-          },
-          {
-            id: this.randomId,
-            panel: {},
-            plugins: [],
-            process: 4,
-            planStart: this.$t.time.add(startTime, 4, timeGranularity).valueOf(),
-          },
-          {
-            id: this.randomId,
-            panel: {},
-            plugins: [],
-            process: 4,
-            planStart: this.$t.time.add(startTime, 5, timeGranularity).valueOf(),
-          },
-          {
-            id: this.randomId,
-            panel: {},
-            plugins: [],
-            process: 4,
-            planStart: this.$t.time.add(startTime, 6, timeGranularity).valueOf(),
-          },
-        ];
+        console.warn('滚动到底部没有数据时: ');
+        const addTasks = this.setTime(startTime, false);
         this.setDownTasks(addTasks);
       } else {
         // 时间基准点=最后一个任务的开始时间+当前时间颗粒度
+        console.warn('滚动到底部有数据时: ');
         const timeNode = this.$t.time.add(startTime, 1, timeGranularity).valueOf();
         const downQuery = {
           timeNode,
@@ -182,25 +97,20 @@ export default {
       }
     },
 
-    // 设置基准点
-    setDatumPoint() {
-      const { tasks } = this;
-      if (tasks && tasks.length) {
-        let tasksHeight = 0;
-        const scrollHeight = document.getElementById('scroll').clientHeight;
-        let width = document.documentElement.clientWidth;
-        for (let i = 0; i < 3; i++) {
-          if (tasks[i].panel && tasks[i].panel.height) {
-            // 如果后台返回了高度，就用返回得任务面板高度 + 固定边距42
-            tasksHeight += +tasks[i].panel.height + 42;
-          } else {
-            // 如果没有返回高度，就用rem + 固定边距42
-            // 因为 u-card 在没有返回高度时 固定高度为 h-16 = 4rem
-            // 所里这里 += 1rem + 42 = width / 20 + 42
-            tasksHeight += (width / 20) * 4 + 42;
-          }
+    // 设置自动滚动位置
+    setViewId() {
+      const { tasks, timeNode } = this;
+      for (let i = 0; i < tasks.length; i++) {
+        const item = tasks[i];
+        const show = this.$t.time.isSame(+item.planStart, +timeNode, this.timeGranularity);
+        if (item.detailId) {
+          this.viewId = `a${item.id}`;
+          return;
+        }
+        if (show) {
+          this.viewId = `a${item.id}`;
+          return;
         }
-        this.top = tasksHeight - scrollHeight / 2;
       }
     },
   },
diff --git a/src/components/TimeLine/component/TimeBox.vue b/src/components/TimeLine/component/TimeBox.vue
index a759856..a35c0e6 100644
--- a/src/components/TimeLine/component/TimeBox.vue
+++ b/src/components/TimeLine/component/TimeBox.vue
@@ -2,12 +2,13 @@
   <view class="column">
     <!-- v-if="tasks && tasks.length" -->
     <view>
-      <view :key="task.id" v-for="task in tasks">
+      <view :key="task.id" v-for="task in tasks" class="ssssss" :id="`a${task.id}`">
         <view class="flex">
           <TimeStatus :task="task" />
           <view class="flex items-center justify-between flex-1 ml-2 task-column">
             <view v-if="task.process !== 4">{{ $moment(+task.planStart).format(startTimeFormat) }}</view>
             <view v-else>{{ $moment(+task.planStart).format('D日') }}</view>
+
             <!-- 任务功能菜单 -->
             <TaskTools v-if="task.process !== 4" />
           </view>
diff --git a/src/mixins/timeline.js b/src/mixins/timeline.js
new file mode 100644
index 0000000..b61c46a
--- /dev/null
+++ b/src/mixins/timeline.js
@@ -0,0 +1,44 @@
+import { mapGetters } from 'vuex';
+
+const mixin = {
+  computed: mapGetters('task', ['timeGranularity']),
+
+  methods: {
+    /**
+     * 设置时间轴空数据
+     * @param {*} startTime
+     * @param {*} show true 向上加载,false 向下加载
+     */
+    setTime(startTime, show) {
+      let { timeGranularity } = this;
+      let arr = [];
+      let str = {};
+      if (show) {
+        for (let i = 10; i > 0; i--) {
+          str = {
+            id: this.$u.guid(20, false, 10),
+            panel: {},
+            plugins: [],
+            process: 4,
+            planStart: this.$t.time.add(startTime, `-${i}` - 0, timeGranularity).valueOf(),
+          };
+          arr.push(str);
+        }
+      } else {
+        for (let i = 0; i < 10; i++) {
+          str = {
+            id: this.$u.guid(20, false, 10),
+            panel: {},
+            plugins: [],
+            process: 4,
+            planStart: this.$t.time.add(startTime, i + 1, timeGranularity).valueOf(),
+          };
+          arr.push(str);
+        }
+      }
+      return arr;
+    },
+  },
+};
+
+export default mixin;
diff --git a/src/pages/project/project.vue b/src/pages/project/project.vue
index ad85156..b7b8416 100644
--- a/src/pages/project/project.vue
+++ b/src/pages/project/project.vue
@@ -18,8 +18,10 @@
 
 <script>
 import { mapState, mapGetters, mapMutations, mapActions } from 'vuex';
+import mixin from '@/mixins/timeline';
 
 export default {
+  mixins: [mixin],
   data() {
     return { height: '' };
   },
@@ -41,12 +43,10 @@ export default {
      * 重新根据时间和角色查询普通日常任务
      * 永久日常任务不发生改变
      */
-    timeNode(val) {
-      console.log('val: ', val);
+    async timeNode(val) {
       if (val && this.roleId) {
         // 根据时间和角色查找日常任务
-        this.getGlobalData();
-        this.getInitTasks();
+        await this.initTasks();
       }
     },
 
@@ -58,13 +58,11 @@ export default {
      */
     roleId(val) {
       if (val) {
+        console.log('角色发生变化: ', val);
         // 如果storage里有timeNode,修改store里的timeNode
-        this.setTimeNode(
-          +this.$t.storage.getStorageSync('timeNode') !== 0 ? +this.$t.storage.getStorageSync('timeNode') !== 0 : Date.now(),
-        );
+        this.setTimeNode(+this.$t.storage.getStorageSync('timeNode') !== 0 ? +this.$t.storage.getStorageSync('timeNode') : Date.now());
         // 清空storage
         this.$t.storage.setStorageSync('timeNode', '');
-        console.log('当角色发生变化时: ', this.timeNode);
         // 根据角色查找永久的日常任务
         this.getPermanent(val);
       }
@@ -77,6 +75,7 @@ export default {
 
   onUnload() {
     this.clearEndFlag();
+    this.clearTasks();
   },
 
   methods: {
@@ -87,7 +86,18 @@ export default {
     ...mapMutations('user', ['setToken']),
     ...mapMutations('project', ['setProject', 'setProjectName']),
     ...mapMutations('role', ['setInvisibleRoles', 'setVisibleRoles', 'setRoleId']),
-    ...mapMutations('task', ['setUpTasks', 'setDownTasks', 'setDailyTasks', 'setTimeNode', 'clearEndFlag', 'setShowSkeleton']),
+    ...mapMutations('task', [
+      'setPermanents',
+      'setUpTasks',
+      'setDownTasks',
+      'setDailyTasks',
+      'setTimeNode',
+      'clearTasks',
+      'clearEndFlag',
+      'setShowSkeleton',
+      'setTopEnd',
+      'setBottomEnd',
+    ]),
 
     /**
      * 初始化
@@ -113,11 +123,6 @@ export default {
           // 没有项目id参数
           this.$t.ui.showToast('缺少项目信息参数');
         } else {
-          // 如果storage里有timeNode,修改store里的timeNode
-          this.setTimeNode(this.$t.storage.getStorageSync('timeNode') - 0);
-          // 清空storage
-          this.$t.storage.setStorageSync('timeNode', '');
-          console.log('timeNode: ', this.$t.storage.getStorageSync('timeNode'), this.timeNode);
           // 根据项目id获取项目信息
           await this.getProjectById({ projectId: options.p });
           // 根据项目id获取角色列表
@@ -129,6 +134,28 @@ export default {
       }
     },
 
+    // 初始化 时间轴
+    async initTasks() {
+      // 清空日常任务的数据
+      this.setPermanents([]);
+      this.setDailyTasks([]);
+      // 清空定期任务数据
+      this.clearTasks();
+      // 到顶的标志复位
+      // 到底的标志复位
+      this.clearEndFlag();
+      // 根据时间和角色查找日常任务
+      this.getGlobalData();
+      // 向上加载空数据
+      this.setPrevTasks();
+      // 向下加载空数据
+      this.setNextTasks();
+      await this.getInitTasks();
+      setTimeout(() => {
+        this.$refs.child.setViewId();
+      }, 2000);
+    },
+
     // 切换了 颗粒度 || 角色时候 获取初始定期任务
     async getInitTasks() {
       // 根据时间基准点和角色查找定期任务
@@ -136,20 +163,21 @@ export default {
       await this.getTasks({ queryType: 1 });
 
       // 预加载 上下的定期任务
-      if (this.tasks && this.tasks.length && this.tasks[0].detailId) {
-        this.$nextTick(() => {
+      const detailId = this.tasks.findIndex(task => task.detailId);
+      if (detailId !== -1) {
+        this.$nextTick(async () => {
           const { tasks, timeGranularity } = this;
-          this.getTasks({ timeNode: +tasks[0].planStart, queryType: 0, queryNum: 6 }); // 向上拿数据
+          await this.getTasks({ timeNode: +tasks[0].planStart, queryType: 0, queryNum: 6 }); // 向上拿数据
           // 向下查的时候要再最后一个任务的开始时间的基础上 多加一个时间颗粒度
           const nextQueryTime = +this.$t.time.add(+tasks[tasks.length - 1].planStart, 1, timeGranularity);
-          this.getTasks({ timeNode: nextQueryTime, queryType: 1, queryNum: 6 }); // 向下拿数据
+          await this.getTasks({ timeNode: nextQueryTime, queryType: 1, queryNum: 6 }); // 向下拿数据
         });
       } else {
         // 没有任务 上下显示时间刻度
         // 向上加载
-        this.setUpTasks();
+        this.setPrevTasks();
         // 向下加载
-        this.setDownTasks();
+        this.setNextTasks();
       }
     },
 
@@ -184,9 +212,14 @@ export default {
           queryNum: query.queryNum || 3,
           queryType: query.queryType,
         };
-        console.log('params: ', params);
-        await this.getRegulars(params);
+        const res = await this.getRegulars(params);
         this.setShowSkeleton(false);
+        // 0 -> 向上  1 -> 向下
+        if (res && res.length) {
+          this.replacePrevData(res, params.queryType);
+        } else {
+          params.queryType === 0 ? this.setPrevTasks() : this.setNextTasks();
+        }
       } catch (error) {
         this.setShowSkeleton(false);
         console.error('error: ', error);
@@ -199,6 +232,73 @@ export default {
       const param = { roleId, timeNode, timeUnit };
       this.getGlobal(param);
     },
+
+    // 设置时间轴向上的空数据
+    setPrevTasks() {
+      this.setTopEnd(true);
+      let sTime = '';
+      if (!this.tasks || !this.tasks.length) {
+        sTime = +new Date().getTime();
+      } else {
+        sTime = +this.tasks[0].planStart - 0;
+      }
+      const initData = this.setTime(sTime, true);
+      this.setUpTasks(initData);
+    },
+
+    // 设置时间轴向下的空数据
+    setNextTasks() {
+      this.setBottomEnd(true);
+      let sTime = '';
+      if (!this.tasks || !this.tasks.length) {
+        sTime = +new Date().getTime();
+      } else {
+        sTime = +this.tasks[this.tasks.length - 1].planStart - 0;
+      }
+      const initData = this.setTime(sTime, false);
+      this.setDownTasks(initData);
+    },
+
+    // 筛选相同的时间替换数据
+    replacePrevData(data, type) {
+      let newTasks = [...this.tasks];
+      for (let i = 0; i < newTasks.length; i++) {
+        const task = newTasks[i];
+        let arr = [];
+        for (let j = 0; j < data.length; j++) {
+          const item = data[j];
+          // 查找有没有超出时间刻度的时间
+          if (+data[0].planStart < +newTasks[0].planStart) {
+            this.setPrevTasks();
+            newTasks = [...this.tasks];
+            break;
+          } else if (+data[data.length - 1].planStart > +newTasks[newTasks.length - 1].planStart) {
+            this.setNextTasks();
+            newTasks = [...this.tasks];
+            break;
+          } else {
+            // 筛选相同的时间替换数据
+            const taskItem = this.$t.time.isSame(+item.planStart, +task.planStart, this.timeGranularity);
+            if (taskItem) {
+              arr.push(item);
+              if (task.detailId) {
+                newTasks.splice(i, 0, item);
+              } else {
+                if (arr.length === 1) {
+                  newTasks.splice(i, 1, item);
+                }
+                if (arr.length > 1) {
+                  newTasks.splice(i, 0, item);
+                }
+              }
+              i++;
+            }
+          }
+        }
+      }
+      this.clearTasks();
+      type === 0 ? this.setUpTasks(newTasks) : this.setDownTasks(newTasks);
+    },
   },
 };
 </script>
diff --git a/src/store/task/actions.js b/src/store/task/actions.js
index f48ced7..33e7da9 100644
--- a/src/store/task/actions.js
+++ b/src/store/task/actions.js
@@ -18,10 +18,10 @@ const actions = {
    * @param {*} commit
    * @param {object} param 请求参数 roleId, timeNode, timeUnit
    */
-  async getGlobal({ commit }, param) {
+  async getGlobal(param) {
     try {
-      const data = await uni.$u.api.getGlobal(param);
-      commit('setDailyTasks', data);
+      await uni.$u.api.getGlobal(param);
+      // commit('setDailyTasks', data);
     } catch (error) {
       console.log('task actions getGlobal error: ', error);
     }
@@ -33,16 +33,10 @@ const actions = {
    * @param {number} param.queryType 必填  0 -> 向上  1 -> 向下
    */
   // eslint-disable-next-line
-  async getRegulars({ commit, state }, param) {
+  async getRegulars(param) {
     try {
-      // 向上查 且 上边没数据了 不查
-      // if (param.queryType === 0) return;
-      // 向下查 且 下边美术家了 不查
-      // if (param.queryType === 1) return;
       const data = await uni.$u.api.getRegularTask(param);
-      // 0 -> 向上  1 -> 向下
-      // data 有无的判断在mutations里
-      param.queryType === 0 ? commit('setUpTasks', data) : commit('setDownTasks', data);
+      return data;
     } catch (error) {
       throw error || '获取定期任务失败';
     }
diff --git a/src/store/task/mutations.js b/src/store/task/mutations.js
index 1994329..a0c51c4 100644
--- a/src/store/task/mutations.js
+++ b/src/store/task/mutations.js
@@ -52,7 +52,6 @@ const mutations = {
    */
   setTimeNode(state, data) {
     state.timeNode = data;
-    console.log('state.timeNode : ', state.timeNode);
   },
 
   /**
@@ -70,65 +69,10 @@ const mutations = {
    * @param {Array} data 服务端返回的模板数组
    */
   setUpTasks(state, data) {
-    if (!data || !data.length) {
-      state.topEnd = true;
-      let sTime = '';
-      if (!state.tasks || !state.tasks.length) {
-        sTime = +new Date().getTime();
-      } else {
-        sTime = +state.tasks[0].planStart - 0;
-      }
-      const initData = [
-        {
-          id: state.randomId,
-          panel: {},
-          plugins: [],
-          process: 4,
-          planStart: uni.$t.time.add(sTime, -6, 'day').valueOf(),
-        },
-        {
-          id: state.randomId,
-          panel: {},
-          plugins: [],
-          process: 4,
-          planStart: uni.$t.time.add(sTime, -5, 'day').valueOf(),
-        },
-        {
-          id: state.randomId,
-          panel: {},
-          plugins: [],
-          process: 4,
-          planStart: uni.$t.time.add(sTime, -4, 'day').valueOf(),
-        },
-        {
-          id: state.randomId,
-          panel: {},
-          plugins: [],
-          process: 4,
-          planStart: uni.$t.time.add(sTime, -3, 'day').valueOf(),
-        },
-        {
-          id: state.randomId,
-          panel: {},
-          plugins: [],
-          process: 4,
-          planStart: uni.$t.time.add(sTime, -2, 'day').valueOf(),
-        },
-        {
-          id: state.randomId,
-          panel: {},
-          plugins: [],
-          process: 4,
-          planStart: uni.$t.time.add(sTime, -1, 'day').valueOf(),
-        },
-      ];
-      state.tasks = [...initData.concat(state.tasks)];
+    if (!state.tasks.length) {
+      state.tasks = [...data];
     } else {
-      if (!state.tasks && !state.tasks.length) {
-        state.tasks = [...data];
-      } else {
-        state.tasks = [...data.concat(state.tasks)];
-      }
+      state.tasks = [...data.concat(state.tasks)];
     }
   },
 
@@ -138,65 +82,10 @@ const mutations = {
    * @param {Array} data 服务端返回的模板数组
    */
   setDownTasks(state, data) {
-    if (!data || !data.length) {
-      state.bottomEnd = true;
-      let sTime = '';
-      if (!state.tasks || !state.tasks.length) {
-        sTime = +new Date().getTime();
-      } else {
-        sTime = +state.tasks[state.tasks.length - 1].planStart - 0;
-      }
-      const initData = [
-        {
-          id: state.randomId,
-          panel: {},
-          plugins: [],
-          process: 4,
-          planStart: uni.$t.time.add(sTime, 1, 'day').valueOf(),
-        },
-        {
-          id: state.randomId,
-          panel: {},
-          plugins: [],
-          process: 4,
-          planStart: uni.$t.time.add(sTime, 2, 'day').valueOf(),
-        },
-        {
-          id: state.randomId,
-          panel: {},
-          plugins: [],
-          process: 4,
-          planStart: uni.$t.time.add(sTime, 3, 'day').valueOf(),
-        },
-        {
-          id: state.randomId,
-          panel: {},
-          plugins: [],
-          process: 4,
-          planStart: uni.$t.time.add(sTime, 4, 'day').valueOf(),
-        },
-        {
-          id: state.randomId,
-          panel: {},
-          plugins: [],
-          process: 4,
-          planStart: uni.$t.time.add(sTime, 5, 'day').valueOf(),
-        },
-        {
-          id: state.randomId,
-          panel: {},
-          plugins: [],
-          process: 4,
-          planStart: uni.$t.time.add(sTime, 6, 'day').valueOf(),
-        },
-      ];
-      state.tasks = [...state.tasks.concat(initData)];
+    if (!state.tasks && !state.tasks.length) {
+      state.tasks = [...data];
     } else {
-      if (!state.tasks && !state.tasks.length) {
-        state.tasks = [...data];
-      } else {
-        state.tasks = [...state.tasks.concat(data)];
-      }
+      state.tasks = [...state.tasks.concat(data)];
     }
   },
 
@@ -218,13 +107,35 @@ const mutations = {
     state.permanents = tasks || [];
   },
 
-  // 清空标志位 任务 如切换角色等使用
+  /**
+   * 设置时间轴是否继续向上查任务
+   * @param {Object} state
+   * @param {Boolean} show
+   */
+  setTopEnd(state, show) {
+    state.topEnd = show;
+  },
+
+  /**
+   * 设置时间轴是否继续向下查任务
+   * @param {Object} state
+   * @param {Boolean} show
+   */
+  setBottomEnd(state, show) {
+    state.bottomEnd = show;
+  },
+
+  // 清空标志位 如切换角色等使用
   clearEndFlag(state) {
-    state.tasks = [];
     state.topEnd = false;
     state.bottomEnd = false;
   },
 
+  // 清空定期任务
+  clearTasks(state) {
+    state.tasks = [];
+  },
+
   /**
    * 收到消息设置任务状态
    * @param {Object} state
diff --git a/src/store/task/state.js b/src/store/task/state.js
index 7aca908..d453785 100644
--- a/src/store/task/state.js
+++ b/src/store/task/state.js
@@ -25,7 +25,6 @@ const state = {
   // 定期任务
   tasks: [],
   showSkeleton: false, // 定期任务骨架屏
-  randomId: Math.floor(Math.random() * 100000000000000000000), // 随机id
 };
 
 export default state;
diff --git a/src/utils/time.js b/src/utils/time.js
index 4997acd..6f1fae2 100644
--- a/src/utils/time.js
+++ b/src/utils/time.js
@@ -100,6 +100,17 @@ const validateTimeIsToday = time => {
   return timeDate.getFullYear() === date.getFullYear() && timeDate.getMonth() === date.getMonth() && timeDate.getDate() === date.getDate();
 };
 
+/**
+ * 检测两个日期是否相同
+ * @param {number | date} time
+ * @param {number | date} value
+ * @param {string} cycle 传入 day 将会比较 day、 month和 year
+ */
+const isSame = (time, value, cycle) => {
+  const str = dayjs(time).isSame(value, cycle);
+  return str;
+};
+
 /**
  * 格式化开始时间
  * @param {Number} timestamp 时间戳
@@ -344,6 +355,7 @@ export default {
   convertTime,
   secondToMinute,
   setTimestampToStr,
+  isSame,
   formatBeginTime,
   formatDuration,
   formatDurationToObject,

From 14123d758c8ace7efb9eb493a000673b01d9eb15 Mon Sep 17 00:00:00 2001
From: song <srf428110@163.com>
Date: Wed, 18 Aug 2021 10:10:32 +0800
Subject: [PATCH 08/14] =?UTF-8?q?perf:=20=E4=BF=AE=E6=94=B9=E4=BB=A3?=
 =?UTF-8?q?=E7=A0=81=E6=A0=BC=E5=BC=8F?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 CHANGELOG.md                   |  3 ++-
 src/components/Roles/Roles.vue |  2 +-
 src/store/task/actions.js      | 11 +++++------
 3 files changed, 8 insertions(+), 8 deletions(-)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index aa13ab5..ca779c3 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -1,4 +1,4 @@
-# 0.1.0 (2021-08-17)
+# 0.1.0 (2021-08-18)
 
 ### 🌟 新功能
 范围|描述|commitId
@@ -79,6 +79,7 @@
 ### 🐛 Bug 修复
 范围|描述|commitId
 --|--|--
+ - | 1.时间轴数据渲染 2.时间基准线 | [d643af2](https://dd.tall.wiki/gitea/ccsens_fe/TALL-MUI-3/commits/d643af2)
  ID1000343 | 解决向下预加载查询参数时间没+1颗粒度;以及滚动加载颗粒度写死的问题 | [940603a](https://dd.tall.wiki/gitea/ccsens_fe/TALL-MUI-3/commits/940603a), closes [#ID1000343](https://dd.tall.wiki/gitea/ccsens_fe/TALL-MUI-3/issues/ID1000343)
  plugin | 插件解析机制完善 | [0f5a27d](https://dd.tall.wiki/gitea/ccsens_fe/TALL-MUI-3/commits/0f5a27d)
  project title | 项目标题修改; 切换角色移除script | [5c20017](https://dd.tall.wiki/gitea/ccsens_fe/TALL-MUI-3/commits/5c20017)
diff --git a/src/components/Roles/Roles.vue b/src/components/Roles/Roles.vue
index 524c0ef..2a087f9 100644
--- a/src/components/Roles/Roles.vue
+++ b/src/components/Roles/Roles.vue
@@ -58,7 +58,7 @@ export default {
   methods: {
     ...mapActions('task', ['handleRegularTask', 'getPermanent']),
     ...mapMutations('role', ['setRoleId']),
-    ...mapMutations('task', ['setPermanents', 'setDailyTasks', 'clearEndFlag']),
+    ...mapMutations('task', ['setPermanents', 'clearEndFlag']),
 
     // 设置滚动位置
     setCurrentRole(index) {
diff --git a/src/store/task/actions.js b/src/store/task/actions.js
index 33e7da9..b8dfbfb 100644
--- a/src/store/task/actions.js
+++ b/src/store/task/actions.js
@@ -18,10 +18,10 @@ const actions = {
    * @param {*} commit
    * @param {object} param 请求参数 roleId, timeNode, timeUnit
    */
-  async getGlobal(param) {
+  async getGlobal({ commit }, param) {
     try {
-      await uni.$u.api.getGlobal(param);
-      // commit('setDailyTasks', data);
+      const data = await uni.$u.api.getGlobal(param);
+      commit('setDailyTasks', data);
     } catch (error) {
       console.log('task actions getGlobal error: ', error);
     }
@@ -33,10 +33,9 @@ const actions = {
    * @param {number} param.queryType 必填  0 -> 向上  1 -> 向下
    */
   // eslint-disable-next-line
-  async getRegulars(param) {
+  async getRegulars({ commit }, param) {
     try {
-      const data = await uni.$u.api.getRegularTask(param);
-      return data;
+      return await uni.$u.api.getRegularTask(param);
     } catch (error) {
       throw error || '获取定期任务失败';
     }

From e082ccb76ffd713bf5ab49ba4991514e80d12aef Mon Sep 17 00:00:00 2001
From: song <srf428110@163.com>
Date: Wed, 18 Aug 2021 11:37:51 +0800
Subject: [PATCH 09/14] =?UTF-8?q?perf:=201.=E6=97=B6=E9=97=B4=E8=BD=B4?=
 =?UTF-8?q?=E7=AD=9B=E9=80=89=E7=9B=B8=E5=90=8C=E7=9A=84=E6=97=B6=E9=97=B4?=
 =?UTF-8?q?=E6=9B=BF=E6=8D=A2=E6=95=B0=E6=8D=AE=202.=E6=95=B4=E7=90=86?=
 =?UTF-8?q?=E4=BB=A3=E7=A0=81?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 CHANGELOG.md                                  |  1 +
 src/components/Roles/Roles.vue                |  1 -
 src/components/TimeLine/TimeLine.vue          | 21 ++++++++++---------
 src/components/TimeLine/component/TimeBox.vue |  7 ++++---
 src/pages/project/project.vue                 | 14 ++++++-------
 src/plugins/p-wbs-import/p-wbs-import.vue     |  3 +--
 src/store/task/mutations.js                   |  9 ++++++++
 src/store/task/state.js                       |  1 +
 8 files changed, 34 insertions(+), 23 deletions(-)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index ca779c3..9636235 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -161,6 +161,7 @@
 ### 🚀 性能优化
 范围|描述|commitId
 --|--|--
+ - | 修改代码格式 | [14123d7](https://dd.tall.wiki/gitea/ccsens_fe/TALL-MUI-3/commits/14123d7)
  - | 修改定期任务骨架屏高度 | [909a734](https://dd.tall.wiki/gitea/ccsens_fe/TALL-MUI-3/commits/909a734)
  - | 插件查询及展示 | [4dba770](https://dd.tall.wiki/gitea/ccsens_fe/TALL-MUI-3/commits/4dba770)
  - | 整理代码 | [7a55315](https://dd.tall.wiki/gitea/ccsens_fe/TALL-MUI-3/commits/7a55315)
diff --git a/src/components/Roles/Roles.vue b/src/components/Roles/Roles.vue
index 2a087f9..798ef98 100644
--- a/src/components/Roles/Roles.vue
+++ b/src/components/Roles/Roles.vue
@@ -85,7 +85,6 @@ export default {
     // 时间基准点不用管 project监听了roleId 里处理了
     changeRole(id, index) {
       try {
-        console.log('切换角色');
         // 清除多余的script
         this.clearPluginScript();
         this.$nextTick(() => {
diff --git a/src/components/TimeLine/TimeLine.vue b/src/components/TimeLine/TimeLine.vue
index 449b74e..efcc1ff 100644
--- a/src/components/TimeLine/TimeLine.vue
+++ b/src/components/TimeLine/TimeLine.vue
@@ -31,20 +31,17 @@ export default {
   mixins: [mixin],
 
   data() {
-    return {
-      top: 0,
-      viewId: '', // 距离顶部的距离
-    };
+    return { top: 0 };
   },
 
   computed: {
     ...mapState('role', ['visibleRoles']),
-    ...mapState('task', ['scrollTop', 'showTips', 'tasks', 'topEnd', 'bottomEnd', 'showSkeleton', 'timeNode']),
+    ...mapState('task', ['scrollTop', 'showTips', 'tasks', 'topEnd', 'bottomEnd', 'showSkeleton', 'timeNode', 'viewId']),
     ...mapGetters('task', ['timeGranularity']),
   },
 
   methods: {
-    ...mapMutations('task', ['setScrollTop', 'setShrink', 'setUpTasks', 'setDownTasks']),
+    ...mapMutations('task', ['setScrollTop', 'setShrink', 'setUpTasks', 'setDownTasks', 'setViewId']),
 
     // 滚动
     scroll(e) {
@@ -98,17 +95,21 @@ export default {
     },
 
     // 设置自动滚动位置
-    setViewId() {
+    setScrollPosition() {
       const { tasks, timeNode } = this;
       for (let i = 0; i < tasks.length; i++) {
         const item = tasks[i];
         const show = this.$t.time.isSame(+item.planStart, +timeNode, this.timeGranularity);
-        if (item.detailId) {
-          this.viewId = `a${item.id}`;
+        // 如果storage里有timeNode,修改store里的timeNode
+        const taskId = this.$t.storage.getStorageSync('taskId');
+        // 清空storage
+        if (taskId) {
+          this.setViewId(`a${taskId}`);
+          this.$t.storage.setStorageSync('taskId', '');
           return;
         }
         if (show) {
-          this.viewId = `a${item.id}`;
+          this.setViewId(`a${item.id}`);
           return;
         }
       }
diff --git a/src/components/TimeLine/component/TimeBox.vue b/src/components/TimeLine/component/TimeBox.vue
index a35c0e6..b8e10c3 100644
--- a/src/components/TimeLine/component/TimeBox.vue
+++ b/src/components/TimeLine/component/TimeBox.vue
@@ -38,7 +38,7 @@
               class="h-16"
               margin="0"
               v-if="tasks && tasks.length && task.process !== 4 && !showSkeleton"
-              @click="onClickTask(+task.planStart)"
+              @click="onClickTask(+task.planStart, task.id)"
             >
               <!-- 任务面板插件 -->
               <view slot="body">
@@ -105,11 +105,12 @@ export default {
     /**
      * 点击了定期任务的面板 更新可变的日常任务
      * @param {number} planStart 任务计划开始时间
+     * @param {string} taskId 任务id
      */
-    onClickTask(planStart) {
+    onClickTask(planStart, taskId) {
       const param = { roleId: this.roleId, timeNode: planStart, timeUnit: this.timeUnit };
       this.getGlobal(param);
-      this.$t.storage.setStorageSync('timeNode', planStart);
+      this.$t.storage.setStorageSync('taskId', taskId);
       this.$t.storage.setStorageSync('roleId', this.roleId);
     },
 
diff --git a/src/pages/project/project.vue b/src/pages/project/project.vue
index b7b8416..9086a26 100644
--- a/src/pages/project/project.vue
+++ b/src/pages/project/project.vue
@@ -44,6 +44,7 @@ export default {
      * 永久日常任务不发生改变
      */
     async timeNode(val) {
+      console.log('时间基准点发生变化: ', val);
       if (val && this.roleId) {
         // 根据时间和角色查找日常任务
         await this.initTasks();
@@ -59,10 +60,7 @@ export default {
     roleId(val) {
       if (val) {
         console.log('角色发生变化: ', val);
-        // 如果storage里有timeNode,修改store里的timeNode
-        this.setTimeNode(+this.$t.storage.getStorageSync('timeNode') !== 0 ? +this.$t.storage.getStorageSync('timeNode') : Date.now());
-        // 清空storage
-        this.$t.storage.setStorageSync('timeNode', '');
+        this.setTimeNode(Date.now());
         // 根据角色查找永久的日常任务
         this.getPermanent(val);
       }
@@ -152,7 +150,7 @@ export default {
       this.setNextTasks();
       await this.getInitTasks();
       setTimeout(() => {
-        this.$refs.child.setViewId();
+        this.$refs.child.setScrollPosition();
       }, 2000);
     },
 
@@ -268,17 +266,19 @@ export default {
         for (let j = 0; j < data.length; j++) {
           const item = data[j];
           // 查找有没有超出时间刻度的时间
-          if (+data[0].planStart < +newTasks[0].planStart) {
+          if (+newTasks[0].planStart > +data[0].planStart) {
             this.setPrevTasks();
             newTasks = [...this.tasks];
+            i--;
             break;
           } else if (+data[data.length - 1].planStart > +newTasks[newTasks.length - 1].planStart) {
             this.setNextTasks();
             newTasks = [...this.tasks];
+            i--;
             break;
           } else {
             // 筛选相同的时间替换数据
-            const taskItem = this.$t.time.isSame(+item.planStart, +task.planStart, this.timeGranularity);
+            const taskItem = this.$t.time.isSame(+task.planStart, +item.planStart, this.timeGranularity);
             if (taskItem) {
               arr.push(item);
               if (task.detailId) {
diff --git a/src/plugins/p-wbs-import/p-wbs-import.vue b/src/plugins/p-wbs-import/p-wbs-import.vue
index 0e37dd2..00b9b1b 100644
--- a/src/plugins/p-wbs-import/p-wbs-import.vue
+++ b/src/plugins/p-wbs-import/p-wbs-import.vue
@@ -54,8 +54,7 @@ export default {
     // TODO: 更新接口没写完
     async handleUpdate() {
       try {
-        const data = await this.$u.api.import({ projectId: this.projectId });
-        console.log('data: ', data);
+        await this.$u.api.import({ projectId: this.projectId });
         // 导入WBS成功后
         // 直接打开导入的项目
         this.onUploadSuccess();
diff --git a/src/store/task/mutations.js b/src/store/task/mutations.js
index a0c51c4..e644faa 100644
--- a/src/store/task/mutations.js
+++ b/src/store/task/mutations.js
@@ -8,6 +8,15 @@ const mutations = {
     state.scrollTop = num;
   },
 
+  /**
+   * 记录时间轴向上滚动的距离
+   * @param { object } state
+   * @param { string } data
+   */
+  setViewId(state, data) {
+    state.viewId = data;
+  },
+
   /**
    * 设置日常任务当前是否应该处于收缩状态
    * @param { object } state
diff --git a/src/store/task/state.js b/src/store/task/state.js
index d453785..e8397e0 100644
--- a/src/store/task/state.js
+++ b/src/store/task/state.js
@@ -1,5 +1,6 @@
 const state = {
   scrollTop: 0,
+  viewId: '', // 时间轴自动滚动的位置
   isShrink: false, // true: 收起， false：展开
   tip: {
     taskId: '', // 当前正在修改状态的任务的id

From a3474f81650fc8aff2973c51d65f2c5f50b6994d Mon Sep 17 00:00:00 2001
From: song <srf428110@163.com>
Date: Wed, 18 Aug 2021 11:50:58 +0800
Subject: [PATCH 10/14] =?UTF-8?q?fix:=20=E8=AE=BE=E7=BD=AE=E6=97=B6?=
 =?UTF-8?q?=E9=97=B4=E8=BD=B4=E8=87=AA=E5=8A=A8=E6=BB=9A=E5=8A=A8=E5=88=B0?=
 =?UTF-8?q?=E5=BD=93=E5=89=8D=E4=BD=8D=E7=BD=AE?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 CHANGELOG.md                  | 1 +
 src/pages/project/project.vue | 6 +++---
 2 files changed, 4 insertions(+), 3 deletions(-)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 9636235..b930d9e 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -161,6 +161,7 @@
 ### 🚀 性能优化
 范围|描述|commitId
 --|--|--
+ - | 1.时间轴筛选相同的时间替换数据 2.整理代码 | [e082ccb](https://dd.tall.wiki/gitea/ccsens_fe/TALL-MUI-3/commits/e082ccb)
  - | 修改代码格式 | [14123d7](https://dd.tall.wiki/gitea/ccsens_fe/TALL-MUI-3/commits/14123d7)
  - | 修改定期任务骨架屏高度 | [909a734](https://dd.tall.wiki/gitea/ccsens_fe/TALL-MUI-3/commits/909a734)
  - | 插件查询及展示 | [4dba770](https://dd.tall.wiki/gitea/ccsens_fe/TALL-MUI-3/commits/4dba770)
diff --git a/src/pages/project/project.vue b/src/pages/project/project.vue
index 9086a26..bd7e511 100644
--- a/src/pages/project/project.vue
+++ b/src/pages/project/project.vue
@@ -149,9 +149,6 @@ export default {
       // 向下加载空数据
       this.setNextTasks();
       await this.getInitTasks();
-      setTimeout(() => {
-        this.$refs.child.setScrollPosition();
-      }, 2000);
     },
 
     // 切换了 颗粒度 || 角色时候 获取初始定期任务
@@ -242,6 +239,9 @@ export default {
       }
       const initData = this.setTime(sTime, true);
       this.setUpTasks(initData);
+      this.$nextTick(() => {
+        this.$refs.child.setScrollPosition();
+      });
     },
 
     // 设置时间轴向下的空数据

From 30e352fa54d8ba172ba9780425ed1715e33a1ca3 Mon Sep 17 00:00:00 2001
From: song <srf428110@163.com>
Date: Wed, 18 Aug 2021 15:19:42 +0800
Subject: [PATCH 11/14] =?UTF-8?q?fix:=20=E4=BF=AE=E6=94=B9=E5=AE=9A?=
 =?UTF-8?q?=E6=9C=9F=E4=BB=BB=E5=8A=A1=E7=8A=B6=E6=80=810=E5=92=8C4?=
 =?UTF-8?q?=E6=97=B6=E4=B8=8D=E5=8A=A0=E8=BD=BD=E5=9C=86=E5=9C=88?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 CHANGELOG.md                                  |  1 +
 .../TimeLine/component/TimeStatus.vue         | 27 ++++++++++++++++++-
 2 files changed, 27 insertions(+), 1 deletion(-)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index b930d9e..bdc413f 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -121,6 +121,7 @@
  - | 角色显示状态修改 | [7d3b906](https://dd.tall.wiki/gitea/ccsens_fe/TALL-MUI-3/commits/7d3b906)
  - | 角色栏修改 | [19228d6](https://dd.tall.wiki/gitea/ccsens_fe/TALL-MUI-3/commits/19228d6)
  - | 解决时间轴报错 | [da1eece](https://dd.tall.wiki/gitea/ccsens_fe/TALL-MUI-3/commits/da1eece)
+ - | 设置时间轴自动滚动到当前位置 | [a3474f8](https://dd.tall.wiki/gitea/ccsens_fe/TALL-MUI-3/commits/a3474f8)
  - | 跳转详情页返回路径修改 | [c5e17c0](https://dd.tall.wiki/gitea/ccsens_fe/TALL-MUI-3/commits/c5e17c0)
  - | 骨架屏替换 | [e9fdd71](https://dd.tall.wiki/gitea/ccsens_fe/TALL-MUI-3/commits/e9fdd71)
 
diff --git a/src/components/TimeLine/component/TimeStatus.vue b/src/components/TimeLine/component/TimeStatus.vue
index 7215474..b98fcef 100644
--- a/src/components/TimeLine/component/TimeStatus.vue
+++ b/src/components/TimeLine/component/TimeStatus.vue
@@ -5,13 +5,25 @@
       :style="{ color: orderStyle.color }"
       @tap="changeStatus($event, task.process)"
     >
+      <!-- 1进行中 2暂停中 3已完成 -->
       <u-circle-progress
         :percent="+orderStyle.persent"
         :active-color="orderStyle.color"
         bg-color="rgba(255,255,255,0)"
         border-width="4"
         :width="task.process !== 4 ? 66 : 50"
+        v-if="task.process === 1 || task.process === 2 || task.process === 3"
       >
+        <view class="u-progress-content">
+          <view class="u-progress-dot"></view>
+          <view class="u-progress-info">
+            <u-icon :name="orderStyle.icon" v-if="orderStyle.icon" size="15px"></u-icon>
+            <template v-else>{{ computeDurationText() }}</template>
+          </view>
+        </view>
+      </u-circle-progress>
+      <!-- 0未开始 4添加任务 -->
+      <view class="progress-box flex justify-center items-center rounded-full" v-else :class="task.process === 4 ? 'progress-box-4' : ''">
         <view class="u-progress-content">
           <view class="u-progress-dot"></view>
           <view class="u-progress-info">
@@ -22,7 +34,7 @@
             <template v-else>{{ computeDurationText() }}</template>
           </view>
         </view>
-      </u-circle-progress>
+      </view>
     </view>
   </view>
 </template>
@@ -184,4 +196,17 @@ export default {
   height: 33px;
   width: 33px;
 }
+
+.progress-box {
+  background: rgba(255, 255, 255, 0);
+  width: 33px;
+  height: 33px;
+  border: 2px solid #9ca3af;
+}
+
+.progress-box-4 {
+  width: 25px;
+  height: 25px;
+  border: 2px solid #60a5fa;
+}
 </style>

From 551da63f697118f36277c3036ae6994c257dac69 Mon Sep 17 00:00:00 2001
From: song <srf428110@163.com>
Date: Wed, 18 Aug 2021 15:44:13 +0800
Subject: [PATCH 12/14] =?UTF-8?q?fix:=20=E6=97=B6=E9=97=B4=E8=BD=B4?=
 =?UTF-8?q?=E6=BB=9A=E5=8A=A8=E4=BD=8D=E7=BD=AE=E4=BF=AE=E6=94=B9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 CHANGELOG.md                                   |  1 +
 .../TimeLine/component/TimeStatus.vue          |  1 -
 src/pages/project/project.vue                  | 18 +++++++++++++-----
 3 files changed, 14 insertions(+), 6 deletions(-)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index bdc413f..a8ecc37 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -92,6 +92,7 @@
  - | 下拉加载定期任务传参，时间格式化修改 | [0b95a0e](https://dd.tall.wiki/gitea/ccsens_fe/TALL-MUI-3/commits/0b95a0e)
  - | 任务开始时间延迟插件 | [992a313](https://dd.tall.wiki/gitea/ccsens_fe/TALL-MUI-3/commits/992a313)
  - | 修改main | [749ae9a](https://dd.tall.wiki/gitea/ccsens_fe/TALL-MUI-3/commits/749ae9a)
+ - | 修改定期任务状态0和4时不加载圆圈 | [30e352f](https://dd.tall.wiki/gitea/ccsens_fe/TALL-MUI-3/commits/30e352f)
  - | 修改小红点传参 | [87b20fd](https://dd.tall.wiki/gitea/ccsens_fe/TALL-MUI-3/commits/87b20fd)
  - | 修改报错 | [531c14d](https://dd.tall.wiki/gitea/ccsens_fe/TALL-MUI-3/commits/531c14d)
  - | 修改接口路径 | [df6acf2](https://dd.tall.wiki/gitea/ccsens_fe/TALL-MUI-3/commits/df6acf2)
diff --git a/src/components/TimeLine/component/TimeStatus.vue b/src/components/TimeLine/component/TimeStatus.vue
index b98fcef..4042b07 100644
--- a/src/components/TimeLine/component/TimeStatus.vue
+++ b/src/components/TimeLine/component/TimeStatus.vue
@@ -118,7 +118,6 @@ export default {
      * @param {object} event
      */
     changeStatus(event, process) {
-      console.log('event, process: ', event, process);
       if (process === 4) {
         this.addTask();
         return;
diff --git a/src/pages/project/project.vue b/src/pages/project/project.vue
index bd7e511..0663aec 100644
--- a/src/pages/project/project.vue
+++ b/src/pages/project/project.vue
@@ -44,7 +44,6 @@ export default {
      * 永久日常任务不发生改变
      */
     async timeNode(val) {
-      console.log('时间基准点发生变化: ', val);
       if (val && this.roleId) {
         // 根据时间和角色查找日常任务
         await this.initTasks();
@@ -59,7 +58,6 @@ export default {
      */
     roleId(val) {
       if (val) {
-        console.log('角色发生变化: ', val);
         this.setTimeNode(Date.now());
         // 根据角色查找永久的日常任务
         this.getPermanent(val);
@@ -146,9 +144,22 @@ export default {
       this.getGlobalData();
       // 向上加载空数据
       this.setPrevTasks();
+      // storage没有存储值就跳转到当前时间位置
+      const storageTaskId = this.$t.storage.getStorageSync('taskId');
+      this.$nextTick(() => {
+        if (!storageTaskId) {
+          this.$refs.child.setScrollPosition();
+        }
+      });
       // 向下加载空数据
       this.setNextTasks();
       await this.getInitTasks();
+      // 从详情页返回时跳转到之前的位置 storage有存储值
+      this.$nextTick(() => {
+        if (storageTaskId) {
+          this.$refs.child.setScrollPosition();
+        }
+      });
     },
 
     // 切换了 颗粒度 || 角色时候 获取初始定期任务
@@ -239,9 +250,6 @@ export default {
       }
       const initData = this.setTime(sTime, true);
       this.setUpTasks(initData);
-      this.$nextTick(() => {
-        this.$refs.child.setScrollPosition();
-      });
     },
 
     // 设置时间轴向下的空数据

From 2ac40531b1a6985febb315e8f5a609b5ceaf889c Mon Sep 17 00:00:00 2001
From: song <srf428110@163.com>
Date: Wed, 18 Aug 2021 16:43:59 +0800
Subject: [PATCH 13/14] =?UTF-8?q?fix:=20=E5=88=9D=E5=A7=8B=E5=B1=95?=
 =?UTF-8?q?=E7=A4=BA=E8=A7=92=E8=89=B2=E4=BF=AE=E6=94=B9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 CHANGELOG.md                     | 1 +
 src/components/Plugin/Plugin.vue | 4 ++--
 src/components/Roles/Roles.vue   | 1 +
 src/pages/project/project.vue    | 2 +-
 4 files changed, 5 insertions(+), 3 deletions(-)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index a8ecc37..fd6b0d7 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -117,6 +117,7 @@
  - | 时间轴上下滚动数据加载bug修改 | [e82ede4](https://dd.tall.wiki/gitea/ccsens_fe/TALL-MUI-3/commits/e82ede4)
  - | 时间轴插件 | [225d3cc](https://dd.tall.wiki/gitea/ccsens_fe/TALL-MUI-3/commits/225d3cc)
  - | 时间轴无任务时时间刻度加载修改 | [4921672](https://dd.tall.wiki/gitea/ccsens_fe/TALL-MUI-3/commits/4921672)
+ - | 时间轴滚动位置修改 | [551da63](https://dd.tall.wiki/gitea/ccsens_fe/TALL-MUI-3/commits/551da63)
  - | 时间轴骨架屏修改 | [ca78d02](https://dd.tall.wiki/gitea/ccsens_fe/TALL-MUI-3/commits/ca78d02)
  - | 监听时间基本点 | [033fca0](https://dd.tall.wiki/gitea/ccsens_fe/TALL-MUI-3/commits/033fca0)
  - | 角色显示状态修改 | [7d3b906](https://dd.tall.wiki/gitea/ccsens_fe/TALL-MUI-3/commits/7d3b906)
diff --git a/src/components/Plugin/Plugin.vue b/src/components/Plugin/Plugin.vue
index 88a6b41..20d7127 100644
--- a/src/components/Plugin/Plugin.vue
+++ b/src/components/Plugin/Plugin.vue
@@ -27,8 +27,8 @@
       <p-task-duration-delay :task="task" v-if="pluginId === '3'" />
       <p-task-start-time-delay :task="task" v-if="pluginId === '4'" />
       <!-- <p-deliverable :task="task" v-if="pluginId === '5'" /> -->
-      <!-- <p-subtasks :task="task" v-if="pluginId === '6'" /> -->
-      <!-- <p-subproject :task="task" v-if="pluginId === '7'" /> -->
+      <p-subtasks :task="task" v-if="pluginId === '6'" />
+      <p-subproject :task="task" v-if="pluginId === '7'" />
       <!-- <p-task-countdown :task="task" v-if="pluginId === '8'" /> -->
       <p-manage-project :task="task" v-if="pluginId === '9'" />
       <p-manage-role :task="task" v-if="pluginId === '10'" />
diff --git a/src/components/Roles/Roles.vue b/src/components/Roles/Roles.vue
index 798ef98..6bf350f 100644
--- a/src/components/Roles/Roles.vue
+++ b/src/components/Roles/Roles.vue
@@ -62,6 +62,7 @@ export default {
 
     // 设置滚动位置
     setCurrentRole(index) {
+      console.log('index: ', index);
       const data = document.getElementsByClassName('tab-children');
       // 获取当前所有子元素 并插入到 tabList 列表中
       data.forEach(item => {
diff --git a/src/pages/project/project.vue b/src/pages/project/project.vue
index 0663aec..9ea4c29 100644
--- a/src/pages/project/project.vue
+++ b/src/pages/project/project.vue
@@ -189,7 +189,7 @@ export default {
 
     // 设置 初始显示角色信息
     setInitialRoleId(visibleList) {
-      const index = visibleList.findIndex(item => item.mine === '1');
+      const index = visibleList.findIndex(item => +item.mine === 1);
       const currentRole = index > 0 ? visibleList[index] : visibleList[0];
       const storageRoleId = this.$t.storage.getStorageSync('roleId');
       const currentRoleId = storageRoleId ? storageRoleId : currentRole ? currentRole.id : '';

From 7bda7e2c2dc1eab763d57a8261e60bd02d61a06b Mon Sep 17 00:00:00 2001
From: song <srf428110@163.com>
Date: Wed, 18 Aug 2021 18:07:51 +0800
Subject: [PATCH 14/14] =?UTF-8?q?feat:=20=E6=B7=BB=E5=8A=A0=E5=AD=90?=
 =?UTF-8?q?=E4=BB=BB=E5=8A=A1=E6=8F=92=E4=BB=B6=20=E5=AD=90=E9=A1=B9?=
 =?UTF-8?q?=E7=9B=AE=E6=8F=92=E4=BB=B6?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 CHANGELOG.md                              |  1 +
 src/apis/plugin.js                        |  4 ++
 src/plugins/p-subproject/p-subproject.vue | 50 ++++++++++++++++++++---
 src/plugins/p-subtasks/p-subtasks.vue     | 32 ++++++++++++---
 4 files changed, 76 insertions(+), 11 deletions(-)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index fd6b0d7..38b457d 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -99,6 +99,7 @@
  - | 修改角色栏组件 | [a54c601](https://dd.tall.wiki/gitea/ccsens_fe/TALL-MUI-3/commits/a54c601)
  - | 切换到默认项目角色没有激活状态的bug | [438d448](https://dd.tall.wiki/gitea/ccsens_fe/TALL-MUI-3/commits/438d448)
  - | 切换日历时查询小红点 | [7091789](https://dd.tall.wiki/gitea/ccsens_fe/TALL-MUI-3/commits/7091789)
+ - | 初始展示角色修改 | [2ac4053](https://dd.tall.wiki/gitea/ccsens_fe/TALL-MUI-3/commits/2ac4053)
  - | 定期任务key值修改 | [c6688db](https://dd.tall.wiki/gitea/ccsens_fe/TALL-MUI-3/commits/c6688db)
  - | 定期任务接口 | [aa4981c](https://dd.tall.wiki/gitea/ccsens_fe/TALL-MUI-3/commits/aa4981c)
  - | 定期任务插件 | [92b3254](https://dd.tall.wiki/gitea/ccsens_fe/TALL-MUI-3/commits/92b3254)
diff --git a/src/apis/plugin.js b/src/apis/plugin.js
index e8ea541..0899cca 100644
--- a/src/apis/plugin.js
+++ b/src/apis/plugin.js
@@ -5,6 +5,10 @@ const install = (Vue, vm) => {
   vm.$u.api = { ...vm.$u.api } || {};
   // 获取插件信息
   vm.$u.api.getOtherPlugin = param => vm.$u.post(`${url}/pluginshop/plugin/query`, param);
+  // 查询子任务
+  vm.$u.api.findSonTask = param => vm.$u.post(`${uni.$t.domain}/task/findSonTask`, param);
+  // 查询子项目
+  vm.$u.api.findSonProject = param => vm.$u.post(`${uni.$t.domain}/project/findSonProject`, param);
 };
 
 export default { install };
diff --git a/src/plugins/p-subproject/p-subproject.vue b/src/plugins/p-subproject/p-subproject.vue
index 67c08b0..602ccd8 100644
--- a/src/plugins/p-subproject/p-subproject.vue
+++ b/src/plugins/p-subproject/p-subproject.vue
@@ -1,18 +1,58 @@
 <template>
   <!-- 子项目插件 -->
-  <view>子项目插件：显示子项目</view>
+  <view>
+    <view v-for="item in sonProject" :key="item.detailId">
+      <span class="text-xs text-blue-500" @click="openProject(item)">{{ item.name }}</span>
+    </view>
+  </view>
 </template>
 
 <script>
+import { mapGetters } from 'vuex';
+
 export default {
   name: 'p-subproject',
-  props: { item: { type: Object, default: null } },
+  props: {
+    task: {
+      type: Object,
+      default: () => {},
+    },
+  },
   data() {
-    return {};
+    return { sonProject: [] };
   },
 
-  computed: {},
-  methods: {},
+  computed: mapGetters('project', ['projectId']),
+
+  mounted() {
+    this.getSonProject();
+  },
+
+  methods: {
+    async getSonProject() {
+      try {
+        const data = await this.$u.api.findSonProject({ projectId: this.task.detailId });
+        this.sonProject = data;
+      } catch (error) {
+        console.error('p-subproject.vue getSonProject error: ', error);
+      }
+    },
+
+    /**
+     * 打开项目
+     * @param {object} project 所点击的项目的信息
+     */
+    openProject(project) {
+      const { name, id, url } = project;
+      url && (uni.$t.domain = url);
+      this.$u.route('pages/project/project', {
+        u: this.userId,
+        p: id,
+        pname: name,
+        url: encodeURIComponent(url),
+      });
+    },
+  },
   watch: {},
 };
 </script>
diff --git a/src/plugins/p-subtasks/p-subtasks.vue b/src/plugins/p-subtasks/p-subtasks.vue
index 0f652cb..8e55858 100644
--- a/src/plugins/p-subtasks/p-subtasks.vue
+++ b/src/plugins/p-subtasks/p-subtasks.vue
@@ -1,18 +1,38 @@
 <template>
-  <view>子任务插件：显示子任务</view>
+  <view>
+    <view v-for="item in sonTask" :key="item.detailId">
+      <span class="text-xs text-gray-500">{{ item.name }}</span>
+    </view>
+  </view>
 </template>
 
 <script>
 export default {
   name: 'p-subtasks',
-  props: { item: { type: Object, default: null } },
+  props: {
+    task: {
+      type: Object,
+      default: () => {},
+    },
+  },
   data() {
-    return {};
+    return { sonTask: [] };
+  },
+
+  created() {
+    this.getSonTask();
   },
 
-  computed: {},
-  methods: {},
-  watch: {},
+  methods: {
+    async getSonTask() {
+      try {
+        const data = await this.$u.api.findSonTask({ detailId: this.task.detailId });
+        this.sonTask = data;
+      } catch (error) {
+        console.error('p-subtasks.vue getSonTask error: ', error);
+      }
+    },
+  },
 };
 </script>