fix:修改课程库的添加学员

This commit is contained in:
lixg
2022-12-04 13:04:54 +08:00
parent 19d6bccea5
commit 669cadf152
4 changed files with 103 additions and 92 deletions

View File

@@ -1,27 +1,27 @@
<template> <template>
<div id="container" v-if="!isLogin"> <div id="container" v-if="!isLogin">
<nav-top/> <nav-top />
<div style="display: flex"> <div style="display: flex">
<nav-left/> <nav-left />
<div style="flex: 1; display: flex; flex-direction: column; width: 0"> <div style="flex: 1; display: flex; flex-direction: column; width: 0">
<open-pages/> <open-pages />
<bread-crumb/> <bread-crumb />
<main> <main>
<a-config-provider :locale="zhCN"> <a-config-provider :locale="zhCN">
<router-view/> <router-view />
</a-config-provider> </a-config-provider>
</main> </main>
</div> </div>
</div> </div>
</div> </div>
<div id="container" v-if="isLogin"> <div id="container" v-if="isLogin">
<router-view/> <router-view />
</div> </div>
</template> </template>
<script> <script>
import {computed, defineComponent, ref, watch} from "vue"; import { computed, defineComponent, ref, watch } from "vue";
import {useRouter, useRoute} from "vue-router"; import { useRouter, useRoute } from "vue-router";
import {useStore} from "vuex"; import { useStore } from "vuex";
import NavLeft from "@/components/NavLeft"; import NavLeft from "@/components/NavLeft";
import NavTop from "@/components/NavTop"; import NavTop from "@/components/NavTop";
import OpenPages from "@/components/OpenPages"; import OpenPages from "@/components/OpenPages";
@@ -44,16 +44,16 @@ export default defineComponent({
const store = useStore(); const store = useStore();
const isLogin = ref(false); const isLogin = ref(false);
// console.log("router", router.getRoutes(), route); // console.log("router", router.getRoutes(), route);
console.log("版本0.12------------"); console.log("版本0.13------------");
const routes = computed(() => { const routes = computed(() => {
return router.getRoutes().filter((e) => e.meta?.isLink); return router.getRoutes().filter((e) => e.meta?.isLink);
}); });
watch( watch(
() => route.path, () => route.path,
() => { () => {
route.path === "/login" && (isLogin.value = true); route.path === "/login" && (isLogin.value = true);
} }
); );
const currentRouteName = computed(() => route.name); const currentRouteName = computed(() => route.name);
@@ -74,45 +74,47 @@ export default defineComponent({
} }
async function getMemberInfo() { async function getMemberInfo() {
const list = localStorage.getItem('memberInitInfo'); const list = localStorage.getItem("memberInitInfo");
if (list) { if (list) {
store.commit("SET_MEMBER_INFO", JSON.parse(list)); store.commit("SET_MEMBER_INFO", JSON.parse(list));
return; return;
} }
const memberInitInfo = await api1.getMemberInfo({keyWord: '', pageNo: 1, pageSize: 10}).then((res) => ( const memberInitInfo = await api1
res.data.data.rows.map(e => ({ .getMemberInfo({ keyWord: "", pageNo: 1, pageSize: 10 })
.then((res) =>
res.data.data.rows.map((e) => ({
label: e.realName, label: e.realName,
value: e.id value: e.id,
})) }))
)); );
store.commit("SET_MEMBER_INFO", memberInitInfo); store.commit("SET_MEMBER_INFO", memberInitInfo);
localStorage.setItem('memberInitInfo', JSON.stringify(memberInitInfo)); localStorage.setItem("memberInitInfo", JSON.stringify(memberInitInfo));
} }
async function getUserInfo() { async function getUserInfo() {
const userInfo = await api2.userInfo() const userInfo = await api2.userInfo();
store.commit("SET_USER", userInfo); store.commit("SET_USER", userInfo);
} }
async function initDict(key) { async function initDict(key) {
let list = localStorage.getItem(key); let list = localStorage.getItem(key);
if (list) { if (list) {
store.commit("SET_DICT", {key, data: JSON.parse(list)}); store.commit("SET_DICT", { key, data: JSON.parse(list) });
return; return;
} }
list = await getDictList(key); list = await getDictList(key);
localStorage.setItem(key, JSON.stringify(list)); localStorage.setItem(key, JSON.stringify(list));
store.commit("SET_DICT", {key, data: list}); store.commit("SET_DICT", { key, data: list });
} }
const getDictList = (param) => const getDictList = (param) =>
api1 api1
.getDict({ .getDict({
pageNo: 1, pageNo: 1,
pageSize: 20, pageSize: 20,
setCode: param, setCode: param,
}) })
.then((res) => res.data.data.rows); .then((res) => res.data.data.rows);
//获取组织树 //获取组织树
const getOrgTree = () => { const getOrgTree = () => {
@@ -128,18 +130,18 @@ export default defineComponent({
pageSize: 20, pageSize: 20,
}; };
api api
.getOrgInfo(obj) .getOrgInfo(obj)
.then((res) => { .then((res) => {
console.log("组织树获取成功", res); console.log("组织树获取成功", res);
if (res.data.code === 200) { if (res.data.code === 200) {
// state.treeData = res.data.data; // state.treeData = res.data.data;
localStorage.setItem("orgtreeList", JSON.stringify(res.data.data)); localStorage.setItem("orgtreeList", JSON.stringify(res.data.data));
store.commit("getOrgtreeList", res.data.data); store.commit("getOrgtreeList", res.data.data);
} }
}) })
.catch((err) => { .catch((err) => {
console.log("组织树获取失败", err); console.log("组织树获取失败", err);
}); });
}; };
init(); init();
@@ -158,7 +160,7 @@ export default defineComponent({
// font-family: MicrosoftYaHei, Microsoft YaHei, Avenir, Helvetica, Arial, // font-family: MicrosoftYaHei, Microsoft YaHei, Avenir, Helvetica, Arial,
// sans-serif; // sans-serif;
font-family: Helvetica Neue, Helvetica, PingFang SC, Hiragino Sans GB, font-family: Helvetica Neue, Helvetica, PingFang SC, Hiragino Sans GB,
Microsoft YaHei, Arial, sans-serif; Microsoft YaHei, Arial, sans-serif;
-webkit-font-smoothing: antialiased; -webkit-font-smoothing: antialiased;
-moz-osx-font-smoothing: grayscale; -moz-osx-font-smoothing: grayscale;
color: #2c3e50; color: #2c3e50;

View File

@@ -2,7 +2,7 @@
* @Author: lixg lixg@dongwu-inc.com * @Author: lixg lixg@dongwu-inc.com
* @Date: 2022-11-21 14:32:52 * @Date: 2022-11-21 14:32:52
* @LastEditors: lixg lixg@dongwu-inc.com * @LastEditors: lixg lixg@dongwu-inc.com
* @LastEditTime: 2022-12-03 19:52:09 * @LastEditTime: 2022-12-04 11:13:37
* @FilePath: /fe-manage/src/api/config.js * @FilePath: /fe-manage/src/api/config.js
* @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
*/ */
@@ -54,6 +54,7 @@ http.interceptors.response.use(
} else { } else {
if (code === 1000) { if (code === 1000) {
// window.open("https://u-pre.boe.com/web/", '_self'); // window.open("https://u-pre.boe.com/web/", '_self');
// window.open("http://111.231.196.214:12013/manage/login", '_self');
} }
console.log("api %o", msg); console.log("api %o", msg);
} }

View File

@@ -2517,13 +2517,13 @@
<!-- 学员管理-添加学员抽屉 --> <!-- 学员管理-添加学员抽屉 -->
<!-- <StuAdd v-model:Stuvisible="Stuvisible" @sure="handlePostSure" /> --> <!-- <StuAdd v-model:Stuvisible="Stuvisible" @sure="handlePostSure" /> -->
<!-- 添加学员抽屉 --> <!-- 添加学员抽屉 -->
<proj-check-ship <!-- <proj-check-ship
v-model:ProjCheckvisible="viewpowervisible" v-model:ProjCheckvisible="viewpowervisible"
:selectProjectId="offcourseId" :selectProjectId="offcourseId"
v-model:addAuthList="addStudentList" v-model:addStudentList="addStudentList"
:authClassify="authClassify" :authClassify="authClassify"
classify="addstudent" classify="addstudent"
/> /> -->
<!-- 新建在线课弹窗 --> <!-- 新建在线课弹窗 -->
<addOnlineCourse <addOnlineCourse
v-model:addOnlineCoursevisible="addOnlineCoursevisible" v-model:addOnlineCoursevisible="addOnlineCoursevisible"
@@ -2551,7 +2551,7 @@
:authClassify="authClassify" :authClassify="authClassify"
classify="course" classify="course"
/> --> /> -->
<!-- 管理权抽屉 --> <!--查看权抽屉 管理权抽屉 添加学员抽屉 -->
<proj-check-ship <proj-check-ship
v-model:ProjCheckvisible="viewpowervisible" v-model:ProjCheckvisible="viewpowervisible"
:selectProjectId="selectCourseId" :selectProjectId="selectCourseId"
@@ -3329,7 +3329,7 @@ export default defineComponent({
selectCourseId: null, //授权选择的id selectCourseId: null, //授权选择的id
viewpowervisible: false, //查看权抽屉 viewpowervisible: false, //查看权抽屉
authClassify: null, //1查看权 2管理权 authClassify: null, //1查看权 2管理权 3学员
addAuthList: null, addAuthList: null,
addStudentList: null, //选中列表 addStudentList: null, //选中列表
@@ -3339,6 +3339,7 @@ export default defineComponent({
const showStuAdd = () => { const showStuAdd = () => {
state.viewpowervisible = true; state.viewpowervisible = true;
state.authClassify = 3;
}; };
// 富文本 sssssssssssssss // 富文本 sssssssssssssss
@@ -4864,55 +4865,63 @@ export default defineComponent({
() => state.addAuthList, () => state.addAuthList,
(res) => { (res) => {
console.log("res", res, state.addAuthList); console.log("res", res, state.addAuthList);
let obj = { if (state.authClassify === 1 || state.authClassify === 2) {
type: 3, let obj = {
tag: type: 3,
state.authClassify === 1 ? 3 : state.authClassify === 2 ? 4 : null, tag:
opt: 3, state.authClassify === 1
deptList: res[1], ? 3
groupList: res[2], : state.authClassify === 2
refId: state.selectCourseId, ? 4
pageNo: 20, : null,
pageSize: 1, opt: 3,
studentList: res[0], deptList: res[1],
keyWord: "", groupList: res[2],
}; refId: state.selectCourseId,
console.log("obj", obj); pageNo: 20,
api1 pageSize: 1,
.optionAuthPerm(obj) studentList: res[0],
.then((res) => { keyWord: "",
console.log("添加授权成功", res); };
message.success("添加授权成功"); console.log("obj", obj);
}) api1
.catch((err) => { .optionAuthPerm(obj)
console.log("添加授权失败", err); .then((res) => {
}); console.log("添加授权成功", res);
message.success("添加授权成功");
})
.catch((err) => {
console.log("添加授权失败", err);
});
}
} }
); );
//添加学员 //添加学员
watch( watch(
() => state.addStudentList, () => state.addAuthList,
(res) => { (res) => {
console.log("res", res, state.addStudentList); console.log("res", res, state.addStudentList);
let obj = { if (state.authClassify === 3) {
deptList: res[1], let obj = {
groupList: res[2], deptList: res[1],
offcourseId: state.offcourseId, groupList: res[2],
offcoursePlanId: state.offcoursePlanId, //开课id offcourseId: state.offcourseId,
studentList: res[0], offcoursePlanId: state.offcoursePlanId, //开课id
}; studentList: res[0],
console.log("obj", obj); };
api1 console.log("obj", obj);
.addStudentCourse(obj) api1
.then((res) => { .addStudentCourse(obj)
console.log("添加学员成功", res); .then((res) => {
message.success("添加学员成功"); console.log("添加学员成功", res);
getTableDate2(); message.success("添加学员成功");
}) getTableDate2();
.catch((err) => { })
console.log("添加学员失败", err); .catch((err) => {
}); console.log("添加学员失败", err);
});
}
} }
); );

View File

@@ -590,7 +590,6 @@
style=" style="
width: 120px; width: 120px;
text-align: center; text-align: center;
text-align: center;
overflow: hidden; overflow: hidden;
text-overflow: ellipsis; text-overflow: ellipsis;
white-space: nowrap; white-space: nowrap;