From 06e6843af61edea931614c9d25bd9d46fdd9cad2 Mon Sep 17 00:00:00 2001
From: wyx <you@example.com>
Date: Fri, 13 Jan 2023 08:03:25 +0800
Subject: [PATCH 1/6] =?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 4ba1c1e5..e7b5d0c8 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.0.6------------");
+		console.log("版本2.0.7------------");
 		const routes = computed(() => {
 			return router.getRoutes().filter((e) => e.meta?.isLink);
 		});

From 108478124442e8f78e54a9e1636d51e83fd75cd8 Mon Sep 17 00:00:00 2001
From: zhangyc <zhangyc@dongwu-inc.com>
Date: Fri, 13 Jan 2023 08:33:25 +0800
Subject: [PATCH 2/6] =?UTF-8?q?style=EF=BC=9A=E5=BC=B9=E7=AA=97=E6=8F=90?=
 =?UTF-8?q?=E7=A4=BA?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/components/drawers/AllStuOver.vue | 2 ++
 src/views/learningpath/LevelAdd.vue   | 2 +-
 2 files changed, 3 insertions(+), 1 deletion(-)

diff --git a/src/components/drawers/AllStuOver.vue b/src/components/drawers/AllStuOver.vue
index 7940a5a9..41bb4b12 100644
--- a/src/components/drawers/AllStuOver.vue
+++ b/src/components/drawers/AllStuOver.vue
@@ -116,7 +116,9 @@ export default {
 </script>
 <style lang="scss">
 .AllStuOverModel {
+
   .ant-modal {
+    z-index: 999;
     width: 424px;
     height: 258px;
 
diff --git a/src/views/learningpath/LevelAdd.vue b/src/views/learningpath/LevelAdd.vue
index 0b8be830..b4f1a7b9 100644
--- a/src/views/learningpath/LevelAdd.vue
+++ b/src/views/learningpath/LevelAdd.vue
@@ -2164,7 +2164,7 @@ export default {
         })
         .catch((err) => {
           console.log(err);
-          message.error("获取路径列表失败" + err);
+         // message.error("获取路径列表失败" + err);
         });
     };
 

From 0d20a1f02387c8d8fc90050a25a26bac7663372d Mon Sep 17 00:00:00 2001
From: wyx <you@example.com>
Date: Fri, 13 Jan 2023 10:39:51 +0800
Subject: [PATCH 3/6] =?UTF-8?q?fix:=E6=96=B0=E5=BB=BA=E9=9D=A2=E6=8E=88?=
 =?UTF-8?q?=E5=AD=97=E6=AE=B5=E7=A9=BA=E5=80=BC=E6=A3=80=E6=9F=A5=E4=BF=AE?=
 =?UTF-8?q?=E6=94=B9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

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

diff --git a/src/views/courselibrary/courseModal.vue b/src/views/courselibrary/courseModal.vue
index 008e3a49..0eef62b9 100644
--- a/src/views/courselibrary/courseModal.vue
+++ b/src/views/courselibrary/courseModal.vue
@@ -769,8 +769,8 @@ export default defineComponent({
 				categoryId: state.fen_lei,
 				sceneContent: state.chang_jin,
 				tips: state.tags_val ? state.tags_val.join(",") : null,
-				teacherId: state.member.value,
-				teacher: state.member.name,
+				// teacherId: state.member.value,
+				// teacher: state.member.name,
 				intro: state.qdms_inputV6,
 				attach: state.attach,
 				outline: valueHtml.value,
@@ -781,7 +781,7 @@ export default defineComponent({
 				postData.name,
 				postData.targetUser,
 				postData.categoryId,
-				postData.teacherId,
+				// postData.teacherId,
 				postData.picUrl,
 				postData.intro,
 			];

From cec444ebbab5ba72ebeac43e5f3d7d1925fc8f8b Mon Sep 17 00:00:00 2001
From: wyx <you@example.com>
Date: Fri, 13 Jan 2023 11:04:54 +0800
Subject: [PATCH 4/6] =?UTF-8?q?fix:=E4=BF=AE=E6=94=B9=E5=AD=A6=E4=B9=A0?=
 =?UTF-8?q?=E8=B7=AF=E5=BE=84=E5=9B=BE=E5=85=B3=E5=8D=A1=E6=B7=BB=E5=8A=A0?=
 =?UTF-8?q?=E9=A1=B5=E9=9D=A2=E6=A0=B7=E5=BC=8F?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

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

diff --git a/src/views/learningpath/LevelAddDetail.vue b/src/views/learningpath/LevelAddDetail.vue
index f6426dd1..7e435804 100644
--- a/src/views/learningpath/LevelAddDetail.vue
+++ b/src/views/learningpath/LevelAddDetail.vue
@@ -526,7 +526,7 @@
           </div>
           -->
         </div>
-        <div class="boom">
+        <div class="boom" :style="{minHeight:level.length>6? ((level.length - 6)*106+512) + 'px' : 512 + 'px'}">
           <div class="boomcen">
             <div class="title">
               <div class="tit_left">

From b5fdd7338dbef1d49a65d3722ba4210f18fc8aac Mon Sep 17 00:00:00 2001
From: wyx <you@example.com>
Date: Fri, 13 Jan 2023 11:28:38 +0800
Subject: [PATCH 5/6] =?UTF-8?q?fix=EF=BC=9A=E4=BF=AE=E6=94=B9=E9=A1=B9?=
 =?UTF-8?q?=E7=9B=AE=E5=85=AC=E5=91=8A=E6=A0=BC=E5=BC=8F?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/components/drawers/NoticeHis.vue | 13 +++++++++++--
 src/components/drawers/NoticePub.vue | 26 ++++++++++++++++++++------
 2 files changed, 31 insertions(+), 8 deletions(-)

diff --git a/src/components/drawers/NoticeHis.vue b/src/components/drawers/NoticeHis.vue
index 07f391d6..289f1834 100644
--- a/src/components/drawers/NoticeHis.vue
+++ b/src/components/drawers/NoticeHis.vue
@@ -8,7 +8,15 @@
   </div>
   <div class="noticeContent">
     <div v-for="item in notice" :key="item.id" class="item">
-      <div class="itemcontent">{{ item.content }}</div>
+      <!-- <div class="itemcontent">{{ item.content }}</div> -->
+      <a-textarea
+          class="itemcontent"
+          disabled="true"
+          v-model:value="item.content"
+          :maxlength="150"
+          placeholder="公告信息最多输入150个字"
+          style="margin-top: -10px; height: 120px;background-color: #fff;"
+        />
       <div class="itemtime">{{ item.pubtime }}</div>
     </div>
   </div>
@@ -136,7 +144,7 @@ export default {
     justify-content: space-between;
     margin-bottom: 66px;
     .itemcontent {
-      width: 500px;
+      width: 700px;
       word-break: break-all;
       word-wrap: break-word;
       // overflow: hidden;
@@ -146,6 +154,7 @@ export default {
       font-weight: 400;
       color: #666666;
       line-height: 22px;
+      resize: none;
     }
     .itemtime {
       font-size: 14px;
diff --git a/src/components/drawers/NoticePub.vue b/src/components/drawers/NoticePub.vue
index a19a2293..1f437cf8 100644
--- a/src/components/drawers/NoticePub.vue
+++ b/src/components/drawers/NoticePub.vue
@@ -14,24 +14,38 @@
       <p>当前公告内容：</p>
       <!-- 预览 -->
       <template v-if="!editOn">
-        <div class="txt-content">
+        <!-- <div class="txt-content">
           {{ noticeContent1 ? noticeContent1 : "暂无公告" }}
-        </div>
+        </div> -->
+        <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;"
+        />
         <div class="btn-content">
           <a-button type="primary" @click="handleEdit">编辑</a-button>
         </div>
       </template>
       <!-- 编辑 -->
       <template v-if="editOn">
-        <div class="txt-content">
+        <!-- <div class="txt-content">
           {{ noticeContent1 ? noticeContent1 : "暂无公告" }}
-        </div>
+        </div> -->
+        <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;"
+        />
         <p>编辑新公告：</p>
         <a-textarea
           v-model:value="noticeContent"
           :maxlength="150"
           placeholder="公告信息最多输入150个字"
-          style="margin-top: -10px; height: 120px"
+          style="margin-top: -10px; height: 160px"
         />
         <div class="btn-content">
           <a-button class="cancel" @click="handleCancel">取消</a-button>
@@ -62,7 +76,7 @@ export default {
     const state = reactive({
       noticeChecked: false,
       projectInfo: {},
-      noticeContent1: "",
+      noticeContent1: "暂无公告",
       noticeContent: "",
       editOn: false,
     });

From 800d1564456405c05b819a1222135b77d0263f91 Mon Sep 17 00:00:00 2001
From: wyx <you@example.com>
Date: Fri, 13 Jan 2023 12:22:53 +0800
Subject: [PATCH 6/6] =?UTF-8?q?fix:=E5=85=B1=E4=BA=AB=E6=96=87=E6=A1=A3?=
 =?UTF-8?q?=E4=B8=8B=E8=BD=BD=E6=96=B9=E5=BC=8F=E4=BF=AE=E6=94=B9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/views/learningpath/LevelAdd.vue    | 27 +++++++++++++++++++++-
 src/views/projectcenter/LibraryAdd.vue | 32 ++++++++++++++++++++++++--
 src/views/projectcenter/TaskPage.vue   | 30 +++++++++++++++++++++++-
 3 files changed, 85 insertions(+), 4 deletions(-)

diff --git a/src/views/learningpath/LevelAdd.vue b/src/views/learningpath/LevelAdd.vue
index b4f1a7b9..e3e9459d 100644
--- a/src/views/learningpath/LevelAdd.vue
+++ b/src/views/learningpath/LevelAdd.vue
@@ -794,7 +794,8 @@
                           >{{ item.name }}</span
                         >
                         <a
-                          :href="item.response ? item.response.data : ''"
+                          href="javascript:void(0);"
+                          @click="downloadFile(item.response ? item.response.data : '')"
                           style="margin-left: 5px"
                           >下载</a
                         >
@@ -2427,6 +2428,29 @@ export default {
       });
     };
 
+    // 共享文档文件下载
+    const downloadFile = (url) => {
+      console.log(url)
+      if(url){
+        window.open(url)
+      }
+      // if(url){
+      //   const filename = '操作指南'
+      //   const x = new XMLHttpRequest()
+      //   x.open('GET', url, true)
+      //   x.responseType = 'blob'
+      //   x.onload = () => {
+      //     // 会创建一个 DOMString，其中包含一个表示参数中给出的对象的URL。这个 URL 的生命周期和创建它的窗口中的 document 绑定。这个新的URL 对象表示指定的 File 对象或 Blob 对象。
+      //     const url = window.URL.createObjectURL(x.response)
+      //     const a = document.createElement('a')
+      //     a.href = url
+      //     a.download = filename
+      //     a.click()
+      //   }
+      //   x.send()
+      // }
+    }
+
     return {
       ...toRefs(state),
       ...toRefs(levelList),
@@ -2492,6 +2516,7 @@ export default {
       evaluationModel,
       homeworkModel,
       commonModel,
+      downloadFile,
     };
   },
 };
diff --git a/src/views/projectcenter/LibraryAdd.vue b/src/views/projectcenter/LibraryAdd.vue
index 78747701..d669c585 100644
--- a/src/views/projectcenter/LibraryAdd.vue
+++ b/src/views/projectcenter/LibraryAdd.vue
@@ -671,7 +671,10 @@
                         <span style="font: oblique bold 16px Sans-serif;width:300px;display:block;overflow:hidden;white-space:nowrap;text-overflow:ellipsis;">{{
                           item.name
                         }}</span>
-                        <a :href="item.response?item.response.data:''" style="margin-left: 5px">下载</a>
+                        <a 
+                          href="javascript:void(0);"
+                          @click="downloadFile(item.response ? item.response.data : '')"  
+                          style="margin-left: 5px">下载</a>
                         <span
                           style="color: #4ea6ff; cursor: pointer"
                           @click="deFile(item.uid)"
@@ -1335,6 +1338,30 @@ export default defineComponent({
 
       state.edit = true;
     };
+
+    // 共享文档文件下载
+    const downloadFile = (url) => {
+      console.log(url)
+      if(url){
+        window.open(url)
+      }
+      // if(url){
+      //   const filename = '操作指南'
+      //   const x = new XMLHttpRequest()
+      //   x.open('GET', url, true)
+      //   x.responseType = 'blob'
+      //   x.onload = () => {
+      //     // 会创建一个 DOMString，其中包含一个表示参数中给出的对象的URL。这个 URL 的生命周期和创建它的窗口中的 document 绑定。这个新的URL 对象表示指定的 File 对象或 Blob 对象。
+      //     const url = window.URL.createObjectURL(x.response)
+      //     const a = document.createElement('a')
+      //     a.href = url
+      //     a.download = filename
+      //     a.click()
+      //   }
+      //   x.send()
+      // }
+    }
+
     return {
       ...toRefs(state),
       value,
@@ -1356,7 +1383,8 @@ export default defineComponent({
       scoresum,
       checkedClose,
       editNotice,
-      deFile
+      deFile,
+      downloadFile
     };
   },
 });
diff --git a/src/views/projectcenter/TaskPage.vue b/src/views/projectcenter/TaskPage.vue
index f432d019..f8444c11 100644
--- a/src/views/projectcenter/TaskPage.vue
+++ b/src/views/projectcenter/TaskPage.vue
@@ -1097,7 +1097,10 @@
                           :title="item.name"
                           >{{ item.name }}</span
                         >
-                        <a :href="item.response?item.response.data:''" style="margin-left: 5px">下载</a>
+                        <a 
+                          href="javascript:void(0);"
+                          @click="downloadFile(item.response ? item.response.data : '')"  
+                          style="margin-left: 5px">下载</a>
                         <span
                           style="color: #4ea6ff; float: right; cursor: pointer"
                           @click="deFile(item.uid)"
@@ -4147,6 +4150,30 @@ export default {
       state.Seevisible = true;
       state.checkStuId = record.studentId;
     }
+
+    // 共享文档文件下载
+    const downloadFile = (url) => {
+      console.log(url)
+      if(url){
+        window.open(url)
+      }
+      // if(url){
+      //   const filename = '操作指南'
+      //   const x = new XMLHttpRequest()
+      //   x.open('GET', url, true)
+      //   x.responseType = 'blob'
+      //   x.onload = () => {
+      //     // 会创建一个 DOMString，其中包含一个表示参数中给出的对象的URL。这个 URL 的生命周期和创建它的窗口中的 document 绑定。这个新的URL 对象表示指定的 File 对象或 Blob 对象。
+      //     const url = window.URL.createObjectURL(x.response)
+      //     const a = document.createElement('a')
+      //     a.href = url
+      //     a.download = filename
+      //     a.click()
+      //   }
+      //   x.send()
+      // }
+    }
+
     return {
       ...toRefs(state),
       ...toRefs(levelList),
@@ -4253,6 +4280,7 @@ export default {
       showCodeModel,
       showCodeModel2,
       checkType,
+      downloadFile,
     };
   },
 };