Browse Source

修改整体页面----测试计划

plg 2 months ago
parent
commit
f2d28e8354

+ 5 - 1
src/views/Community.vue

@@ -3,7 +3,7 @@ import CpmdHeader from '@/components/CpmdHeader.vue';
 import { onMounted, onUnmounted, ref } from 'vue'
 
 import { userInfoStore } from '@/stores'
-
+import { getUnread } from '../utils/test'
 //持久化设置 菜单状态
 import { menuStatusStore } from '@/stores'
 import { ElMessage } from 'element-plus';
@@ -46,6 +46,9 @@ onMounted(() => {
     userSex.value = userInfo.userInfo.gender;
     //进到界面开始轮询
     // queryMsg()
+    if (userInfo.token) {
+        getUnread()
+    }
 })
 //界面销毁函数
 const parentId = ref<string>('')
@@ -630,6 +633,7 @@ label {
     background-repeat: no-repeat;
     background-size: contain;
     background-color: #B3F1DA; //估计是需要动态
+    flex: 1;
 
     //获取屏幕宽度home_header_out 这个div的宽度--然后宽度*1000再除1920即为当前div的宽度
     .home_header_inner {

+ 4 - 1
src/views/Plan.vue

@@ -3,7 +3,7 @@ import CpmdHeader from '@/components/CpmdHeader.vue';
 import CpmdQuestionnaire from '@/components/CpmdQuestionnaire.vue'
 import { onMounted, onUnmounted, ref } from 'vue'
 import { useRouter } from 'vue-router'
-
+import { getUnread } from '../utils/test'
 const router = useRouter()
 
 //调用子组件的ref
@@ -224,6 +224,9 @@ const planNumGet = async () => {
 onMounted(() => {
     //查询计划内容
     planNumGet()
+    if (userInfo.token) {
+        getUnread()
+    }
     //进到界面开始轮询
 })
 //界面销毁函数

+ 4 - 2
src/views/PopularizationScience.vue

@@ -2,7 +2,7 @@
 import CpmdHeader from '@/components/CpmdHeader.vue';
 import { onMounted, onUnmounted, ref } from 'vue'
 import { format } from 'date-fns/format';
-
+import { getUnread } from '../utils/test'
 import { menuStatusStore, userInfoStore } from '@/stores'
 import { userPlanApi } from '@/api/home';
 const userInfo = userInfoStore()
@@ -176,7 +176,9 @@ const timeFormat = () => {
 
 //刚进入页面就将高度设置为页面需要的
 onMounted(() => {
-
+    if (userInfo.token) {
+        getUnread()
+    }
     //进到界面开始轮询
 })
 //界面销毁函数

+ 3 - 3
src/views/Register.vue

@@ -66,7 +66,7 @@ const loginFun = () => {
 
 }
 const validatePassword = (password: string) => {
-    const regex = /^[a-zA-Z0-9!@#$%^&*(),.?":{}|<>]+$/;
+    const regex = /^[a-zA-Z0-9!@#~$%^&*(),.?":{}|<>]+$/;
     return regex.test(password);
 }
 //注册方法
@@ -149,7 +149,7 @@ const registerFun = async () => {
     }
     if (!validatePassword(password.value)) {
         ElMessage({
-            message: '密码规则为数字或英文或字符,可任意组合。',
+            message: '密码规则为数字或英文或字符(@#~$%.),可任意组合。',
             type: 'warning'
         })
         isLock.value = false
@@ -173,7 +173,7 @@ const registerFun = async () => {
     }
     if (!validatePassword(comPassword.value)) {
         ElMessage({
-            message: '密码规则为数字或英文或字符,可任意组合。',
+            message: '密码规则为数字或英文或字符(@#~$%.),可任意组合。',
             type: 'warning'
         })
         isLock.value = false

+ 1 - 0
src/views/Scale.vue

@@ -722,6 +722,7 @@ onUnmounted(() => {
     background-repeat: no-repeat;
     background-size: contain;
     background-color: #B3F1DA; //估计是需要动态
+    flex: 1;
 
     //获取屏幕宽度home_header_out 这个div的宽度--然后宽度*1000再除1920即为当前div的宽度
     .home_header_inner {

+ 1 - 0
src/views/ScaleDetail.vue

@@ -207,6 +207,7 @@ const startText = () => {
     background-repeat: no-repeat;
     background-size: contain;
     background-color: #B3F1DA; //估计是需要动态
+    flex: 1;
 
     .home_header_inner {
         min-height: 1;

+ 4 - 1
src/views/TestRecord.vue

@@ -1,7 +1,7 @@
 <script setup lang="ts">
 import CpmdHeader from '@/components/CpmdHeader.vue';
 import { onMounted, onUnmounted, ref } from 'vue'
-
+import { getUnread } from '../utils/test'
 //持久化设置 菜单状态
 import { menuStatusStore, userInfoStore } from '@/stores'
 // import router from '@/router';
@@ -125,6 +125,9 @@ const initData = async () => {
 //刚进入页面就将高度设置为页面需要的
 onMounted(() => {
     initData()
+    if (userInfo.token) {
+        getUnread()
+    }
     //进到界面开始轮询
 
 })

+ 3 - 3
src/views/UpdatePas.vue

@@ -51,7 +51,7 @@ onUnmounted(() => {
 
 
 const validatePassword = (password: string) => {
-    const regex = /^[a-zA-Z0-9!@#$%^&*(),.?":{}|<>]+$/;
+    const regex = /^[a-zA-Z0-9!@#~$%^&*(),.?":{}|<>]+$/;
     return regex.test(password);
 }
 //登录方法
@@ -78,7 +78,7 @@ const loginFun = async () => {
         return
     } else if (!validatePassword(password.value)) {
         ElMessage({
-            message: '密码规则为数字或英文或字符,可任意组合。',
+            message: '密码规则为数字或英文或字符(@#~$%.),可任意组合。',
             type: 'warning'
         })
         isLock.value = false
@@ -101,7 +101,7 @@ const loginFun = async () => {
         return
     } else if (!validatePassword(comPassword.value)) {
         ElMessage({
-            message: '密码规则为数字或英文或字符,可任意组合。',
+            message: '密码规则为数字或英文或字符(@#~$%.),可任意组合。',
             type: 'warning'
         })
         isLock.value = false