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

1 day ago · 79e2c64e78
parent 3f594b8966 4f0650263c
commit 79e2c64e78
11 changed files with 21 additions and 12 deletions
--- a/index.html
+++ b/index.html
@ -2,9 +2,9 @@
 <html lang="en">
  <head>
    <meta charset="UTF-8" />
-    <link rel="icon" type="image/svg+xml" href="/vite.svg" />
+    <link rel="icon"  />
    <meta name="viewport" content="width=device-width, initial-scale=1.0" />
-    <title>Vite + Vue + TS</title>
+    <title>虚拟真实验项目</title>
  </head>
  <body>
    <div id="app"></div>
--- a/public/favicon.ico
+++ b/public/favicon.ico
--- a/src/assets/images/guanxitu.png
+++ b/src/assets/images/guanxitu.png
--- a/src/layout/knowledgePage.vue
+++ b/src/layout/knowledgePage.vue
@ -48,8 +48,8 @@ const index = ref(0)
 //右箭头
 // const activeData = ref({})
 const SubRight = async() => {
-    await knowledgeCheckService(Knowledges.value[currentKnowledgeIndex.value].id)
-    Knowledges.value[currentKnowledgeIndex.value].isStudy = true
+    await knowledgeCheckService(Knowledges.value[currentKnowledgeIndex.value + 1].id)
+    Knowledges.value[currentKnowledgeIndex.value + 1].isStudy = true
    if (currentKnowledgeIndex.value + 1 < Knowledges.value.length) {
        currentKnowledgeIndex.value++; // 更新到下一题

@ -68,6 +68,10 @@ const getKnowledge = async () => {
    Knowledges.value = res.result.kpVlist
    // isStudy.value = Knowledges.value[currentKnowledgeIndex.value].isStudy
    console.log(Knowledges.value, 'ress')
+    await knowledgeCheckService(Knowledges.value[currentKnowledgeIndex.value].id)
+    Knowledges.value[currentKnowledgeIndex.value].isStudy = true
+    isStudy.value = true
+
 }
 // 当前题目的索引
 const currentKnowledgeIndex = ref(0);
--- a/src/layout/loginPage.vue
+++ b/src/layout/loginPage.vue
@ -571,6 +571,7 @@ const register = async () => {
      mobile: "",
      captcha: "",
    };
+    getcodeinfo();
    ElMessage.success(`注册成功`);
    isRegister.value = false;
  } catch (error) {
--- a/src/utils/auth.ts
+++ b/src/utils/auth.ts
@ -14,9 +14,10 @@ const clearLocalStorage = () => {
  localStorage.removeItem("product");
  localStorage.removeItem("installationStep");
  localStorage.removeItem("stepIds");
-  // localStorage.removeItem("wenduCode");
-  // localStorage.removeItem("shiduCode");
+  localStorage.removeItem("graph_operations");
+  localStorage.removeItem("graph_operations1");
  localStorage.removeItem('isStudy')
+  localStorage.removeItem('complete')

 }
 export  {
--- a/src/utils/request.ts
+++ b/src/utils/request.ts
@ -47,6 +47,7 @@ server.interceptors.response.use(
        return Promise.reject(response);
      case 200:
      case 0:
+        
        return response.data;
      default:
        ElMessage.error(message);
--- a/src/views/compiler/index.vue
+++ b/src/views/compiler/index.vue
@ -8,7 +8,7 @@
      </div>
    </div>
    <div class="setting">
-        <el-button @click="saveCode" v-if="!isShowStrring">保存</el-button>
+        <el-button @click="saveCode" v-if="isShowStrring">保存</el-button>
        <el-button @click="router.back()" v-else>返回</el-button>
    </div>
  </div>
--- a/src/views/designRoute/index.vue
+++ b/src/views/designRoute/index.vue
@ -840,8 +840,7 @@ const onRedo = () => {
 const wenduCode = "float a;a=1000000*M*S/W;T+(1-exp(-t/a))*100+T0;if(T>=100){T=100;}";
 const shiduCode = "float b;a=10000*S0/W1;R+(1-exp(-t1/b))*100+R0;if(R>=100){R=100;}";
 const onSave = () => {
-  setStepEvent(3, formatDate(new Date()));
-  settingStore.activeStepIndex =4
+

  // console.log(removeDuplicateEdges(formatEdges()), standardData);
  // return
@ -854,6 +853,8 @@ const onSave = () => {
  if(settingStore.shiduCode != shiduCode){
    return ElMessage.error("湿度代码编写错误");
  }
+  setStepEvent(3, formatDate(new Date()));
+  settingStore.activeStepIndex =4
  ElMessage.success("保存成功");
  settingStore.setValue( true,'saveRoute');
  localStorage.setItem('saveRoute',true)
--- a/src/views/largeDataScreen/home.vue
+++ b/src/views/largeDataScreen/home.vue
@ -834,7 +834,7 @@ const isShowStrring = Boolean(localStorage.getItem("falg")) || false;

 // 前往labView
 const goToLabView = async () => {
-  if (!isShowStrring) {
+  if (isShowStrring) {
    await setStepEvent(1, formatDate(new Date()));
    useSettingStore.activeStepIndex = 2;
  }
@ -842,7 +842,7 @@ const goToLabView = async () => {
  router.push("/program");
 };
 const goToLabIdea = async () => {
-  if (!isShowStrring) {
+  if (isShowStrring) {
    await setStepEvent(7, formatDate(new Date()));
    useSettingStore.activeStepIndex = 8;
  }
--- a/src/views/program/index.vue
+++ b/src/views/program/index.vue
@ -39,7 +39,7 @@
      </el-form-item>
    </el-form>
  </el-drawer>
-  <div class="setting" v-if="!isShowStrring">
+  <div class="setting" v-if="isShowStrring">
    <el-button @click="onUndo">撤回</el-button>
    <el-button @click="onRedo">恢复</el-button>
    <el-button @click="clearLocalStorage">清除缓存</el-button>
@ -1535,6 +1535,7 @@ const exportWord = async () => {
  })
  dialogVisible.value = false;
  ElMessage.success('保存成功')
+  localStorage.removeItem("falg");
  await setStepEvent(11, formatDate(new Date()));
  useSettingStore.activeStepIndex = 12
  router.push('/studyPage')