Merge pull request 'zouyf_dev' (#322) from zouyf_dev into main

Reviewed-on: #322

src/renderer/src/api/classTask/index.js

@@ -18,6 +18,14 @@ export function listClassworkdataByDeadDate(query) {
   })
 }
 
+// 查询classworkdata详细
+export function getClassworkdata(id) {
+  return request({
+    url: '/education/classworkdata/' + id,
+    method: 'get'
+  })
+}
+
 // 查询classworkdata列表 班级作业列表
 export function listClassworkdata(query) {
   return request({

src/renderer/src/layout/components/Header.vue

@@ -10,12 +10,12 @@
           <li class="flex" :class="[activeId == menu.path ? 'active-li' : '', menu.disabled ? 'disabled' : '']"
             v-for="menu in headerMenus" :key="menu.id" @click="clickMenu(menu)">
             <div class="icon-box">
-            
-              
+
+
                 <svg class="icon iconfont" aria-hidden="true">
                   <use :xlink:href="menu.icon"></use>
                 </svg>
-              
+
             </div>
             <span class="text">{{ menu.name }}</span>
           </li>
@@ -80,8 +80,8 @@ import { updateUserInfo } from '@/api/system/user'
 import logoIco from '@/assets/images/logo.png'
 import { listEvaluation } from '@/api/classManage/index'
 import { sessionStore } from '@/utils/store'
-import Chat from '@/utils/chat' // im 登录初始化
-if (!Chat.imChat) Chat.init()
+// import Chat from '@/utils/chat' // im 登录初始化
+// if (!Chat.imChat) Chat.init()
 
 let homeTitle = ref(import.meta.env.VITE_APP_TITLE)
 const { ipcRenderer } = window.electron || {}
@@ -145,7 +145,7 @@ function handleCommand(command) {
       break
     case 'logout':
       logout()
-      Chat?.logout() // im 退出登录
+      // Chat?.logout() // im 退出登录
       break
     default:
       break
@@ -161,7 +161,9 @@ function logout() {
     cancelButtonText: '取消',
     type: 'warning'
   })
-    .then(() => {
+    .then(async () => {
+      const Chat = (await import('@/utils/chat')).default
+      if (!!Chat.imChat) Chat.logout()
       userStore
         .logOut()
         .then(() => {
@@ -172,8 +174,7 @@ function logout() {
           // router.replace('/login')
           ipcRenderer && ipcRenderer.send('openLoginWindow')
         })
-    })
-    .catch(() => { })
+    }).catch(()=>{})
 }
 
 const emits = defineEmits(['setLayout'])
@@ -183,10 +184,10 @@ function setLayout() {
 // 切换学科
 const changeSubject = async (command) =>{
   let sessionSubject = {
-    bookList: null, 
-    curBook: null, 
-    curNode: null, 
-    defaultExpandedKeys: [], 
+    bookList: null,
+    curBook: null,
+    curNode: null,
+    defaultExpandedKeys: [],
     subjectTree: []
   }
   sessionStore.set( 'subject', sessionSubject)

src/renderer/src/utils/chat.js

@@ -20,9 +20,9 @@ export class Chat {
   }
  /**
       * 初始化 获取IM签名
-      * @param {*} isInit  : 是否初始化IM 
+      * @param {*} isInit  : 是否初始化IM
       * @param {*} isLogin : 是否登录IM
-      * @param {*} callback: 监听消息回调函数 
+      * @param {*} callback: 监听消息回调函数
       * @returns Promise<ImChat>
       */
   async init(isInit = true, isLogin = true, callback) {
@@ -69,7 +69,6 @@ export class Chat {
   async logout() {
     if (!this.imChat) return
     await this.imChat?.logout()
-    imChat = null
     this.imChat = null
   }
   // 发群消息
@@ -95,4 +94,4 @@ export class Chat {
   }
 }
 
-export default new Chat()
+export default new Chat()

src/renderer/src/views/classTask/container/classOverview/distribution/echarts.vue

@@ -32,6 +32,8 @@ function getColor(index) {
 // 初始化图表
 function initChart() {
   const myChart = echarts.init(chartRef.value);
+  const total = dataList.value.reduce((acc, cur) => acc + cur.value, 0); // 计算总数
+
   const options = {
     tooltip: {
       trigger: 'axis',
@@ -70,7 +72,11 @@ function initChart() {
       label: {
         show: true,
         position: 'top',
-        formatter: '{c}人',
+        formatter: params => {
+          const value = dataList.value[params.dataIndex].value;
+          const percentage = ((value / total) * 100).toFixed(2); // 计算百分比并保留两位小数
+          return `${percentage}%`; // 显示为百分比形式
+        },
         color: '#333',
         fontSize: 12
       }

src/renderer/src/views/classTask/container/classTask/item-dialog-score.vue

@@ -460,12 +460,13 @@ import useUserStore from '@/store/modules/user'
 import { ref, reactive } from 'vue'
 // import { Plus } from '@element-plus/icons-vue'
 import { ElMessageBox, ElMessage } from 'element-plus'
-import { updateClassworkeval, updateClassworkdata } from '@/api/classTask'
+import { updateClassworkeval, updateClassworkdata, getClassworkdata } from '@/api/classTask'
 import { getTimeDate } from '@/utils/date'
 import ReFilePreview from '@/components/refile-preview/index.vue'
 import { quizStrToList } from '@/utils/comm';
 
 
+
 const userStore = useUserStore()
 const router = useRouter()
 const route = useRoute()
@@ -644,7 +645,7 @@ const selectScore = (score) => {
 }
 
 // 接收父组件传过来的参数
-const acceptParams = (params) => {
+const acceptParams = async (params) => {
   console.log(params)
   console.log(dialogProps, 'dialogProps')
   // 先重置一下 参数
@@ -709,8 +710,9 @@ const acceptParams = (params) => {
       if (params.studentObj.worktype == '常规作业') {
         try {
           // 老师布置的附件 datacontent TODO：常规作业、其他类型还未接入
-          if (params.studentObj.datacontent != '') {
-            const teachWorkFileList = JSON.parse(params.studentObj.datacontent)
+          const res = await getClassworkdata(params.studentObj.id);
+          if(res.data.datacontent != ''){
+            const teachWorkFileList = JSON.parse(res.data.datacontent);
             console.log(teachWorkFileList, '老师filelist-------------')
             teachWorkFileList &&
               teachWorkFileList.forEach((item) => {
@@ -727,7 +729,6 @@ const acceptParams = (params) => {
             teacherFeedContentList.value.push(teachWorkFileList)
           }
 
-          dialogProps.value.studentObj.datacontent = dialogProps.value.studentObj.datacontent
         } catch (error) {
           console.error('Invalid JSON:', error)
         }

src/renderer/src/views/classTask/container/item-dialog.vue

@@ -418,15 +418,15 @@ const getStudentClassWorkDataDetail = (row) => {
             wevalres.rows[w].score = wevalres.rows[w].score ? wevalres.rows[w].score : 0
 
             // 参考答案  去除下html标签
-            wevalres.rows[w].rightanswer =
-              wevalres.rows[w].rightanswer != '' && wevalres.rows[w].rightanswer != null
-                ? wevalres.rows[w].rightanswer.replace(/<[^>]+>/g, '')
-                : wevalres.rows[w].rightanswer
-            // 学生回答 去除下html标签
-            wevalres.rows[w].feedcontent =
-              wevalres.rows[w].feedcontent != '' && wevalres.rows[w].feedcontent != null
-                ? wevalres.rows[w].feedcontent.replace(/<[^>]+>/g, '')
-                : wevalres.rows[w].feedcontent
+            // wevalres.rows[w].rightanswer =
+            //   wevalres.rows[w].rightanswer != '' && wevalres.rows[w].rightanswer != null
+            //     ? wevalres.rows[w].rightanswer.replace(/<[^>]+>/g, '')
+            //     : wevalres.rows[w].rightanswer
+            // // 学生回答 去除下html标签
+            // wevalres.rows[w].feedcontent =
+            //   wevalres.rows[w].feedcontent != '' && wevalres.rows[w].feedcontent != null
+            //     ? wevalres.rows[w].feedcontent.replace(/<[^>]+>/g, '')
+            //     : wevalres.rows[w].feedcontent
 
             if (classWorkAnalysis.row.worktype == '常规作业') {
               wevalres.rows[w].feedcontent = JSON.parse(wevalres.rows[w].feedcontent)

src/renderer/src/views/classTask/teachClassTask.vue

@@ -410,15 +410,15 @@ const getStudentClassWorkDataDetail = (row) => {
             wevalres.rows[w].score = wevalres.rows[w].score ? wevalres.rows[w].score : 0
 
             // 参考答案  去除下html标签
-            wevalres.rows[w].rightanswer =
-              wevalres.rows[w].rightanswer != '' && wevalres.rows[w].rightanswer != null
-                ? wevalres.rows[w].rightanswer.replace(/<[^>]+>/g, '')
-                : wevalres.rows[w].rightanswer
-            // 学生回答 去除下html标签
-            wevalres.rows[w].feedcontent =
-              wevalres.rows[w].feedcontent != '' && wevalres.rows[w].feedcontent != null
-                ? wevalres.rows[w].feedcontent.replace(/<[^>]+>/g, '')
-                : wevalres.rows[w].feedcontent
+            // wevalres.rows[w].rightanswer =
+            //   wevalres.rows[w].rightanswer != '' && wevalres.rows[w].rightanswer != null
+            //     ? wevalres.rows[w].rightanswer.replace(/<[^>]+>/g, '')
+            //     : wevalres.rows[w].rightanswer
+            // // 学生回答 去除下html标签
+            // wevalres.rows[w].feedcontent =
+            //   wevalres.rows[w].feedcontent != '' && wevalres.rows[w].feedcontent != null
+            //     ? wevalres.rows[w].feedcontent.replace(/<[^>]+>/g, '')
+            //     : wevalres.rows[w].feedcontent
 
             if (classWorkAnalysis.row.worktype == '常规作业') {
               wevalres.rows[w].feedcontent = JSON.parse(wevalres.rows[w].feedcontent)