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

.env

@@ -7,7 +7,7 @@ VUE_APP_FILE_PATH=/upload/
 # 代理url 本地调试，不可以用在其他地方
 VUE_APP_PROXY_URL=//43.143.139.204/manageApi
 # 登录url
-VUE_APP_LOGIN_URL=//u-pre.boe.com/web
+VUE_APP_LOGIN_URL=//u-pre.boe.com/web?returnUrl=
 # boe域名
 VUE_APP_BOE_API_URL=//u-pre.boe.com
 #打包路径
@@ -36,4 +36,6 @@ VUE_APP_EXAM_DETAIL_URL=//u-pre.boe.com/mobile/pages/exam/exam?id=
 #h5的基本url
 VUE_APP_H5=//u-pre.boe.com/student-h5
 #用户头像
-VUE_APP_AVATAR_PATH=/upload/
+VUE_APP_AVATAR_PATH=/upload/
+# 旧版管理员界面
+VUE_APP_OLD_MANAGE=//u-pre.boe.com/resource/index.html

.env.boe

@@ -2,7 +2,7 @@ NODE_ENV=boe
 VUE_APP_BASE=/manage
 VUE_APP_BASE_API=/manageApi
 
-VUE_APP_LOGIN_URL=//u-pre.boe.com/web
+VUE_APP_LOGIN_URL=//u-pre.boe.com/web?returnUrl=
 
 VUE_APP_BOE_API_URL=//u-pre.boe.com
 

.env.prod

@@ -4,7 +4,7 @@ VUE_APP_BASE_API=/manageApi
 
 VUE_APP_PROXY_URL=//u.boe.com/
 
-VUE_APP_LOGIN_URL=//u.boe.com/web
+VUE_APP_LOGIN_URL=//u.boe.com/web?returnUrl=
 
 VUE_APP_BOE_API_URL=//u.boe.com
 
@@ -27,4 +27,6 @@ VUE_APP_H5=//u.boe.com/student-h5
 #文件基础路径调试 只在生产做了变更
 VUE_APP_FILE_PATH=/upload/boe/file/
 #用户头像
-VUE_APP_AVATAR_PATH=/upload/
+VUE_APP_AVATAR_PATH=/upload/
+# 旧版管理员界面
+VUE_APP_OLD_MANAGE=//u.boe.com/resource/index.html

.env.release

@@ -3,7 +3,7 @@ VUE_APP_BASE=/manage-release
 VUE_APP_BASE_API=/manageApi-release
 
 VUE_APP_PROXY_URL=//u-pre.boe.com/
-VUE_APP_LOGIN_URL=//u.boe.com/web-release
+VUE_APP_LOGIN_URL=//u.boe.com/web-release?returnUrl=
 
 VUE_APP_BOE_API_URL=//u.boe.com
 
@@ -23,4 +23,6 @@ VUE_APP_EXAM_DETAIL_URL=//u.boe.com/mobile-release/pages/exam/exam?id=
 #h5的基本url
 VUE_APP_H5=//u.boe.com/student-h5-release
 #用户头像
-VUE_APP_AVATAR_PATH=/upload/
+VUE_APP_AVATAR_PATH=/upload/
+# 旧版管理员界面
+VUE_APP_OLD_MANAGE=//u-pre.boe.com/resource/index.html

src/api/config.js

@@ -58,7 +58,9 @@ http.interceptors.response.use(
             return response;
         }
         if (code === 1000) {
-            (process.env.NODE_ENV === 'development' || process.env.NODE_ENV === 'alpine') ? router.push({path: 'login'}) : (window.location.href = process.env.VUE_APP_LOGIN_URL)
+            (process.env.NODE_ENV === 'development' || process.env.NODE_ENV === 'alpine') ? 
+            router.push({path: 'login', query: { returnUrl: router.currentRoute.value.fullPath }}) : 
+            (window.location.href = process.env.VUE_APP_LOGIN_URL + encodeURIComponent(window.location.protocol + import.meta.env.VUE_APP_BOE_API_URL + import.meta.env.VUE_APP_BASE + router.currentRoute.value.fullPath))
             return Promise.reject(response);
         }
         show && message.error(msg);

src/components/NavLeft.vue

@@ -436,7 +436,7 @@
               src="../assets/images/navleft/review.png"
             />
           </div>
-          <a target="_blank" href="https://u-pre.boe.com/web/">旧版管理员界面</a>
+          <a target="_blank" :href="oldManage">旧版管理员界面</a>
           <!-- <router-link target="_blank" to="/oldsystemmanage">旧版管理员界面</router-link> -->
         </a-menu-item>
         <a-menu-item key="sub17" v-if="checkMenu('ReadingClubManage')">
@@ -807,6 +807,7 @@ export default {
           pagename: "字典管理",
         },
       ],
+      oldManage: window.location.protocol + process.env.VUE_APP_OLD_MANAGE
     });
 
     // console.log(state.openKeys, state.selectedKeys);

src/components/common/FJUpload.vue

@@ -23,7 +23,11 @@
               {{ 
                 item.name.indexOf('http')!==-1?
                 item.name.slice(item.name.lastIndexOf('/') + 1)
-                :item.name.indexOf('-')!==-1?item.name.slice(0,item.name.indexOf('-')) + item.name.slice(item.name.indexOf('.')) :item.name 
+                :item.name.indexOf('-')!==-1?
+                item.name.indexOf('/')!==-1?
+                item.name.slice(item.name.lastIndexOf('/') + 1).slice(0,item.name.slice(item.name.lastIndexOf('/') + 1).indexOf('-')) + item.name.slice(item.name.indexOf('.'))
+                :item.name.slice(0,item.name.indexOf('-')) + item.name.slice(item.name.indexOf('.')) 
+                :item.name  
               }}
             </span>
           </div>

src/components/drawers/ActiveAttendance.vue

@@ -126,6 +126,21 @@
             }"
           />
         </div>
+        <div class="tableBox" style="display: flex;justify-content:center;align-items:center;margin-top:12px;">
+          <div class="pa">
+            <a-pagination
+              v-if="tableDataTotal>10"
+              :showSizeChanger="false"
+              showQuickJumper="true"
+              hideOnSinglePage="true"
+              :pageSize="pageSize"
+              :current="currentPage"
+              :total="tableDataTotal"
+              class="pagination"
+              @change="changePagination"
+            />
+          </div>
+        </div>
       </div>
       <div class="btnn">
         <button class="btn1" @click="closeDrawer">取消</button>
@@ -459,6 +474,13 @@ export default {
       }
     };
 
+    //分页
+    const changePagination = (page) => {
+      state.tableDataTotalLoading = true;
+      state.currentPage = page;
+      getTableData();
+    };
+
     const getTableData = () => {
       // debugger
       console.log("当前是项目还是路径图 1 项目 2 路径图", props);
@@ -510,6 +532,7 @@ export default {
           .catch((err) => {
             console.log(err);
             state.tableDataTotalLoading = false;
+            state.tableDataTotal = 0;
             state.tableData = [];
           });
       } else if (
@@ -560,10 +583,12 @@ export default {
             console.log(err);
             state.tableDataTotalLoading = false;
             state.tableData = [];
+            state.tableDataTotal = 0;
           });
       } else {
         state.tableDataTotalLoading = false;
         state.tableData = [];
+        state.tableDataTotal = 0;
       }
 
       // let arr = state.tableData;
@@ -1047,6 +1072,7 @@ export default {
       searchTaskList,
       resetTaskList,
       exportTaskStu,
+      changePagination
     };
   },
 };

src/components/drawers/ProjectScore.vue

@@ -158,89 +158,73 @@
             </div>
 
             <div v-if="edit" class="pjcb_content">
-              <div class="content content1">
+             
-                <span>当前设计下，学员可以获得 </span
-                ><span class="scoretext">{{ scoresum }}</span
-                ><span>积分</span>
-              </div>
               <div class="content content2">
-                <span>完成【必修/选修】获得 </span
+                <span>每完成一项任务则可获得 </span
-                ><span class="scoretext">{{ score1 }} </span><span>积分</span>
+                ><span class="scoretext">{{ score1 }} </span><span>积分,除此以外:</span>
               </div>
+              <!--
               <div class="content">
-                <span>完成作业成绩不低于 </span
+                <span>作业：完成作业成绩不低于 </span
                 ><span class="scoretext">{{ done2 }}</span
                 ><span>分获得</span> <span class="scoretext">{{ done3 }}</span
                 ><span>积分</span>
-              </div>
+              </div>-->
+              
+              
               <div class="content">
-                <span>前</span><span class="scoretext">{{ four1 }}</span
+                <span>作业：最早完成任意一项目作业的前</span
-                ><span>名学完在线课程获得</span>
-                <span class="scoretext">{{ four2 }}</span
-                ><span style="margin-right: 50px">积分</span> <span>前</span
                 ><span class="scoretext">{{ four3 }}</span
-                ><span>名提交作业且成绩不低于</span>
+                ><span>名学员且成绩不低于</span>
                 <span class="scoretext">{{ four4 }}</span
                 ><span>分获得</span> <span class="scoretext">{{ four5 }}</span
                 ><span>积分</span>
               </div>
               <div class="content">
-                <span>考试成绩高于</span
+                <span>在线：最早完成任意一门课程的</span><span class="scoretext">{{ four1 }}</span
+                ><span>名学员获得</span>
+                <span class="scoretext">{{ four2 }}</span
+                ><span style="margin-right: 50px">积分</span>
+                 
+              </div>
+              <div class="content">
+                <span>考试：完成任意一场考试且成绩高于</span
                 ><span class="scoretext">{{ five1 }}</span
                 ><span>分获得</span> <span class="scoretext">{{ five2 }}</span
                 ><span>积分</span>
               </div>
               <div class="content">
-                <span>考勤正常学员获得 </span
+                <span>面授、直播、活动：完成任意一面授课、直播、活动且考勤正常学员获得 </span
                 ><span class="scoretext">{{ six1 }}</span
                 ><span>积分</span>
               </div>
+             
               <div class="content">
                 <span>成为小组长获得</span
                 ><span class="scoretext">{{ seven1 }}</span
-                ><span style="margin-right: 50px">积分</span>
+                ><span style="margin-right: 50px">积分（同一项目只加一次）</span>
+                </div> <div class="content">
                 <span>优秀学员可获得</span>
                 <span class="scoretext">{{ seven2 }}</span
-                ><span>积分</span>
+                ><span>积分（同一项目只加一次）</span>
               </div>
             </div>
             <div v-else class="pjcb_content">
-              <div class="content content1">
+             
-                <span>当前设计下，学员可以获得 </span
-                ><span class="scoretext">{{ scoresum }}</span
-                ><span>积分</span>
-              </div>
               <div class="content content2">
-                <span>完成【必修/选修】获得 </span
+                <span>每完成一项任务则可获得 </span
                 ><span
                   ><a-input
                     v-model:value="score1"
                     :bordered="false"
                     @change="getScore"
                   /> </span
-                ><span>积分</span>
+                ><span>积分，除此以外：</span>
               </div>
               <div class="content">
-                <span>完成作业成绩不低于 </span
+                <span>作业：最早完成任意一项作业的</span
-                ><a-input v-model:value="done2" :bordered="false" /><span
-                  >分获得</span
-                >
-                <a-input v-model:value="done3" :bordered="false" /><span
-                  >积分</span
-                >
-              </div>
-              <div class="content">
-                <span>前</span
-                ><a-input v-model:value="four1" :bordered="false" /><span
-                  >名学完在线课程获得</span
-                >
-                <a-input v-model:value="four2" :bordered="false" /><span
-                  style="margin-right: 50px"
-                  >积分</span
-                >
-                <span>前</span
                 ><a-input v-model:value="four3" :bordered="false" /><span
-                  >名提交作业且成绩不低于</span
+                  >名学员且成绩不低于</span
                 >
                 <a-input v-model:value="four4" :bordered="false" /><span
                   >分获得</span
@@ -250,7 +234,18 @@
                 >
               </div>
               <div class="content">
-                <span>考试成绩高于</span
+                <span>在线：最早完成任意一门课程的</span
+                ><a-input v-model:value="four1" :bordered="false" /><span
+                  >名学完在线课程获得</span
+                >
+                <a-input v-model:value="four2" :bordered="false" /><span
+                  style="margin-right: 50px"
+                  >积分</span
+                >
+               
+              </div>
+              <div class="content">
+                <span>考试：完成任意一场考试且成绩高于</span
                 ><a-input v-model:value="five1" :bordered="false" /><span
                   >分获得</span
                 >
@@ -259,20 +254,21 @@
                 >
               </div>
               <div class="content">
-                <span>考勤正常学员获得 </span
+                <span>面授、直播、活动：完成任意一面授课、直播、活动且考勤正常学员获得 </span
                 ><a-input v-model:value="six1" :bordered="false" /><span
                   >积分</span
                 >
               </div>
+          
               <div class="content">
                 <span>成为小组长获得</span
                 ><a-input v-model:value="seven1" :bordered="false" /><span
                   style="margin-right: 50px"
-                  >积分</span
+                  >积分（同一项目只加一次）</span
-                >
+                > </div> <div class="content">
                 <span>优秀学员可获得</span>
                 <a-input v-model:value="seven2" :bordered="false" /><span
-                  >积分</span
+                  >积分（同一项目只加一次）</span
                 >
               </div>
             </div>

src/router/index.js

@@ -8,6 +8,8 @@
  */
 import { createRouter, createWebHistory } from 'vue-router';
 import routesConfig from './config';
+import store from "@/store";
+
 const routes = [
 	{
 		path: '/',
@@ -21,4 +23,26 @@ const router = createRouter({
 	routes,
 
 })
+
+let count = 0;
+const timers = setInterval(() => {
+	count ++ 
+	let pathArr = store.state.menus
+	let currentPath = router.options.history.location
+	console.log(pathArr, currentPath, pathArr.indexOf(currentPath))
+	if(pathArr.length!==0){
+		// 刷新界面是否重新执行
+		if(pathArr.indexOf(currentPath)==-1){
+			clearInterval(timers)
+			router.push({path: pathArr[0]})
+		}else{
+			clearInterval(timers)
+		}
+	}
+	// 30s超时结束
+	if(count==60&&pathArr.length==0){
+		clearInterval(timers)
+	}
+}, 500);
+
 export default router

src/store/index.js

@@ -12,14 +12,7 @@ export default createStore({
   state: {
     openpages: localStorage.getItem("openpages")
       ? JSON.parse(localStorage.getItem("openpages"))
-      : [
+      : [],
-        {
-          pagename: "学习路径图",
-          href: "/learningpath",
-          active: true,
-        },
-      ],
-
     assessmentName: "",
     routerId: null,
     projectTemplateId: null,

src/views/courselibrary/CoursewareManage.vue

@@ -321,7 +321,7 @@
         :scroll="{ x: 'max-content' }"
       >
         <template #operation="{ text, record, index }">
-          <a-space>
+          <a-space :key="record.id">
             <a-button
               v-if="(record.auditStatus === 2 || record.auditStatus === 3) && !record.publishStatus && checkPer(record.permissions,createId)"
               @click="() => handlePush(text, index)"
@@ -417,7 +417,8 @@
                 >启用</a-button
               >
               <a-button
-                @click="() => handleDelete(text, index)"
+                v-if="record.publishStatus!==1"
+                @click="() => handleDelete(text, index, record)"
                 type="link"
                 danger
                 >删除
@@ -1165,7 +1166,7 @@
               <span style="margin-right: 3px"></span>
             </div>
             <div class="b_input">
-              <FJUpload v-model:value="attachName" @changevalue="changevalue" />
+              <FJUpload v-model:value="attach" @changevalue="changevalue" />
             </div>
           </div>
 
@@ -2591,7 +2592,6 @@ export default defineComponent({
       imgList: [],
       validated: 0,
       attach: "",
-      attachName: "",
       pageSize2: 10,
       currentPage2: 0,
       tableDataTotal2: 0,
@@ -3740,15 +3740,6 @@ export default defineComponent({
       console.log("获取面授课开课详情", item);
       state.xjkkinputV2 = item.address;
       state.checked1 = item.applyFlag === 1 ? true : false;
-      let arrss = item.attach.split(",");
-      let str = "";
-      for (let i = 0; i < arrss.length; i++) {
-        i == arrss.length - 1
-          ? (str += arrss[i].slice(arrss[i].lastIndexOf("/") + 1))
-          : (str += arrss[i].slice(arrss[i].lastIndexOf("/") + 1) + ",");
-      }
-      console.log(str);
-      state.attachName = str;
       state.attach = item.attach;
 
       state.xjkkinputV3 = [

src/views/courselibrary/courseModal.vue

@@ -1010,15 +1010,15 @@ export default defineComponent({
       state.qdms_inputV6 = item.intro;
       state.member = { value: item.teacherId, name: item.teacher };
       valueHtml.value = item.outline;
-      let arrss = item.attach.split(",");
+      // let arrss = item.attach.split(",");
-      let str = "";
+      // let str = "";
-      for (let i = 0; i < arrss.length; i++) {
+      // for (let i = 0; i < arrss.length; i++) {
-        i == arrss.length - 1
+      //   i == arrss.length - 1
-          ? (str += arrss[i].slice(arrss[i].lastIndexOf("/") + 1))
+      //     ? (str += arrss[i].slice(arrss[i].lastIndexOf("/") + 1))
-          : (str += arrss[i].slice(arrss[i].lastIndexOf("/") + 1) + ",");
+      //     : (str += arrss[i].slice(arrss[i].lastIndexOf("/") + 1) + ",");
-      }
+      // }
-      console.log(str);
+      // console.log(str);
-      state.attach = str;
+      state.attach = item.attach;
 
       if (item.jobTypeIds) {
         state.selectJobId = item.jobTypeIds.split(",");

src/views/projectcenter/LibraryAdd.vue

@@ -359,60 +359,51 @@
               </div>
 
               <div v-if="edit" class="pjcb_content">
-                <div class="content content1">
+                
-                  <span>当前设计下，学员可以获得 </span
-                  ><span class="scoretext">{{ scoresum }}</span
-                ><span>积分</span>
-                </div>
                 <div class="content content2">
-                  <span>完成【必修/选修】获得 </span
+                  <span>每完成一项任务则可获得 </span
-                  ><span class="scoretext">{{ score1 }} </span><span>积分</span>
+                  ><span class="scoretext">{{ score1 }}</span
+                ><span>积分，除此以外：</span>
                 </div>
                 <div class="content">
-                  <span>完成作业成绩不低于 </span
+                  <span>作业：最早完成任意一项作业的</span
-                  ><span class="scoretext">{{ done2 }}</span
-                ><span>分获得</span> <span class="scoretext">{{ done3 }}</span
-                ><span>积分</span>
-                </div>
-                <div class="content">
-                  <span>前</span><span class="scoretext">{{ four1 }}</span
-                ><span>名学完在线课程获得</span>
-                  <span class="scoretext">{{ four2 }}</span
-                  ><span style="margin-right: 50px">积分</span> <span>前</span
                 ><span class="scoretext">{{ four3 }}</span
-                ><span>名提交作业且成绩不低于</span>
+                ><span>名学员且成绩不低于</span>
                   <span class="scoretext">{{ four4 }}</span
                   ><span>分获得</span> <span class="scoretext">{{ four5 }}</span
                 ><span>积分</span>
                 </div>
                 <div class="content">
-                  <span>考试成绩高于</span
+                  <span>在线：最早完成任意一门课程的</span><span class="scoretext">{{ four1 }}</span
+                ><span>名学员获得</span>
+                  <span class="scoretext">{{ four2 }}</span
+                  ><span style="margin-right: 50px">积分</span> 
+                </div>
+                <div class="content">
+                  <span>考试:完成任意 一场考试且成绩高于</span
                   ><span class="scoretext">{{ five1 }}</span
                 ><span>分获得</span> <span class="scoretext">{{ five2 }}</span
                 ><span>积分</span>
                 </div>
                 <div class="content">
-                  <span>考勤正常学员获得 </span
+                  <span>面授、直播、活动：完成任意一面授课、直播、活动且考勤正常学员获得 </span
                   ><span class="scoretext">{{ six1 }}</span
                 ><span>积分</span>
                 </div>
                 <div class="content">
                   <span>成为小组长获得</span
                   ><span class="scoretext">{{ seven1 }}</span
-                ><span style="margin-right: 50px">积分</span>
+                ><span style="margin-right: 50px">积分（同一项目只加一次）</span>
+              </div> <div class="content">
                   <span>优秀学员可获得</span>
                   <span class="scoretext">{{ seven2 }}</span
-                  ><span>积分</span>
+                  ><span>积分（同一项目只加一次）</span>
                 </div>
               </div>
               <div v-else class="pjcb_content">
-                <div class="content content1">
+              
-                  <span>当前设计下，学员可以获得 </span
-                  ><span class="scoretext">{{ scoresum }}</span
-                ><span>积分</span>
-                </div>
                 <div class="content content2">
-                  <span>完成【必修/选修】获得 </span
+                  <span>每完成一项任务则可获得 </span
                   ><span
                 ><a-input
                   v-model:value="score1"
@@ -422,34 +413,11 @@
                 ><span>积分</span>
                 </div>
                 <div class="content">
-                  <span>完成作业成绩不低于 </span
+                  <span>作业:最早完成任意一项作业的</span
-                  >
-                  <a-input v-model:value="done2" :bordered="false"/>
-                  <span
-                  >分获得</span
-                  >
-                  <a-input v-model:value="done3" :bordered="false"/>
-                  <span
-                  >积分</span
-                  >
-                </div>
-                <div class="content">
-                  <span>前</span
-                  >
-                  <a-input v-model:value="four1" :bordered="false"/>
-                  <span
-                  >名学完在线课程获得</span
-                  >
-                  <a-input v-model:value="four2" :bordered="false"/>
-                  <span
-                    style="margin-right: 50px"
-                  >积分</span
-                  >
-                  <span>前</span
                   >
                   <a-input v-model:value="four3" :bordered="false"/>
                   <span
-                  >名提交作业且成绩不低于</span
+                  >名学员且成绩不低于</span
                   >
                   <a-input v-model:value="four4" :bordered="false"/>
                   <span
@@ -461,7 +429,21 @@
                   >
                 </div>
                 <div class="content">
-                  <span>考试成绩高于</span
+                  <span>在线:最早完成任意一门课程的</span
+                  >
+                  <a-input v-model:value="four1" :bordered="false"/>
+                  <span
+                  >名学员获得</span
+                  >
+                  <a-input v-model:value="four2" :bordered="false"/>
+                  <span
+                    style="margin-right: 50px"
+                  >积分</span
+                  >
+               
+                </div>
+                <div class="content">
+                  <span>考试:完成任意一场考试且成绩高于</span
                   >
                   <a-input v-model:value="five1" :bordered="false"/>
                   <span
@@ -473,7 +455,7 @@
                   >
                 </div>
                 <div class="content">
-                  <span>考勤正常学员获得 </span
+                  <span>面授、直播、活动：完成任意一面授课、直播、活动且考勤正常学员获得 </span
                   >
                   <a-input v-model:value="six1" :bordered="false"/>
                   <span
@@ -486,12 +468,12 @@
                   <a-input v-model:value="seven1" :bordered="false"/>
                   <span
                     style="margin-right: 50px"
-                  >积分</span
+                  >积分（同一项目只加一次）</span
-                  >
+                  > </div> <div class="content">
                   <span>优秀学员可获得</span>
                   <a-input v-model:value="seven2" :bordered="false"/>
                   <span
-                  >积分</span
+                  >积分（同一项目只加一次）</span
                   >
                 </div>
               </div>