From 058af8c327305b70d72bfcfce39c9618c421e858 Mon Sep 17 00:00:00 2001
From: xuesinan <1404152492@qq.com>
Date: Thu, 25 Nov 2021 14:40:38 +0800
Subject: [PATCH] =?UTF-8?q?feat:=20"=E6=9F=A5=E7=9C=8B=E8=AA=B2=E9=A1=8C?=
 =?UTF-8?q?=E9=80=B2=E5=B1=95"?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/App.vue                                   |  4 +-
 .../tall/task/CheckSubjectProgress.vue        | 60 ++++++++++++++++---
 src/components/tall/top/TopNavbar.vue         |  2 +-
 src/routers/index.js                          | 12 ++--
 src/views/detail/Test.vue                     |  8 ++-
 src/views/user/SignIn.vue                     |  2 +-
 6 files changed, 69 insertions(+), 19 deletions(-)

diff --git a/src/App.vue b/src/App.vue
index 36b3c4f..eda03f6 100644
--- a/src/App.vue
+++ b/src/App.vue
@@ -52,7 +52,7 @@ if (userString) {
   const user = JSON.parse(userString);
   store.commit('user/setUser', user);
 } else {
-  router.push({ path: '/user/signIn' });
+  router.push({ path: '/experiment/user/signIn' });
 }
 
 // useRouter()
@@ -62,7 +62,7 @@ if (userString) {
 //     if (!u.value) {
 //       // 获取url中的u参数, 没有提示缺少参数
 //       console.log('缺少参数');
-//       router.push({ path: '/user/signIn' });
+//       router.push({ path: '/experiment/user/signIn' });
 //     } else {
 //       // 根据userId 获取token
 //       await store.dispatch('user/getTokenByUserId', u.value);
diff --git a/src/components/tall/task/CheckSubjectProgress.vue b/src/components/tall/task/CheckSubjectProgress.vue
index e6eaada..2062e12 100644
--- a/src/components/tall/task/CheckSubjectProgress.vue
+++ b/src/components/tall/task/CheckSubjectProgress.vue
@@ -35,7 +35,7 @@
           />
         </div>
 
-        <div class="sub-topic">
+        <div class="sub-topic flex justify-between flex-wrap">
           <div class="topic">
             <p>穿戴式运动捕获单元</p>
             <a-progress
@@ -62,16 +62,46 @@
     </div>
     <div class="wrap overflow-hidden">
       <a-card title="穿戴式运动捕获单元">
-        <p>card content</p>
-        <p>card content</p>
-        <p>card content</p>
+        <div class="flex flex-wrap justify-center">
+          <div class="achievements border-right text-center">
+            <p class="num">1/6</p>
+            <p class="name">论文</p>
+          </div>
+          <div class="achievements border-bottom text-center">
+            <p class="num">1/6</p>
+            <p class="name">专利</p>
+          </div>
+          <div class="achievements border-top text-center">
+            <p class="num">1/6</p>
+            <p class="name">软著</p>
+          </div>
+          <div class="achievements border-left text-center">
+            <p class="num">1/6</p>
+            <p class="name">会议</p>
+          </div>
+        </div>
       </a-card>
     </div>
     <div class="wrap overflow-hidden">
       <a-card title="穿戴式康复数据手套">
-        <p>card content</p>
-        <p>card content</p>
-        <p>card content</p>
+        <div class="flex flex-wrap justify-center">
+          <div class="achievements border-right text-center">
+            <p class="num">1/6</p>
+            <p class="name">论文</p>
+          </div>
+          <div class="achievements border-bottom text-center">
+            <p class="num">1/6</p>
+            <p class="name">专利</p>
+          </div>
+          <div class="achievements border-top text-center">
+            <p class="num">1/6</p>
+            <p class="name">软著</p>
+          </div>
+          <div class="achievements border-left text-center">
+            <p class="num">1/6</p>
+            <p class="name">会议</p>
+          </div>
+        </div>
       </a-card>
     </div>
   </div>
@@ -180,4 +210,20 @@ const colorList = ref([
   margin-bottom: 8px;
   color: #666666;
 }
+
+.sub-topic .topic {
+  margin-top: 40px;
+  width: calc((100% - 32px) / 2);
+}
+
+.ant-card {
+  height: 100%;
+}
+
+.ant-card :deep(.ant-card-body) {
+  height: calc(100% - 48px);
+  display: flex;
+  flex-direction: column;
+  justify-content: center;
+}
 </style>
diff --git a/src/components/tall/top/TopNavbar.vue b/src/components/tall/top/TopNavbar.vue
index 2aad24c..9c436c4 100644
--- a/src/components/tall/top/TopNavbar.vue
+++ b/src/components/tall/top/TopNavbar.vue
@@ -39,7 +39,7 @@ function signOut() {
   store.commit('user/setUser', null);
   store.commit('projects/setProject', null);
   store.commit('task/setTaskDetail', null);
-  router.push({ path: '/user/signin' });
+  router.push({ path: '/experiment/user/signin' });
 }
 </script>
 
diff --git a/src/routers/index.js b/src/routers/index.js
index e6043f7..2fbc78d 100644
--- a/src/routers/index.js
+++ b/src/routers/index.js
@@ -1,14 +1,14 @@
 import { createRouter, createWebHistory } from 'vue-router';
 // 还有 createWebHashHistory 和 createMemoryHistory
 
-export const user = [{ path: '/user/signIn', name: 'signIn', component: () => import('views/user/SignIn.vue') }];
+export const user = [{ path: '/experiment/user/signIn', name: 'signIn', component: () => import('views/user/SignIn.vue') }];
 export const routes = [
   {
-    path: '/home',
+    path: '/experiment/home',
     name: 'home',
-    redirect: '/home/test',
+    redirect: '/experiment/home/test',
     component: () => import('views/home/Index.vue'),
-    children: [{ path: '/home/test', name: 'test', component: () => import('views/detail/Test.vue') }],
+    children: [{ path: '/experiment/home/test', name: 'test', component: () => import('views/detail/Test.vue') }],
   },
 ];
 
@@ -16,8 +16,8 @@ const router = createRouter({
   history: createWebHistory(),
   routes: [
     {
-      path: '/',
-      redirect: '/home',
+      path: '/experiment',
+      redirect: '/experiment/home',
     },
     ...user,
     ...routes,
diff --git a/src/views/detail/Test.vue b/src/views/detail/Test.vue
index 624aca6..575826e 100644
--- a/src/views/detail/Test.vue
+++ b/src/views/detail/Test.vue
@@ -1,7 +1,7 @@
 <template>
   <div class="task-detail">
     <div class="task-con">
-      {{ taskInfo.name }}
+      <!-- {{ taskInfo.name }} -->
 
       <!-- 查看课题进展 -->
       <CheckSubjectProgress v-if="label === 'KT_KTJZ'" />
@@ -51,11 +51,15 @@ watch(taskDetail, () => {
   width: 100%;
   height: 100%;
   padding: 16px;
+  overflow-y: auto;
+}
+
+::-webkit-scrollbar {
+  width: 0 !important;
 }
 
 .task-con {
   width: 100%;
   min-height: 500px;
-  max-height: 100%;
 }
 </style>
diff --git a/src/views/user/SignIn.vue b/src/views/user/SignIn.vue
index 52a6dee..dff770f 100644
--- a/src/views/user/SignIn.vue
+++ b/src/views/user/SignIn.vue
@@ -74,7 +74,7 @@ function handleSingIn() {
           console.log('登录成功， 欢迎回来');
           setTimeout(() => {
             // 跳转到首页
-            router.push({ path: '/home' });
+            router.push({ path: '/experiment/home' });
           }, 1000);
         } catch (error) {
           throw new Error(error);