Merge branch 'main' into zhuhao_dev

Reviewed-on: #429

package.json

@@ -1,6 +1,6 @@
 {
   "name": "aix-win",
-  "version": "2.1.37",
+  "version": "2.1.38",
   "description": "",
   "main": "./out/main/index.js",
   "author": "上海交大重庆人工智能研究院",

src/renderer/src/utils/comm.js

@@ -127,7 +127,10 @@ export const removePropertyOf = function(obj){
 export function removeTree(list) {
   var this_ = this
   for (var i in list) {
-    if (list[i].children.length == 0) {
+    if (list[i].children == null) {
+      delete list[i].children;
+    }
+    else if (list[i].children.length == 0) {
       list[i].children = undefined
     } else {
       this_.removeTree(list[i].children)

src/renderer/src/views/classTask/container/newTask/taskTypeView.vue

@@ -286,6 +286,7 @@ import { updateClasswork, listEvaluationclue, listClassworkeval,delClassworkeval
 import { listEvaluation } from '@/api/subject'
 import { listEntpcoursefile } from '@/api/education/entpcoursefile'
 import { listKnowledgePoint } from "@/api/knowledge/knowledgePoint";
+import { isJson } from "@/utils/comm";
 
 
 import { useGetHomework } from '@/hooks/useGetHomework'
@@ -483,12 +484,13 @@ function Apis(key) {
  */
  const t = function(name, time) {
    return new Promise(resolve => {
+    const evalId = props.bookobj.levelSecondId=='' ? props.bookobj.levelFirstId : props.bookobj.levelSecondId;
     const queryForm = {
       // 分页参数
       currentPage: paginationParams.pageNum,
       pageSize: paginationParams.pageSize,
       // 课程相关参数
-      eid: props.bookobj.levelSecondId,
+      eid: evalId,
       sectionName: props.bookobj.coursetitle,
       edusubject: userStore.edusubject,
       edustage: userStore.edustage,
@@ -583,10 +585,14 @@ const getQueryFromEvaluationclue = () => {
       }
 
       if (clueres.rows[i].childlist != '') {
-        clueres.rows[i].childArray = JSON.parse('['+clueres.rows[i].childlist+']');
-        for (var j=0; j<clueres.rows[i].childArray.length; j++) {
-          clueres.rows[i].childArray[j].title = clueres.rows[i].childArray[j].title.replace(/(<([^>]+)>)/ig, '');
+        const tmpJson = '['+clueres.rows[i].childlist+']';
+        if (isJson(tmpJson)){
+          clueres.rows[i].childArray = JSON.parse(tmpJson);
+          for (var j=0; j<clueres.rows[i].childArray.length; j++) {
+            clueres.rows[i].childArray[j].title = clueres.rows[i].childArray[j].title.replace(/(<([^>]+)>)/ig, '');
+          }
         }
+        
       } else {
         clueres.rows[i].childArray = {};
       }
@@ -1062,9 +1068,27 @@ watch(() => props.propsformobj.uniquekey, (newVal) => {
     classWorkForm.uniquekey = props.propsformobj.uniquekey?cloneDeep(props.propsformobj.uniquekey):''; // 作业唯一标识 作业名称
   }
 })
-watch(() => props.bookobj.levelSecondId, (newVal, oldVal) => {
-  console.log(props.bookobj,'课程选择')
-  debounceQueryData();
+watch(
+  [
+    () => props.bookobj.levelSecondId,
+    () => props.bookobj.levelFirstId
+  ],
+  ([newLevelSecondId, newLevelFirstId], [oldLevelSecondId, oldLevelFirstId]) =>  {
+    if(props.bookobj.node.edusubject == '英语' && props.bookobj.node.edustage == '高中'){
+      if(newLevelFirstId != oldLevelFirstId){
+        console.log(props.bookobj,'高中英语-课程选择')
+        debounceQueryData();
+      }
+      else{
+        // 习题清空
+        workResource.entpCourseWorkList = [];
+        return;
+      }
+    }
+    else{
+      console.log(props.bookobj,'课程选择')
+      debounceQueryData();
+    }
 })
 
 </script>

src/renderer/src/views/experiment/index.vue

@@ -184,7 +184,7 @@ const chooseVedio = (item) => {
   padding: 5px;
   display: flex;
   flex-direction: column;
-  justify-content: space-between;
+  // justify-content: space-between;
 }
 
 .content:hover {
@@ -192,7 +192,7 @@ const chooseVedio = (item) => {
   //   box-shadow: 0 4px 16px 0 rgba(0, 0, 0, 0.15);
 }
 .content-list{
-  height: 100%;
+  height: 150px;
   display: flex;
   align-items: center
 }

src/renderer/src/views/login/index.vue

@@ -1,5 +1,5 @@
 <template>
-  <ycLogin v-if="buildMode === 'yc'">
+  <ycLogin v-if="buildMode === 'yc'||buildMode === 'yc2'">
   </ycLogin>
   <defultLogin v-else>
   </defultLogin>

src/renderer/src/views/login/yc-login.vue

@@ -1,13 +1,13 @@
 <template>
   <div class="login-container">
     <div class="login-yc">
-      <img class="welcome-img" :src="buildMode === 'yc2?'?leftBg2:leftBg1" />
+      <img class="welcome-img" :src="buildMode === 'yc2'?leftBg2:leftBg1" />
     </div>
     <div class="box-item login">
       <WindowTools :is-has-max="false" />
       <div style="display: flex;justify-content: center;"><img class="title-logo" :src="yclogo" /></div>
       <div class="login-title">永川中小学</div>
-      <div class="login-title2">{{buildMode === 'yc2?'?'重庆永川虚拟仿真AI实训教学管理系统':'人工智能赋能科学素养与劳动技能系统'}}</div>
+      <div class="login-title2">{{buildMode === 'yc2'?'虚拟仿真AI实训教学管理系统':'人工智能赋能科学素养与劳动技能系统'}}</div>
       <el-form ref="formRef" class="login-form" :model="loginForm" :rules="rules" size="large">
         <el-form-item prop="username">
           <el-input v-model.trim="loginForm.username" placeholder="请输入用户名" />