Merge pull request 'baigl' (#311) from baigl into main

Reviewed-on: #311

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

@@ -71,7 +71,8 @@ import { useToolState } from '@/store/modules/tool'
 import { getCurrentTime, getTomorrow } from '@/utils/date'
 import useUserStore from '@/store/modules/user'
 import useClassTaskStore from "@/store/modules/classTask";
-import {sessionStore, createWindow} from '@/utils/tool'
+import {createWindow} from '@/utils/tool'
+import {sessionStore} from '@/utils/store'
 import {throttle,debounce } from '@/utils/comm'  
 
 

src/renderer/src/views/classTask/classTaskAssign.vue

@@ -101,11 +101,7 @@
 
       <!-- 作业内容编辑 -->
       <el-dialog v-model="workEdit" title="作业内容详情" width="90%" append-to-body>
-        <div v-if="currentTag=='学习目标定位'" style="display: flex;">
-          <degreeevolution :attainmentList="attainmentList" :show-class="true" :courseQualityList="courseQualityList"/>
-        </div>
         <!--  课标研读 目标设定 教材研读 框架梳理 学科定位 -->
-
         <div v-if="currentTag=='习题训练'" :style="{'padding': '15px', 'overflow': 'auto'}">
           <el-table :data="workConfObj.quizlist" style="width: 100%;">
             <el-table-column type="index" width="60" />
@@ -130,6 +126,32 @@
           </el-table>
         </div>
 
+        <div v-if="currentTag=='框架梳理'" :style="{'padding': '15px', 'overflow': 'auto'}">
+          <div style="margin: 5px; background-color: white">
+            
+            <template v-for="(item) in workConfObj.chooseWorkLists" :key="item.id">
+              <div v-if="item.worktype==workConfObj.worktype">
+                <div class="choose-work">
+                  <div class="choose-work-title">{{ item.worktype }}</div>
+                  <div class="choose-work-content">
+                    <div style="color: silver; display: flex;align-items: center;flex: 1;">
+                      <el-form-item label="分值">
+                        <el-input-number v-model="item.score" :min="1" :max="100" size="small"></el-input-number >
+                      </el-form-item>
+                      <div style="display: flex;align-items: center;flex: 1;justify-content: flex-end;"> 
+                        <el-button @click="prevRead(item)">预览</el-button>
+                      </div>
+                    </div>
+                  </div>
+                </div>
+              </div>
+            </template>
+          </div>
+        </div>
+
+
+
+
         <div slot="footer" class="dialog-footer" style="text-align: right; margin-top: 20px;">
           <div style="display: flex">
             <!-- <el-button v-if="currentTag=='习题训练'" style="margin-right: auto" type="primary"
@@ -137,7 +159,6 @@
             <el-button type="primary" style="margin-left: auto" :disabled="checkTaskAssigned(currentWorkEdit.currentTask)"
                 @click="submitStudy('submit')">确 定</el-button>
           </div>
-
         </div>
       </el-dialog>
 
@@ -467,7 +488,21 @@ const handleWorkTitleEdit = (row, index) => {
 };
 
 
-// 作业内容-查看详情
+// 作业内容编辑-跳转到设计界面-传参
+let classtaskObj = reactive({
+  id: '', //
+  bookName: '', // 课程名称
+  uniquekey: '', // 设计中的标题
+  title: '', // 设计中的说明
+  worktype: '', // 设计中的作业类型
+  quizlist: [], // 设计中的试题列表
+  chooseWorkLists: [],// 设计中的框架梳理list
+  fileHomeworkList: [],// 设计中的常规作业list
+  whiteboardObj: '',// 设计中的课堂展示对象
+})
+/**
+ * 作业内容-查看详情 
+ * */ 
  const handleWorkEdit = (row, index) =>{
   console.log(row, index)
   workEdit.value = true
@@ -549,34 +584,8 @@ const handleWorkEdit = (row, index) =>{
     }
   }
 };
-// 作业内容编辑-跳转到设计界面-传参
-let classtaskObj = reactive({
-  id: '', //
-  bookName: '', // 课程名称
-  uniquekey: '', // 设计中的标题
-  title: '', // 设计中的说明
-  worktype: '', // 设计中的作业类型
-  quizlist: [], // 设计中的试题列表
-  chooseWorkLists: [],// 设计中的框架梳理list
-  fileHomeworkList: [],// 设计中的常规作业list
-  whiteboardObj: '',// 设计中的课堂展示对象
-})
 // 作业内容编辑-跳转到设计界面
 const newHandleWorkEdit2ClassWorkQuizAdd = async (row, index) =>{
-  // this.newWorkSpace = true;
-  // this.newWorkSpaceEdit = true;
-  // this.currentTask = row;
-  // this.currentIndex = index;
-  // this.currentTag = row.worktype;
-  // this.attainmentList = row.workcodesList?.attlist;
-  // this.courseQualityList = row.workcodesList?.qualist;
-
-  // 更新新任务中的各数据
-  // this.classWorkForm.uniquekey = this.currentTask.uniquekey;
-  // this.classWorkForm.title = this.currentTask.title;
-  // 更新新任务中作业类型
-  // this.classWorkForm.worktype = this.currentTask.worktype;
-
   //重新更新[新任务]中右侧列表数据
   var listCourseWork = [];
   for (var i=0; i < row.entpcourseworklistarray.length; i++) {
@@ -600,11 +609,6 @@ const newHandleWorkEdit2ClassWorkQuizAdd = async (row, index) =>{
 
     if (row.worktype == '框架梳理') {
       // 框架梳理对应只有一个内容
-      // let queryParams = {}
-      // queryParams.id = listCourseWork[0].id;
-      // queryParams.ppttype = '教材分析';
-      // queryParams.title = '框架梳理';
-      // queryParams.filetype = 'draw';
       const res = await getEvaluationclue(listCourseWork[0].id);
       if ( res.data==null || res.data==undefined ) {
         return;
@@ -615,6 +619,7 @@ const newHandleWorkEdit2ClassWorkQuizAdd = async (row, index) =>{
       res.data.score = listCourseWork[0].score;
       classtaskObj.chooseWorkLists.push(res.data);
       //
+      ToNewClassTask(classtaskObj);
     }
     else if (row.worktype == '习题训练') {
       const ids = listCourseWork.map(item => item.id).join(",");
@@ -636,6 +641,7 @@ const newHandleWorkEdit2ClassWorkQuizAdd = async (row, index) =>{
 
           classtaskObj.quizlist = idres.rows;
           //
+          ToNewClassTask(classtaskObj);
         }
       })
     } 
@@ -644,15 +650,22 @@ const newHandleWorkEdit2ClassWorkQuizAdd = async (row, index) =>{
       const workcodes = JSON.parse(row.workcodes);
       classtaskObj.whiteboardObj = JSON.stringify(workcodes.json);
       //
+      ToNewClassTask(classtaskObj);
     }
     else if (row.worktype == '常规作业') {
       if(isJson(row.workcodes)){
         classtaskObj.fileHomeworkList = JSON.parse(row.workcodes);
         //
+        ToNewClassTask(classtaskObj);
       }
     }
-
+  }
-    // 跳转 作业设计 进行编辑页面
+};
+/**
+ * 跳转 作业设计 进行编辑页面
+ * @param classtaskObj 
+ */
+const ToNewClassTask = (classtaskObj) => {
   router.push({
     path: '/newClassTask',
     query: {
@@ -660,7 +673,6 @@ const newHandleWorkEdit2ClassWorkQuizAdd = async (row, index) =>{
     }
   })
 }
-};
 
 const isJson = (str) => {
   if (typeof str == 'string') {

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

@@ -156,7 +156,7 @@ import ItemDialogScore from '@/views/classTask/container/item-dialog-score.vue'
 // zdg: 组件导入
 import quizStats from '@/views/classTask/container/quizStats.vue'
 import ClassOverview from '@/views/classTask/container/classOverview.vue'
-import {sessionStore} from '@/utils/tool'
+import {sessionStore} from '@/utils/store'
 
 const { proxy } = getCurrentInstance()
 const emit = defineEmits(['cle-click'])
@@ -636,7 +636,7 @@ onMounted(() => {
   
   // const data = JSON.parse(localStorage.getItem('teachClassWorkItem'));
   const data = sessionStore.get('teachClassWorkItem');
-  // console.log(data,'????????????????????' )
+  console.log(data,'????????????????????' )
   if(data){
     openDialog(data)
   }

src/renderer/src/views/desktop/container/work-trend.vue

@@ -35,7 +35,8 @@ import { ref, onMounted, watch } from 'vue'
 import useUserStore from '@/store/modules/user'
 import { homeworklist } from '@/api/teaching/classwork'
 import { getCurrentTime, getTomorrow } from '@/utils/date'
-import {sessionStore, createWindow} from '@/utils/tool'
+import {sessionStore} from '@/utils/store'
+import {createWindow} from '@/utils/tool'
 import { useToolState } from '@/store/modules/tool'
 import {throttle,debounce } from '@/utils/comm'