Merge branch 'main' into zhuhao_dev

src/renderer/src/components/choose-textbook/index.vue

@@ -114,6 +114,7 @@ const emitChangeBook = async () => {
    */
   let levelFirstId = null
   let levelSecondId = null
+  let bookeId = curBook.data.id
    if (curData.parentNode) {
     levelFirstId = curData.parentNode.id
     levelSecondId = curData.id
@@ -121,7 +122,7 @@ const emitChangeBook = async () => {
     levelFirstId = curData.id
     levelSecondId = ''
   }
-  localStorage.setItem('unitId', JSON.stringify({ levelFirstId, levelSecondId}))
+  localStorage.setItem('unitId', JSON.stringify({ levelFirstId, levelSecondId, bookeId}))
   emit('changeBook', data)
 }
 
@@ -206,6 +207,7 @@ const handleNodeClick = (data, node) => {
  */
   let levelFirstId = null
   let levelSecondId = null
+  let bookeId = curBook.data.id
    if (nodeData.parentNode) {
     levelFirstId = nodeData.parentNode.id
     levelSecondId = nodeData.id
@@ -213,7 +215,7 @@ const handleNodeClick = (data, node) => {
     levelFirstId = nodeData.id
     levelSecondId = ''
   }
-  localStorage.setItem('unitId', JSON.stringify({ levelFirstId, levelSecondId}))
+  localStorage.setItem('unitId', JSON.stringify({ levelFirstId, levelSecondId, bookeId}))
 
   emit('nodeClick', curData)
 

src/renderer/src/hooks/useGetClassWork.js

@@ -102,8 +102,9 @@ const getTreeData = () => {
       levelFirstId = curNode.id
       levelSecondId = ''
     }
+    let bookeId = curBookId
     // 头部 教材分析、作业设计：打开外部链接需要当前章节ID
-    localStorage.setItem('unitId', JSON.stringify({ levelFirstId, levelSecondId}))
+    localStorage.setItem('unitId', JSON.stringify({ levelFirstId, levelSecondId, bookeId}))
 
     // const data = {
     //   textBook: {

src/renderer/src/views/classManage/index.vue

@@ -302,7 +302,7 @@
     addClasses({classIds:classids.value.join(','),userId:userStore.userId}).then(res => {
       if (res.code === 200) {
         dialogVisible.value = false
-        ElMessage({
+        ElMessage({x
           message: res.msg,
           type: 'success',
         })

src/renderer/src/views/desktop/index.vue

@@ -168,10 +168,11 @@ const clickMenu = ({isOuter, path, disabled}) =>{
     let fullPath = configObj.fullPath + path
     if(path == '/teaching/classtaskassign?titleName=作业布置&openDialog=newClassTask' || path == '/teaching/classtaskassign?titleName=作业布置'){
       // 头部 教材分析打开外部链接需要当前章节ID
-      const { levelFirstId, levelSecondId } = JSON.parse(localStorage.getItem('unitId'))
+      const { levelFirstId, levelSecondId, bookeId } = JSON.parse(localStorage.getItem('unitId'))
 
       let unitId = levelSecondId ? levelSecondId : levelFirstId
-      fullPath = fullPath + `&unitId=${unitId}`
+  
+      fullPath = fullPath + `&unitId=${unitId}&bookeId=${bookeId}`
 
       console.log(fullPath)
     }

src/renderer/src/views/login/components/Register.vue

@@ -7,7 +7,7 @@
     :before-close="handleClose"
   >
   <el-steps v-if="type==1" style="max-width: 100%;-webkit-app-region: no-drag;height:35px" :active="activeIndex" finish-status="success" simple>
-    <el-step title="1.基本信息" @click="activeIndex=1" />
+    <el-step title="1.基本信息" @click="activeIndex=1" style="cursor:pointer"/>
     <el-step title="2.在校信息" />
   </el-steps>
     <el-form
@@ -40,9 +40,11 @@
       <el-form-item  label="所属地区" prop="address" v-if="activeIndex==2">
         <el-cascader
             style="width:100%"
+            popper-class="aix-regist-address"
             v-model="ruleForm.address"
             :options="regionData"
              @change="handleChange"
+            :props="{checkStrictly: true}"
           />
       </el-form-item>
       <el-form-item label="学校" prop="school" v-if="activeIndex==2">
@@ -72,6 +74,7 @@
       </el-form-item>
       <el-form-item v-if="activeIndex==2">
         <div  class="centerDiv">
+          <el-button  type="default" @click="activeIndex=1">上一步</el-button>
           <el-button  type="primary" @click="submitForm(ruleFormRef)">立即注册</el-button>
         </div>
       </el-form-item>
@@ -294,7 +297,6 @@ const nextStep = (formEl) => {
             }
           })
           getSubject()
-          console.log(res)
         })
         console.log('submit!')
       }
@@ -308,7 +310,8 @@ const getSubject = async ()=>{
   const  rows= await listEvaluation({ itemkey: "subject", pageSize: 500 })
   console.log(rows,'所有学科')
   allSubjectList.value = rows.data
-  
+  accessToDisciplines()
+  getClassmain()
 }
 
 const submitForm = async (formEl) => {
@@ -419,9 +422,15 @@ const sbmitImg=()=>{
 const handleChange = (value) => {
       console.log('选中的地址值：', value);
     };
-const handleSchoolChange= async ()=>{
+const handleSchoolChange= ()=>{
   ruleForm.discipline=[];
   ruleForm.class=[];
+  //获取学科班级
+  accessToDisciplines()
+  getClassmain()
+}
+// 获取学科
+const accessToDisciplines = () => {
   getDept({deptId:ruleForm.school[2]}).then(res =>{
     if(res.data.studying && res.data.studying.length){
       let studying = res.data.studying.split(',')
@@ -444,11 +453,12 @@ const handleSchoolChange= async ()=>{
       schoolSubject.value = []
     }
   })
-  listClassmain( {entpid: ruleForm.school[2], pageSize: 500, status: 'open'}).then(res=>{
+}
+// 获取班级
+const getClassmain = async ()=>{
+  console.log(ruleForm.school)
+  const res = await listClassmain( {entpid: ruleForm.school[2], pageSize: 500, status: 'open'})
   gradeTree.value = groupByCondition(res.rows, item => item.agekey);
-    console.log(gradeTree.value,'班级')
-  })
- 
 }
 //将所有班级筛选成二级的数组
 const groupByCondition = (arr, condition)=>{
@@ -484,7 +494,10 @@ const gradeName = (key) =>{
   }
 }
  onMounted(()=>{
-  
+   //默认给到地区重庆
+   ruleForm.address = ['50']
+   //默认给到学校的值
+   ruleForm.school = [100,255,279]
  })
 defineExpose({
   OpenModel,
@@ -498,4 +511,17 @@ defineExpose({
   display: flex;
   justify-content: center;
 }
+
+</style>
+<style lang="scss">
+.aix-regist-address{
+.el-cascader-node{
+  position: relative!important;
+.el-radio{
+  position: absolute!important;
+  width: 90%!important;
+  left:5px!important;
+}
+}
+}
 </style>

src/renderer/src/views/prepare/container/kj-list-item.vue

@@ -208,7 +208,8 @@ export default {
     openFileWin(items) {
       if (items.fileFlag === 'apt') {
         console.log(this.curNode);
-        const path="/teaching/aptindex?id="+items.fileId + "&cataId=" + this.curNode.id;
+        let curBook = JSON.parse(localStorage.getItem('curBook'))
+        const path="/teaching/aptindex?id="+items.fileId + "&unitId=" + this.curNode.id + "&bookId=" + curBook.id;
         let configObj = outLink().getBaseData()
         let fullPath = configObj.fullPath + path
         fullPath = fullPath.replaceAll('//', '/')