Merge remote-tracking branch 'origin/lucky' into temp

CHANGELOG.md

@@ -165,6 +165,16 @@
  - | 组件文件夹新建 | 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
@@ -189,4 +199,3 @@
  - | style:index | 978f272
  - | !2 基础模板v1.1.0 | f5e61dd
  - | init | c0f1deb
-

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(() => {

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);
     },
 
     // 设置网格布局

src/pages/project/project.vue

@@ -44,8 +44,8 @@ export default {
     timeNode(val) {
       if (val && this.roleId) {
         // 根据时间和角色查找日常任务
-        this.getGlobalData();
+        // this.getGlobalData();
-        this.getInitTasks();
+        // 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,6 +110,11 @@ 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获取角色列表
@@ -145,8 +154,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', '');
     },
 
     /**
@@ -169,7 +181,7 @@ export default {
           queryNum: query.queryNum || 3,
           queryType: query.queryType,
         };
-
+        console.log('params: ', params);
         await this.getRegulars(params);
         this.setShowSkeleton(false);
       } catch (error) {

src/store/task/mutations.js

@@ -52,6 +52,7 @@ const mutations = {
    */
   setTimeNode(state, data) {
     state.timeNode = data;
+    console.log('state.timeNode : ', state.timeNode);
   },
 
   /**