From 27380707f4a83ffc138a9356c27866774c3e46fd Mon Sep 17 00:00:00 2001
From: wyx <you@example.com>
Date: Sun, 15 Jan 2023 20:15:24 +0800
Subject: [PATCH 1/2] =?UTF-8?q?fix:=E4=BF=AE=E6=94=B9=E5=BE=85=E5=AE=A1?=
 =?UTF-8?q?=E6=A0=B8=E3=80=81=E5=B7=B2=E5=AE=A1=E6=A0=B8=E8=AF=BE=E7=A8=8B?=
 =?UTF-8?q?=E4=B8=89=E7=BA=A7=E5=88=86=E7=B1=BB=E6=98=BE=E7=A4=BA?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/views/courselibrary/CoursewareManage.vue | 40 ++++++++--------
 src/views/examine/CourseReviewed.vue         | 48 ++++++++------------
 src/views/examine/CourseReviewedN.vue        | 28 ++----------
 3 files changed, 41 insertions(+), 75 deletions(-)

diff --git a/src/views/courselibrary/CoursewareManage.vue b/src/views/courselibrary/CoursewareManage.vue
index 243d3f3d..01b33c91 100644
--- a/src/views/courselibrary/CoursewareManage.vue
+++ b/src/views/courselibrary/CoursewareManage.vue
@@ -3539,30 +3539,30 @@ export default defineComponent({
       state.viewpowervisible = true;
     };
 
-    const sysTypeOptions = computed(() => formateDictT(store.state.sysType));
+    const sysTypeOptions = computed(() => store.state.sysType);
 
     // console.log('12344', sysTypeOptions)
 
     // 处理数据字典
-    function formateDictT(data) {
-      for(let i=0;i<data.length;i++){
-        data[i].title = data[i].dictName;
-        data[i].value = data[i].dictCode;
-        if(data[i].children.length!==0){
-          for(let j=0;j<data[i].children.length;j++){
-            data[i].children[j].title = data[i].children[j].dictName;
-            data[i].children[j].value = data[i].children[j].dictCode;
-            if(data[i].children[j].children.length!==0){
-              for(let k=0; k<data[i].children[j].children.length; k++) {
-                data[i].children[j].children[k].title = data[i].children[j].children[k].dictName;
-                data[i].children[j].children[k].value = data[i].children[j].children[k].dictCode;
-              }
-            }
-          }
-        }
-      }
-      return data;
-    }
+    // function formateDictT(data) {
+    //   for(let i=0;i<data.length;i++){
+    //     data[i].title = data[i].dictName;
+    //     data[i].value = data[i].dictCode;
+    //     if(data[i].children.length!==0){
+    //       for(let j=0;j<data[i].children.length;j++){
+    //         data[i].children[j].title = data[i].children[j].dictName;
+    //         data[i].children[j].value = data[i].children[j].dictCode;
+    //         if(data[i].children[j].children.length!==0){
+    //           for(let k=0; k<data[i].children[j].children.length; k++) {
+    //             data[i].children[j].children[k].title = data[i].children[j].children[k].dictName;
+    //             data[i].children[j].children[k].value = data[i].children[j].children[k].dictCode;
+    //           }
+    //         }
+    //       }
+    //     }
+    //   }
+    //   return data;
+    // }
 
     //  富文本 sssssssssssssss
     // 编辑器实例，必须用 shallowRef
diff --git a/src/views/examine/CourseReviewed.vue b/src/views/examine/CourseReviewed.vue
index 2104ca4d..98fd95de 100644
--- a/src/views/examine/CourseReviewed.vue
+++ b/src/views/examine/CourseReviewed.vue
@@ -23,16 +23,25 @@
                   ...calssifyList,
                 ]"
               />-->
-							<a-tree-select :getPopupContainer="
-								(triggerNode) => {
-									return triggerNode.parentNode || document.body;
-								}
-							" v-model:value="valueproj" show-search :dropdown-style="{ maxHeight: '400px', overflow: 'auto' }"
-								placeholder="请选择内容分类" allow-clear tree-default-expand-all :tree-data="sysTypeOptions">
-								<template #title="{ value: val, title }">
+							<a-tree-select 
+								:getPopupContainer="triggerNode => triggerNode.parentNode || document.body"
+								v-model:value="valueproj" 
+								show-search 
+								:dropdown-style="{ maxHeight: '400px', overflow: 'auto' }"
+								:fieldNames="{
+									children: 'children',
+									label: 'dictName',
+									value: 'dictCode',
+								}"
+								placeholder="请选择内容分类" 
+								allow-clear 
+								tree-default-expand-all 
+								:tree-data="sysTypeOptions">
+
+								<!-- <template #title="{ value: val, title }">
 									<b v-if="val === '11111'" style="color: #08c">sss</b>
 									<template v-else>{{ title }}</template>
-								</template>
+								</template> -->
 							</a-tree-select>
 						</div>
 						<div class="inpbox1">
@@ -401,28 +410,7 @@ export default {
 
     const store = useStore();
 
-    const sysTypeOptions = computed(() => formateDictT(store.state.sysType));
-
-	// 处理数据字典
-    function formateDictT(data) {
-      for(let i=0;i<data.length;i++){
-        data[i].title = data[i].dictName;
-        data[i].value = data[i].dictCode;
-        if(data[i].children.length!==0){
-          for(let j=0;j<data[i].children.length;j++){
-            data[i].children[j].title = data[i].children[j].dictName;
-            data[i].children[j].value = data[i].children[j].dictCode;
-            if(data[i].children[j].children.length!==0){
-              for(let k=0; k<data[i].children[j].children.length; k++) {
-                data[i].children[j].children[k].title = data[i].children[j].children[k].dictName;
-                data[i].children[j].children[k].value = data[i].children[j].children[k].dictCode;
-              }
-            }
-          }
-        }
-      }
-      return data;
-    }
+    const sysTypeOptions = computed(() => store.state.sysType);
 
     function findClassFullName(list,classify,name=''){
       return list && list.length && list.map(e=>{
diff --git a/src/views/examine/CourseReviewedN.vue b/src/views/examine/CourseReviewedN.vue
index c87026a2..882c68d7 100644
--- a/src/views/examine/CourseReviewedN.vue
+++ b/src/views/examine/CourseReviewedN.vue
@@ -25,10 +25,10 @@
 							<a-tree-select 
 								:fieldNames="{
 									children: 'children',
-									title: 'dictName',
+									label: 'dictName',
 									value: 'dictCode',
 								}"
-								:getPopupContainer="triggerNode => triggerNode.parentNode || document.body" 
+								:getPopupContainer="triggerNode => triggerNode.parentNode || document.body"
 								v-model:value="valueproj" 
 								show-search 
 								:dropdown-style="{ maxHeight: '400px', overflow: 'auto' }"
@@ -411,29 +411,7 @@ export default {
 		});
     const store = useStore();
 
-    const sysTypeOptions = computed(() => formateDictT(store.state.sysType));
-	// console.log('asdasd--------------------------------------', sysTypeOptions)
-
-	// 处理数据字典
-    function formateDictT(data) {
-      for(let i=0;i<data.length;i++){
-        data[i].title = data[i].dictName;
-        data[i].value = data[i].dictCode;
-        if(data[i].children.length!==0){
-          for(let j=0;j<data[i].children.length;j++){
-            data[i].children[j].title = data[i].children[j].dictName;
-            data[i].children[j].value = data[i].children[j].dictCode;
-            if(data[i].children[j].children.length!==0){
-              for(let k=0; k<data[i].children[j].children.length; k++) {
-                data[i].children[j].children[k].title = data[i].children[j].children[k].dictName;
-                data[i].children[j].children[k].value = data[i].children[j].children[k].dictCode;
-              }
-            }
-          }
-        }
-      }
-      return data;
-    }
+    const sysTypeOptions = computed(() => store.state.sysType);
 
     function findClassFullName(list,classify,name=''){
       return list && list.length && list.map(e=>{

From 7a1f40df5bfd18a3c6063013b64205d2243e2820 Mon Sep 17 00:00:00 2001
From: zhangyc <zhangyc@dongwu-inc.com>
Date: Sun, 15 Jan 2023 22:00:49 +0800
Subject: [PATCH 2/2] =?UTF-8?q?style:=E5=BC=B9=E7=AA=97?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/components/student/CommonStudent.vue | 4 ++--
 src/components/student/TableStudent.vue  | 3 ++-
 2 files changed, 4 insertions(+), 3 deletions(-)

diff --git a/src/components/student/CommonStudent.vue b/src/components/student/CommonStudent.vue
index fede1abb..d9421ee7 100644
--- a/src/components/student/CommonStudent.vue
+++ b/src/components/student/CommonStudent.vue
@@ -341,7 +341,7 @@
   </a-modal>
  -->
   <a-modal
-    :style="{padding: 0,position: relative,right: - (screenWidth/2 - 660) + 'px',}"
+    :style="{padding: 0,position: relative,right: '-20%'}"
     :closable="true"
     :visible="stageVisible"
     :footer="null"
@@ -560,7 +560,7 @@ const stuSelectKeys = ref([]);
 const orgSelectKeys = ref([]);
 const auditSelectKeys = ref([]);
 const screenHeight = ref(document.body.clientHeight);
-const screenWidth = ref(document.body.clientWidth);
+//const screenWidth = ref(document.body.clientWidth);
 const stuRowSelection = computed(() => ({
   columnWidth: 20,
   selectedRowKeys: stuSelectKeys.value,
diff --git a/src/components/student/TableStudent.vue b/src/components/student/TableStudent.vue
index 46b7c532..7378abe7 100644
--- a/src/components/student/TableStudent.vue
+++ b/src/components/student/TableStudent.vue
@@ -117,7 +117,8 @@
           导出学习信息
         </a-button>
       </a-col>
-      <a-col :span="1.5" v-else>
+      
+      <a-col :span="1.5" v-if="type === 2">
         <a-button class="cus-btn white" @click="exportTaskStuRouter">
           导出学习信息
         </a-button>