Merge branch 'dongwu-master'

# Conflicts:
#	src/views/case/CaseManage.vue

src/App.vue

@@ -34,7 +34,7 @@ import {USER_PERMISSION, VALIDATE_TOKEN} from "@/api/apis";
 const store = useStore();
 const isLogin = ref(false);
 
-console.log("版本3.1.2------------");
+console.log("版本3.3.1------------");
 
 
 // 监听关闭浏览器

src/api/ThirdApi.js

@@ -16,4 +16,6 @@ export const ONLINE_PAGE = "/systemapi/xboe/m/course/manage/pagelist post formDa
 export const LOGOUT = "/userbasic/logout post";
 export const REFRESH_TOKEN_API = "/userbasic/refreshToken";
 
+export const COURSE_AUDIT = "/systemapi/xboe/m/course/manage/audit post formData";
+export const OTHER_AUDIT = "/systemapi/xboe/m/course/audit/appoint post formData";
 export const ONLINE_COURSE_DEL = (id, courseId) => `/systemapi/xboe/school/study/course/delete-signup?id=${id}&couserId=${courseId} post`;

src/components/Modals/addOnlineCourse.vue

@@ -22,7 +22,7 @@
         style="width: 100%; height: 100%"
         :src="iframeUrl + '/course/manages'"
         name="myframe"
-        sandbox="allow-forms allow-scripts allow-same-origin allow-popups"
+        sandbox="allow-forms allow-scripts allow-downloads allow-same-origin allow-popups"
       ></iframe>
     </a-modal>
   </div>

src/components/NavLeft.vue

@@ -572,7 +572,7 @@
           <router-link to="/download">问答</router-link>
         </a-menu-item>
         <a-menu-item key="sub18" v-if="checkMenu('OldSystemManage')">
-          <router-link to="/oldsystemmanage">旧版</router-link>
+          <a target="_blank" :href="oldManage">旧版</a>
         </a-menu-item>
         <a-menu-item key="sub19" v-if="checkMenu('ReadingClubManage')">
           <router-link to="/readingclubmanage">业务</router-link>
@@ -598,7 +598,7 @@ export default {
     const store = useStore();
     const state = reactive({
       packup: false,
-      screenHeight: document.body.clientHeight, // 屏幕高度
+      screenHeight: document.body.clientHeight, // 屏幕 高度
       rootSubmenuKeys: [
         "sub1",
         "sub2",

src/components/drawers/AddLevelImportStu.vue

@@ -41,7 +41,7 @@
                 :data="{
                   targetId: Number(courseId),
                   type: courseType,
-                  userId: userInfo.id,
+                  userId: userInfo.userId,
                   userName: userInfo.realName,
                 }"
                 :showUploadList="false"

src/components/drawers/CheckAnsware.vue

@@ -25,7 +25,7 @@
                     frameborder="0"
                     name="myframe"
                     security="restricted"
-                    sandbox="allow-forms allow-scripts allow-same-origin allow-popups"
+                    sandbox="allow-forms allow-downloads allow-scripts allow-same-origin allow-popups"
                     >
                 </iframe>
             </div>

src/components/drawers/CheckVote.vue

@@ -128,12 +128,12 @@ export default {
         function getData() {
             console.log('我是请求的参数', {
                 "courseId": props.courseID,
-                "studentId": userInfo.value.id,
+                "studentId": userInfo.value.userId,
                 "voteSubmitId": props.voteID
             })
             api.QueryVoteTaskDetailById({
                 "courseId": props.courseID,
-                "studentId": userInfo.value.id,
+                "studentId": userInfo.value.userId,
                 "voteSubmitId": props.voteID
             }).then(res=>{
                 console.log(res)

src/components/drawers/CreateOnline.vue

@@ -17,7 +17,7 @@
       :src="`${iframeUrl}/course/manages?f=choose&refId=${props.id}&refType=${props.type}`"
       name="myframe"
       security="restricted"
-      sandbox="allow-forms allow-scripts allow-same-origin allow-popups"
+      sandbox="allow-forms allow-downloads allow-scripts allow-same-origin allow-popups"
     ></iframe>
   </a-modal>
 </template>

src/components/drawers/EvList.vue

@@ -184,7 +184,7 @@ const initParams = {
   keyword: "",
   page: 1,
   size: 10,
-  user_id: store.state.userInfo.id,
+  user_id: store.state.userInfo.userId,
   // orderAsc: true
 };
 const params = ref(initParams);

src/components/drawers/SelectTest.vue

@@ -83,7 +83,7 @@
         style="width: 100%; height: 100%"
         :src="iframeUrl + '/exam/papers?addnew=true'"
         name="myframe"
-        sandbox="allow-forms allow-scripts allow-same-origin allow-popups"
+        sandbox="allow-forms allow-downloads allow-scripts allow-same-origin allow-popups"
     ></iframe>
   </a-modal>
 </template>

src/views/article/ArticleManage.vue

@@ -17,7 +17,7 @@
       frameborder="0"
       name="myframe"
       security="restricted"
-      sandbox="allow-forms allow-scripts allow-same-origin allow-popups"
+      sandbox="allow-forms allow-downloads allow-scripts allow-same-origin allow-popups"
     ></iframe>
   </div>
 </template>

src/views/courselibrary/CourseManage.vue

@@ -17,7 +17,7 @@
       frameborder="0"
       name="myframe"
       security="restricted"
-      sandbox="allow-forms allow-scripts allow-same-origin allow-popups"
+      sandbox="allow-forms allow-downloads allow-scripts allow-same-origin allow-popups"
     ></iframe>
   </div>
 </template>

src/views/courselibrary/CoursewareManage.vue

@@ -4582,7 +4582,7 @@ export default defineComponent({
       console.log(state.kk_inputV1);
       console.log(state.kk_inputV2);
       console.log(state.selectTime);
-      state.pageSize222 = 1
+      state.pageSize222 = 10
       state.currentPage1 = 1
       getTableDate();
       getTableDate3();
@@ -4593,7 +4593,7 @@ export default defineComponent({
       state.selectTime = "";
       state.currentPage2 = 1;
       state.tableDataTotal2 = [];
-      state.pageSize222 = 1
+      state.pageSize222 = 10
       state.currentPage1 = 1
       getTableDate();
       getTableDate3();

src/views/courselibrary/OnlineManage.vue

@@ -17,7 +17,7 @@
         frameborder="0"
         name="myframe"
         security="restricted"
-        sandbox="allow-forms allow-scripts allow-same-origin allow-popups"
+        sandbox="allow-forms allow-downloads allow-scripts allow-same-origin allow-popups"
     ></iframe>
     <OnlineClassModelStudent ref="stuRef" :type="13"></OnlineClassModelStudent>
   </div>

src/views/examination/ExaminationCenter.vue

@@ -17,7 +17,7 @@
       frameborder="0"
       name="myframe"
       security="restricted"
-      sandbox="allow-forms allow-scripts allow-same-origin allow-popups"
+      sandbox="allow-forms allow-downloads allow-scripts allow-same-origin allow-popups"
     ></iframe>
   </div>
 </template>

src/views/examination/PaperManage.vue

@@ -17,7 +17,7 @@
       frameborder="0"
       name="myframe"
       security="restricted"
-      sandbox="allow-forms allow-scripts allow-same-origin allow-popups"
+      sandbox="allow-forms allow-downloads allow-scripts allow-same-origin allow-popups"
     ></iframe>
   </div>
 </template>

src/views/examination/QuestionManage.vue

@@ -17,7 +17,7 @@
       frameborder="0"
       name="myframe"
       security="restricted"
-      sandbox="allow-forms allow-scripts allow-same-origin allow-popups"
+      sandbox="allow-forms allow-downloads allow-scripts allow-same-origin allow-popups"
     ></iframe>
   </div>
 </template>

src/views/examine/CourseReviewed.vue

@@ -511,15 +511,16 @@ export default {
 					type: item.type == 1 ? "线上" : "线下",
 					content: sHX(item.sysTypeId),
 					status:
-						item.auditStatus == 0
+              item.type == 2?
+                  (item.status == 0
                       ? "未提交"
-							: item.auditStatus == 1
+                      : item.status == 1
-								? "提交待审核"
+                          ? "待审核"
-								: item.auditStatus == 2
+                          : item.status == 2
                               ? "通过"
-									: item.auditStatus == -1
+                              : item.status == -1
                                   ? "拒绝"
-										: "-",
+                                  : "-"):(item.status == 1?'待审核':item.status == 2 ? "待审核":item.status == 5 ? "通过":item.status == 3?'拒绝':item.status == 9?'通过':'-'),
 					creater: item.createName,
 					time: item.createTime,
 					msg: item.description || "-",

src/views/examine/CourseReviewedN.vue

@@ -245,7 +245,7 @@
 		<a-modal v-model:visible="onlineClassesVisible" :footer="null" :closable="false"
 			wrapClassName="modalStyle onlineClassesStyle" :zIndex="9999">
 			<iframe id="iframe" style="width: 100%; height: 100%" :src="iframeUrl + 'course/noapproved'" name="myframe"
-				sandbox="allow-forms allow-scripts allow-same-origin allow-popups"></iframe>
+				sandbox="allow-forms allow-downloads allow-scripts allow-same-origin allow-popups"></iframe>
 		</a-modal>
 	</div>
 </template>
@@ -259,6 +259,8 @@ import { iframeUrl } from "../../api/method";
 import { editCourseRecord } from "../../api/indexAudit";
 import {useStore} from "vuex";
 import dayjs from "dayjs";
+import {boeRequest} from "@/api/request";
+import {COURSE_AUDIT, OTHER_AUDIT} from "@/api/ThirdApi";
 
 export default {
 	name: "CoursereViewedN",
@@ -405,7 +407,10 @@ export default {
 										showAudit(
 											value.record.createrId,
 											value.record.creater,
-											value.record.offId
+											value.record.offId,
+											value.record.type,
+											value.record.id,
+											value.record.courseId
 										);
 									}}
 								>
@@ -420,7 +425,10 @@ export default {
 											showInvitationAudit(
 												value.record.createrId,
 												value.record.creater,
-												value.record.offId
+												value.record.offId,
+                        value.record.type,
+                        value.record.id,
+                        value.record.courseId
 											)
 										}}>
 										邀请审核
@@ -713,8 +721,8 @@ export default {
 		// contentList11.find(e => e.dictCode == text)?.dictValue
 
 		const searchList = () => {
-			console.log('searchParamsearchParamsearchParam', state.searchParam)
+			// console.log('searchParamsearchParamsearchParam', state.searchParam)
-			console.log('searchParamsearchParamsearchParam', Math.ceil(new Date(state.searchParam[0]).getTime()))
+			// console.log('searchParamsearchParamsearchParam', Math.ceiXXl(new Date(state.searchParam[0]).getTime()))
 			let objn = {
 				auditStatus: 1,
 				// categoryId: state.valueproj,
@@ -764,10 +772,12 @@ export default {
 				let obj = {
 					number: i + 1 + (state.currentPage - 1) * 10,
 					name: item.name,
+					id: item.id,
+					courseId: item.courseId,
 					type: item.type == 1 ? "线上" : "线下",
 					content: sHX(item.sysTypeId),
-					status:
+					status:item.type == 2?
-						item.status == 0
+              (item.status == 0
                   ? "未提交"
                   : item.status == 1
                       ? "待审核"
@@ -775,7 +785,7 @@ export default {
                           ? "通过"
                           : item.status == -1
                               ? "拒绝"
-										: "-",
+                              : "-"):(item.status == 1?'待审核':item.status == 2 ? "待审核":item.status == 5 ? "通过":item.status == 3?'拒绝':item.status == 9?'通过':'-'),
 					change: "-",
 					creater: item.createName,
 					time: item.processTime,
@@ -803,23 +813,32 @@ export default {
 			state.currentPage = pagina;
 			getFaceList();
 		};
-		const showAudit = (createId, creater, offId) => {
+		const showAudit = (createId, creater, offId,type,id,courseId) => {
 			console.log("参数",createId, creater, offId)
 			state.courAuditModal = true;
 			state.createId = createId;
 			state.chooseCreater = creater;
 			state.chooseOffId = offId;
+			state.type = type;
+			state.id = id;
+			state.courseId = courseId;
 			{/* 获取当前课程的审核记录 */}
 			getCourseRecord(offId);
 		};
 
 		// 显示邀请审核弹框
-		const showInvitationAudit = (createId, creater, offId) => {
+		const showInvitationAudit = (createId, creater, offId,type,id,courseId) => {
 			console.log("参数",createId, creater, offId)
 			state.courInvitationAuditModal = true;
 			state.inviteReview.offcourseId = offId;
 			state.inviteReview.teacherId = createId;
 			state.inviteReview.teacherName = creater;
+      state.memberValue.value = '';
+      state.memberValue.label = '';
+      state.valueSuggInvitation='';
+      state.type = type;
+      state.id = id;
+      state.courseId = courseId;
 		};
 		// 关闭邀请审核弹框
 		const closeInvitationCourAuditModal = () => {
@@ -833,6 +852,7 @@ export default {
 				"teacherId": state.memberValue.value,
 				"teacherName": state.memberValue.label
 			})
+      if(state.type=='线下'){
         inviteAudit({
           "inviteContent": state.valueSuggInvitation,
           "offcourseId": state.inviteReview.offcourseId,
@@ -842,10 +862,25 @@ export default {
           console.log(res)
           getFaceList();
           state.courInvitationAuditModal = false;
+          message.success("已经提交转审成功，请等待审核");
         }).catch(err=>{
           console.log(err)
           state.courInvitationAuditModal = false;
         })
+      }else if (state.type=='线上'){
+        boeRequest(OTHER_AUDIT,{
+          auditId:state.id,
+          courseId:state.courseId,
+          teacherId:state.memberValue.value,
+          teacherName:state.memberValue.label,
+          remark:state.valueSuggInvitation,
+        }).then(()=>{
+          getFaceList();
+          state.courInvitationAuditModal = false;
+          message.success("已经提交转审成功，请等待审核");
+        })
+      }
+
 		}
 
 		// 转审完成弹框
@@ -884,7 +919,7 @@ export default {
 				message.error("请输入审核意见");
 				return;
 			}
-
+    if(state.type=='线下'){
       courseAuditView({
         createId: state.createId,
         createName: state.chooseCreater,
@@ -909,6 +944,24 @@ export default {
             state.valuepass = "1";
             state.openDetailVisibie = false;
           });
+    }else if(state.type=='线上'){
+      boeRequest(COURSE_AUDIT,{
+        auditId:state.id,
+        courseId:state.courseId,
+        title:state.valueSugg,
+        remark:state.valueSugg,
+        pass:state.valuepass == "1" ? true : false,
+      }).then(()=>{
+        state.courAuditModal = false;
+        message.destroy();
+        message.success("审核提交成功");
+        state.valueSugg = null;
+        state.valuepass = "1";
+        getFaceList();
+        state.openDetailVisibie = false;
+      })
+      }
+
 		};
 		onMounted(async () => {
 			getFaceList();

src/views/examine/OnlineReviewed.vue

@@ -7,7 +7,7 @@
       frameborder="0"
       name="myframe"
       security="restricted"
-      sandbox="allow-forms allow-scripts allow-same-origin allow-popups"
+      sandbox="allow-forms allow-downloads allow-scripts allow-same-origin allow-popups"
     ></iframe>
   </div>
 </template>

src/views/examine/TobeOnlineReviewed.vue

@@ -7,7 +7,7 @@
       frameborder="0"
       name="myframe"
       security="restricted"
-      sandbox="allow-forms allow-scripts allow-same-origin allow-popups"
+      sandbox="allow-forms allow-downloads allow-scripts allow-same-origin allow-popups"
     ></iframe>
   </div>
 </template>

src/views/questionsanswers/QAManage.vue

@@ -17,7 +17,7 @@
       frameborder="0"
       name="myframe"
       security="restricted"
-      sandbox="allow-forms allow-scripts allow-same-origin allow-popups"
+      sandbox="allow-forms allow-downloads allow-scripts allow-same-origin allow-popups"
     ></iframe>
   </div>
 </template>

src/views/system/AudienceManage.vue

@@ -6,7 +6,7 @@
         :src="`${BOE_URL}/pc/iframe/ugroup/manages`"
         name="myframe"
         security="restricted"
-        sandbox="allow-forms allow-scripts allow-same-origin allow-popups"
+        sandbox="allow-forms allow-downloads allow-scripts allow-same-origin allow-popups"
     ></iframe>
   </div>
 </template>

src/views/system/DictManage.vue

@@ -6,7 +6,7 @@
         :src="`${BOE_URL}/platform/sys/dwdictionary`"
         name="myframe"
         security="restricted"
-        sandbox="allow-forms allow-scripts allow-same-origin allow-popups"
+        sandbox="allow-forms allow-downloads allow-scripts allow-same-origin allow-popups"
     ></iframe>
   </div>
 </template>

src/views/system/OldSystemManage.vue

@@ -6,7 +6,7 @@
         :src="`${BOE_URL}/resource/index.html`"
         name="myframe"
         security="restricted"
-        sandbox="allow-forms allow-scripts allow-same-origin allow-popups"
+        sandbox="allow-forms allow-downloads allow-scripts allow-same-origin allow-popups"
     ></iframe>
   </div>
 </template>

src/views/system/ReadingClubManage.vue

@@ -6,7 +6,7 @@
         :src="`${BOE_URL}/train/manager/index.html`"
         name="myframe"
         security="restricted"
-        sandbox="allow-forms allow-scripts allow-same-origin allow-popups"
+        sandbox="allow-forms allow-downloads allow-scripts allow-same-origin allow-popups"
     ></iframe>
   </div>
 </template>