Merge remote-tracking branch 'origin/develop' into develop

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);
 		});

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;
 

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;

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,
     });

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,
+				// teacherId: state.member.value,
-				teacher: state.member.name,
+				// 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,
 			];

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
                         >
@@ -2164,7 +2165,7 @@ export default {
         })
         .catch((err) => {
           console.log(err);
-          message.error("获取路径列表失败" + err);
+         // message.error("获取路径列表失败" + err);
         });
     };
 
@@ -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,
     };
   },
 };

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">

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
     };
   },
 });

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,
     };
   },
 };