Home Explore Help
Register Sign In
psychological_camera
/
cpdm_pc
8
0
Fork 0
Files Issues 0 Pull Requests 0 Wiki
Browse Source

Merge branch 'fix-new-高知新UI' of http://101.43.129.26:10880/psychological_camera/cpdm_pc into fix-new-学生新UI鸭蛋

plg 1 month ago
parent
35985021cc 2debc394ea
commit
817fe3b139
20 changed files with 230 additions and 51 deletions
Split View Show Diff Stats
  1. BIN
      favicon.png
  2. 1 1
      index.html
  3. 9 0
      src/api/login.ts
  4. BIN
      src/assets/cognize/Stroop.mp4
  5. 6 7
      src/assets/cognize/Stroop.pdf
  6. BIN
      src/assets/cognize/Stroop1.mp4
  7. 35 0
      src/assets/cognize/Stroop1.pdf
  8. BIN
      src/assets/cognize/dt.mp4
  9. 34 0
      src/assets/cognize/dt.pdf
  10. BIN
      src/assets/cognize/rl.mp4
  11. 35 0
      src/assets/cognize/rl.pdf
  12. BIN
      src/assets/home/group_slide_22.png
  13. BIN
      src/assets/logo.png
  14. BIN
      src/assets/logo_white.png
  15. 10 10
      src/components/CpdmTask.vue
  16. 1 0
      src/components/CpmdHeader.vue
  17. 6 0
      src/views/Cognize.vue
  18. 22 7
      src/views/HomeView.vue
  19. 50 4
      src/views/Login.vue
  20. 21 22
      src/views/Stroop.vue

BIN
favicon.png
View File


+ 1 - 1
index.html
View File 

@@ -5,7 +5,7 @@
 
   <meta charset="UTF-8">
 
   <link rel="icon" href="/favicon.png">
 
   <meta name="viewport" content="width=device-width, initial-scale=1.0">
 
-  <title>学生心理健康测评系统</title>
 
+  <title>高知人员心理压力测评系统</title>
 
 </head>
 
 
 <body>

+ 9 - 0
src/api/login.ts
View File 

@@ -6,6 +6,8 @@ const userRegisterUrl = '/system/registerUser'
 
 
 //登录方法
 
 const userLoginUrl = '/system/login'
 
+const loginTestUrl = '/system/getVersion'
 
+
 
 
 const homeUrl = ''
 
 const updatePasUrl = '/system/updatePassword'
 
@@ -96,4 +98,11 @@ export const leaveRecordApi = (val: any) => {
 
         method: 'get',
 
         url: `${leaveRecordUrl}?pageNum=${val.pageNum}&pageSize=${val.pageSize}`,
 
     })
 
+}
 
+
 
+export const loginTestApi = () => {
 
+    return http<any>({
 
+        method: 'get',
 
+        url: `${loginTestUrl}`,
 
+    })
 
 }

BIN
src/assets/cognize/Stroop.mp4
View File


File diff suppressed because it is too large
+ 6 - 7
src/assets/cognize/Stroop.pdf


BIN
src/assets/cognize/Stroop1.mp4
View File


File diff suppressed because it is too large
+ 35 - 0
src/assets/cognize/Stroop1.pdf


BIN
src/assets/cognize/dt.mp4
View File


File diff suppressed because it is too large
+ 34 - 0
src/assets/cognize/dt.pdf


BIN
src/assets/cognize/rl.mp4
View File


File diff suppressed because it is too large
+ 35 - 0
src/assets/cognize/rl.pdf


BIN
src/assets/home/group_slide_22.png
View File


BIN
src/assets/logo.png
View File


BIN
src/assets/logo_white.png
View File


+ 10 - 10
src/components/CpdmTask.vue
View File 

@@ -94,7 +94,7 @@ defineExpose({ open })
 
 <template>
 
 
     <div>
 
-        <el-dialog v-model="taskVisible" style="border-radius: 40px;" width="60%" top="15vh" @closed="giveUp">
 
+        <el-dialog v-model="taskVisible" style="border-radius: 5px;" width="60%" top="15vh" @closed="giveUp">
 
             <template #header="{ close, titleId, titleClass }">
 
                 <div class="com_title">选做题</div>
 
                 <div class="select_min">
 
@@ -149,10 +149,10 @@ defineExpose({ open })
 
 
 :deep(.el-radio-button__inner) {
 
     // width: 100%;
 
-    border-radius: 40px !important;
 
+    border-radius: 4px !important;
 
     margin-top: 10px;
 
-    border: 4px solid #B2F2D2;
 
-    border-left: 4px solid #B2F2D2 !important;
 
+    border: 1px solid #89DF32;
 
+    border-left: 1px solid #89DF32 !important;
 
     padding: 10px 10px;
 
     font-size: 14px;
 
     font-weight: 700;
 
@@ -162,17 +162,17 @@ defineExpose({ open })
 
 
 :deep(.el-radio-button__inner:hover) {
 
     // width: 100%;
 
-    border-radius: 40px !important;
 
+    border-radius: 4px !important;
 
     margin-top: 10px;
 
-    border: 4px solid #B2F2D2;
 
-    border-left: 4px solid #B2F2D2 !important;
 
+    border: 1px solid #89DF32;
 
+    border-left: 1px solid #89DF32 !important;
 
     padding: 10px 10px;
 
     font-size: 14px;
 
     font-weight: 700;
 
     text-align: left;
 
 
     color: #000000;
 
-    background-color: #48D68E;
 
+    background-color: #00DE7E;
 
     color: #ffffff;
 
 
 }
 
@@ -211,8 +211,8 @@ defineExpose({ open })
 
     .pub_button {
 
         cursor: pointer;
 
         // width: 100px;
 
-        border-radius: 12px;
 
-        border: 3px solid #48D68E;
 
+        border-radius: 4px;
 
+        border: 1px solid #00DE7E;
 
         color: #ffffff;
 
         background-color: #000000;

+ 1 - 0
src/components/CpmdHeader.vue
View File 

@@ -102,6 +102,7 @@ const leaveFun = () => {
 
                 <!-- <div>学生心理健康测评系统</div> -->
 
                 <div style="display: flex;align-items: center;">
 
                     <span class="home_line_1"></span>
 
+                    <img width="30px" style="margin-left: 10px;" src="../assets/logo_white.png" alt="">
 
                     <!-- <img style="width: 20vw;" src="../assets/home/group_title.png" alt=""> -->
 
                     <div style="display: flex;flex-direction: column;margin-left:6px">
 
                         <span style="color: #ffffff;font-size: 26px;font-weight: 100;">学生心理测评系统</span>

+ 6 - 0
src/views/Cognize.vue
View File 

@@ -75,6 +75,12 @@ const requireImg = () => {
 
     if (flag.value == 'EMOTION_STROOP') {
 
         name = 'Stroop'
 
     }
 
+    if (flag.value == 'ETB01') {
 
+        name = 'rl'
 
+    }
 
+    if (flag.value == 'FDOT') {
 
+        name = 'dt'
 
+    }
 
 
 
     return new URL(`../assets/cognize/${name}.pdf`, import.meta.url).href

+ 22 - 7
src/views/HomeView.vue
View File 

@@ -216,11 +216,11 @@ const brightStatusLevel = () => {
 
 
       <div style="display: flex; justify-content: space-around;">
 
         <div class="home_two_img">
 
-          <img src="../assets/home/group_six_1.png"
 
+          <<<<<<< HEAD <img src="../assets/home/group_six_1.png"
 
             style="width: 500px;padding: 20px 40px;background-color: #EFFDFF;border-radius: 20px;box-sizing: border-box;"
 
             alt="">
 
-          <div style="text-align: center;margin-top: 20px;color: #333333;font-weight: 700;">学生心理健康问题的来源</div>
 
-          <div class="home_two_des">学生心理健康问题的来源复杂多样，主要包括学业负担、家庭环境（如亲子关系、经济状况）、人际关系（同伴关系、师生关系）以及青春期的生理和心理变化等多重因素。</div>
 
+            <div style="text-align: center;margin-top: 20px;color: #333333;font-weight: 700;">学生心理健康问题的来源</div>
 
+            <div class="home_two_des">学生心理健康问题的来源复杂多样，主要包括学业负担、家庭环境（如亲子关系、经济状况）、人际关系（同伴关系、师生关系）以及青春期的生理和心理变化等多重因素。</div>
 
         </div>
 
         <div class="home_two_img">
 
           <img src="../assets/home/group_six_2.png" alt=""
 
@@ -228,6 +228,17 @@ const brightStatusLevel = () => {
 
           <div style="text-align: center;margin-top: 20px;color: #333333;font-weight: 700;">大学生抑郁焦虑的风险</div>
 
           <div class="home_two_des">
 
             有78.52%的学生无抑郁风险，而相比于抑郁，焦虑更可能出现在大学生的生活中，仅有一半的大学生无焦虑风险（54.72%）。其中，不同性别、学校、户口和学段的大学生之间的心理健康状况有显著差异。</div>
 
+          =======
 
+          <img src="../assets/home/group_six2.png"
 
+            style="width: 500px;height: 30vh;object-fit: cover;object-position: center;" alt="">
 
+          <div class="home_two_des">如果在工作中感到压力过大或情绪低落时，应及时与家人、领导沟通，寻求支持和理解。在自我调节的基础上 做到多休息，健康饮食，避免这些身心问题持续加重，
 
+            进而对工作和生活造成负面影响。</div>
 
+        </div>
 
+        <div class="home_two_img">
 
+          <img src="../assets/home/group_senven1.png" alt=""
 
+            style="width: 500px;height: 30vh;object-fit: cover;object-position: center;">
 
+          <div class="home_two_des">对公司来说，关注员工的心理健康并积极进行心理疏导，制定合理的休假制度，不仅能激发员工更高的工作热情和创造力，还能确保员工在面对挑战时具备更强的韧性和适应力</div>
 
+          >>>>>>> 2debc394ea05e1df1c4b00bb62b9df5ecbd4d13a
 
         </div>
 
 
       </div>
 
@@ -278,10 +289,14 @@ const brightStatusLevel = () => {
 
       </div>
 
       <div style="display: flex; justify-content: space-around;position: relative;">
 
         <div class="home_two_img">
 
-          <img src="../assets/home/group_senven1_new.png" alt="" style="width: 500px;">
 
-          <div class="home_two_des">
 
-            借助专业的心理健康量表和测评工具，学校、家长可以全面、客观地了解学生的心理状态，包括情绪、动机、性格、兴趣、价值观等方面。这有助于及早发现学生可能存在的焦虑、抑郁、自卑等心理问题，从而采取及时有效的干预措施，防止问题进一步恶化。
 
-          </div>
 
+          <<<<<<< HEAD <img src="../assets/home/group_senven1_new.png" alt="" style="width: 500px;">
 
+            =======
 
+            <img src="../assets/home/group_senven1.png" alt=""
 
+              style="width: 500px;height: 30vh;object-fit: cover;object-position: center;">
 
+            >>>>>>> 2debc394ea05e1df1c4b00bb62b9df5ecbd4d13a
 
+            <div class="home_two_des">
 
+              借助专业的心理健康量表和测评工具，学校、家长可以全面、客观地了解学生的心理状态，包括情绪、动机、性格、兴趣、价值观等方面。这有助于及早发现学生可能存在的焦虑、抑郁、自卑等心理问题，从而采取及时有效的干预措施，防止问题进一步恶化。
 
+            </div>
 
         </div>
 
         <div class="home_two_img">
 
           <img src="../assets/home/group_senven2_new.png" alt="" style="width: 500px;">

+ 50 - 4
src/views/Login.vue
View File 

@@ -8,7 +8,7 @@ import { ElMessage } from 'element-plus';
 
 import { onMounted, onUnmounted, reactive, ref } from 'vue'
 
 
 import { useRoute, useRouter } from 'vue-router'
 
-import { userLoginApi } from '@/api/login';
 
+import { loginTestApi, userLoginApi } from '@/api/login';
 
 
 import { userInfoStore } from '@/stores'
 
 const userInfo = userInfoStore()
 
@@ -26,8 +26,20 @@ const password = ref<string>('')
 
 const id = ref<string>('')
 
 //持久化设置 菜单状态
 
 //刚进入页面就将高度设置为页面需要的
 
-onMounted(() => {
 
+onMounted(async () => {
 
+    //调用查看是否是演示版的接口
 
+    const res: any = await loginTestApi()
 
+    if (res.code == 200) {
 
+
 
+        if (res.msg == 'test') {
 
+            isTest.value = true
 
+        } else {
 
+            isTest.value = false
 
+        }
 
 
+    } else {
 
+        ElMessage({ message: `${res.msg}`, type: 'error' })
 
+    }
 
 })
 
 //跳转到注册页面的方法
 
 const router = useRouter()
 
@@ -37,15 +49,40 @@ const registerFun = () => {
 
 }
 
 
 
-
 
+const isTest = ref<boolean>(false)
 
 
 //轮旋切换页面的方法
 
 
 //退出页面销毁 方法
 
-onUnmounted(() => {
 
+onUnmounted(async () => {
 
 
 })
 
+const loginTest = async () => {
 
+
 
+    let params = {
 
+        userNo: '20250126386',
 
+        password: md5('123456')
 
+    }
 
+    const res: any = await userLoginApi(params)
 
+    if (res.code == 200) {
 
+        if (res.data.type == '1' || res.data.type == '2') {
 
+            userInfo.saveToken(res.data.token)
 
+            userInfo.saveUserInfo(res.data.user)
 
+            ElMessage({ message: `${res.msg}`, type: 'success' })
 
+            //跳转到首页
 
+            router.push({ name: 'homeView' })
 
+        } else {
 
+            ElMessage({ message: `请使用普通账户登录`, type: 'error' })
 
+        }
 
+        //登录成功后将信息存入缓存  
+
 
+    } else {
 
+        ElMessage({ message: `${res.msg}`, type: 'error' })
 
+    }
 
+    //登录成功后将信息存入缓存  
+
 
 
+}
 
 
 
 //登录方法
 
@@ -135,6 +172,15 @@ const loginFun = async () => {
 
                             <div @click="loginFun" class="start_button_self">登录</div>
 
                         </div>
 
 
+                    <div v-show="isTest">
 
+                        <el-divider>
 
+                            演示账号一键登录
 
+                        </el-divider>
 
+                    </div>
 
+                    <div style="text-align: center;" v-show="isTest">
 
+                        <el-button size="small" @click="loginTest">演示账号一键登录</el-button>
 
+                    </div>
 
+
 
 
                     </div>

+ 21 - 22
src/views/Stroop.vue
View File 

@@ -170,18 +170,18 @@ const showFont = () => {
 
 
         if (list.value[numberFlag.value].color == 'red') {
 
             needColor.value = '红色'
 
-            needJ.value = 'F'
 
+            needJ.value = '1'
 
         } else if (list.value[numberFlag.value].color == 'yellow') {
 
             needColor.value = '黄色'
 
-            needJ.value = 'G'
 
+            needJ.value = '2'
 
 
         } else if (list.value[numberFlag.value].color == 'blue') {
 
             needColor.value = '蓝色'
 
-            needJ.value = 'H'
 
+            needJ.value = '3'
 
 
         } else if (list.value[numberFlag.value].color == 'green') {
 
             needColor.value = '绿色'
 
-            needJ.value = 'J'
 
+            needJ.value = '4'
 
 
         }
 
     }
 
@@ -229,29 +229,29 @@ const clickColor = async (val: string) => {
 
     let currentP = false
 
     if (list.value[numberFlag.value].color == 'red') {
 
         needColor.value = '红色'
 
-        needJ.value = 'F'
 
-        if (val == 'f') {
 
+        needJ.value = '1'
 
+        if (val == '1') {
 
             responseFlag.value = true
 
             currentP = true
 
         }
 
     } else if (list.value[numberFlag.value].color == 'yellow') {
 
         needColor.value = '黄色'
 
-        needJ.value = 'G'
 
-        if (val == 'g') {
 
+        needJ.value = '2'
 
+        if (val == '2') {
 
             responseFlag.value = true
 
             currentP = true
 
         }
 
     } else if (list.value[numberFlag.value].color == 'blue') {
 
         needColor.value = '蓝色'
 
-        needJ.value = 'H'
 
-        if (val == 'h') {
 
+        needJ.value = '3'
 
+        if (val == '3') {
 
             responseFlag.value = true
 
             currentP = true
 
         }
 
     } else if (list.value[numberFlag.value].color == 'green') {
 
         needColor.value = '绿色'
 
-        needJ.value = 'J'
 
-        if (val == 'j') {
 
+        needJ.value = '4'
 
+        if (val == '4') {
 
             responseFlag.value = true
 
             currentP = true
 
         }
 
@@ -304,7 +304,6 @@ const clickColor = async (val: string) => {
 
             //     message: `正确率为${score}%`
 
             // })
 
 
-
 
             if (score >= 60) {
 
                 ElMessage({
 
                     type: 'success',
 
@@ -526,10 +525,10 @@ const formatterData = () => {
 
 
 }
 
 const buttonList = ref<any>([
 
-    { name: 'F', val: 'f' },
 
-    { name: 'G', val: 'g' },
 
-    { name: 'H', val: 'h' },
 
-    { name: 'J', val: 'j' }
 
+    { name: '1', val: '1' },
 
+    { name: '2', val: '2' },
 
+    { name: '3', val: '3' },
 
+    { name: '4', val: '4' }
 
 ]);
 
 
 </script>
 
@@ -566,10 +565,10 @@ const buttonList = ref<any>([
 
         </div> -->
 
         <div style="margin-top:20px" class="tip_claFun btn-content" v-show="list.length > 0 && !timingShow && !addFlag">
 
 
-            <el-button @click="clickColor('f')">F</el-button>
 
-            <el-button @click="clickColor('g')">G</el-button>
 
-            <el-button @click="clickColor('h')">H</el-button>
 
-            <el-button @click="clickColor('j')">J</el-button>
 
+            <el-button @click="clickColor('1')">1</el-button>
 
+            <el-button @click="clickColor('2')">2</el-button>
 
+            <el-button @click="clickColor('3')">3</el-button>
 
+            <el-button @click="clickColor('4')">4</el-button>
 
         </div>
 
     </div>
 
     <div class="activeTaskTest" v-show="formalTest == '0'">
 
@@ -600,7 +599,7 @@ const buttonList = ref<any>([
 
 
         </div> -->
 
         <div class="tip_cla" v-show="!timingShow && formalTest == '0' && !addFlag">
 
-            F:代表红色 G:代表黄色 H:代表蓝色 J:代表绿色
 
+            1:代表红色 2:代表黄色 3:代表蓝色 4:代表绿色
 
         </div>
 
         <!-- <div class="tip_cla" v-show="!timingShow && formalTest == '0' && !addFlag">
 
             当前颜色为<span class="font_sub_one sbclass">{{ needColor }}</span>，请按下 <span class="font_sub_two sbclass">{{

Some files were not shown because too many files changed in this diff