Merge branch 'main' of http://182.92.169.222:3000/dlsx/virtualSimulation

src/api/index.ts

@@ -74,3 +74,11 @@ export const getExperiment = ()=>{
     method:'get',
   })
 }
+// 确认实验
+export const submitExperiment = (data:any) => {
+  return request({
+    url:'/xnRecords/verifyExperimentaInfo',
+    method:"POST",
+    data
+  })
+}

src/layout/index.vue

@@ -2,8 +2,9 @@
   <div class="container-bgc">
     <div class="top">
       <div class="loginBtn">
-        <p @click="loginFn">{{user.token?'已登录':'登录/注册'}}</p>
+        <p @click="loginFn">{{ user.token ? "已登录" : "登录/注册" }}</p>
       </div>
+      
       <div class="title">{{ setting.title }}</div>
     </div>
     <router-view v-slot="{ Component }">
@@ -17,19 +18,25 @@
 </template>
 
 <script lang="ts" setup>
-import { useRouter } from 'vue-router'
+import { useRouter } from "vue-router";
 // import { onMounted, reactive, ref, toRefs, watch } from "vue";
 import settingStore from "@/store/modules/setting";
-import userStore from '@/store/modules/user';
+import userStore from "@/store/modules/user";
 const user = userStore();
 const setting = settingStore();
-const router = useRouter()
+const router = useRouter();
 
 console.log(setting.title);
-user.token ? router.push('/spacePage') : ''
 const loginFn = () => {
-  router.push('/login')
+  // user.token ? router.push("/spacePage") : "";
+
+if(user.token){
+
+  router.push("/spacePage")
+  return
 }
+  router.push("/login");
+};
 </script>
 
 <style lang="scss" scoped>
@@ -64,12 +71,12 @@ const loginFn=()=>{
       /* 向左浮动 */
       top: 10px;
       left: 230px;
-      border: 1px solid #33FEFE;
+      border: 1px solid #33fefe;
       box-shadow: 0 0 10px rgba(0, 0, 0, 0.2);
       width: 142px;
       height: 40px;
       line-height: 37px;
-      background: linear-gradient(to bottom, #08B9C1, #0758B8);
+      background: linear-gradient(to bottom, #08b9c1, #0758b8);
       transform: skew(-30deg);
       cursor: pointer;
       /* 在X轴方向倾斜 -35 度 */
@@ -82,6 +89,5 @@ const loginFn=()=>{
       }
     }
   }
-
 }
 </style>

src/layout/loginPage.vue

@@ -35,8 +35,7 @@
                     <div style="padding-right: 10px; color: #2592a1">用户密码</div>
                   </div>
                   <div class="right">
-                    <el-input type="password" v-model="formModel.password"
+                    <el-input type="password" v-model="formModel.password" placeholder="请输入密码" show-password></el-input>
-                      placeholder="请输入密码" show-password></el-input>
                   </div>
                 </div>
               </el-form-item>
@@ -157,9 +156,9 @@
                             </el-link>
                         </el-form-item> -->
             </el-form>
-            <el-form style="margin-bottom: 90px;" :model="formModel" :rules="rules" ref="formRef" size="large"
+            <el-form style="margin-bottom: 80px;" :model="formModel" :rules="rules" ref="formRef" size="large"
               autocomplete="off" v-else class="custom-form">
-              <el-form-item prop="username">
+              <el-form-item prop="username" style="margin-bottom: 30px;">
                 <div style="display: flex; align-items: center;">
                   <div class="left" style="display: flex; align-items: center;width: 90px;">
                     <div style="padding-right: 10px; color: #1084c1">
@@ -175,7 +174,7 @@
                   </div>
                 </div>
               </el-form-item>
-              <el-form-item prop="studentNumb">
+              <!-- <el-form-item prop="studentNumb">
                 <div style="display: flex; align-items: center;">
                   <div class="left" style="display: flex; align-items: center ;width: 90px;">
                     <div style="padding-right: 10px; color: #1084c1">
@@ -190,8 +189,8 @@
                       placeholder="请输入学号"></el-input>
                   </div>
                 </div>
-              </el-form-item>
+              </el-form-item> -->
-              <el-form-item prop="password">
+              <el-form-item prop="password" style="margin-bottom: 30px;">
                 <div style="display: flex; align-items: center;">
                   <div class="left" style="display: flex; align-items: center ;width: 90px;">
                     <div style="padding-right: 10px; color: #1084c1">
@@ -207,7 +206,7 @@
                   </div>
                 </div>
               </el-form-item>
-              <el-form-item>
+              <el-form-item style="margin-bottom: 35px;">
                 <div style="display: flex; align-items: center;">
                   <div class="left" style="display: flex; align-items: center ;width: 90px;">
                     <div style="padding-right: 10px; color: #1084c1">
@@ -429,7 +428,7 @@ const login = async () => {
   };
   const res = await user.logIn(data);
   if (res) {
-    router.push('/')
+    router.push('/studyPage')
   }
 
 };

src/layout/studyPage.vue

@@ -2,38 +2,67 @@
   <div class="login_container">
     <div class="top">
       <div class="loginBtn">
-                <p @click="loginFn">{{ user.token ? '已登录' : '登录/注册' }}</p>
+        <p @click="loginFn">{{ user.token ? "已登录" : "登录/注册" }}</p>
+      </div>
+      <div class="submit">
+        <p @click="submit">提交</p>
       </div>
       <div class="title">{{ setting.title }}</div>
     </div>
     <div class="main-content">
-            <div class="box" :style="{ backgroundImage: isBox1Clicked ? `url(${btn1})` : `url(${btn2})` }"
+      <div
-                @click="handleBoxClick(1)">
+        class="box"
+        :style="{
+          backgroundImage: isBox1Clicked ? `url(${btn1})` : `url(${btn2})`,
+        }"
+        @click="handleBoxClick(1)"
+      >
         知识点学习
       </div>
-            <div class="box" :style="{ backgroundImage: isBox2Clicked ? `url(${btn1})` : `url(${btn2})` }"
+      <div
-                @click="handleBoxClick(2)">学习</div>
+        class="box"
-            <div class="box" :style="{ backgroundImage: isBox3Clicked ? `url(${btn1})` : `url(${btn2})` }"
+        :style="{
-               style="margin-bottom: 80px;" @click="handleBoxClick(3)">仿真实验</div>
+          backgroundImage: isBox2Clicked ? `url(${btn1})` : `url(${btn2})`,
+        }"
+        @click="handleBoxClick(2)"
+      >
+        学习
+      </div>
+      <div
+        class="box"
+        :style="{
+          backgroundImage: isBox3Clicked ? `url(${btn1})` : `url(${btn2})`,
+        }"
+        style="margin-bottom: 80px"
+        @click="handleBoxClick(3)"
+      >
+        仿真实验
+      </div>
     </div>
   </div>
 </template>
 
 <script setup lang="ts" name="studyPage">
-import { ref } from "vue"
+import { ref } from "vue";
-import { useRouter } from 'vue-router'
+import { useRouter } from "vue-router";
 import settingStore from "@/store/modules/setting";
 const setting = settingStore();
-import userStore from '@/store/modules/user';
+import userStore from "@/store/modules/user";
-import btn1 from '@/assets/images/btn1.png'
+import btn1 from "@/assets/images/btn1.png";
-import btn2 from '@/assets/images/btn2.png'
+import btn2 from "@/assets/images/btn2.png";
-console.log(btn1, 'btn1');
+import { submitExperiment } from "@/api";
-
+import { ElMessage } from "element-plus";
-const router = useRouter()
+const router = useRouter();
 const user = userStore();
 const loginFn = () => {
-    router.push('/login')
+  // user.token ? router.push("/spacePage") : "";
+
+  if (user.token) {
+    router.push("/spacePage");
+    return;
   }
+  router.push("/login");
+};
 const isBox1Clicked = ref(false);
 const isBox2Clicked = ref(false);
 const isBox3Clicked = ref(false);
@@ -45,20 +74,33 @@ const handleBoxClick = (boxNumber) => {
     case 1:
       isBox1Clicked.value = true;
       // router.push('/page1'); // 跳转到对应的页面，这里以 /page1 为例
-            router.push('/knowledgePage')
+      router.push("/knowledgePage");
       break;
     case 2:
       isBox2Clicked.value = true;
-            // router.push('/page2');
+      router.push("/subjectTest");
       break;
     case 3:
       isBox3Clicked.value = true;
-            // router.push('/page3');
+      router.push("/");
       break;
     default:
       break;
   }
 };
+
+const submit = async () => {
+  await submitExperiment({ getStudyRecords_id: user.userInfo.id }).then(
+    (res: any) => {
+      console.log(res);
+      if (res.code == 500) {
+        ElMessage.error(res.message);
+      } else {
+        ElMessage.success(res.message);
+      }
+    }
+  );
+};
 </script>
 
 <style lang="less" scoped>
@@ -93,12 +135,37 @@ const handleBoxClick = (boxNumber) => {
       /* 向左浮动 */
       top: 10px;
       left: 230px;
-            border: 1px solid #33FEFE;
+      border: 1px solid #33fefe;
       box-shadow: 0 0 10px rgba(0, 0, 0, 0.2);
       width: 142px;
       height: 40px;
       line-height: 37px;
-            background: linear-gradient(to bottom, #08B9C1, #0758B8);
+      background: linear-gradient(to bottom, #08b9c1, #0758b8);
+      transform: skew(-30deg);
+      cursor: pointer;
+      /* 在X轴方向倾斜 -35 度 */
+      border-radius: 5%;
+
+      p {
+        transform: skew(30deg);
+        /* 反向倾斜，抵消父元素的变形 */
+        font-size: 18px;
+        color: #fff;
+      }
+    }
+    .submit {
+      position: absolute;
+      /* 清除浮动影响 */
+      // float: right;
+      /* 向左浮动 */
+      top: 10px;
+      right: 230px;
+      border: 1px solid #33fefe;
+      box-shadow: 0 0 10px rgba(0, 0, 0, 0.2);
+      width: 142px;
+      height: 40px;
+      line-height: 37px;
+      background: linear-gradient(to bottom, #08b9c1, #0758b8);
       transform: skew(-30deg);
       cursor: pointer;
       /* 在X轴方向倾斜 -35 度 */
@@ -126,7 +193,6 @@ const handleBoxClick = (boxNumber) => {
   flex-direction: column;
 
   .box {
-
     width: 520px;
     height: 162px;
     // background-color: #007BFF;

src/permissions.ts

@@ -6,7 +6,7 @@ const store = userStore(pinia);
 router.beforeEach((to: any, from: any, next: any) => {
   if (to.path === "/login") {
     if (store.token) {
-      next("/");
+      next("/studyPage");
     } else {
       next();
     }

src/utils/request.ts

@@ -2,8 +2,9 @@
 import axios from "axios";
 import pinia from "@/store";
 import { ElMessage } from "element-plus";
-
+import {removeToken} from '@/utils/auth'
 import userStore from "@/store/modules/user";
+import router from '@/router'
 // 创建axios实例
 const server = axios.create({
   baseURL: import.meta.env.VITE_APP_BASE_API,
@@ -26,8 +27,14 @@ server.interceptors.response.use((response) => {
 //   useuserStore.clearStatus();
     // return Promise.reject(response);
   }
+  if(response.data.code=== 401){
+    ElMessage.error(response.data.message);
+    return Promise.reject(response);
+  }
   if (response.data.code === 412) {
     ElMessage.error(response.data.message);
+    removeToken()
+    router.push('/login')
     return Promise.reject(response);
   }
   return response.data;

src/views/program/index.vue

@@ -1391,7 +1391,7 @@ const onSave = async () => {
     // console.log(graph.toJSON());
 
     // return;
-    clearLocalStorage();
+    clearLocalStorage(false);
     const data = graph.toJSON().cells.map((item: any) => {
       return {
         node: item,
@@ -1474,11 +1474,14 @@ function loadFromLocalStorage() {
   return JSON.parse(localStorage.getItem(SESSION_KEY) as string) || [];
 }
 
-function clearLocalStorage() {
+function clearLocalStorage(falg=true) {
   localStorage.removeItem(SESSION_KEY);
+  if(falg){
   window.location.reload();
 
   }
+
+}
 // 恢复画布状态
 function restoreGraph() {
   const operations = loadFromLocalStorage();

src/views/subjectTest/index.vue

@@ -157,7 +157,7 @@ import { useRouter   } from 'vue-router';
     // 退出答题
     const router = useRouter()
     const resetAnswers = () => {
-        router.push('/spacePage')
+        router.push('/studyPage')
     };
     // 计时器相关变量
     const timer = ref<number | null>(null); // 用于存储 setInterval 的返回值