From 0d9f91ca79bdc9b5a6207991a1f648263c357a73 Mon Sep 17 00:00:00 2001
From: wyx <you@example.com>
Date: Tue, 17 Jan 2023 15:31:14 +0800
Subject: [PATCH 1/7] =?UTF-8?q?fix:=E5=8E=BB=E6=8E=89=E9=9D=A2=E6=8E=88?=
 =?UTF-8?q?=E7=AE=A1=E7=90=86=E4=B8=AD=E5=AF=B9=E5=AD=A6=E5=91=98=E8=BF=9B?=
 =?UTF-8?q?=E8=A1=8C=E5=BE=97=E6=93=8D=E4=BD=9C-=E9=80=9A=E8=BF=87?=
 =?UTF-8?q?=E3=80=81=E6=8B=92=E7=BB=9D?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/components/student/TableStudent.vue | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/src/components/student/TableStudent.vue b/src/components/student/TableStudent.vue
index 3fbeda80..41510e4e 100644
--- a/src/components/student/TableStudent.vue
+++ b/src/components/student/TableStudent.vue
@@ -196,7 +196,7 @@
         :scroll="{ x: 1500 }"
         row-key="id"
         :row-selection="stuRowSelection"
-      >
+      > 
         <template #action="{ record }">
           <!--					<div style="display:flex;justify-content: center;align-items: center;">-->
           <!-- <div v-if="props.type == 1" @click="excellentStudent(record)"
@@ -232,8 +232,8 @@
                 换组
               </div>
             </a-col>
--->
-            <a-col v-if="type === 3">
+-->         
+            <a-col v-if="type === 3 && record.status!==0">
               <div
                 style=" color: #4ea6ff; font-size: 14px;text-align: center; margin-left: 10px; cursor: pointer; "
                 @click="updateStatus(0, record.id)"
@@ -241,7 +241,7 @@
                 通过
               </div>
             </a-col>
-            <a-col v-if="type === 3">
+            <a-col v-if="type === 3 && record.status!==0">
               <div
                 style=" color: #4ea6ff;font-size: 14px;text-align: center; margin-left: 10px;cursor: pointer; "
                 @click="updateStatus(2, record.id)"

From 20500ff393676cc917847dee9f6132ac6e45d77d Mon Sep 17 00:00:00 2001
From: wyx <you@example.com>
Date: Tue, 17 Jan 2023 15:40:25 +0800
Subject: [PATCH 2/7] =?UTF-8?q?fix:=E9=9D=A2=E6=8E=88=E8=AF=BE=E6=8E=88?=
 =?UTF-8?q?=E8=AF=BE=E6=95=99=E5=B8=88?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/views/courselibrary/components/seeModal.vue | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/src/views/courselibrary/components/seeModal.vue b/src/views/courselibrary/components/seeModal.vue
index 20da3a76..a1e3e6a8 100644
--- a/src/views/courselibrary/components/seeModal.vue
+++ b/src/views/courselibrary/components/seeModal.vue
@@ -96,7 +96,7 @@
               </div>
             </div>
             <div class="mb_right">
-              <div class="mbl_items">
+              <!-- <div class="mbl_items">
                 <div class="item_nam">
                   <div class="asterisk_icon">
                     <img src="@/assets/images/coursewareManage/asterisk.png" alt="asterisk"/>
@@ -108,7 +108,7 @@
                     {{ filterTxt(detail.teacher) }}
                   </div>
                 </div>
-              </div>
+              </div> -->
               <div class="mbl_items2" v-if="detail.intro">
                 <div class="item_nam">
                   <div class="asterisk_icon">

From baba2414761643a68f19518fdcebc1a11e377b68 Mon Sep 17 00:00:00 2001
From: wyx <you@example.com>
Date: Tue, 17 Jan 2023 16:55:09 +0800
Subject: [PATCH 3/7] =?UTF-8?q?fix:=E5=9C=A8=E7=BA=BF=E8=AF=BE=E5=88=97?=
 =?UTF-8?q?=E8=A1=A8=E4=B8=8D=E6=98=BE=E7=A4=BA=E9=97=AE=E9=A2=98=EF=BC=8C?=
 =?UTF-8?q?=E6=B7=BB=E5=8A=A0=E9=9D=A2=E6=8E=88=E8=AF=BE=E5=88=86=E7=B1=BB?=
 =?UTF-8?q?=E9=97=AE=E9=A2=98?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/components/drawers/SelFacet.vue           | 85 ++++++++++++-------
 .../drawers/project/ProjectOnlineManage.vue   |  5 +-
 .../drawers/router/RouterCommonManage.vue     |  2 +-
 3 files changed, 55 insertions(+), 37 deletions(-)

diff --git a/src/components/drawers/SelFacet.vue b/src/components/drawers/SelFacet.vue
index 7638f33c..7367a80c 100644
--- a/src/components/drawers/SelFacet.vue
+++ b/src/components/drawers/SelFacet.vue
@@ -120,6 +120,8 @@ import { reactive, toRefs, computed } from "vue";
 // import { planList } from "../../api/indexTaskadd";
 //import {detail} from "../../api/indexCourse";
 import { list } from "../../api/indexTaskadd";
+import {useStore} from "vuex";
+
 
 
 const columns1 = [
@@ -194,6 +196,7 @@ export default {
 		},
 	},
 	setup(props, ctx) {
+		const store = useStore();
 		const state = reactive({
 			classTableData: [
 				// {
@@ -417,6 +420,17 @@ export default {
 				});
 		};
 
+		const sysTypeOptions = computed(() => store.state.sysType);
+
+		function findClassFullName(list,classify, name = '') {
+			console.log(list,classify)
+			return list && list.length && list
+				.map(e => classify == e.dictCode ? name ? name + '-' + e.dictName : e.dictName : findClassFullName(e.children, classify,name ? name + '-' + e.dictName : e.dictName))
+				.filter(name => name)
+				.join('') || ''
+		}
+
+
 		const getClassData = (tabledata) => {
 			let data = tabledata;
 			let array = [];
@@ -429,8 +443,8 @@ export default {
 					teacher: value.teacher || "-",
 					creator: value.createName || "-",
 					time: value.publishTime,
-					categoryId: value.categoryId,
-					category: changeTreeSelectValue(String(value.categoryId)),
+					categoryId: value.sysTypeId,
+					category: value.sysTypeId,
 					//需要判断content
 				};
 				console.log("obj", obj);
@@ -455,43 +469,48 @@ export default {
 				// 		break;
 				// 	}
 				// }
-				if (!obj.category) {
-					obj.category = "-";
-				}
-				console.log("obj. obj.category22 ", obj.category);
+				// if (!obj.category) {
+				// 	obj.category = "-";
+				// }
+				// console.log("obj. obj.category22 ", obj.category);
 				array.push(obj);
 			});
+			
+			array.forEach((itm) => {
+				itm.category = findClassFullName(sysTypeOptions.value,itm.categoryId) || '-'
+			});
+			console.log(array)
 			state.classTableData = array;
 		};
 
 		// 格式化树型结构选择数据
-		const changeTreeSelectValue = (values) => {
-			let data = state.options2222;
-			console.log(values, data)
-			let str = ''
-			for (let i = 0; i < data.length; i++) {
-				if (data[i].value == values) {
-					str = data[i].title
-				} else {
-					for (let j = 0; j < data[i].children.length; j++) {
-						if (data[i].children[j].value == values) {
-							str = data[i].title + '/' + data[i].children[j].title
-						} else {
-							if (data[i].children[j].children) {
-								for (let k = 0; k < data[i].children[j].children.length; k++) {
-									if (data[i].children[j].children[k].value == values) {
-										str = data[i].title + '/' + data[i].children[j].title + '/' + data[i].children[j].children[k].title
-									}
-								}
-							}
-						}
-					}
-				}
-			}
-			console.log('str-str-str-str', str)
-			state.fen_lei1 = str;
-			return str;
-		}
+		// const changeTreeSelectValue = (values) => {
+		// 	let data = state.options2222;
+		// 	console.log(values, data)
+		// 	let str = ''
+		// 	for (let i = 0; i < data.length; i++) {
+		// 		if (data[i].value == values) {
+		// 			str = data[i].title
+		// 		} else {
+		// 			for (let j = 0; j < data[i].children.length; j++) {
+		// 				if (data[i].children[j].value == values) {
+		// 					str = data[i].title + '/' + data[i].children[j].title
+		// 				} else {
+		// 					if (data[i].children[j].children) {
+		// 						for (let k = 0; k < data[i].children[j].children.length; k++) {
+		// 							if (data[i].children[j].children[k].value == values) {
+		// 								str = data[i].title + '/' + data[i].children[j].title + '/' + data[i].children[j].children[k].title
+		// 							}
+		// 						}
+		// 					}
+		// 				}
+		// 			}
+		// 		}
+		// 	}
+		// 	console.log('str-str-str-str', str)
+		// 	state.fen_lei1 = str;
+		// 	return str;
+		// }
 
 
 
diff --git a/src/components/drawers/project/ProjectOnlineManage.vue b/src/components/drawers/project/ProjectOnlineManage.vue
index 63cd9666..59caaee0 100644
--- a/src/components/drawers/project/ProjectOnlineManage.vue
+++ b/src/components/drawers/project/ProjectOnlineManage.vue
@@ -388,13 +388,12 @@ export default {
           "thirdId": props.datasource.targetId,
           "type": 1
         });
-
+        {/* "chapterId": props.datasource.stageId=="0"?"":props.datasource.stageId, */}
         api.QueryOnlineManagementDetail({
-          "chapterId": props.datasource.stageId=="0"?"":props.datasource.stageId,
           "status": state.projectName,
           "studentName": state.name,
           "targetId":props.datasource.projectId,
-          "taskId": props.datasource.projectTaskId,
+          "taskId": props.datasource.courseId,
           "thirdId": props.datasource.targetId,
           "type": 1
         }).then(res=>{
diff --git a/src/components/drawers/router/RouterCommonManage.vue b/src/components/drawers/router/RouterCommonManage.vue
index 84f11ede..40cba7dc 100644
--- a/src/components/drawers/router/RouterCommonManage.vue
+++ b/src/components/drawers/router/RouterCommonManage.vue
@@ -397,7 +397,7 @@ export default {
           "status": state.projectName,
           "studentName": state.name,
           "targetId":props.datasource.routerId,
-          "taskId": props.datasource.routerTaskId,
+          "taskId": props.datasource.courseId,
           "thirdId": props.datasource.targetId,
           "type": 1
         }).then(res=>{

From 98d4a51e68f743ddf5ef19c273a58d8a31001b2d Mon Sep 17 00:00:00 2001
From: wyx <you@example.com>
Date: Tue, 17 Jan 2023 16:57:08 +0800
Subject: [PATCH 4/7] =?UTF-8?q?style:=E5=8E=BB=E6=8E=89=E9=9D=A2=E6=8E=88?=
 =?UTF-8?q?=E8=AF=BE=E6=8E=88=E8=AF=BE=E6=95=99=E5=B8=88?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/components/drawers/SelFacet.vue | 16 ++++++++--------
 1 file changed, 8 insertions(+), 8 deletions(-)

diff --git a/src/components/drawers/SelFacet.vue b/src/components/drawers/SelFacet.vue
index 7367a80c..cee1d9f1 100644
--- a/src/components/drawers/SelFacet.vue
+++ b/src/components/drawers/SelFacet.vue
@@ -149,14 +149,14 @@ const columns1 = [
 		align: "center",
 		ellipsis: true,
 	},
-	{
-		title: "授课教师",
-		width: "15%",
-		dataIndex: "teacher",
-		key: "teacher",
-		align: "center",
-		ellipsis: true,
-	},
+	// {
+	// 	title: "授课教师",
+	// 	width: "15%",
+	// 	dataIndex: "teacher",
+	// 	key: "teacher",
+	// 	align: "center",
+	// 	ellipsis: true,
+	// },
 	{
 		title: "创建人",
 		width: "15%",

From 4d00610689eaf8f8c454f8ac50acd2804d2c4e93 Mon Sep 17 00:00:00 2001
From: wyx <you@example.com>
Date: Tue, 17 Jan 2023 17:23:20 +0800
Subject: [PATCH 5/7] =?UTF-8?q?style:=E5=85=AC=E5=91=8A=E6=A0=B7=E5=BC=8F?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/components/drawers/NoticeHis.vue |  8 ++++----
 src/components/drawers/NoticePub.vue | 19 +++++++++++++------
 2 files changed, 17 insertions(+), 10 deletions(-)

diff --git a/src/components/drawers/NoticeHis.vue b/src/components/drawers/NoticeHis.vue
index 7e02a166..329ff3f9 100644
--- a/src/components/drawers/NoticeHis.vue
+++ b/src/components/drawers/NoticeHis.vue
@@ -9,15 +9,15 @@
   <div class="noticeContent">
     <div v-for="item in notice" :key="item.id" class="item">
       <!-- <div class="itemcontent">{{ item.content }}</div> -->
-      <!-- <a-textarea
+      <a-textarea
           class="itemcontent"
           disabled="true"
           v-model:value="item.content"
           :maxlength="150"
           placeholder="公告信息最多输入150个字"
-          style="margin-top: -10px; height: 120px;background-color: #fff;"
-        /> -->
-      <pre style="text-align: left;padding-left: 20px">{{item.content}}</pre>
+          style="margin-top: -10px; height: 220px;background-color: #fff;border:1px solid #fff;"
+        />
+      <!-- <pre style="text-align: left;padding-left: 20px">{{item.content}}</pre> -->
       <div class="itemtime">{{ item.pubtime }}</div>
     </div>
   </div>
diff --git a/src/components/drawers/NoticePub.vue b/src/components/drawers/NoticePub.vue
index 59d3deef..be42d539 100644
--- a/src/components/drawers/NoticePub.vue
+++ b/src/components/drawers/NoticePub.vue
@@ -17,14 +17,14 @@
         <!-- <div class="txt-content">
           {{ noticeContent1 ? noticeContent1 : "暂无公告" }}
         </div> -->
-        <!-- <a-textarea
+        <a-textarea
           disabled="true"
           v-model:value="noticeContent1"
           :maxlength="150"
           placeholder="公告信息最多输入150个字"
-          style="margin-top: -10px; height: 160px; resize: none;background-color: #fff;color:#666;"
-        /> -->
-        <pre>{{noticeContent1}}</pre>
+          style="margin-top: -10px; height: 220px;border:1px solid #fff; resize: none;background-color: #fff;color:#666;"
+        />
+        <!-- <pre>{{noticeContent1}}</pre> -->
         <div class="btn-content">
           <a-button type="primary" @click="handleEdit">编辑</a-button>
         </div>
@@ -34,13 +34,20 @@
         <!-- <div class="txt-content">
           {{ noticeContent1 ? noticeContent1 : "暂无公告" }}
         </div> -->
-        <pre>{{noticeContent1}}</pre>
+        <!-- <pre>{{noticeContent1}}</pre> -->
+        <a-textarea
+          disabled="true"
+          v-model:value="noticeContent1"
+          :maxlength="150"
+          placeholder="公告信息最多输入150个字"
+          style="margin-top: -10px; height: 220px;border:1px solid #fff; resize: none;background-color: #fff;color:#666;"
+        />
         <p>编辑新公告：</p>
         <a-textarea
           v-model:value="noticeContent"
           :maxlength="150"
           placeholder="公告信息最多输入150个字"
-          style="margin-top: -10px; height: 160px; width:340px;"
+          style="margin-top: -10px; height: 160px;"
         />
         <div class="btn-content">
           <a-button class="cancel" @click="handleCancel">取消</a-button>

From e03131a3c050891a2f352ad0c5321235016ebefa Mon Sep 17 00:00:00 2001
From: wyx <you@example.com>
Date: Tue, 17 Jan 2023 17:35:57 +0800
Subject: [PATCH 6/7] =?UTF-8?q?fix:=E9=9D=A2=E6=8E=88=E8=AF=BE=E5=BC=80?=
 =?UTF-8?q?=E8=AF=BE=E5=9C=B0=E7=82=B9=E8=AE=BE=E7=BD=AE=E4=B8=BA=E9=9D=9E?=
 =?UTF-8?q?=E5=BF=85=E5=A1=AB=E9=A1=B9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/views/courselibrary/CoursewareManage.vue | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/src/views/courselibrary/CoursewareManage.vue b/src/views/courselibrary/CoursewareManage.vue
index 7fa46255..4960463a 100644
--- a/src/views/courselibrary/CoursewareManage.vue
+++ b/src/views/courselibrary/CoursewareManage.vue
@@ -1430,10 +1430,10 @@
           <div class="cstm_items">
             <div class="signbox">
               <div class="sign">
-                <img
+                <!-- <img
                   src="@/assets/images/coursewareManage/asterisk.png"
                   alt=""
-                />
+                /> -->
               </div>
               <span style="margin-right: 3px">地点</span>
             </div>
@@ -4521,7 +4521,7 @@ export default defineComponent({
       console.log(postData);
       const checkList = [
         postData.name,
-        postData.address,
+        // postData.address,
         postData.beginTime,
         postData.endTime,
         postData.teacherId,

From 9235e07a5d6e393eb336d22b7f4c9b399dbc7782 Mon Sep 17 00:00:00 2001
From: wyx <you@example.com>
Date: Tue, 17 Jan 2023 17:36:36 +0800
Subject: [PATCH 7/7] =?UTF-8?q?fix:=E4=BF=AE=E6=94=B9=E7=89=88=E6=9C=AC?=
 =?UTF-8?q?=E5=8F=B7?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/App.vue | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/App.vue b/src/App.vue
index 9d385244..b22bbd4d 100644
--- a/src/App.vue
+++ b/src/App.vue
@@ -44,7 +44,7 @@ export default defineComponent({
 		const store = useStore();
 		const isLogin = ref(false);
 		// console.log("router", router.getRoutes(), route);
-		console.log("版本2.1.2------------");
+		console.log("版本2.1.3------------");
 		const routes = computed(() => {
 			return router.getRoutes().filter((e) => e.meta?.isLink);
 		});