Merge remote-tracking branch 'origin/manage-release' into manage-release

This commit is contained in:
yuping
2022-12-14 19:26:38 +08:00
7 changed files with 110 additions and 101 deletions

View File

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

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-13 09:24:16 * @LastEditTime: 2022-12-14 17:40:35
* @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
*/ */

View File

@@ -193,7 +193,7 @@ const setCookie = (name, value, perpetual) => {
//先写一个方法 //先写一个方法
function getCookie(name) { function getCookie(name) {
return document.cookie?.split(";").find(e => e.includes(name)).replace(`${name}=`,'') || '' return document.cookie?.split(";").find(e => e.includes(name)).replace(`${name}=`, '') || ''
//1.获取cookie字符串 //1.获取cookie字符串
// const cookies = document.cookie; // const cookies = document.cookie;
// console.log('cookies',cookies) // console.log('cookies',cookies)
@@ -219,7 +219,7 @@ function getCookie(name) {
//滚动加载信息 //滚动加载信息
const scrollLoad = (e) => { const scrollLoad = (e) => {
// console.log("滚动", e, b); // console.log("滚动", e, b);
const {target} = e; const { target } = e;
const scrllHeight = target.scrollHeight - target.scrollTop; const scrllHeight = target.scrollHeight - target.scrollTop;
const clientHeight = target.clientHeight; const clientHeight = target.clientHeight;
// console.log("scrllHeight", scrllHeight, clientHeight); // console.log("scrllHeight", scrllHeight, clientHeight);
@@ -276,7 +276,7 @@ const commonData = {
const organizationalTree = [] const organizationalTree = []
//嵌套页面 //嵌套页面
const iframeUrl = "https://u-pre.boe.com/pc/iframe" const iframeUrl = "https://u-pre.boe.com/pc-release/iframe"
//二维码 //二维码
const codeUrl = "https://u-pre.boe.com" const codeUrl = "https://u-pre.boe.com"
export { export {

View File

@@ -76,12 +76,12 @@ export default {
{ {
id: 1, id: 1,
name: "管理员", name: "管理员",
go: "/manage/learningpath", go: "/manage-release/learningpath",
}, },
{ {
id: 2, id: 2,
name: "学员", name: "学员",
go: "https://u.boe.com/pc/uc/study/courses", go: "https://u.boe.com/pc-release/uc/study/courses",
}, },
], ],

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-21 17:42:59 * @LastEditTime: 2022-12-14 17:38:53
* @FilePath: /fe-manage/src/router/index.js * @FilePath: /fe-manage/src/router/index.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
*/ */
@@ -17,7 +17,7 @@ const routes = [
...routesConfig ...routesConfig
] ]
const router = createRouter({ const router = createRouter({
history: createWebHistory("/manage/"), history: createWebHistory("/manage-release/"),
routes, routes,
}) })

View File

@@ -4,10 +4,10 @@
<div class="header"> <div class="header">
<span class="title">创建/编辑单层模板</span> <span class="title">创建/编辑单层模板</span>
<div <div
@click="backPage" @click="backPage"
style="cursor: pointer" style="cursor: pointer"
to="/manage/libraryAdd" to="/manage-release/libraryAdd"
class="goback" class="goback"
> >
<span class="return"></span><span class="returntext">返回</span> <span class="return"></span><span class="returntext">返回</span>
</div> </div>
@@ -17,25 +17,25 @@
<div class="name"> <div class="name">
<div class="namebox"> <div class="namebox">
<img <img
class="nameimg" class="nameimg"
src="../../assets/images/basicinfo/asterisk.png" src="../../assets/images/basicinfo/asterisk.png"
/> />
<div class="inname">模板名称</div> <div class="inname">模板名称</div>
</div> </div>
<div class="in"> <div class="in">
<a-input <a-input
v-model:value="projectInfo.name" v-model:value="projectInfo.name"
placeholder="请输入模板名称" placeholder="请输入模板名称"
show-count show-count
:maxlength="30" :maxlength="30"
/> />
</div> </div>
</div> </div>
<div class="name"> <div class="name">
<div class="namebox"> <div class="namebox">
<img <img
class="nameimg" class="nameimg"
src="../../assets/images/basicinfo/asterisk.png" src="../../assets/images/basicinfo/asterisk.png"
/> />
<div class="inname">分类</div> <div class="inname">分类</div>
</div> </div>
@@ -43,18 +43,18 @@
<ProjectClass v-model:value="projectInfo.category"></ProjectClass> <ProjectClass v-model:value="projectInfo.category"></ProjectClass>
</div> </div>
</div> </div>
<div class="name" style="align-items: flex-start;"> <div class="name" style="align-items: flex-start">
<div class="namebox" style="margin-top: 10px"> <div class="namebox" style="margin-top: 10px">
<img <img
class="nameimg" class="nameimg"
src="../../assets/images/basicinfo/asterisk.png" src="../../assets/images/basicinfo/asterisk.png"
/> />
<div class="inname">封面图</div> <div class="inname">封面图</div>
</div> </div>
<div class="in select" style="display: flex"> <div class="in select" style="display: flex">
<div <div
:class="`box ${projectInfo.picUrl === src.value ? 'active' : ''}`" :class="`box ${projectInfo.picUrl === src.value ? 'active' : ''}`"
style=" style="
width: 100px; width: 100px;
height: 100px; height: 100px;
border-radius: 5px; border-radius: 5px;
@@ -62,19 +62,19 @@
position: relative; position: relative;
overflow: hidden; overflow: hidden;
" "
v-for="(src, index) in projectPic" v-for="(src, index) in projectPic"
:key="index" :key="index"
@click="() => (projectInfo.picUrl = src.value)" @click="() => (projectInfo.picUrl = src.value)"
> >
<img <img
style=" style="
width: 100px; width: 100px;
height: 100px; height: 100px;
margin-bottom: 4px; margin-bottom: 4px;
margin-right: 4px; margin-right: 4px;
" "
:src="src.value" :src="src.value"
alt="avatar" alt="avatar"
/> />
</div> </div>
</div> </div>
@@ -82,53 +82,53 @@
<div class="name"> <div class="name">
<div class="namebox"> <div class="namebox">
<img <img
class="nameimg" class="nameimg"
src="../../assets/images/basicinfo/asterisk.png" src="../../assets/images/basicinfo/asterisk.png"
/> />
<div class="inname">项目时间</div> <div class="inname">项目时间</div>
</div> </div>
<div class="in"> <div class="in">
<a-range-picker <a-range-picker
separator="至" separator="至"
:placeholder="[' 开始时间', ' 结束时间']" :placeholder="[' 开始时间', ' 结束时间']"
v-model:value="projectInfo.rangeTime" v-model:value="projectInfo.rangeTime"
style="width: 100%; height: 40px; border-radius: 5px" style="width: 100%; height: 40px; border-radius: 5px"
valueFormat="YYYY-MM-DD HH:mm:ss" valueFormat="YYYY-MM-DD HH:mm:ss"
@change="timeChange" @change="timeChange"
/> />
</div> </div>
</div> </div>
<div class="name"> <div class="name">
<div class="namebox"> <div class="namebox">
<img <img
class="nameimg" class="nameimg"
src="../../assets/images/basicinfo/asterisk.png" src="../../assets/images/basicinfo/asterisk.png"
/> />
<div class="inname">项目经理</div> <div class="inname">项目经理</div>
</div> </div>
<div class="in"> <div class="in">
<ProjectManager <ProjectManager
v-model:value="projectInfo.managerId" v-model:value="projectInfo.managerId"
v-model:name="projectInfo.manager" v-model:name="projectInfo.manager"
@onChange="managerChange" @onChange="managerChange"
mode="multiple" mode="multiple"
></ProjectManager> ></ProjectManager>
</div> </div>
</div> </div>
<div class="name"> <div class="name">
<div class="namebox"> <div class="namebox">
<img <img
class="nameimg" class="nameimg"
src="../../assets/images/basicinfo/asterisk.png" src="../../assets/images/basicinfo/asterisk.png"
/> />
<div class="inname">资源归属</div> <div class="inname">资源归属</div>
</div> </div>
<div class="in select"> <div class="in select">
<OrgClass <OrgClass
v-model:value="projectInfo.sourceBelongId" v-model:value="projectInfo.sourceBelongId"
v-model:name="projectInfo.sourceBelongName" v-model:name="projectInfo.sourceBelongName"
></OrgClass> ></OrgClass>
</div> </div>
</div> </div>
@@ -138,11 +138,11 @@
</div> </div>
<div class="in"> <div class="in">
<a-textarea <a-textarea
v-model:value="projectInfo.remark" v-model:value="projectInfo.remark"
style="height: 80px" style="height: 80px"
placeholder="请输入说明" placeholder="请输入说明"
show-count show-count
:maxlength="200" :maxlength="200"
/> />
</div> </div>
</div> </div>
@@ -151,24 +151,23 @@
<div class="inname">同步学习记录</div> <div class="inname">同步学习记录</div>
</div> </div>
<div class="in"> <div class="in">
<a-checkbox <a-checkbox v-model:checked="projectInfo.courseSyncFlag"
v-model:checked="projectInfo.courseSyncFlag" ><span
><span
style=" style="
width: 100%; width: 100%;
color: rgba(109, 117, 132, 1); color: rgba(109, 117, 132, 1);
font-size: 14px; font-size: 14px;
" "
>同步课程学习记录如学员在课程库中拥有课程的学习记录自动免修该课程</span >同步课程学习记录如学员在课程库中拥有课程的学习记录自动免修该课程</span
></a-checkbox ></a-checkbox
> >
</div> </div>
</div> </div>
<div class="name"> <div class="name">
<div class="namebox"> <div class="namebox">
<img <img
class="nameimg" class="nameimg"
src="../../assets/images/basicinfo/asterisk.png" src="../../assets/images/basicinfo/asterisk.png"
/> />
<div class="inname">项目级别</div> <div class="inname">项目级别</div>
</div> </div>
@@ -179,8 +178,8 @@
<div class="name"> <div class="name">
<div class="namebox"> <div class="namebox">
<img <img
class="nameimg" class="nameimg"
src="../../assets/images/basicinfo/asterisk.png" src="../../assets/images/basicinfo/asterisk.png"
/> />
<div class="inname">培训体系</div> <div class="inname">培训体系</div>
</div> </div>
@@ -191,15 +190,13 @@
<div class="name"> <div class="name">
<div class="namebox"> <div class="namebox">
<img <img
class="nameimg" class="nameimg"
src="../../assets/images/basicinfo/asterisk.png" src="../../assets/images/basicinfo/asterisk.png"
/> />
<div class="inname">是否BOEU实施</div> <div class="inname">是否BOEU实施</div>
</div> </div>
<div class="in"> <div class="in">
<a-radio-group <a-radio-group v-model:value="projectInfo.boeFlag">
v-model:value="projectInfo.boeFlag"
>
<a-radio :value="1"></a-radio> <a-radio :value="1"></a-radio>
<a-radio :value="0"></a-radio> <a-radio :value="0"></a-radio>
</a-radio-group> </a-radio-group>
@@ -210,20 +207,18 @@
<div class="footer"> <div class="footer">
<div class="btn"> <div class="btn">
<a-button v-on:click="createProject" type="primary" class="btn1" <a-button v-on:click="createProject" type="primary" class="btn1"
>确定 >确定
</a-button </a-button>
>
<a-button @click="backPage" class="btn2">取消</a-button> <a-button @click="backPage" class="btn2">取消</a-button>
</div> </div>
</div> </div>
</div> </div>
</template> </template>
<script setup> <script setup>
import { useStore } from "vuex";
import {useStore} from "vuex"; import { ref, onMounted, watch } from "vue";
import {ref, onMounted, watch} from "vue"; import { message } from "ant-design-vue";
import {message} from "ant-design-vue"; import { useRouter, useRoute } from "vue-router";
import {useRouter, useRoute} from "vue-router";
import * as api from "../../api/indexTemplate"; import * as api from "../../api/indexTemplate";
import ProjectClass from "@/components/project/ProjectClass"; import ProjectClass from "@/components/project/ProjectClass";
import TrainClass from "@/components/project/TrainClass"; import TrainClass from "@/components/project/TrainClass";
@@ -234,23 +229,33 @@ import ProjectLevel from "@/components/project/ProjectLevel";
const route = useRoute(); const route = useRoute();
const router = useRouter(); const router = useRouter();
const store = useStore(); const store = useStore();
const projectInfo = ref({}) const projectInfo = ref({});
const projectPic = ref([]) const projectPic = ref([]);
onMounted(() => { onMounted(() => {
getDetail() getDetail();
projectPic.value = store.state.projectPic.map((e) => ({value: e.dictValue, label: e.dictName})); projectPic.value = store.state.projectPic.map((e) => ({
}) value: e.dictValue,
label: e.dictName,
}));
});
watch(() => route.query.projectTemplateId, () => { watch(
getDetail() () => route.query.projectTemplateId,
}) () => {
getDetail();
}
);
const getDetail = () => route.query.projectTemplateId && api.templateDetail(route.query.projectTemplateId) const getDetail = () =>
.then((res) => { route.query.projectTemplateId &&
projectInfo.value = res.data.data.projectTemplateInfo; api.templateDetail(route.query.projectTemplateId).then((res) => {
projectInfo.value.rangeTime = [projectInfo.value.beginTime, projectInfo.value.endTime] projectInfo.value = res.data.data.projectTemplateInfo;
}) projectInfo.value.rangeTime = [
projectInfo.value.beginTime,
projectInfo.value.endTime,
];
});
const backPage = () => { const backPage = () => {
router.back(); router.back();
@@ -285,18 +290,22 @@ const createProject = () => {
return; return;
} }
} }
api.templateEdit({...projectInfo.value, courseSyncFlag: projectInfo.value.courseSyncFlag ? 1 : 0}).then(() => { api
message.destroy(); .templateEdit({
message.success("编辑成功"); ...projectInfo.value,
router.back() courseSyncFlag: projectInfo.value.courseSyncFlag ? 1 : 0,
}) })
.then(() => {
message.destroy();
message.success("编辑成功");
router.back();
});
}; };
function managerChange(e, l, d, t) { function managerChange(e, l, d, t) {
projectInfo.value.valuesourceBelongId = d projectInfo.value.valuesourceBelongId = d;
projectInfo.value.sourceBelongName = t projectInfo.value.sourceBelongName = t;
} }
</script> </script>
<style lang="scss"> <style lang="scss">
.active { .active {

View File

@@ -2,14 +2,14 @@
* @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-11-21 15:15:30 * @LastEditTime: 2022-12-14 17:38:38
* @FilePath: /fe-manage/vue.config.js * @FilePath: /fe-manage/vue.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
*/ */
const {defineConfig} = require("@vue/cli-service"); const { defineConfig } = require("@vue/cli-service");
module.exports = defineConfig({ module.exports = defineConfig({
publicPath: "/manage", publicPath: "/manage-release",
// transpileDependencies: true, // transpileDependencies: true,
// devServer: { // devServer: {
// port: 8080, // port: 8080,