From 5e06adf5a37db436568ee8dd207bc4347efd97b7 Mon Sep 17 00:00:00 2001
From: song <srf428110@163.com>
Date: Wed, 11 Aug 2021 18:19:59 +0800
Subject: [PATCH] =?UTF-8?q?feat:=20=E5=AF=BC=E5=85=A5=E9=A1=B9=E7=9B=AE,?=
 =?UTF-8?q?=E6=9B=B4=E6=96=B0=E9=A1=B9=E7=9B=AE?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 CHANGELOG.md                              |  1 +
 src/pages/project/project.vue             | 13 ------
 src/plugins/p-wbs-import/p-wbs-import.vue | 54 +++++++++++++++++++++--
 src/store/project/mutations.js            | 12 -----
 src/store/project/state.js                |  6 ---
 5 files changed, 51 insertions(+), 35 deletions(-)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 7e165fb..e78cb32 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -88,6 +88,7 @@
  - | 修改报错 | [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)
+ - | 切换日历时查询小红点 | [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)
diff --git a/src/pages/project/project.vue b/src/pages/project/project.vue
index 89bb87d..e5c9975 100644
--- a/src/pages/project/project.vue
+++ b/src/pages/project/project.vue
@@ -1,17 +1,5 @@
 <template>
   <view :style="{ height: height }" class="flex flex-col overflow-hidden u-font-14">
-    <!-- 全局提示框 -->
-    <u-alert-tips
-      class="top-0 -inset-x-0"
-      style="position: fixed !important; z-index: 999"
-      type="error"
-      :close-able="true"
-      :title="alert.title"
-      :show="alert.show"
-      :description="alert.description"
-      @close="alert.show = false"
-    ></u-alert-tips>
-
     <!-- 标题栏 -->
     <Title />
 
@@ -40,7 +28,6 @@ export default {
     ...mapState('user', ['user', 'token']),
     ...mapState('role', ['visibleRoles', 'roleId']),
     ...mapState('task', ['timeNode', 'timeUnit', 'tasks']),
-    ...mapState('project', ['alert']),
     ...mapGetters('task', ['timeGranularity']),
   },
 
diff --git a/src/plugins/p-wbs-import/p-wbs-import.vue b/src/plugins/p-wbs-import/p-wbs-import.vue
index c1624bd..0e37dd2 100644
--- a/src/plugins/p-wbs-import/p-wbs-import.vue
+++ b/src/plugins/p-wbs-import/p-wbs-import.vue
@@ -1,11 +1,14 @@
 <template>
   <view>
-    <view @tap="handleUpload">{{ task.name }}</view>
+    <view @tap="handleUpload" v-if="task.name === '导入WBS新建项目'">{{ task.name }}</view>
+    <view @tap="handleUpdate" v-if="task.name === '导入WBS更新项目'">{{ task.name }}</view>
+    <!-- 全局提示框 -->
+    <u-top-tips ref="uTips"></u-top-tips>
   </view>
 </template>
 
 <script>
-import { mapState, mapMutations } from 'vuex';
+import { mapGetters, mapMutations } from 'vuex';
 
 export default {
   name: 'p-wbs-import',
@@ -19,7 +22,10 @@ export default {
     return {};
   },
 
-  computed: mapState('project', ['alert']),
+  computed: {
+    ...mapGetters('user', ['userId']),
+    ...mapGetters('project', ['projectId']),
+  },
 
   methods: {
     ...mapMutations('project', ['setShowAlert']),
@@ -30,11 +36,51 @@ export default {
         const data = await this.$u.api.import();
         // 导入WBS成功后
         // 直接打开导入的项目
+        this.onUploadSuccess();
+        setTimeout(() => {
+          this.$u.route('/pages/project/project', {
+            u: this.userId,
+            p: data.id,
+            pname: data.pname,
+            url: data.url,
+          });
+        }, 2000);
+      } catch (error) {
+        this.onUploadError(error);
+      }
+    },
+
+    // 更新项目
+    // TODO: 更新接口没写完
+    async handleUpdate() {
+      try {
+        const data = await this.$u.api.import({ projectId: this.projectId });
         console.log('data: ', data);
+        // 导入WBS成功后
+        // 直接打开导入的项目
+        this.onUploadSuccess();
       } catch (error) {
-        this.setShowAlert(error);
+        this.onUploadError(error);
       }
     },
+
+    // 导入成功
+    onUploadSuccess() {
+      this.$refs.uTips.show({
+        title: '导入成功，即将打开新项目',
+        type: 'success',
+        duration: '3000',
+      });
+    },
+
+    // 导入失败
+    onUploadError(error) {
+      this.$refs.uTips.show({
+        title: error || '导入失败',
+        type: 'error',
+        duration: '6000',
+      });
+    },
   },
 };
 </script>
diff --git a/src/store/project/mutations.js b/src/store/project/mutations.js
index f7c20ef..c208b5f 100644
--- a/src/store/project/mutations.js
+++ b/src/store/project/mutations.js
@@ -30,18 +30,6 @@ const mutations = {
     state.project.name = data;
   },
 
-  /**
-   * 设置alert展示消息
-   * @param { object } state
-   * @param { Boolean } event
-   */
-  setShowAlert(state, event) {
-    state.alert.description = event || '发生了点小意外';
-    state.alert.show = true;
-
-    setTimeout(() => (state.alert.show = false), 10000);
-  },
-
   /**
    * 设置小红点
    * @param { object } state
diff --git a/src/store/project/state.js b/src/store/project/state.js
index 11c2632..d33be86 100644
--- a/src/store/project/state.js
+++ b/src/store/project/state.js
@@ -2,12 +2,6 @@
 const state = {
   project: { name: '加载中...' }, // 当前项目信息
   projects: [], // 项目列表
-  alert: {
-    // 全局提示框
-    show: false,
-    title: '',
-    description: '',
-  },
   dotList: [], // 小红点
 };