feat:增加嵌套页面

This commit is contained in:
lixg
2022-11-24 17:17:24 +08:00
parent 753d0a8623
commit 1dd90d9b1e
6 changed files with 542 additions and 407 deletions

View File

@@ -162,6 +162,7 @@ function autoComma(number) {
return 0; return 0;
} }
} }
//新建延迟
const commonData = { const commonData = {
timeout: 50 timeout: 50
} }
@@ -368,6 +369,8 @@ const commonData = {
//组织树 //组织树
const organizationalTree = [] const organizationalTree = []
const iframeUrl = "https://u-pre.boe.com/pc/iframe"
export { export {
toDate, toDate,
getWeek, getWeek,
@@ -375,4 +378,5 @@ export {
formatNumber, formatNumber,
commonData, commonData,
organizationalTree, organizationalTree,
iframeUrl,
} }

View File

@@ -0,0 +1,68 @@
<!--
* @Author: lixg lixg@dongwu-inc.com
* @Date: 2022-11-24 16:39:48
* @LastEditors: lixg lixg@dongwu-inc.com
* @LastEditTime: 2022-11-24 16:53:00
* @FilePath: /fe-manage/src/components/Modals/addOnlineCourse.vue
* @Description: 这是默认设置,请设置`customMade`, 打开koroFileHeader查看配置 进行设置: https://github.com/OBKoro1/koro1FileHeader/wiki/%E9%85%8D%E7%BD%AE
-->
<template>
<!-- 新建在线课弹窗 -->
<div>
<a-modal
:visible="addOnlineCoursevisible"
:footer="null"
:closable="false"
wrapClassName="modalStyle addOnlineCourseStyle"
:zIndex="9999"
@cancel="closeModal"
>
<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>
</a-modal>
</div>
</template>
<script>
import { reactive, toRefs } from "vue";
// import {getTask} from "../../api/indexTaskadd"
// import dayjs from "dayjs";
// import {message} from "ant-design-vue"
import { iframeUrl } from "@/api/method";
export default {
name: "addOnlineCourse",
props: {
addOnlineCoursevisible: {
type: Boolean,
default: false,
},
},
setup(props, ctx) {
// console.log("学习路径", props.addOnlineCoursevisible, ctx);
const state = reactive({
iframeUrl: iframeUrl,
});
const closeModal = () => {
ctx.emit("update:addOnlineCoursevisible", false);
};
return {
...toRefs(state),
closeModal,
};
},
};
</script>
<style lang="scss" >
.addOnlineCourseStyle {
.ant-modal {
width: 80% !important;
}
}
</style>

View File

@@ -61,7 +61,11 @@
:columns="tableDataFunc()" :columns="tableDataFunc()"
:data-source="tableData" :data-source="tableData"
:loading="tableDataTotal === -1 ? true : false" :loading="tableDataTotal === -1 ? true : false"
:row-selection="{selectedRowKeys:selectedRowKeys, onChange:onSelectChange, hideSelectAll:true}" :row-selection="{
selectedRowKeys: selectedRowKeys,
onChange: onSelectChange,
hideSelectAll: true,
}"
:scroll="{ x: 900 }" :scroll="{ x: 900 }"
:pagination="false" :pagination="false"
/> />
@@ -87,12 +91,30 @@
</div> </div>
</div> </div>
</a-drawer> </a-drawer>
<!-- 新建考试 -->
<a-modal
v-model:visible="addExamVisible"
:footer="null"
:closable="false"
wrapClassName="modalStyle addExamModal"
:zIndex="9999"
>
<iframe
id="iframe"
style="width: 100%; height: 100%"
:src="iframeUrl + '/exam/tests'"
name="myframe"
sandbox="allow-forms allow-scripts allow-same-origin allow-popups"
></iframe>
</a-modal>
</template> </template>
<script> <script>
import { toRefs, reactive } from "vue"; import { toRefs, reactive } from "vue";
import * as api from "../../api/indexTest"; import * as api from "../../api/indexTest";
import { message } from 'ant-design-vue'; import { message } from "ant-design-vue";
import { iframeUrl } from "../../api/method";
export default { export default {
name: "STest", name: "STest",
props: { props: {
@@ -116,19 +138,21 @@
//需要传给父亲的参数 //需要传给父亲的参数
SelectTestData: {}, SelectTestData: {},
addExamVisible: false, //新建考试弹窗
iframeUrl: iframeUrl,
}); });
//点击确认后执行此方法将参数传给父亲 //点击确认后执行此方法将参数传给父亲
const CreatSTText = () => { const CreatSTText = () => {
ctx.emit('getSTData',state.SelectTestData) ctx.emit("getSTData", state.SelectTestData);
closeDrawer() closeDrawer();
} };
const closeDrawer = () => { const closeDrawer = () => {
ctx.emit("update:STvisible", false); ctx.emit("update:STvisible", false);
}; };
const afterVisibleChange = (bol) => { const afterVisibleChange = (bol) => {
if (bol == true) { if (bol == true) {
getManageList() getManageList();
} }
}; };
@@ -175,7 +199,7 @@
align: "center", align: "center",
className: "h", className: "h",
}, },
] ];
return columns; return columns;
} }
}; };
@@ -186,16 +210,17 @@
const onSelectChange = (selectedRowKeys, selectedRows) => { const onSelectChange = (selectedRowKeys, selectedRows) => {
if (selectedRowKeys.length > 1) { if (selectedRowKeys.length > 1) {
return return;
} }
state.selectedRowKeys = selectedRowKeys; state.selectedRowKeys = selectedRowKeys;
state.SelectTestData = selectedRows[0]; state.SelectTestData = selectedRows[0];
console.log('state.SelectTestData---------------',state.SelectTestData); console.log("state.SelectTestData---------------", state.SelectTestData);
} };
const newTest = () => { const newTest = () => {
console.log('创建考试没设计图'); console.log("创建考试没设计图");
} state.addExamVisible = true;
};
const getTableDate = (tableData) => { const getTableDate = (tableData) => {
let data = tableData; let data = tableData;
let array = []; let array = [];
@@ -219,20 +244,20 @@
// "pageIndex": 0, // "pageIndex": 0,
// "pageSize": 0, // "pageSize": 0,
// "published": true, // "published": true,
"keyWord": "", keyWord: "",
"orderAsc": true, orderAsc: true,
"orderFiled": "", orderFiled: "",
"pageIndex": 0, pageIndex: 0,
"pageSize": 0 pageSize: 0,
}; };
api api
.queryExaminationPaper(obj) .queryExaminationPaper(obj)
.then((res) => { .then((res) => {
getTableDate(res.data.data) getTableDate(res.data.data);
}) })
.catch(() => { .catch(() => {
message.destroy() message.destroy();
message.error("获取选择考试列表失败") message.error("获取选择考试列表失败");
}); });
}; };
@@ -261,8 +286,7 @@
} }
state.tabledata = newArr; state.tabledata = newArr;
}) })
.catch(() => { .catch(() => {});
});
} }
}; };
@@ -403,7 +427,8 @@
} }
} }
.tab { .tab {
th,th.h { th,
th.h {
background-color: #eff4fc !important; background-color: #eff4fc !important;
} }
@@ -462,5 +487,11 @@
} }
} }
} }
.addExamModal {
.ant-modal {
width: 80% !important;
}
}
</style> </style>

View File

@@ -2,7 +2,7 @@
* @Author: lixg lixg@dongwu-inc.com * @Author: lixg lixg@dongwu-inc.com
* @Date: 2022-11-09 09:26:26 * @Date: 2022-11-09 09:26:26
* @LastEditors: lixg lixg@dongwu-inc.com * @LastEditors: lixg lixg@dongwu-inc.com
* @LastEditTime: 2022-11-22 20:13:01 * @LastEditTime: 2022-11-24 16:16:10
* @FilePath: /fe-manage/src/views/courselibrary/CourseManage.vue * @FilePath: /fe-manage/src/views/courselibrary/CourseManage.vue
* @Description: 这是默认设置,请设置`customMade`, 打开koroFileHeader查看配置 进行设置: https://github.com/OBKoro1/koro1FileHeader/wiki/%E9%85%8D%E7%BD%AE * @Description: 这是默认设置,请设置`customMade`, 打开koroFileHeader查看配置 进行设置: https://github.com/OBKoro1/koro1FileHeader/wiki/%E9%85%8D%E7%BD%AE
--> -->
@@ -11,8 +11,8 @@
<div class="courseManage"> <div class="courseManage">
<iframe <iframe
id="iframe" id="iframe"
style="width: 100%l; height: 100%" style="width: 100%; height: 100%"
src="https://u-pre.boe.com/pc/iframe/course/coursewares" :src="iframeUrl + '/course/coursewares'"
name="myframe" name="myframe"
sandbox="allow-forms allow-scripts allow-same-origin allow-popups" sandbox="allow-forms allow-scripts allow-same-origin allow-popups"
></iframe> ></iframe>
@@ -20,12 +20,14 @@
</template> </template>
<script> <script>
import { reactive, toRefs, onMounted } from "vue"; import { reactive, toRefs, onMounted } from "vue";
import { iframeUrl } from "../../api/method";
export default { export default {
name: "CourseManage", name: "CourseManage",
setup() { setup() {
const state = reactive({}); const state = reactive({
iframeUrl: iframeUrl,
});
onMounted(() => { onMounted(() => {
// console.log("执行"); // console.log("执行");

View File

@@ -2118,6 +2118,9 @@
<!-- 添加授权侧弹窗 --> <!-- 添加授权侧弹窗 -->
<corpowerlist v-model:corpowerlistVisible="corpowerlistvisible" /> <corpowerlist v-model:corpowerlistVisible="corpowerlistvisible" />
<!-- 添加授权侧弹窗 --> <!-- 添加授权侧弹窗 -->
<!-- 新建在线课弹窗 -->
<addOnlineCourse v-model:addOnlineCoursevisible="addOnlineCoursevisible" />
<!-- 新建在线课弹窗 -->
</div> </div>
</template> </template>
<script> <script>
@@ -2133,6 +2136,7 @@ import {
import { message } from "ant-design-vue"; import { message } from "ant-design-vue";
import OwnPower from "../../components/drawers/OwnPower.vue"; import OwnPower from "../../components/drawers/OwnPower.vue";
import Corpowerlist from "../../components/drawers/CorPowerlist.vue"; import Corpowerlist from "../../components/drawers/CorPowerlist.vue";
import addOnlineCourse from "../../components/Modals/addOnlineCourse.vue";
import { import {
list, list,
edit, edit,
@@ -2601,6 +2605,7 @@ export default defineComponent({
Corpowerlist, Corpowerlist,
Editor, Editor,
Toolbar, Toolbar,
addOnlineCourse,
}, },
setup() { setup() {
const state = reactive({ const state = reactive({
@@ -3067,6 +3072,7 @@ export default defineComponent({
checked4: false, checked4: false,
offcoursePlanId: 0, offcoursePlanId: 0,
filesList: [], filesList: [],
addOnlineCoursevisible: false, //新建面授弹窗
}); });
// 富文本 sssssssssssssss // 富文本 sssssssssssssss
@@ -3655,6 +3661,9 @@ export default defineComponent({
state.qdms_inputV1 = state.xzinputV1; state.qdms_inputV1 = state.xzinputV1;
state.xzinputV1 = ""; state.xzinputV1 = "";
} }
if (state.bs_hs&& state.valueE1 != "") {
state.addOnlineCoursevisible = true;
}
}; };
const ft_exit = () => { const ft_exit = () => {
state.ft_hs = false; state.ft_hs = false;

View File

@@ -2,7 +2,7 @@
* @Author: lixg lixg@dongwu-inc.com * @Author: lixg lixg@dongwu-inc.com
* @Date: 2022-11-16 20:59:33 * @Date: 2022-11-16 20:59:33
* @LastEditors: lixg lixg@dongwu-inc.com * @LastEditors: lixg lixg@dongwu-inc.com
* @LastEditTime: 2022-11-16 21:09:01 * @LastEditTime: 2022-11-24 16:21:04
* @FilePath: /fe-manage/src/views/examine/CourseReviewedN.vue * @FilePath: /fe-manage/src/views/examine/CourseReviewedN.vue
* @Description: 这是默认设置,请设置`customMade`, 打开koroFileHeader查看配置 进行设置: https://github.com/OBKoro1/koro1FileHeader/wiki/%E9%85%8D%E7%BD%AE * @Description: 这是默认设置,请设置`customMade`, 打开koroFileHeader查看配置 进行设置: https://github.com/OBKoro1/koro1FileHeader/wiki/%E9%85%8D%E7%BD%AE
--> -->
@@ -382,6 +382,23 @@
</div> </div>
</div> </div>
</a-modal> </a-modal>
<!-- 审核在线课 -->
<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>
</a-modal>
</div> </div>
</template> </template>
<script> <script>
@@ -390,7 +407,7 @@ import { list, courseAuditView } from "../../api/indexAudit";
import { toDate } from "../../api/method"; import { toDate } from "../../api/method";
import { message } from "ant-design-vue"; import { message } from "ant-design-vue";
import { Editor, Toolbar } from "@wangeditor/editor-for-vue"; import { Editor, Toolbar } from "@wangeditor/editor-for-vue";
import { iframeUrl } from "../../api/method";
export default { export default {
name: "CoursereViewedN", name: "CoursereViewedN",
components: { components: {
@@ -503,6 +520,10 @@ export default {
], ],
// 待审核课程的数据 // 待审核课程的数据
tableData1: [], tableData1: [],
//审核在线课嵌套页面
onlineClassesVisible: false,
iframeUrl: iframeUrl,
}); });
const getFaceList = (obj) => { const getFaceList = (obj) => {