Merge branch 'main' into zhuhao_dev

Reviewed-on: #245

electron.vite.config.mjs

@@ -3,7 +3,14 @@ import path from 'path'
 import { defineConfig, externalizeDepsPlugin } from 'electron-vite'
 import vue from '@vitejs/plugin-vue'
 import WindiCSS from "vite-plugin-windicss"
-
+/*import electron from 'vite-plugin-electron'
+plugins: [electron({
+  main: {
+    builderOptions: {
+      asar: false
+    }
+  }
+})],*/
 export default defineConfig({
   main: {
     plugins: [externalizeDepsPlugin()]

package.json

@@ -1,6 +1,6 @@
 {
   "name": "aix-win",
-  "version": "2.0.2",
+  "version": "2.0.4",
   "description": "An Electron application with Vue",
   "main": "./out/main/index.js",
   "author": "example.com",
@@ -45,10 +45,12 @@
     "jsencrypt": "^3.3.2",
     "jsondiffpatch": "0.6.0",
     "lodash": "^4.17.21",
+    "node-addon-api": "^8.1.0",
     "pdfjs-dist": "4.4.168",
     "pinia": "^2.1.7",
     "pinia-plugin-persistedstate": "^3.2.1",
     "spark-md5": "^3.0.2",
+    "vite-plugin-electron": "^0.28.8",
     "vue-qr": "^4.0.9",
     "vue-router": "^4.4.0",
     "xgplayer": "^3.0.19",

src/main/index.js

@@ -21,6 +21,27 @@ File({ app, shell, BrowserWindow, ipcMain })
 process.env['ELECTRON_DISABLE_SECURITY_WARNINGS'] = 'true'
 let mainWindow, loginWindow
 
+const additionalData = {myKey:'ys_axi_smarttalk'}
+const gotTheLock = app.requestSingleInstanceLock(additionalData)
+
+if(!gotTheLock){
+  app.quit()
+}else{
+  app.on('second-instance',(event,commandLine,workingDirectory,additionalData)=>{
+    //输入从第二个实例中接收到的数据
+    console.log(additionalData)
+    //有人试图运行第二个实例，我们应该关注我们的窗口
+    if(mainWindow){
+      if(mainWindow.isMinimized()) mainWindow.restore()
+      mainWindow.focus()
+    }
+    if(loginWindow){
+      if(loginWindow.isMinimized()) loginWindow.restore()
+      loginWindow.focus()
+    }
+  })
+}
+
 //登录窗口
 function createLoginWindow() {
   if (loginWindow) return
@@ -53,7 +74,7 @@ function createLoginWindow() {
     updateInit(loginWindow)
   }
 
-  loginWindow.webContents.openDevTools()
+  // loginWindow.webContents.openDevTools()
   loginWindow.once('ready-to-show', () => {
     loginWindow.show()
   })
@@ -101,7 +122,7 @@ function createMainWindow() {
     shell.openExternal(details.url)
     return { action: 'deny' }
   })
-  mainWindow.webContents.openDevTools()
+  // mainWindow.webContents.openDevTools()
 
   if (is.dev && process.env['ELECTRON_RENDERER_URL']) {
     mainWindow.loadURL(process.env['ELECTRON_RENDERER_URL'])

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

@@ -98,6 +98,8 @@ const emitChangeBook = async () => {
   let curData = cloneDeep(toRaw(curNode.data))
   let parentNode = findParentByChildId(treeData.value, curData.id)
   curData.parentNode = toRaw(parentNode)
+  //怎加一个label 之前取的label
+  curData.label = curData.itemtitle
   const data = {
     textBook: {
       curBookId: curBook.data.id,
@@ -107,6 +109,19 @@ const emitChangeBook = async () => {
     },
     node: curData
   }
+  /**
+   * 临时用 后续删除 unitId
+   */
+  let levelFirstId = null
+  let levelSecondId = null
+   if (curData.parentNode) {
+    levelFirstId = curData.parentNode.id
+    levelSecondId = curData.id
+  } else {
+    levelFirstId = curData.id
+    levelSecondId = ''
+  }
+  localStorage.setItem('unitId', JSON.stringify({ levelFirstId, levelSecondId}))
   emit('changeBook', data)
 }
 
@@ -160,7 +175,9 @@ const handleNodeClick = (data, node) => {
    * data : 当前节点数据
    * node : 当前节点对象 包含当前节点所有数据  parent属性 指向父节点Node对象
    */
-  const nodeData = cloneDeep(toRaw(data));
+  let nodeData = cloneDeep(toRaw(data));
+  //怎加一个label 之前取的label
+  nodeData.label = nodeData.itemtitle
   const parentNode = node.parent.data;
   // parentNode 为数组 则点击的是一级节点
   if (Array.isArray(parentNode)) {
@@ -183,6 +200,21 @@ const handleNodeClick = (data, node) => {
   }
   localStorage.setItem('defaultExpandedKeys', parentNode ? JSON.stringify([parentNode.id]) : JSON.stringify([data.id]))
   localStorage.setItem('curNode', JSON.stringify(nodeData))
+
+  /**
+ * 临时用 后续删除 unitId
+ */
+  let levelFirstId = null
+  let levelSecondId = null
+   if (nodeData.parentNode) {
+    levelFirstId = nodeData.parentNode.id
+    levelSecondId = nodeData.id
+  } else {
+    levelFirstId = nodeData.id
+    levelSecondId = ''
+  }
+  localStorage.setItem('unitId', JSON.stringify({ levelFirstId, levelSecondId}))
+
   emit('nodeClick', curData)
 
 }

src/renderer/src/views/classManage/basicGroup.vue

@@ -1,10 +1,10 @@
 <template>
   <el-card style="width: 100%;height: 100%;overflow: auto">
-<!--    <template #header>-->
+    <template #header>
-<!--      <div class="card-header" style="text-align: left">-->
+      <div class="card-header" style="text-align: left">
-<!--        <el-button type="primary" @click="addGroup">新建分组</el-button>-->
+        <el-button type="primary" @click="addGroup">新建分组</el-button>
-<!--      </div>-->
+      </div>
-<!--    </template>-->
+    </template>
     <template v-if="groupList.length > 0">
       <div style="font-size: 16px;font-weight: bold;color: #000;text-align: left;margin-bottom: 5px">可用分组</div>
       <div class="groupList">

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

@@ -186,7 +186,8 @@
   ])
   //选择的班级
   const classids = ref('')
-
+  // 未加入的班级
+  const classesNotAMemberOf = ref([])
   // 获取班级信息
   const getClassInfo = () => {
     classList.value = []
@@ -199,13 +200,13 @@
     });
     listClassmain({entpid: userStore.deptId, status: 'open', pageSize: 100}).then(response => {
       //清除已有的班级
-      let arr = [...response.rows]
+      classesNotAMemberOf.value = [...response.rows]
       classList.value.forEach(item => {
-        const currentIndex = arr.findIndex(items => items.id === item.id)
+        const currentIndex = classesNotAMemberOf.value.findIndex(items => items.id === item.id)
-        if(currentIndex) arr.splice(currentIndex, 1)
+        if(currentIndex) classesNotAMemberOf.value.splice(currentIndex, 1)
       })
       //这里获取组装所有班级
-      gradeTree.value = groupByCondition(arr, item => item.agekey);
+      gradeTree.value = groupByCondition(classesNotAMemberOf.value, item => item.agekey);
     })
   }
   //将所有班级筛选成二级的数组

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

@@ -211,12 +211,6 @@ const rules = reactive({
       message: '请选择地址',
       trigger: 'change',
   },],
-  class:[ {
-      type:'array',
-      required: true,
-      message: '请选择班级',
-      trigger: 'change',
-  },],
   discipline:[ {
       type: 'array',
       required: true,

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

@@ -108,6 +108,12 @@ export default {
   name: 'FileListItem',
   components: { FileImage },
   props: {
+    curNode: {
+      type: Object,
+      default: function () {
+        return {}
+      }
+    },
     item: {
       type: Object,
       default: function () {
@@ -201,8 +207,8 @@ export default {
     },
     openFileWin(items) {
       if (items.fileFlag === 'apt') {
-        console.log(items);
+        console.log(this.curNode);
-        const path="/teaching/aptindex?id="+items.fileId
+        const path="/teaching/aptindex?id="+items.fileId + "&cataId=" + this.curNode.id;
         let configObj = outLink().getBaseData()
         let fullPath = configObj.fullPath + path
         fullPath = fullPath.replaceAll('//', '/')

src/renderer/src/views/prepare/index.vue

@@ -20,6 +20,7 @@
               :key="index"
               :item="item"
               :index="index"
+              :curNode="currentNode"
               @on-delete="deleteTalk"
               @on-start-class="startClass"
             >
@@ -115,13 +116,13 @@
             </el-checkbox-group>
           </el-tab-pane>
           <el-tab-pane label="作业" name="作业">
-            <div class="prepare-body-header">
+<!--            <div class="prepare-body-header">
               <div>
                 <label style="font-size: 15px">共{{ currentWorkList.length }}个作业</label>&nbsp;
                 <el-button size="small" @click="handleOutLink('feedback')">作业反馈</el-button>
                 <el-button size="small" @click="handleOutLink('homeWork')">布置作业</el-button>
               </div>
-            </div>
+            </div>-->
             <div class="prepare-work-wrap">
               <file-list-item
                 v-for="(item, index) in currentWorkList"

src/renderer/src/views/profile/index.vue

@@ -30,9 +30,9 @@
               <li class="list-group-item">
                 <div class="left-align">
                   <Message class="Message"/>
-                  <span>用户邮箱</span>
+                  <span>身份证号</span>
                 </div>
-                <div class="right-align">{{ state.user.email }}</div>
+                <div class="right-align">{{ state.user.identity }}</div>
               </li>
               <li class="list-group-item">
                 <div class="left-align">
@@ -48,7 +48,7 @@
                   <Avatar class="Avatar"/>
                   <span>所属角色</span>
                 </div>
-                <div class="right-align">{{ state.roleGroup }}</div>
+                <div class="right-align">{{ state.roleGroup || '教师' }}</div>
               </li>
               <li class="list-group-item">
                 <div class="left-align">

src/renderer/src/views/profile/userInfo.vue

@@ -6,10 +6,10 @@
     <el-form-item label="手机号码" prop="phonenumber">
       <el-input v-model="user.phonenumber" maxlength="11" />
     </el-form-item>
-    <el-form-item label="邮箱" prop="email">
+    <el-form-item label="身份证号" prop="identity">
-      <el-input v-model="user.email" maxlength="50" />
+      <el-input v-model="user.identity" maxlength="50" />
     </el-form-item>
-    <el-form-item label="性别">
+    <el-form-item label="性别" style="display: none">
       <el-radio-group v-model="user.sex">
         <el-radio value="0">男</el-radio>
         <el-radio value="1">女</el-radio>
@@ -18,8 +18,8 @@
     <el-form-item label="学段">
       <el-radio-group v-model="user.edustage" @change="semeterChange">
         <template v-for="(item,index) in semesterList" :key="index">
-          <el-radio :value="item.title">
+          <el-radio :value="item.label">
-            {{item.title }}
+            {{item.label }}
           </el-radio>
         </template>
       </el-radio-group>
@@ -42,6 +42,7 @@
  <script setup>
 import { ref, getCurrentInstance,onMounted } from 'vue'
 import {updateUserInfo } from '@/api/system/user'
+import {getDept } from '@/api/login'
 import { listEvaluation } from '@/api/subject/index'
 import useUserStore from '@/store/modules/user'
 import {ElMessage} from 'element-plus'
@@ -60,21 +61,30 @@ const userStore = useUserStore()
 const semesterList = ref([
   {
     id:1,
-    title:'幼儿园'
+    label:'幼儿园'
   },
   {
     id:2,
-    title:'小学'
+    label:'小学'
   },
   {
     id:3,
-    title:'初中'
+    label:'初中'
   },
   {
     id:4,
-    title:'高中'
+    label:'高中'
   },
 ])
+// 获取学校所存在的学段
+
+const getTheSection = () => {
+  getDept({deptId:userStore.user.deptId}).then(res => {
+    //获取该学校可以选择的学科
+    const arr = res.data.studying.split(',')
+    semesterList.value = semesterList.value.filter(items => {return arr.includes(items.label)}).map(item => item)
+  })
+}
 
 const rules = ref({
   nickName: [{ required: true, message: '用户昵称不能为空', trigger: 'blur' }],
@@ -159,5 +169,6 @@ const semeterChange = (item) => {
 }
 onMounted(() => {
   getSubject()
+  getTheSection()
 })
 </script>

src/renderer/src/views/tool/sphere.vue

@@ -16,8 +16,7 @@
     <div class="tool-bottom-all"
       @mouseenter="mouseChange(0)" @mouseleave="mouseChange(1)">
       <div v-drag="{handle:'.tool-bottom-all', dragtime}"
-        @v-drag-start="dragtime = Date.now()"
+        @v-drag-start="dragtime = Date.now()">
-        @v-drag-end="mouseChange(1)">
         <div class="c-logo" @click="logoHandle" title="拖动 | 折叠 | 展开">
           <el-image :src="logo" draggable="false" />
         </div>