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.1.5------------");
+		console.log("版本2.1.6------------");
 		const routes = computed(() => {
 			return router.getRoutes().filter((e) => e.meta?.isLink);
 		});

src/components/drawers/AddHomework.vue

@@ -72,10 +72,10 @@
 							<FJUpload v-model:value="attach" @changevalue="changevalue"/>
 							</div>
 						</div>
-						
+						<div style="width:100%;height: 80px;"></div>
 					</div>
 				</div>
-				<div class="main_btns">
+				<div class="main_btns" style="background:#fff;">
 					<a-button class="btn1" @click="closeDrawer2">取消</a-button>
 					<a-button class="btn2" html-type="submit" @click="updteHomeWork">确定</a-button>
 				</div>

src/components/drawers/ExportScore.vue

@@ -298,6 +298,12 @@ export default {
               console.log("查询导入状态失败", err);
             });
         }, 500);
+        setTimeout(() => {
+          clearInterval(timer)
+          state.addLoading = false;
+          message.destroy();
+          message.error(`文件导入超时`);
+        }, 30000);
       } else if (status === "error") {
         state.uploadErr = true;
         message.error(`${info.file.name}上传失败`);

src/components/drawers/NoticeHis.vue

@@ -7,7 +7,7 @@
     <div>发布时间</div>
   </div>
   <div class="noticeContent">
-    <div v-for="item in notice" :key="item.id" class="item">
+    <div v-for="item in notice" :key="item.id" class="item" style="align-items:flex-start;">
       <!-- <div class="itemcontent">{{ item.content }}</div> -->
       <a-textarea
           class="itemcontent"

src/components/student/TableStudent.vue

@@ -457,6 +457,8 @@ const tablecolumns = ref([
     align: "center",
     className: "h",
     ellipsis: true,
+    customRender: ({ record: { studentOrgName, studentDepartName } }) =>
+      (allDepartShow(studentOrgName, studentDepartName)),
   },
   {
     title: "加入方式",
@@ -466,7 +468,7 @@ const tablecolumns = ref([
     align: "center",
     customRender: ({ record: { source } }) =>
       // ({ 1: "快速添加", 2: "组织", 3: "受众", 4: "报名" }[source]),
-      ({ 1: "手动加入", 2: "手动加入", 3: "手动加入", 4: "报名" }[source]),
+      ({ 0: "手动加入", 1: "手动加入", 2: "手动加入", 3: "手动加入", 4: "报名", 5: "手动加入", 6: "手动加入"}[source]),
   },
   ...props.columns,
   {
@@ -478,6 +480,14 @@ const tablecolumns = ref([
     slots: { customRender: "action" },
   },
 ]);
+
+function allDepartShow(a,b) {
+  let org = (a=="" || a == null || a == undefined) ? a = "" : a.slice(0,1) =='/' ? a.slice(1,a.length) : a;
+  let depart = (b=="" || b == null || b == undefined) ? b = "" : b;
+  let allname = org == "" && depart == "" ? '-' : org + depart;
+  return allname;
+}
+
 const tableParam = ref({
   studentName: "", //学员名称
   groupName: "", //学员小组

src/views/DownLoad.vue

@@ -59,7 +59,7 @@
         '0%': countCMB>2?'#FF0000 ':'#45B058',
         '100%': countCMB>2?'#FF0000 ':'#45B058',
       }" />
-        <div v-if="countCMB>2" style="color:rgba(255, 116, 116, 1);font-size:12px;">容量已满，请删除文件</div>
+        <div v-if="formatCapacityGB(capacity)>2" style="color:rgba(255, 116, 116, 1);font-size:12px;">容量已满，请删除文件</div>
       </div>
     </div>
     <!-- 文件容器 -->
@@ -176,6 +176,12 @@ export default {
       return CMB
     }
 
+    function formatCapacityGB(data) {
+      let num = Number(data);
+      let CMB = (num / (1048576*1024)).toFixed(2);
+      return CMB
+    }
+
     // 下载文件
     function downLoadFile(data) {
       console.log(data)
@@ -226,7 +232,8 @@ export default {
       changePaginationStu,
       searchDownloadList,
       reseatDownloadList,
-      formatCapacity
+      formatCapacity,
+      formatCapacityGB
     };
   },
 };