From 196946d5e94715820b39c8d3ecb3b78760555ccb Mon Sep 17 00:00:00 2001
From: jiangzhe <244140623@qq.com>
Date: Thu, 25 Jul 2024 09:53:10 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E7=B3=BB=E7=BB=9F=E5=90=8D?=
 =?UTF-8?q?=E7=A7=B0?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .env.development                          |  2 +-
 .env.production                           |  2 +-
 .gitignore                                |  1 +
 index.html                                |  2 +-
 package.json                              |  4 ++--
 src/router/index.ts                       |  2 +-
 src/views/activity/index.vue              | 15 ++++++++++++---
 src/views/bigScreen/index.vue             |  2 +-
 src/views/evaluate/evaluateList/index.vue |  2 +-
 src/views/login.vue                       |  2 +-
 src/views/register.vue                    | 18 +++++++-----------
 src/views/scale/SysScalePublish/index.vue |  2 +-
 12 files changed, 30 insertions(+), 24 deletions(-)

diff --git a/.env.development b/.env.development
index 0346121..218b0df 100644
--- a/.env.development
+++ b/.env.development
@@ -1,5 +1,5 @@
 # 页面标题
-VITE_APP_TITLE = 云舒_心理健康平台
+VITE_APP_TITLE = 云舒心理成长平台
 
 # 开发环境配置
 VITE_APP_ENV = 'development'
diff --git a/.env.production b/.env.production
index 8823fed..9f4a491 100644
--- a/.env.production
+++ b/.env.production
@@ -1,5 +1,5 @@
 # 页面标题
-VITE_APP_TITLE = 云舒_心理健康平台
+VITE_APP_TITLE = 云舒心理成长平台
 
 # 生产环境配置
 VITE_APP_ENV = 'production'
diff --git a/.gitignore b/.gitignore
index faacb14..e1da26c 100644
--- a/.gitignore
+++ b/.gitignore
@@ -27,3 +27,4 @@ yarn.lock
 auto-imports.d.ts
 components.d.ts
 manage/
+/manage.zip
diff --git a/index.html b/index.html
index dcfe9fe..1ce05e6 100644
--- a/index.html
+++ b/index.html
@@ -6,7 +6,7 @@
     <meta name="renderer" content="webkit" />
     <meta name="viewport" content="width=device-width, initial-scale=1, maximum-scale=1, user-scalable=no" />
     <link rel="icon" href="/favicon.ico" />
-    <title>云舒_心理健康平台</title>
+    <title>云舒心理成长平台</title>
     <!--[if lt IE 11
       ]><script>
         window.location.href='/html/ie.html';
diff --git a/package.json b/package.json
index de7179f..4ed7f69 100644
--- a/package.json
+++ b/package.json
@@ -1,7 +1,7 @@
 {
-  "name": "云舒_心理健康平台",
+  "name": "mental-health-web",
   "version": "5.1.2",
-  "description": "云舒_心理健康平台",
+  "description": "云舒心理成长平台",
   "author": "LionLi",
   "license": "MIT",
   "scripts": {
diff --git a/src/router/index.ts b/src/router/index.ts
index d671d07..98a89c8 100644
--- a/src/router/index.ts
+++ b/src/router/index.ts
@@ -175,7 +175,7 @@ export const dynamicRoutes: RouteOption[] = [
     permissions: ['publish:evaluation:pageList'],
     children: [
       {
-        path: 'index/:batchNo/:sessionName',
+        path: 'index/:type/:batchNo/:sessionName',
         component: () => import('@/views/activity/index.vue'),
         name: 'ActivityStatistics',
         meta: { title: '活动', activeMenu: '/activity/index', icon: '' }
diff --git a/src/views/activity/index.vue b/src/views/activity/index.vue
index b9f829a..ec4fe86 100644
--- a/src/views/activity/index.vue
+++ b/src/views/activity/index.vue
@@ -26,15 +26,24 @@ import schedule from '@/views/activity/component/schedule/index.vue'
 const { proxy } = getCurrentInstance() as ComponentInternalInstance;
 
 const route = useRoute()
+const type = route.params.type
 const batchNo = route.params.batchNo
 const sessionName = route.params.sessionName
 
 const activeName = ref('schedule')
 
 const handleBack = () => {
-  console.log("handleBack");
-  const obj = { path: "/scale/SysScalePublish" };
-  proxy?.$tab.closeOpenPage(obj);
+
+  if (type == '1') {
+    const obj = { path: "/scale/SysScalePublish" };
+    proxy?.$tab.closeOpenPage(obj);
+  }
+
+  if(type == '2') {
+    const obj = { path: "/evaluate/evaluateList" };
+    proxy?.$tab.closeOpenPage(obj);
+  }
+ 
 }
 </script>
 
diff --git a/src/views/bigScreen/index.vue b/src/views/bigScreen/index.vue
index a6c73fd..1318983 100644
--- a/src/views/bigScreen/index.vue
+++ b/src/views/bigScreen/index.vue
@@ -1,7 +1,7 @@
 <template>
   <div class="big-screen">
     <header class="item item1">
-      <h1>云舒心理健康云平台</h1>
+      <h1>云舒心理成长平台</h1>
       <div class="showTime">{{ showTime }}</div>
     </header>
 
diff --git a/src/views/evaluate/evaluateList/index.vue b/src/views/evaluate/evaluateList/index.vue
index cc871f6..6126448 100644
--- a/src/views/evaluate/evaluateList/index.vue
+++ b/src/views/evaluate/evaluateList/index.vue
@@ -56,7 +56,7 @@
             <el-tooltip content="查看测评结果" placement="top">
               <el-button link type="primary" icon="View" @click="handleUpdate(scope.row)"
                 v-hasPermi="['publish:evaluation:pageList']">
-                <router-link :to="'/activity/index/' + scope.row.batchNo + '/' + scope.row.sessionName"
+                <router-link :to="`/activity/index/2/${scope.row.batchNo}/${scope.row.sessionName}`"
                   class="link-type">
                   <span>查看测评结果</span>
                 </router-link>
diff --git a/src/views/login.vue b/src/views/login.vue
index 6090d2d..f88b660 100644
--- a/src/views/login.vue
+++ b/src/views/login.vue
@@ -3,7 +3,7 @@
     <el-form ref="loginRef" :model="loginForm" :rules="loginRules" class="login-form">
       <div class="header">
         <img class="logo" src="@/assets/logo/logo.png" />
-        <h1 class="title">云舒心理健康平台</h1>
+        <h1 class="title">云舒心理成长平台</h1>
       </div>
 
       <el-form-item prop="username">
diff --git a/src/views/register.vue b/src/views/register.vue
index aa325f1..823dc64 100644
--- a/src/views/register.vue
+++ b/src/views/register.vue
@@ -1,31 +1,27 @@
 <template>
   <div class="register">
     <el-form ref="registerRef" :model="registerForm" :rules="registerRules" class="register-form">
-      <h3 class="title">云舒_心理健康平台</h3>
+      <h3 class="title">云舒心理成长平台</h3>
       <el-form-item prop="username">
         <el-input v-model="registerForm.username" type="text" size="large" auto-complete="off" placeholder="账号">
           <template #prefix><svg-icon icon-class="user" class="el-input__icon input-icon" /></template>
         </el-input>
       </el-form-item>
       <el-form-item prop="password">
-        <el-input v-model="registerForm.password" type="password" size="large" auto-complete="off" placeholder="密码" @keyup.enter="handleRegister">
+        <el-input v-model="registerForm.password" type="password" size="large" auto-complete="off" placeholder="密码"
+          @keyup.enter="handleRegister">
           <template #prefix><svg-icon icon-class="password" class="el-input__icon input-icon" /></template>
         </el-input>
       </el-form-item>
       <el-form-item prop="confirmPassword">
-        <el-input
-          v-model="registerForm.confirmPassword"
-          type="password"
-          size="large"
-          auto-complete="off"
-          placeholder="确认密码"
-          @keyup.enter="handleRegister"
-        >
+        <el-input v-model="registerForm.confirmPassword" type="password" size="large" auto-complete="off"
+          placeholder="确认密码" @keyup.enter="handleRegister">
           <template #prefix><svg-icon icon-class="password" class="el-input__icon input-icon" /></template>
         </el-input>
       </el-form-item>
       <el-form-item prop="code" v-if="captchaEnabled">
-        <el-input size="large" v-model="registerForm.code" auto-complete="off" placeholder="验证码" style="width: 63%" @keyup.enter="handleRegister">
+        <el-input size="large" v-model="registerForm.code" auto-complete="off" placeholder="验证码" style="width: 63%"
+          @keyup.enter="handleRegister">
           <template #prefix><svg-icon icon-class="validCode" class="el-input__icon input-icon" /></template>
         </el-input>
         <div class="register-code">
diff --git a/src/views/scale/SysScalePublish/index.vue b/src/views/scale/SysScalePublish/index.vue
index 157e252..7c61e5e 100644
--- a/src/views/scale/SysScalePublish/index.vue
+++ b/src/views/scale/SysScalePublish/index.vue
@@ -78,7 +78,7 @@
             <el-tooltip content="查看测评结果" placement="top">
               <el-button link type="primary" icon="View" @click="handleUpdate(scope.row)"
                 v-hasPermi="['scale:publish:query']">
-                <router-link :to="'/activity/index/' + scope.row.batchNo + '/' + scope.row.sessionName"
+                <router-link :to="`/activity/index/1/${scope.row.batchNo}/${scope.row.sessionName}`"
                   class="link-type">
                   <span>查看测评结果</span>
                 </router-link>