Merge branch 'develop' of ssh://gitlab.dongwu-inc.com:10022/BOE/fe-manage into develop

This commit is contained in:
zhangyc
2022-12-04 17:30:26 +08:00
34 changed files with 2874 additions and 2185 deletions

View File

@@ -29,7 +29,7 @@ import BreadCrumb from "@/components/BreadCrumb";
import zhCN from "ant-design-vue/es/locale/zh_CN";
import * as api from "./api/index1";
import * as api1 from "@/api/index1";
import * as api2 from "@/api/index";
export default defineComponent({
components: {
NavLeft,
@@ -43,22 +43,20 @@ export default defineComponent({
const store = useStore();
const isLogin = ref(false);
// console.log("router", router.getRoutes(), route);
console.log("版本0.11------------");
console.log("版本0.13------------");
const routes = computed(() => {
return router.getRoutes().filter((e) => e.meta?.isLink);
});
watch(
() => route.path,
() => {
route.path === "/login" && (isLogin.value = true);
}
);
const currentRouteName = computed(() => route.name);
function init() {
console.log(store);
getUserInfo();
initDict("faceclassPic");
initDict("faceclassClass");
initDict("faceclassScene");
@@ -67,9 +65,25 @@ export default defineComponent({
initDict("pathmapPic");
initDict("projectClass");
initDict("projectPic");
getMemberInfo();
getOrgTree();
}
async function getMemberInfo() {
const list = localStorage.getItem("memberInitInfo");
if (list) {
store.commit("SET_MEMBER_INFO", JSON.parse(list));
return;
}
const memberInitInfo = await api1
.getMemberInfo({ keyWord: "", pageNo: 1, pageSize: 10 })
.then((res) => res.data.data.rows);
store.commit("SET_MEMBER_INFO", memberInitInfo);
localStorage.setItem("memberInitInfo", JSON.stringify(memberInitInfo));
}
async function getUserInfo() {
const userInfo = await api2.userInfo();
store.commit("SET_USER", userInfo);
}
async function initDict(key) {
let list = localStorage.getItem(key);
if (list) {
@@ -80,7 +94,6 @@ export default defineComponent({
localStorage.setItem(key, JSON.stringify(list));
store.commit("SET_DICT", { key, data: list });
}
const getDictList = (param) =>
api1
.getDict({
@@ -89,7 +102,6 @@ export default defineComponent({
setCode: param,
})
.then((res) => res.data.data.rows);
//获取组织树
const getOrgTree = () => {
const orgtreeList = localStorage.getItem("orgtreeList");
@@ -117,9 +129,7 @@ export default defineComponent({
console.log("组织树获取失败", err);
});
};
init();
return {
isLogin,
routes,
@@ -140,17 +150,14 @@ export default defineComponent({
color: #2c3e50;
height: 100%;
}
#container {
margin: 0;
display: flex;
flex-direction: column;
width: 100%;
min-width: 1000px;
min-height: 100%;
background-color: rgba(245, 247, 250, 1);
main {
height: 0;
flex: 1 1 auto;
@@ -166,7 +173,6 @@ export default defineComponent({
background: #ffffff;
box-shadow: 0px 1px 35px 0px rgba(118, 136, 166, 0.07);
}
// @media screen and (max-width: 1366px) {
// .cmMain {
// width: 750px;

View File

@@ -2,10 +2,11 @@
* @Author: lixg lixg@dongwu-inc.com
* @Date: 2022-11-21 14:32:52
* @LastEditors: lixg lixg@dongwu-inc.com
* @LastEditTime: 2022-12-02 17:13:55
* @LastEditTime: 2022-12-04 13:27:07
* @FilePath: /fe-manage/src/api/config.js
* @Description: 这是默认设置,请设置`customMade`, 打开koroFileHeader查看配置 进行设置: https://github.com/OBKoro1/koro1FileHeader/wiki/%E9%85%8D%E7%BD%AE
*/
import { message } from "ant-design-vue";
import axios from "axios";
// import { getCookie } from '../api/method'
// const Qs = require("qs");
@@ -23,6 +24,7 @@ const http = axios.create({
http.interceptors.request.use(
(config) => {
// console.log('config', config)
// const token = localStorage.getItem("token");
// // const token = getCookie('token')
// // console.log('token', token)
@@ -54,12 +56,17 @@ http.interceptors.response.use(
} else {
if (code === 1000) {
// 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);
}
return response;
},
function (error) {
if (error.message == "timeout of 1ms exceeded") {
message.destroy()
message.error("请求超时")
}
console.log("api error %o", error);
return Promise.reject(error);
}

View File

@@ -52,7 +52,7 @@ export const createProject = (obj) => http.post('/admin/project/edit', obj)
export const getProjectList = (obj) => http.post('/admin/project/list', obj)
// 获取项目详情信息(包含阶段及任务列表)
export const getProjectDetail = (obj) => http.get('/admin/project/detail', { params: obj })
export const getProjectDetail = (obj) => http.get('/admin/project/detail', {params: obj})
//发布项目
export const releaseProject = (obj) => http.post('/admin/project/publish', obj)
//获取项目学员
@@ -70,10 +70,11 @@ export const getDiscussDetail = (obj) => http.post('/discuss/getDiscussDetail',
//获取模版列表
export const getTemplate = (obj) => http.post('/admin/project/template/list', obj)
//获取模版详细信息
export const getTemplateDetail = (obj) => http.get('/admin/project/template/detail', { params: obj })
export const getTemplateDetail = (obj) => http.get('/admin/project/template/detail', {params: obj})
//获取项目统计
export const getProjectCount = (projectId) => http.get('/admin/project/projectCount', { params: { projectId: projectId } })
export const getProjectCount = (projectId) => http.get('/admin/project/projectCount', {params: {projectId: projectId}})
export const login = (obj) => http.post('/admin/CheckUser/userLogin', obj)
export const userInfo = () => http.get('/admin/CheckUser/userInfo')

Binary file not shown.

After

Width:  |  Height:  |  Size: 1.4 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 785 B

View File

@@ -2,8 +2,8 @@
<div class="navTop">
<div class="navTopMain">
<img
style="width: 205px; height: 29px; margin-left: 37px; margin-top: 22px"
src="../assets/images/navtop/logo.png"
style="width: 205px; height: 29px; margin-left: 37px; margin-top: 22px"
src="../assets/images/navtop/logo.png"
/>
<div class="navTopRight">
<div class="role">
@@ -11,10 +11,10 @@
<div class="roleArrow"></div>
<div class="roleItems">
<div
v-for="(value, index) in roleList"
:key="index"
class="roleItem"
@click="changeRole(value)"
v-for="(value, index) in roleList"
:key="index"
class="roleItem"
@click="changeRole(value)"
>
{{ value.name }}
</div>
@@ -22,14 +22,14 @@
</div>
<div class="user">
<img
style="
style="
width: 40px;
height: 40px;
margin-left: 8px;
border-radius: 15px;
margin-right: 10px;
"
:src="avatar"
:src="avatar"
/>
<div style="margin-right: 20px">{{ username }}</div>
</div>
@@ -47,20 +47,21 @@
</div> -->
<div class="signOutMain" @click="logOut">
<img
style="width: 27px; height: 27px"
src="../assets/images/navtop/signout.png"
style="width: 27px; height: 27px"
src="../assets/images/navtop/signout.png"
/>
<span class="signOut">登出</span>
</div>
</div>
</div>
</div>
<down-load v-model:downloadVisible="visible" />
<down-load v-model:downloadVisible="visible"/>
</template>
<script>
import { reactive, toRefs } from "vue";
import {reactive, toRefs} from "vue";
import DownLoad from "../components/drawers/DownLoad";
import * as api from "../api/index1";
export default {
name: "NavTop",
components: {
@@ -100,24 +101,32 @@ export default {
};
const getUser = () => {
api
.getUser()
.then((res) => {
console.log("获取登录信息成功", res);
if (res.data.code === 200) {
state.username = res.data.data.realName;
// state.avatar = res.data.data.avatar
// ? res.data.data.avatar
// : require("../assets/images/avatar.png");
state.avatar = require("../assets/images/avatar.png");
}
})
.catch((err) => {
console.log("获取登录信息失败", err);
});
.getUser()
.then((res) => {
console.log("获取登录信息成功", res);
if (res.data.code === 200) {
state.username = res.data.data.realName;
// state.avatar = res.data.data.avatar
// ? res.data.data.avatar
// : require("../assets/images/avatar.png");
state.avatar = require("../assets/images/avatar.png");
}
})
.catch((err) => {
console.log("获取登录信息失败", err);
});
};
getUser();
const logOut = () => {
localStorage.removeItem('faceclassPic');
localStorage.removeItem('faceclassClass');
localStorage.removeItem('faceclassScene');
localStorage.removeItem('projectLevel');
localStorage.removeItem('projectSys');
localStorage.removeItem('pathmapPic');
localStorage.removeItem('projectClass');
localStorage.removeItem('projectPic');
window.open("https://u-pre.boe.com/web/", "_self");
};
return {
@@ -142,9 +151,11 @@ export default {
display: flex;
justify-content: space-between;
background-color: rgba(255, 255, 255, 1);
.navTopRight {
display: flex;
}
.role {
display: flex;
align-items: center;
@@ -154,6 +165,7 @@ export default {
line-height: 36px;
cursor: pointer;
position: relative;
.roleArrow {
width: 13px;
height: 7px;
@@ -161,6 +173,7 @@ export default {
background-image: url(../assets/images/navtop/down.png);
background-size: 100%;
}
.roleItems {
width: 109px;
height: 90px;
@@ -174,22 +187,27 @@ export default {
display: none;
z-index: 100;
}
.roleItem {
font-size: 14px;
font-weight: 400;
color: rgba(79, 81, 86, 1);
line-height: 36px;
}
.roleItem:hover {
color: #4ea6ff;
}
}
.role:hover .roleItems {
display: block;
}
.role:hover .roleArrow {
background-image: url(../assets/images/navtop/up.png);
}
.user {
margin-left: 37px;
display: flex;
@@ -199,12 +217,14 @@ export default {
color: #b3bdc4;
line-height: 36px;
}
.signOutMain {
cursor: pointer;
margin-right: 29px;
display: flex;
align-items: center;
}
.signOut {
font-size: 16px;
font-weight: 400;

View File

@@ -30,7 +30,7 @@
</div>
<div class="btnbox">
<button class="xkbtn" @click="showDrawerSelFacet">
{{ chooseCourse == null ? "选择" : 重选 }}面授课
{{ chooseCourse == null ? "选择" : "重选" }}面授课
</button>
<div v-if="chooseCourse">
<a-tag closable color="processing" @close="logC">
@@ -209,7 +209,7 @@
<button class="xkbtn">配置</button>
<div v-if="EditWorkId > 0">
<a-tag closable color="processing" @close="logW">
<span style="font-size:14px;line-height: 33px;">删除作业{{EditWorkId}}</span>
<span style="font-size:14px;line-height: 33px;">删除作业</span>
</a-tag>
</div>
@@ -233,7 +233,7 @@
<button class="xkbtn">配置</button>
<div v-if="EditTestId > 0">
<a-tag closable color="processing" @close="logT">
<span style="font-size:14px;line-height: 33px;">删除考试{{EditTestId}}</span>
<span style="font-size:14px;line-height: 33px;">删除考试</span>
</a-tag>
</div>

View File

@@ -31,6 +31,7 @@
<div class="btnbox">
<a-form-item has-feedback label="作业名称" name="workName">
<a-input
v-model:value="formState.workName"
style="width: 424px; height: 32px; margin-left: 35px"
placeholder="请输入作业名称"
@@ -49,10 +50,12 @@
placeholder="请输入作业要求"
autocomplete="off"
allow-clear
:rows="6"
style="margin-left: 35px"
show-count :maxlength="200"
/></div>
</a-form-item>
</div>
<div class="main_item">

View File

@@ -202,7 +202,7 @@
<div class="signbox"></div>
<div class="btnbox">
<button class="xkbtn" @click="showAssessment">选择评估</button>
<div v-if="(assessmentId !== '0')">
<div v-if="(assessmentId > 0)">
<a-tag closable @close="removePG" color="processing">
<span style="font-size: 14px; line-height: 33px"
>删除评估</span
@@ -596,10 +596,11 @@ export default {
};
const showAssessment = () => {
state.assessmentVisible = true;
console.log("hshs======", state.assessmentVisible);
};
//创建直播
const updateLiveBroadcast = () => {
console.log("hshs======", state.memberValue);
if (!state.inputV1) {
message.destroy();
return message.warning("请输入直播名称");
@@ -612,6 +613,14 @@ export default {
message.destroy();
return message.warning("请输入直播时长");
}
if (state.memberValue.value=="") {
message.destroy();
return message.warning("请选择授课教师");
}
if (!state.imageUrl) {
message.destroy();
return message.warning("请上传封面");
}
const regular = /^[+]{0,1}(\d+)$/;
if (!regular.test(state.inputV2)) {
message.destroy();

View File

@@ -115,26 +115,20 @@
</a-menu>
</template>
</a-dropdown> -->
<span style="margin-left: 10px">
<a-tag
class="tag-style"
v-if="paperName != ''"
:closable="true"
@close="delTag"
>{{ paperName }}</a-tag
>
<!-- <a-tag
class="tag-style"
v-for="item in choosedTestList"
:closable="true"
@close="closeTag(item.key)"
:key="item.key"
>{{ item.value }}</a-tag
> -->
</span>
<a-tag v-if="paperName != ''" closable color="processing" @close="delTag">
<span style="font-size:14px;line-height: 33px;">删除考试</span>
</a-tag>
</a-form-item>
</div>
</div>
<div class="main_item">
<div class="btnbox">
<a-form-item has-feedback label="考试时间" name="choosedTime">
@@ -525,6 +519,7 @@ export default {
return Promise.reject("请选择时间");
}
};
let checkExaminationDuration = async (_rule, value) => {
if (!value) {
return Promise.reject("请输入考试时长");
@@ -674,7 +669,7 @@ export default {
state.paperName = "";
};
const queryTest = () => {
state.addLoading = true;
// state.addLoading = true;
queryExaminationDetailById({ examinationId: props.EditTestId })
.then((res) => {
formState.examinationName = res.data.data.examinationName;
@@ -729,9 +724,13 @@ export default {
scoringModel: formState.scoringModel,
showAnalysis: formState.showAnalysis,
showAnswers: formState.showAnswers,
examinationTestId: state.id,
examinationTestName: state.testName,
examinationTestId: state.paperId,
examinationTestName: state.paperName,
};
if(!(state.paperId >0)){
message.destroy();
return message.error("请选择考试");
}
if (props.edit) {
// 编辑任务
updateExamination(obj)
@@ -740,6 +739,7 @@ export default {
closeDrawer();
})
.catch(() => {
message.destroy();
message.error(`编辑失败`);
});
} else {
@@ -750,6 +750,7 @@ export default {
closeDrawer();
})
.catch(() => {
message.destroy();
message.error(`创建失败`);
});
}
@@ -860,6 +861,7 @@ export default {
state.id = value.id;
state.testName = value.testName;
};
return {
formState,
afterVisibleChange,
@@ -885,6 +887,7 @@ export default {
chooseTest,
closeTag,
getData,
...toRefs(state),
};
},

View File

@@ -79,7 +79,6 @@
<div class="chooseLeft">
<div class="boeTree">
<div class="boeTreeTitle">BOE组织树</div>
<a-tree
v-model:value="valueSelectboe"
class="treeMain"
@@ -110,14 +109,14 @@
style="border: 1px solid #f2f6fe"
:columns="tablecolumns"
:data-source="tabledata"
:loading="tableDataTotal === -1 ? true : false"
expandRowByClick="true"
@expand="expandTable"
:loading="loading"
:pagination="false"
rowKey="id"
:row-selection="{
columnWidth: 20,
selectedRowKeys: selectedRowKeys,
onChange: onSelectChange,
preserveSelectedRowKeys: true,
}"
/>
<div class="pa">
@@ -206,7 +205,6 @@
>
<template #suffixIcon></template>
</a-tree>
<a-tree
v-else-if="isSearchOrg"
class="treeMain treeMain2"
@@ -288,7 +286,6 @@
</div>
</div>
</div>
<!-- <div class="line">
<div class="inline">
<div class="left1">
@@ -316,6 +313,7 @@
columnWidth: 30,
selectedRowKeys: selectedRowKeys2,
onChange: onSelectChange2,
preserveSelectedRowKeys: true,
}"
/>
<div class="pa" style="margin-top: 20px">
@@ -356,7 +354,7 @@
<div class="selecteds" id="selecteds">
<!-- 遍历生成 -->
<div class="chose" v-for="item in choosepeople" :key="item.key">
<div>{{ item.name }}</div>
<div>{{ item.name || item.realName }}</div>
<div class="ch" @click="deleteChoosePeople(item)"></div>
</div>
</div>
@@ -541,7 +539,6 @@
<button class="btn2" @click="submitAuth">确定</button>
</div>
</div>
<!-- 确认添加部门弹窗 -->
<a-modal
v-model:visible="showOrgModal"
@@ -574,7 +571,6 @@
<!-- 确认添加部门弹窗 -->
</a-drawer>
</template>
<script>
import { reactive, toRefs, onMounted, onUnmounted, computed } from "vue";
import elementResizeDetectorMaker from "element-resize-detector";
@@ -598,6 +594,14 @@ export default {
type: Number,
default: null,
},
classify: {
type: String,
default: "",
},
selectProjectId: {
type: Number,
default: null,
},
},
setup(props, ctx) {
const store = useStore();
@@ -606,30 +610,24 @@ export default {
//快速选人
pageSize: 10,
currentPage: 1,
tableDataTotal: 0,
tableDataTotal: 100,
nameSearch: "", //搜索名称
loading: false,
//受众
pageSize2: 10,
currentPage2: 1,
tableDataTotal2: 0,
audienceName: "",
pageSize1: 10,
currentPage1: 1,
tableDataTotal1: 0,
selectedRowKeys1: [],
activeKey: "1",
value: [], //级联选择框
choosevalue: null, //受众选择
valueSelect: null, //树形选择
valueSelectboe2: null, //boe树形选择
nameadd: "",
searchOrgName: "", //搜索组织
//组织树
treeData: [],
@@ -646,8 +644,8 @@ export default {
tablecolumns: [
{
title: "姓名",
dataIndex: "name",
key: "name",
dataIndex: "realName",
key: "realName",
width: 80,
align: "center",
className: "h",
@@ -655,8 +653,8 @@ export default {
},
{
title: "工号",
dataIndex: "numb",
key: "numb",
dataIndex: "userNo",
key: "userNo",
width: 80,
align: "center",
className: "h",
@@ -664,8 +662,8 @@ export default {
},
{
title: "归属组织",
dataIndex: "guishu",
key: "guishu",
dataIndex: "orgName",
key: "orgName",
width: 80,
align: "center",
className: "h",
@@ -673,15 +671,14 @@ export default {
},
{
title: "部门",
dataIndex: "bum",
key: "bum",
dataIndex: "departName",
key: "departName",
width: 80,
align: "center",
className: "h",
ellipsis: true,
},
],
//受众关联table数据
tabledata2: [
// {
@@ -761,46 +758,59 @@ export default {
selectOrgName: null, //选中的组织名称
//快速选人-------------------------------------
//添加组织-------------------------------------
selectedKeys1: [], //选中部门的key
chooseorganization: [], //添加组织的选择组织
chooseorganization1: [], //显示到右侧的数组
showMore1: false, //是否显示添加组织的查看更多
showHidden1: false, //是否显示添加组织的收回
showOrgModal: false, //确认弹窗
isSearchOrg: false,
treeData2: [],
//添加组织-------------------------------------
//受众关联-------------------------------------
relationpeople: [], //总的数组
showMore2: false, //是否显示快速选人的查看更多
showHidden2: false, //是否显示收回
selectedRowKeys2: [], //表格选中的key
//受众关联-------------------------------------
selectAllArr: null, //所有选中
expandedKeys: [], //展开的节点
});
const closeDrawer = () => {
state.activeKey = "1";
ctx.emit("update:ProjCheckvisible", false);
deleteAll();
// console.log("expandedKeys", state.expandedKeys);
state.expandedKeys = [];
state.tabledata = [];
//快速选人
state.currentPage = 1;
state.tableDataTotal = 0;
state.nameSearch = ""; //搜索名称
//受众
state.currentPage2 = 1;
state.tableDataTotal2 = 0;
state.audienceName = "";
state.currentPage1 = 1;
state.tableDataTotal1 = 0;
state.selectedKeys = [];
state.selectOrgId = null; //选中的组织id
state.selectOrgName = null; //选中的组织名称
state.searchOrgName = null;
state.isSearchOrg = false;
state.treeData2 = [];
getAudienceInfo();
};
const afterVisibleChange = (bool) => {
console.log("state", bool);
if (bool) {
optionAuthPerm();
}
};
//获取组织树
state.treeData = computed(() => {
return store.state.orgtreeList ? store.state.orgtreeList : [];
});
const getClientHeight = () => {
state.screenHeight = document.body.clientHeight;
};
@@ -808,19 +818,14 @@ export default {
// const getClientHeightSelecteds = () => {
// state.selectedsHeight = document.getElementById('selecteds').offsetHeight
// console.log('selectedsHeight',state.selectedsHeight)
// };
onMounted(() => {
// console.log("11111", 1);
window.addEventListener("resize", getClientHeight, false);
// window.addEventListener("resize", getClientHeightSelecteds, false);
// judgeUrl();
state.tabledata = store.state.memberInitInfo;
});
onUnmounted(() => {
window.removeEventListener("resize", getClientHeight, false);
// window.removeEventListener("resize", getClientHeightSelecteds, false);
});
// 开始 快速选人------------------------------------------------------------------
//选中部门
const departmentSelect = (e, k) => {
@@ -836,11 +841,10 @@ export default {
};
//获取学员
const getMember = async (org) => {
if (!state.nameSearch && !org) {
return false;
}
console.log("org", org);
const item1 = await api
// if (!state.nameSearch && !org) {
// return false;
// }
await api
.getMemberInfo({
pageNo: state.currentPage,
pageSize: state.pageSize,
@@ -848,30 +852,28 @@ export default {
org: state.nameSearch ? null : org,
})
.then((res) => {
if (res.data.code === 200) {
console.log("获取学员", res.data);
state.tableDataTotal = res.data.data.total;
return res.data.data.rows;
}
state.tabledata = res.data.data.rows;
state.tableDataTotal = res.data.data.total;
});
state.tabledata = traverseArr(item1, {
key: "id",
name: "realName",
bum: "depName",
numb: "id",
guishu: "orgName",
});
};
// state.tabledata = traverseArr(item1, {
// key: "id",
// name: "realName",
// bum: "depName",
// numb: "id",
// guishu: "orgName",
// });
// };
//分页获取学员
const changePagination = (page) => {
state.currentPage = page;
console.log("1111111");
console.log("1111111", state.selectedRowKeys, state.choosepeople);
getMember(state.selectOrgId);
};
//搜索学员
const handleSearchStu = () => {
deleteDepSelect();
state.currentPage = 1;
state.currentPage2 = 1;
console.log("22222");
getMember();
@@ -891,10 +893,19 @@ export default {
};
//快速选人 选中的数组
const onSelectChange = (selectedRowKeys, item) => {
// console.log("selectedRowKeys changed: ", selectedRowKeys,item);
state.selectedRowKeys.push(selectedRowKeys[selectedRowKeys.length - 1]);
state.choosepeople.unshift(item[item.length - 1]);
console.log("selectedRowKeys changed: ", selectedRowKeys, item);
state.selectedRowKeys = selectedRowKeys;
state.choosepeople = item.reverse();
selectedsHeight();
// if (selectedRowKeys.length > 0 && item.length > 0) {
// state.selectedRowKeys.push(selectedRowKeys[selectedRowKeys.length - 1]);
// state.choosepeople.unshift(item[item.length - 1]);
// // console.log(
// // "selectedRowKeys changed22222: ",
// // state.selectedRowKeys,
// // state.choosepeople
// // );
// }
};
//单个删除选中的人
const deleteChoosePeople = (item) => {
@@ -920,7 +931,7 @@ export default {
resize.listenTo(
document.getElementById("ProjCheckship").querySelector("#selecteds"),
function (ele) {
console.log("ele", ele.offsetHeight);
console.log("ele", ele.clientHeight, ele.offsetHeight);
if (ele.offsetHeight > 160 && !state.showHidden) {
state.showMore = true;
document
@@ -962,9 +973,7 @@ export default {
.getElementById("ProjCheckship")
.querySelector("#selectedsBox").style.height = "160px";
};
// 结束 快速选人------------------------------------------------------------------
// 开始 添加组织------------------------------------------------------------------
//搜索组织
const searchOrg = (id) => {
@@ -1002,7 +1011,6 @@ export default {
return store.state.orgtreeList ? store.state.orgtreeList : [];
});
};
// //搜索组织
// const searchOrg = () => {
// let treeTitle = document
@@ -1027,7 +1035,6 @@ export default {
// message.warning("请输入组织名称");
// }
// };
//选中部门
const departmentSelect1 = (e, k) => {
console.log("选中的部门", e, k);
@@ -1046,8 +1053,7 @@ export default {
}
}
}
// console.log("选中的部门2", state.selectedKeys1, state.chooseorganization);
console.log("选中的部门2", state.selectedKeys1, state.chooseorganization);
};
//点击确认添加-判断是否显示确定弹窗
const addOrgModal = () => {
@@ -1069,27 +1075,25 @@ export default {
const closeOrgModal = () => {
state.showOrgModal = false;
};
//单个删除选中的人
//单个删除选中的组织
const deleteChoosePeople1 = (item) => {
console.log("item", item);
console.log("item", item, state.chooseorganization);
let arr = state.chooseorganization;
for (let i = 0; i < arr.length; i++) {
if (arr[i].key === item.key) {
if (arr[i].id === item.id) {
arr.splice(i, 1);
}
}
state.chooseorganization = arr;
let array = state.selectedKeys1;
for (let i = 0; i < array.length; i++) {
if (array[i] === item.key) {
if (array[i] === item.id) {
array.splice(i, 1);
}
}
state.selectedKeys1 = array;
console.log("state.selectedKeys1", state.selectedKeys1);
};
//根据右侧快速选人高度,判断是否显示更多
const selectedsHeight1 = () => {
let resize = elementResizeDetectorMaker();
@@ -1138,11 +1142,8 @@ export default {
.getElementById("ProjCheckship")
.querySelector("#selectedsBox1").style.height = "160px";
};
// 结束 添加组织------------------------------------------------------------------
// 开始 受众关联------------------------------------------------------------------
//获取受众
const getAudienceInfo = async () => {
const item1 = await api
@@ -1189,13 +1190,13 @@ export default {
state.audienceName = "";
getAudienceInfo();
};
//受众关联 选中的数组
const onSelectChange2 = (selectedRowKeys, item) => {
// console.log("selectedRowKeys changed: ", selectedRowKeys, item);
state.selectedRowKeys2.push(selectedRowKeys[selectedRowKeys.length - 1]);
state.relationpeople.unshift(item[item.length - 1]);
state.selectedRowKeys2 = selectedRowKeys;
state.relationpeople = item.reverse();
// state.selectedRowKeys2.push(selectedRowKeys[selectedRowKeys.length - 1]);
// state.relationpeople.unshift(item[item.length - 1]);
selectedsHeight2();
};
//单个删除选中的人
@@ -1263,9 +1264,7 @@ export default {
.getElementById("ProjCheckship")
.querySelector("#selectedsBox2").style.height = "160px";
};
// 结束 受众关联------------------------------------------------------------------
//全部清除
const deleteAll = () => {
//快速选人-------------------------------------
@@ -1278,37 +1277,31 @@ export default {
state.selectOrgName = null; //选中的组织名称
//快速选人-------------------------------------
//添加组织-------------------------------------
state.selectedKeys1 = []; //选中部门的key
state.chooseorganization = []; //添加组织的选择组织
state.chooseorganization1 = []; //显示到右侧的数组
state.showMore1 = false; //是否显示添加组织的查看更多
state.showHidden1 = false; //是否显示添加组织的收回
state.showOrgModal = false; //确认弹窗
//添加组织-------------------------------------
//受众关联-------------------------------------
state.relationpeople = []; //总的数组
state.showMore2 = false; //是否显示快速选人的查看更多
state.showHidden2 = false; //是否显示收回
state.selectedRowKeys2 = []; //表格选中的key
//受众关联-------------------------------------
state.selectAllArr = null; //所有选中
};
//确定添加授权
const submitAuth = () => {
let choosepeople = [];
state.choosepeople.map((value) => {
let obj = {
id: value.key,
name: value.name,
id: value.id,
name: value.realName,
};
choosepeople.push(obj);
});
let chooseorganization1 = [];
state.chooseorganization1.map((value) => {
let obj = {
@@ -1317,7 +1310,6 @@ export default {
};
chooseorganization1.push(obj);
});
let relationpeople = [];
state.relationpeople.map((value) => {
let obj = {
@@ -1331,7 +1323,71 @@ export default {
ctx.emit("update:addAuthList", state.selectAllArr);
closeDrawer();
};
//获取授权 坐回显
const optionAuthPerm = () => {
let obj = {
keyWord: "",
type:
props.classify === "learnPath"
? 1
: props.classify === "project"
? 2
: props.classify === "course"
? 3
: null,
tag: props.authClassify === 1 ? 3 : props.authClassify === 2 ? 4 : "",
opt: 1,
refId: props.selectProjectId,
pageNo: 0,
pageSize: 0,
deptList: [],
groupList: [],
studentList: [],
};
console.log("获取权限名单obj", obj);
api
.optionAuthPerm(obj)
.then((res) => {
// console.log("获取权限名单成功", res);
if (res.data.code === 200) {
let studentArr = res.data.data.studentList;
let selectedRowKeys = [];
let choosepeople = [];
for (let i = 0; i < studentArr.length; i++) {
selectedRowKeys.push(studentArr[i].id);
choosepeople.push(studentArr[i]);
}
//快速选人
state.selectedRowKeys = selectedRowKeys;
state.choosepeople = choosepeople;
let deptArr = res.data.data.deptList;
let selectedKeys1 = [];
let chooseorganization = [];
for (let i = 0; i < deptArr.length; i++) {
selectedKeys1.push(deptArr[i].id);
chooseorganization.push(deptArr[i]);
}
//组织
state.selectedKeys1 = selectedKeys1;
state.chooseorganization = chooseorganization;
state.chooseorganization1 = chooseorganization;
let groupArr = res.data.data.groupList;
let selectedRowKeys2 = [];
let relationpeople = [];
for (let i = 0; i < groupArr.length; i++) {
selectedRowKeys2.push(groupArr[i].id);
relationpeople.push(groupArr[i]);
}
//受众
state.selectedRowKeys2 = selectedRowKeys2;
state.relationpeople = relationpeople;
console.log("获取权限名单成功", res);
}
})
.catch((err) => {
console.log("获取权限名单失败", err);
});
};
return {
...toRefs(state),
afterVisibleChange,
@@ -1344,7 +1400,6 @@ export default {
selectedsHeight,
morePeopleShow,
morePeopleHidden,
departmentSelect1,
addOrgModal,
addOrg,
@@ -1353,32 +1408,26 @@ export default {
morePeopleShow1,
morePeopleHidden1,
deleteChoosePeople1,
selectedsHeight2,
morePeopleShow2,
morePeopleHidden2,
deleteChoosePeople2,
deleteAll,
searchOrg,
changePagination,
handleSearchStu,
resetStu,
getAudienceInfo,
changePagination1,
searchAudienceInfo,
resetAudienceInfo,
resetOrg,
submitAuth,
optionAuthPerm,
};
},
};
</script>
<style lang="scss">
.ProjCheckship {
.ant-drawer-content-wrapper {
@@ -1527,42 +1576,35 @@ export default {
align-items: center;
margin-top: 20px;
border: 1px solid #c3e6fc;
.inline {
width: 95%;
height: 100%;
display: flex;
justify-content: space-between;
// background-color: #bfa;
.left1 {
height: 100%;
display: flex;
align-items: center;
.img {
width: 14px;
height: 15px;
background-image: url(../../assets/images/leveladd/gan.png);
background-size: 100% 100%;
}
.text {
color: #999ba3;
}
.text2 {
color: #4ea6ff;
margin-left: 5px;
margin-right: 5px;
}
.text3 {
color: #999ba3;
margin-left: 20px;
}
}
.right1 {
font-size: 14px;
font-weight: 400;
@@ -1649,7 +1691,6 @@ export default {
th.h {
background-color: #eff4fc !important;
}
.ant-table-tbody
> tr:hover:not(.ant-table-expanded-row):not(.ant-table-row-selected)
> td {
@@ -1684,7 +1725,6 @@ export default {
}
}
}
.tab2 {
display: flex;
align-items: center;
@@ -1700,7 +1740,6 @@ export default {
font-size: 14px;
}
}
.t1 {
display: flex;
align-items: center;
@@ -1748,7 +1787,6 @@ export default {
font-size: 14px;
white-space: nowrap;
}
.ant-select-dropdown {
min-width: 800px !important;
}
@@ -1904,7 +1942,9 @@ export default {
margin-right: 32px;
margin-left: 32px;
min-height: 100px;
// height: 170px;
// overflow: hidden;
flex-shrink: 0;
.chose {
// width: 64px;
padding-left: 10px;
@@ -1920,6 +1960,7 @@ export default {
color: rgba(56, 139, 225, 1);
font-size: 12px;
position: relative;
flex-shrink: 0;
.ch {
position: absolute;
width: 18px;
@@ -1977,7 +2018,6 @@ export default {
width: 7px !important;
}
}
.changetreedropdownboe {
width: 240px !important;
border-radius: 5px;
@@ -2078,7 +2118,6 @@ export default {
display: flex;
align-items: center;
justify-content: center;
flex-shrink: 0;
cursor: pointer;
.btnText {

View File

@@ -133,6 +133,7 @@
<script>
import { toRefs, reactive } from "vue";
import * as api from "../../api/index1";
import { message } from "ant-design-vue";
export default {
name: "ProjPowerList",
props: {
@@ -172,6 +173,7 @@ export default {
// },
],
cancelAuthInfo: null, //取消授权id
cancelAuthState: null, //取消授权种类
});
const closeDrawer = () => {
@@ -199,6 +201,7 @@ export default {
name: item.name,
};
state.cancelAuthInfo = obj;
state.cancelAuthState = item.state;
};
const closeCancelModal = () => {
state.cancelModal = false;
@@ -364,7 +367,14 @@ export default {
: props.classify === "course"
? 3
: null,
tag: 1,
tag:
state.cancelAuthState === "归属权"
? 2
: state.cancelAuthState === "查看权"
? 3
: state.cancelAuthState === "管理权"
? 4
: null,
opt: 4,
refId: props.selectProjectId,
pageNo: 1,
@@ -373,7 +383,7 @@ export default {
groupList: [],
studentList: [state.cancelAuthInfo],
};
console.log("取消权限名单obj", obj);
console.log("取消权限名单obj", obj, state.cancelAuthState);
api
.optionAuthPerm(obj)
.then((res) => {
@@ -381,6 +391,7 @@ export default {
if (res.data.code === 200) {
// console.log("取消授权成功", res.data.data);
optionAuthPerm();
message.success("取消授权成功");
closeCancelModal();
}
})

View File

@@ -28,13 +28,13 @@
<div class="nameinp">
<div class="namee">姓名</div>
<a-input
v-model:value="name"
v-model:value="nameSearch"
style="width: 270px; height: 40px; border-radius: 8px"
placeholder="请输入姓名"
/>
</div>
<div class="btns">
<div class="btn1">
<div class="btn1" @click="handleSearchStu">
<div class="img1">
<img
src="../../assets/images/courseManage/search0.png"
@@ -42,7 +42,7 @@
</div>
<div class="wz">搜索</div>
</div>
<div class="btn2">
<div class="btn2" @click="resetStu">
<div class="img2">
<img
src="../../assets/images/courseManage/reset1.png"
@@ -242,7 +242,7 @@ export default {
valueSelect: null, //树形选择
valueSelectboe2: null, //boe树形选择
name: "",
nameSearch: "",
nameadd: "",
nameaddd: "",
com: "",
@@ -317,6 +317,18 @@ export default {
ctx.emit("update:ProjOwnervisible", false);
state.openKeys = [];
state.isDisabled = true;
state.nameSearch = "";
state.tabledata = [];
state.currentPage = 1;
state.selectedKeys = [];
state.valueSelectboe = null;
state.choosepeople = []; //选中的组织名称
state.selectDepartment = null; //选中部门名称
state.showMore = false; //是否显示快速选人的查看更多
state.showHidden = false; //是否显示收回
state.selectedRowKeys = []; //表格选中的key
state.selectPeopleArr = []; //表格选中的人
};
const afterVisibleChange = (bool) => {
@@ -336,16 +348,22 @@ export default {
});
//获取选中部门的人员信息
const getPeoples = () => {
if (!state.nameSearch && !state.selectedKeys[0]) {
state.tableDataTotal = 0;
return false;
}
// console.log("org", org);
let obj = {
org: state.selectedKeys[0],
pageNo: state.currentPage,
pageSize: state.pageSize,
keyWord: state.nameSearch,
org: state.nameSearch ? null : state.selectedKeys[0],
};
if (!state.selectedKeys[0]) {
state.tableDataTotal = 0;
return;
}
// console.log("obj", obj);
// if (!state.selectedKeys[0]) {
// state.tableDataTotal = 0;
// return;
// }
console.log("obj", obj);
api
.getMemberInfo(obj)
.then((res) => {
@@ -373,7 +391,26 @@ export default {
console.log("获取学员失败", err);
});
};
//搜索学员
const handleSearchStu = () => {
// deleteDepSelect();
state.currentPage = 1;
console.log("22222");
getPeoples();
};
//重置
const resetStu = () => {
state.nameSearch = "";
state.currentPage = 1;
state.tableDataTotal = 0;
state.tabledata = [];
};
// //清空选择部门信息
// const deleteDepSelect = () => {
// state.selectedKeys = null;
// state.selectOrgId = null;
// state.selectOrgName = null;
// };
//分页
const changePagination = () => {
getPeoples();
@@ -610,6 +647,8 @@ export default {
changeOwnership,
addAuth,
removeClick,
handleSearchStu,
resetStu,
};
},
};

View File

@@ -29,6 +29,7 @@
/>
</div>
</div>
<!--
<div class="mii_ipt">
<div class="ipt_name">课程状态</div>
<div class="select fitems">
@@ -44,6 +45,7 @@
</a-select>
</div>
</div>
-->
</div>
<div class="mi_btns">
<div class="btn btn1" @click="search">
@@ -113,9 +115,9 @@
:loading="tableDataTotal === -1 ? true : false"
:pagination="false"
/>
<div class="pa">
<div class="pa" style="display:flex;justify-content:center;padding:20px;">
<a-pagination
v-if="total > 10"
v-if="tableDataTotal > 10"
showSizeChanger="true"
showQuickJumper="true"
hideOnSinglePage="true"
@@ -134,7 +136,7 @@
</template>
<script>
//import { ApiFilled } from "@ant-design/icons-vue";
import {reactive, toRefs, ref, computed} from "vue";
import {reactive, toRefs, computed} from "vue";
// import { planList } from "../../api/indexTaskadd";
//import {detail} from "../../api/indexCourse";
import {list} from "../../api/indexTaskadd";
@@ -279,14 +281,14 @@ export default {
//获取面授课列表
const getClassList = (obj) => {
let objn = obj || {
auditStatus: state.auditStatus,
auditStatus:2,
name: state.name,
pageNo: state.currentPage,
pageSize: state.pageSize
};
list(objn)
.then((res) => {
console.log(res.data.data.rows);
console.log('面授课列表', res.data.data);
let result = res.data.data;
state.tableDataTotal = result.total;
getClassData(result.rows);
@@ -314,7 +316,7 @@ export default {
});
state.classTableData = array;
};
/**
const options1 = ref([
{
value: 0,
@@ -328,11 +330,8 @@ export default {
value: 2,
label: "已审核",
},
{
value: -1,
label: "审核未通过",
},
]);
]);*/
const handleChange = (value, option) => {
console.log("改变了", value, option);
console.log(state.valueContent);
@@ -359,7 +358,7 @@ export default {
// showDrawerSelFacet,
afterVisibleChange,
closeDrawer,
options1,
columns1,
getClassData,
handleChange,

View File

@@ -1,5 +1,10 @@
<template>
<a-tree-select
:getPopupContainer="
(triggerNode) => {
return triggerNode.parentNode || document.body;
}
"
v-model:value="id"
style="width: 100%"
:dropdown-style="{ maxHeight: '400px', overflow: 'auto' }"
@@ -11,58 +16,36 @@
label: 'name',
value: 'id',
}"
:disabled="viewDetail ? true : false"
:disabled="disabled"
@change="change"
dropdownClassName="treeDropdown"
>
</a-tree-select>
</template>
<script>
import {onMounted, reactive, toRefs, watch} from "vue";
<script setup>
import {computed, defineEmits, defineProps, onMounted, ref} from "vue";
import {useStore} from "vuex";
export default {
name: "OrgClass",
const store = useStore();
props: {
modelValue: {
type: Number,
},
name: {
type: String,
},
disabled: {
type: Boolean,
default: false
},
},
setup(props, ctx) {
const store = useStore();
const props = defineProps({
value: String
})
const emit = defineEmits({})
const state = reactive({
options: [],
id: props.value
});
watch(state.id, () => {
ctx.emit('update:modelValue', state.id)
})
watch(props, () => {
if (props.modelValue !== state.id) {
state.id = props.modelValue
}
})
onMounted(() => {
state.options = [...store.state.orgtreeList]
})
const options = ref([])
function change(key, obj) {
ctx.emit('update:name', obj[0])
}
const id = computed(() => {
return props.value
})
onMounted(() => {
options.value = [...store.state.orgtreeList]
})
function change(key, obj) {
emit('update:name', obj[0])
emit('update:value', key)
}
return {
...toRefs(state),
change
};
},
};
</script>

View File

@@ -1,55 +1,46 @@
<!-- 评估管理-创建评估页面 -->
<template>
<a-select
:getPopupContainer="
(triggerNode) => {
return triggerNode.parentNode || document.body;
}
"
v-model:value="id"
placeholder="请选择分类"
style="width: 100%"
:options="options"
allowClear
@change="change"
:disabled="disabled"
>
</a-select>
</template>
<script>
import {onMounted, reactive, toRefs, watch} from "vue";
<script setup>
import {computed, defineEmits, defineProps, onMounted, ref} from "vue";
import {useStore} from "vuex";
export default {
name: "ProjectClass",
const store = useStore();
props: {
modelValue: {
type: Number,
},
disabled: {
type: Boolean,
default: false
},
},
setup(props, ctx) {
const store = useStore();
const props = defineProps({
value: String,
disabled: String
})
const emit = defineEmits({})
const state = reactive({
options: [],
id: props.modelValue
});
const options = ref([])
watch(props, () => {
if (props.modelValue !== state.id) {
state.id = props.modelValue
}
})
const id = computed(() => {
return props.value
})
watch(state.id,()=>{
ctx.emit('update:modelValue',state.id)
})
onMounted(() => {
options.value = store.state.projectClass.map(e => ({value: parseInt(e.dictCode), label: e.dictName}))
})
function change(key, obj) {
emit('update:name', obj[0])
emit('update:value', key)
}
onMounted(() => {
state.options = store.state.projectClass.map(e => ({value: parseInt(e.dictCode), label: e.dictName}))
})
return {
...toRefs(state),
};
},
};
</script>

View File

@@ -1,45 +1,42 @@
<template>
<a-select
:getPopupContainer="
(triggerNode) => {
return triggerNode.parentNode || document.body;
}
"
v-model:value="id"
:options="options"
style="width: 100%"
placeholder="请选择项目级别"
@change="change"
:disabled="disabled"
/>
</template>
<script>
import {onMounted, reactive, toRefs, watch} from "vue";
<script setup>
import {computed, defineEmits, defineProps, onMounted, ref} from "vue";
import {useStore} from "vuex";
export default {
name: "ProjectClass",
props: {
modelValue: {
type: Number,
},
disabled: {
type: Boolean,
default: false
},
},
setup(props, ctx) {
const store = useStore();
const store = useStore();
const props = defineProps({
value: String,
disabled: String
})
const state = reactive({
options: [],
id: props.modelValue
});
watch(state.id, () => {
ctx.emit('update:modelValue', state.id)
})
const id = computed(() => {
return props.value
})
onMounted(() => {
state.options = store.state.projectLevel.map(e => ({value: parseInt(e.dictCode), label: e.dictName}))
})
return {
...toRefs(state),
};
},
};
const emit = defineEmits({})
const options = ref([])
onMounted(() => {
options.value = store.state.projectLevel.map(e => ({value: parseInt(e.dictCode), label: e.dictName}))
})
function change(key) {
emit('update:value', key)
}
</script>

View File

@@ -1,5 +1,10 @@
<template>
<a-select
:getPopupContainer="
(triggerNode) => {
return triggerNode.parentNode || document.body;
}
"
v-model:value="managerArray"
:placeholder="placeholder"
:filterOption="false"
@@ -28,10 +33,12 @@ export default {
props: {
value: {
type: Number,
type: String,
default: ''
},
name: {
type: Number,
type: String,
default: ''
},
disabled: {
type: Boolean,
@@ -55,9 +62,9 @@ export default {
loading: false,
init: false
});
const getMemberThrottle = throttle(getMember, 500)
watch(() => state.memberParam, getMemberThrottle)
watch(()=>state.memberParam.keyWord , throttle(getMember, 500))
watch(()=>state.memberParam.pageNo , throttle(getPushMember, 500))
watch(props, init)
onMounted(() => {
@@ -71,15 +78,21 @@ export default {
getMemberData()
}
function getPushMember() {
state.loading = true
getMemberData()
}
function getMemberData() {
console.log('getMemberData')
api1.getMemberInfo(state.memberParam).then((res) => {
const list = res.data.data.rows.filter(e => !props.value?.includes(e.id + '')).map(e => ({
const list = res.data.data.rows.filter(e => !(props.value + '')?.includes(e.id + '')).map(e => ({
label: e.realName,
value: e.id
}));
if (state.memberParam.pageNo === 1 && props.value) {
const arrManagerId = props.value.split(',')
const arrManagerId = (props.value + '').split(',')
const arrManager = props.name.split(',')
state.options = [...arrManager.map((e, i) => ({label: e, value: arrManagerId[i]})), ...list]
} else state.options.push(...list)
@@ -102,10 +115,11 @@ export default {
function init() {
console.log('init--', props)
if (props.value !== typeof state.managerArray === 'object' ? state.managerArray.join(',') : state.managerArray) {
console.log(Array.isArray(state.managerArray))
if ((props.value + '') !== (Array.isArray(state.managerArray) ? state.managerArray.join(',') : (state.managerArray + ''))) {
if (props.value) {
const arrManager = props.name.split(',')
const arrManagerId = props.value.split(',')
const arrManagerId = (props.value + '').split(',')
state.managerArray = props.mode === 'select' ? props.value : arrManagerId;
state.options = arrManager.map((e, i) => ({label: e, value: arrManagerId[i]}))
} else {
@@ -124,7 +138,7 @@ export default {
}
function change(e, l) {
console.log('change')
console.log('change', l)
if (Array.isArray(l)) {
ctx.emit('update:value', l.map(t => t.value).join(','))
ctx.emit('update:name', l.map(t => t.label).join(','))

View File

@@ -0,0 +1,126 @@
<template>
<a-select
:getPopupContainer="
(triggerNode) => {
return triggerNode.parentNode || document.body;
}
"
v-model:value="managerArray"
:placeholder="placeholder"
:filterOption="true"
style="width: 100%"
:options="options"
allowClear
showSearch
:mode="mode"
:disabled="disabled"
@popupScroll="memberScroll"
@search="searchMember"
@change="change"
>
<template v-if="loading" #notFoundContent>
<a-spin size="small"/>
</template>
</a-select>
</template>
<script setup>
import {computed, defineEmits, defineProps, onMounted, ref, watch} from "vue";
import {scrollLoad, throttle} from "@/api/method";
import * as api1 from "@/api/index1";
import {useStore} from "vuex";
const props = defineProps({
value: {
type: String,
default: ''
},
name: {
type: String,
default: ''
},
disabled: Boolean,
placeholder: String,
mode: String
})
const store = useStore();
const managerArray = computed(() => {
return props.mode === 'select' ? props.value : props.value.split(',')
})
const emit = defineEmits({})
const options = ref([])
const memberParam = ref({keyWord: '', pageNo: 1, pageSize: 10})
const loading = ref(false)
watch(() => memberParam.value.keyWord, throttle(getSearchMember, 500))
watch(() => memberParam.value.pageNo, throttle(getPageMember, 500))
onMounted(() => {
console.log('onMounted')
const memberOptions = store.state.memberInitInfo.map(e => ({
label: e.realName,
value: e.id
}))
if (props.value) {
options.value = [...(props.value + '').split(',').map((value, i) => ({
label: (props.name + '').split(',')[i],
value
})), ...memberOptions]
} else options.value = memberOptions
})
function getSearchMember() {
loading.value = true
options.value = []
getMemberData()
}
function getPageMember() {
loading.value = true
getMemberData()
}
function getMemberData() {
api1.getMemberInfo(memberParam.value).then((res) => {
const list = res.data.data.rows.filter(e => !(props.value + '').includes(e.id)).map(e => ({
label: e.realName,
value: e.id
}));
if (memberParam.value.pageNo === 1 && props.value) {
const arrManagerId = (props.value + '').split(',')
const arrManager = props.name.split(',')
options.value = [...arrManager.map((e, i) => ({label: e, value: arrManagerId[i]})), ...list]
} else options.value.push(...list)
loading.value = false
});
}
const memberScroll = (e) => {
let num = scrollLoad(e);
if (num === 2) {
memberParam.value.pageNo++;
}
};
//搜索学员
const searchMember = (keyWord) => {
keyWord && (memberParam.value = {keyWord, pageNo: 1, pageSize: 10});
};
function change(e, l) {
console.log('change', l)
if (Array.isArray(l)) {
emit('update:value', l.map(t => t.value).join(','))
emit('update:name', l.map(t => t.label).join(','))
} else {
emit('update:value', l.value)
emit('update:name', l.label)
}
}
</script>

View File

@@ -1,52 +1,43 @@
<template>
<a-select
:getPopupContainer="
(triggerNode) => {
return triggerNode.parentNode || document.body;
}
"
v-model:value="id"
:options="options"
style="width: 100%"
placeholder="请选择分类"
@change="change"
:disabled="disabled"
/>
</template>
<script>
import {onMounted, reactive, toRefs, watch} from "vue";
<script setup>
import {computed, defineEmits, defineProps, onMounted, ref} from "vue";
import {useStore} from "vuex";
export default {
name: "TrainClass",
const store = useStore();
props: {
modelValue: {
type: Number,
},
disabled: {
type: Boolean,
default: false
},
},
setup(props, ctx) {
const store = useStore();
const props = defineProps({
value: String,
disabled: String
})
const state = reactive({
options: [],
id: props.modelValue
});
watch(state.id, () => {
ctx.emit('update:modelValue', state.id)
})
const id = computed(() => {
return props.value
})
watch(props, () => {
if (props.modelValue !== state.id) {
state.id = props.modelValue
}
})
const emit = defineEmits({})
const options = ref([])
onMounted(() => {
options.value = store.state.projectSys.map(e => ({value: parseInt(e.dictCode), label: e.dictName}))
})
function change(key) {
emit('update:value', key)
}
onMounted(() => {
state.options = store.state.projectSys.map(e => ({value: parseInt(e.dictCode), label: e.dictName}))
})
return {
...toRefs(state),
};
},
};
</script>

View File

@@ -6,60 +6,68 @@
* @FilePath: /fe-manage/src/store/index.js
* @Description: 这是默认设置,请设置`customMade`, 打开koroFileHeader查看配置 进行设置: https://github.com/OBKoro1/koro1FileHeader/wiki/%E9%85%8D%E7%BD%AE
*/
import { createStore } from "vuex";
import {createStore} from "vuex";
// import * as api from '../api/index1'
export default createStore({
state: {
openpages: localStorage.getItem("openpages")
? JSON.parse(localStorage.getItem("openpages"))
: [
{
pagename: "学习路径图",
href: "/learningpath",
active: true,
state: {
openpages: localStorage.getItem("openpages")
? JSON.parse(localStorage.getItem("openpages"))
: [
{
pagename: "学习路径图",
href: "/learningpath",
active: true,
},
],
assessmentName: "",
routerId: null,
projectTemplateId: null,
userInfo: {},
orgtreeList: [],
faceclassPic: null,
faceclassClass: [],
faceclassScene: [],
projectLevel: [],//项目级别
projectSys: [],//培训分类
pathmapPic: [],//学习路径背景图
memberInitInfo: [],//学员默认
},
getters: {},
mutations: {
chengeOpenpages(state, list) {
// console.log('list', list)
state.openpages = list;
},
chengeRouterId(state, routerId) {
// console.log('list', list)
state.routerId = routerId;
},
],
assessmentName: "",
routerId: null,
projectTemplateId: null,
orgtreeList: [],
faceclassPic: null,
faceclassClass: [],
faceclassScene: [],
projectLevel: [],//项目级别
projectSys: [],//培训分类
pathmapPic: [],//学习路径背景图
},
getters: {},
mutations: {
chengeOpenpages(state, list) {
// console.log('list', list)
state.openpages = list;
},
chengeRouterId(state, routerId) {
// console.log('list', list)
state.routerId = routerId;
},
SET_assessmentName(state, name) {
state.assessmentName = name;
console.log("state.assessmentName");
console.log(state.assessmentName);
},
//获取组织树
getOrgtreeList(state, data) {
state.orgtreeList = data
},
SET_DICT(state, { key, data }) {
state[key] = data
},
SET_projectTemplateId(state, projectTemplateId) {
state.projectTemplateId = projectTemplateId;
}
SET_assessmentName(state, name) {
state.assessmentName = name;
console.log("state.assessmentName");
console.log(state.assessmentName);
},
//获取组织树
getOrgtreeList(state, data) {
state.orgtreeList = data
},
SET_DICT(state, {key, data}) {
state[key] = data
},
SET_MEMBER_INFO(state, data) {
state.memberInitInfo = data
},
SET_USER(state, userInfo) {
state.userInfo = userInfo
},
SET_projectTemplateId(state, projectTemplateId) {
state.projectTemplateId = projectTemplateId;
}
},
actions: {},
modules: {},
},
actions: {},
modules: {},
});

File diff suppressed because it is too large Load Diff

View File

@@ -230,13 +230,14 @@
</div>
</div>
<div class="mbl_items">
<div class="item_nam">
<div v-if="(attachMap.length>0)" class="item_nam">
<span style="margin-right: 10px">附件</span>
</div>
<div class="item_inp" v-for="(value, index) in attachMap" :key="index">
<a :src="value">
<a>
{{ ['附件一', '附件二', '附件三', '附件四', '附件五', '附件六'][index] }}
</a>
<a style="margin-left:120px;" :src="value" :href="value">查看</a>
<!-- <a-upload multiple :show-upload-list="false" :before-upload="beforeUpload2">
<div class="accessory" style="cursor: pointer">
<div class="accessory_icon">
@@ -287,9 +288,9 @@
</div>
<div class="fotarea">
<div style="border: 1px solid #ccc">
<Toolbar style="border-bottom: 1px solid #ccc" :editor="editorRef" :defaultConfig="toolbarConfig"
:mode="mode" />
<Editor v-model="valueHtml" :defaultConfig="editorConfig" :mode="mode" @onCreated="handleCreated" />
<!-- <Toolbar style="border-bottom: 1px solid #ccc;width:900px;height: 300px;" :defaultConfig="toolbarConfig"
:mode="mode" /> -->
<Editor @focus="onEditorFocus" style="border-bottom: 1px solid #ccc;width:900px;height: 300px;" v-model="valueHtml" :defaultConfig="editorConfig" :mode="mode" @onCreated="handleCreated" />
</div>
</div>
</div>
@@ -319,7 +320,7 @@ import { reactive, toRefs, onMounted, ref } from "vue";
import { list, courseAuditView, courseDetail } from "../../api/indexAudit";
import { toDate } from "../../api/method";
import { message } from "ant-design-vue";
import { Editor, Toolbar } from "@wangeditor/editor-for-vue";
import { Editor } from "@wangeditor/editor-for-vue";
import { iframeUrl } from "../../api/method";
import * as api1 from "@/api/index1";
@@ -327,7 +328,7 @@ export default {
name: "CoursereViewedN",
components: {
Editor,
Toolbar,
// Toolbar,
},
setup() {
const state = reactive({
@@ -505,7 +506,7 @@ export default {
state.faceDetailObj = result;
heroImg.value.src = result.picUrl
valueHtml.value = result.outline
attachMap.value = result.attach.split(",")
attachMap.value = result.attach==""?[]:result.attach.split(",")
console.log(result, attachMap.value);
})
.catch((err) => {
@@ -654,6 +655,11 @@ export default {
//获取分类列表
state.calssifyList = (await getDictList("faceclassClass")).map(e => ({ label: e.dictName, value: e.dictCode }))
});
// 禁止用户编辑文本框内容
const onEditorFocus = (event) => {
event.enable(false);
}
return {
...toRefs(state),
getFaceList,
@@ -671,7 +677,8 @@ export default {
valueHtml,
attachMap,
contentList11,
sceneist11
sceneist11,
onEditorFocus
};
},
};

View File

@@ -188,6 +188,7 @@ export default {
key: "topName",
align: "center",
width: "10%",
customRender: ({record: {parentId,name}}) => <div>{parentId==0?name:(parentId)}</div>,
},
{
title: "项目经理",
@@ -219,6 +220,7 @@ export default {
dataIndex: "description",
key: "description",
align: "center",
customRender: ({record: {auditList,description}}) => <div>{auditList.length!==0?auditList[auditList.length-1].description?auditList[auditList.length-1].description:'-':description?description:'-'}</div>,
},
{
@@ -290,6 +292,7 @@ export default {
status: 1,
};
auditedlist(objn).then((res) => {
console.log('获取已审核项目列表数据',res)
let result = res.data.data;
state.total = res.data.data.total;
state.tableData1 = result.rows
@@ -347,7 +350,7 @@ export default {
reset,
closeProjAuditModal,
showProjAuditModal,
setAudit,
setAudit
};
},
};

View File

@@ -589,20 +589,20 @@
/>
<!-- 查看权抽屉 -->
<proj-check-ship
v-model:ProjCheckvisible="Queryvisible"
:selectProjectId="selectPathId"
v-model:ProjCheckvisible="showCheck"
v-model:selectProjectId="selectPathId"
v-model:addAuthList="addAuthList"
:authClassify="authClassify"
v-model:authClassify="authClassify"
classify="learnPath"
/>
<!-- 管理权抽屉 -->
<proj-check-ship
<!-- <proj-check-ship
v-model:ProjCheckvisible="Managevisible"
:selectProjectId="selectPathId"
v-model:addAuthList="addAuthList"
:authClassify="authClassify"
classify="learnPath"
/>
/> -->
<!-- 创建路径loading -->
<!-- 更多背景图 v-model:visible="learnBgMore" -->
@@ -733,6 +733,7 @@ export default {
PLvisible: false, //授权名单抽屉
Queryvisible: false, //查看权抽屉
Managevisible: false, //管理权抽屉
showCheck: false,
value1: "",
value2: "",
@@ -991,12 +992,12 @@ export default {
const showQuery = (id) => {
state.authClassify = 1;
state.selectPathId = id;
state.Queryvisible = true;
state.showCheck = true;
};
const showManage = (id) => {
state.authClassify = 2;
state.selectPathId = id;
state.Managevisible = true;
state.showCheck = true;
};
const getTableDate = (tableData) => {
let data = tableData;
@@ -1713,6 +1714,7 @@ export default {
});
}
);
return {
...toRefs(state),
selectProjectName,

View File

@@ -98,7 +98,7 @@
<div class="taskmain">快速创建项目详情</div>
</div>
<div class="second">
<router-link :to="{ path: '/leveladddetail' }">
<div @click="totask">
<div
class="taskbox"
style="background: linear-gradient(180deg, #fef3dd, #fffaf0)"
@@ -117,10 +117,10 @@
</div>
<div class="centermain">快速添加任务/关卡</div>
</div>
</router-link>
</div>
<div
class="taskbox"
@click="showAddStu"
@click="tostudent"
style="background: linear-gradient(180deg, #ddeaff, #f0f8fe)"
>
<div class="leftt">
@@ -415,31 +415,33 @@
>
<img
:src="
item.type === 1
item.type == 1
? require('../../assets/images/leveladd/zai.png')
: type === 2
: item.type == 2
? require('../../assets/images/leveladd/mian.png')
: item.type === 3
: item.type == 3
? require('../../assets/images/leveladd/an.png')
: item.type === 4
: item.type == 4
? require('../../assets/images/leveladd/zuo.png')
: item.type === 5
: item.type == 5
? require('../../assets/images/leveladd/kao.png')
: item.type === 6
: item.type == 6
? require('../../assets/images/leveladd/zhi.png')
: item.type === 7
: item.type == 7
? require('../../assets/images/leveladd/wai.png')
: item.type === 8
: item.type == 8
? require('../../assets/images/leveladd/tao.png')
: item.type === 9
: item.type == 9
? require('../../assets/images/leveladd/huo.png')
: item.type === 10
: item.type == 10
? require('../../assets/images/leveladd/ce.png')
: item.type === 11
? require('../../assets/images/leveladd/diao.png')
: item.type === 12
: item.type == 11
? require('../../assets/images/leveladd/pinggu.png')
: item.type == 12
? require('../../assets/images/leveladd/tou.png')
: null
: item.type == 13
? require('../../assets/images/leveladd/tou.png')
: require('../../assets/images/leveladd/xiangmu.png')
"
/>
</div>
@@ -458,11 +460,11 @@
</div>
<div class="time">
<div class="timetext">开始时间</div>
<div class="timetext">{{ item.beginTime }}</div>
<div class="timetext">{{ item.startTime!==null?item.startTime:''}}</div>
</div>
<div class="progress">
<div class="progresstext">
{{ item.complete }}/{{ item.total }}
{{ item.complete?item.complete:0 }}/{{ item.total?item.total:0 }}
</div>
<div style="display: flex">
<a-progress
@@ -472,7 +474,7 @@
trailColor="rgba(253, 209, 98, 0.2)"
/>
<span class="progresstext" style="margin-left: 10px"
>{{ item.percent }}%</span
>{{ item.percent?item.percent:0 }}%</span
>
</div>
</div>
@@ -771,7 +773,7 @@
</div>
<div class="btnbox" style="margin: 20px">
<a-upload
v-if="(docChecked==true)"
v-if="docChecked == true"
v-model:file-list="fileList"
name="file"
action="/manageApi/file/upload"
@@ -788,7 +790,11 @@
alt=""
/>
</a-upload>
<div v-if="(docChecked==true)" class="btnbox" style="margin: 20px">
<div
v-if="docChecked == true"
class="btnbox"
style="margin: 20px"
>
<span style="color: #999999">
支持pdf.ppt.pptx.doc.docx.xls.xlsx.jpeg.png.gif.zip
</span>
@@ -992,7 +998,7 @@
<div class="header">
<div class="icon"></div>
<span>活动管理</span>
<div class="close_exit" @click="closehuodModal"></div>
<!-- <div class="close_exit" @click="closehuodModal"></div> -->
</div>
<div class="body">
<div><img src="../../assets/images/taskpage/erweima.png" /></div>
@@ -1882,6 +1888,7 @@ export default {
const getOverview = () => {
getRouterOverview(state.routerId)
.then((res) => {
console.log(res)
Object.keys(res.data.data.routerInfoOverview).forEach((item) => {
levelList.routerInfoOverview[item] =
res.data.data.routerInfoOverview[item] || 0;
@@ -1894,7 +1901,7 @@ export default {
// console.log(r)
// })
state.addLoading = false;
console.log("项目概览--" + res);
console.log("项目概览--", res);
})
.catch((err) => {
state.addLoading = false;
@@ -1906,6 +1913,8 @@ export default {
const myGetRouterDetail = () => {
GetRouterDetail(state.routerId)
.then((res) => {
console.log('router-list',res)
state.fileList = JSON.parse(res.data.data.routerInfo.attach)
if (res.data.data.routerInfo.status == 1) {
state.nodata = false;
}
@@ -2111,6 +2120,15 @@ export default {
});
}
);
const totask = () => {
state.activeKey = "2";
};
const tostudent = () => {
state.activeKey = "3";
getStudent();
// state.activeKey1 = "8";
};
return {
...toRefs(state),
...toRefs(levelList),
@@ -2162,6 +2180,8 @@ export default {
setconfig,
deFile,
deleteStu,
totask,
tostudent,
};
},
};

View File

@@ -1385,10 +1385,13 @@ export default {
const dataAssignment = (id) => {
console.log(state.level);
for (let i = 0; i < state.level.length; i++) {
if (state.level[i].chapterId === id) {
console.log("state.level[i].chapterId", state.level[i].chapterId, id);
if (state.level[i].chapterId == Number(id)) {
let array = [];
state.chooseProjectList = JSON.stringify(state.level[i].taskList);
console.log("state.level[i].taskList", state.level[i].taskList);
state.level[i].taskList.forEach((element) => {
// console.log("element", element);
let obj = {
id: element.routerTaskId,
key: element.routerTaskId,
@@ -1403,9 +1406,12 @@ export default {
routerId: element.routerId,
chapterId: element.chapterId,
};
// console.log("obj", obj);
array.push(obj);
// console.log("array", array);
});
state.tableData = array;
// console.log("tableData", state.tableData);
}
}
};
@@ -1432,12 +1438,15 @@ export default {
});
console.log("路径图详情", res);
if (state.level.length > 0) {
let chapter = localStorage.getItem("chapterId");
// console.log("chapter", chapter, chapter !== "null");
let chapter = localStorage.getItem("chapterId")
? JSON.parse(localStorage.getItem("chapterId"))
: null;
console.log("chapter", chapter);
if (chapter) {
dataAssignment(chapter); //用哪个的任务表
state.isactive = chapter; //哪个亮
} else {
console.log("state.level[0]", state.level[0]);
dataAssignment(state.level[0].chapterId);
state.isactive = state.level[0].chapterId;
}
@@ -1740,7 +1749,7 @@ export default {
const moveTask = () => {
if (state.isactive == state.removeStageId) {
message.destroy();
message.warning("选择的任务已在当前阶段");
message.warning("选择的任务已在当前关卡");
} else if (state.removeStageId == null) {
message.destroy();
message.warning("请选择关卡");

View File

@@ -15,7 +15,7 @@
</div>
</div>
<div class="right">
<img class="img1" src="../../assets/images/leveladd/ma.png" />
<!-- <img class="img1" src="../../assets/images/leveladd/ma.png" />
<div class="line"></div>
<img class="img2" src="../../assets/images/projectadd/ending.png" />
<div class="pub">结束项目</div>
@@ -33,7 +33,7 @@
<div class="sammo">复制</div>
</div>
</div>
<div class="line"></div>
<div class="line"></div> -->
<router-link to="/templatelibrary"
><div style="display: flex">
<img class="img2" src="../../assets/images/leveladd/back.png" />

View File

@@ -2,12 +2,14 @@
<template>
<div class="projectAdd">
<div class="header">
<span class="title">{{ projectInfo.parentId ? '编辑' : '创建' }}项目</span>
<span class="title"
>{{ projectInfo.parentId ? "编辑" : "创建" }}项目</span
>
<div
@click="backPage"
style="cursor: pointer"
to="/projectmanage"
class="goback"
@click="backPage"
style="cursor: pointer"
to="/projectmanage"
class="goback"
>
<span class="return"></span><span class="returntext">返回</span>
</div>
@@ -17,8 +19,8 @@
<div class="name" v-if="projectInfo.parentName">
<div class="namebox">
<img
class="nameimg"
src="../../assets/images/basicinfo/asterisk.png"
class="nameimg"
src="../../assets/images/basicinfo/asterisk.png"
/>
<div class="inname">项目归属</div>
</div>
@@ -31,26 +33,26 @@
<div class="name">
<div class="namebox">
<img
class="nameimg"
src="../../assets/images/basicinfo/asterisk.png"
class="nameimg"
src="../../assets/images/basicinfo/asterisk.png"
/>
<div class="inname">项目名称</div>
</div>
<div class="in">
<a-input
v-model:value="projectInfo.name"
placeholder="请输入项目名称"
show-count
:maxlength="30"
:disabled="viewDetail ? true : false"
v-model:value="projectInfo.name"
placeholder="请输入项目名称"
show-count
:maxlength="30"
:disabled="viewDetail ? true : false"
/>
</div>
</div>
<div class="name">
<div class="namebox">
<img
class="nameimg"
src="../../assets/images/basicinfo/asterisk.png"
class="nameimg"
src="../../assets/images/basicinfo/asterisk.png"
/>
<div class="inname">分类</div>
</div>
@@ -61,14 +63,14 @@
<div class="name">
<div class="namebox">
<img
class="nameimg"
src="../../assets/images/basicinfo/asterisk.png"
class="nameimg"
src="../../assets/images/basicinfo/asterisk.png"
/>
<div class="inname">封面图</div>
</div>
<div
:class="`box ${projectInfo.picUrl == src?'active':''}`"
style="
:class="`box ${projectInfo.picUrl == src ? 'active' : ''}`"
style="
width: 100px;
height: 100px;
border-radius: 5px;
@@ -76,68 +78,77 @@
position: relative;
overflow: hidden;
"
v-for="(src,index) in projectPic"
:key="index"
@click="()=>{
projectInfo.picUrl = src
}"
v-for="(src, index) in projectPic"
:key="index"
@click="
() => {
projectInfo.picUrl = src;
}
"
>
<img
style="
style="
width: 100px;
height: 100px;
margin-bottom: 4px;
margin-right: 4px;
"
:src="src"
alt="avatar"
:src="src"
alt="avatar"
/>
</div>
</div>
<div class="name">
<div class="namebox">
<img
class="nameimg"
src="../../assets/images/basicinfo/asterisk.png"
class="nameimg"
src="../../assets/images/basicinfo/asterisk.png"
/>
<div class="inname">项目时间</div>
</div>
<div class="in">
<a-range-picker
separator="至"
:placeholder="[' 开始时间', ' 结束时间']"
v-model:value="projectInfo.rangeTime"
style="width: 100%; height: 40px; border-radius: 5px"
valueFormat="YYYY-MM-DD HH:mm:ss"
@change="timeChange"
:disabled="viewDetail ? true : false"
separator="至"
:placeholder="[' 开始时间', ' 结束时间']"
v-model:value="projectInfo.rangeTime"
style="width: 100%; height: 40px; border-radius: 5px"
valueFormat="YYYY-MM-DD HH:mm:ss"
@change="timeChange"
:disabled="viewDetail ? true : false"
/>
</div>
</div>
<div class="name">
<div class="namebox">
<img
class="nameimg"
src="../../assets/images/basicinfo/asterisk.png"
class="nameimg"
src="../../assets/images/basicinfo/asterisk.png"
/>
<div class="inname">项目经理</div>
</div>
<div class="in">
<ProjectManager v-model:value="projectInfo.managerId" v-model:name="projectInfo.manager" mode="multiple"></ProjectManager>
<ProjectManager
v-model:value="projectInfo.managerId"
v-model:name="projectInfo.manager"
mode="multiple"
></ProjectManager>
</div>
</div>
<div class="name">
<div class="namebox">
<img
class="nameimg"
src="../../assets/images/basicinfo/asterisk.png"
class="nameimg"
src="../../assets/images/basicinfo/asterisk.png"
/>
<div class="inname">资源归属</div>
</div>
<div class="in select">
<OrgClass v-model:value="projectInfo.sourceBelongId" v-model:name="projectInfo.sourceBelongName"></OrgClass>
<OrgClass
v-model:value="projectInfo.sourceBelongId"
v-model:name="projectInfo.sourceBelongName"
></OrgClass>
</div>
</div>
<div class="name name2">
@@ -146,12 +157,12 @@
</div>
<div class="in">
<a-textarea
v-model:value="projectInfo.remark"
style="height: 80px"
placeholder="请输入说明"
show-count
:maxlength="200"
:disabled="viewDetail ? true : false"
v-model:value="projectInfo.remark"
style="height: 80px"
placeholder="请输入说明"
show-count
:maxlength="200"
:disabled="viewDetail ? true : false"
/>
</div>
</div>
@@ -160,26 +171,39 @@
<div class="inname">同步学习记录</div>
</div>
<div class="in">
<a-switch
v-model:checked="projectInfo.courseSyncFlag"
:checkedValue="1"
:unCheckedValue="0"
:disabled="viewDetail ? true : false"
><span
<a-checkbox
v-model:checked="courseSyncFlag"
:disabled="viewDetail ? true : false"
><span
style="
width: 100%;
color: rgba(109, 117, 132, 1);
font-size: 14px;
"
>同步课程学习记录如学员在课程库中拥有课程的学习记录自动免修该课程</span
></a-switch>
>同步课程学习记录如学员在课程库中拥有课程的学习记录自动免修该课程</span
></a-checkbox
>
<!-- <a-switch
v-model:checked="projectInfo.courseSyncFlag"
:checkedValue="1"
:unCheckedValue="0"
:disabled="viewDetail ? true : false"
><span
style="
width: 100%;
color: rgba(109, 117, 132, 1);
font-size: 14px;
"
>同步课程学习记录如学员在课程库中拥有课程的学习记录自动免修该课程</span
></a-switch
> -->
</div>
</div>
<div class="name">
<div class="namebox">
<img
class="nameimg"
src="../../assets/images/basicinfo/asterisk.png"
class="nameimg"
src="../../assets/images/basicinfo/asterisk.png"
/>
<div class="inname">项目级别</div>
</div>
@@ -190,8 +214,8 @@
<div class="name">
<div class="namebox">
<img
class="nameimg"
src="../../assets/images/basicinfo/asterisk.png"
class="nameimg"
src="../../assets/images/basicinfo/asterisk.png"
/>
<div class="inname">培训分类</div>
</div>
@@ -201,19 +225,30 @@
</div>
<div class="name">
<div class="namebox">
<!-- <img-->
<!-- class="nameimg"-->
<!-- src="../../assets/images/basicinfo/asterisk.png"-->
<!-- />-->
<img
class="nameimg"
src="../../assets/images/basicinfo/asterisk.png"
class="nameimg"
src="../../assets/images/basicinfo/asterisk.png"
/>
<div class="inname">是否BOEU实施</div>
</div>
<div class="in">
<a-switch
<!-- <a-switch
v-model:checked="projectInfo.boeFlag"
:checkedValue="1"
:unCheckedValue="0"
:disabled="viewDetail ? true : false"
></a-switch>
></a-switch> -->
<a-radio-group
v-model:value="projectInfo.boeFlag"
:disabled="viewDetail ? true : false"
>
<a-radio :style="radioStyle" :value="1"></a-radio>
<a-radio :style="radioStyle" :value="0"></a-radio>
</a-radio-group>
</div>
</div>
</div>
@@ -222,19 +257,19 @@
<div class="inname" style="width: 50px">模版</div>
<div class="in select" style="margin-left: 2px">
<a-select
:getPopupContainer="
:getPopupContainer="
(triggerNode) => {
return triggerNode.parentNode || document.body;
}
"
v-model:value="classifySelect5"
placeholder="请选择模版"
:size="size"
style="width: 100%"
:options="classifyList5"
@change="classificationChange5"
@popupScroll="templateScroll"
:fieldNames="{
v-model:value="classifySelect5"
placeholder="请选择模版"
:size="size"
style="width: 100%"
:options="classifyList5"
@change="classificationChange5"
@popupScroll="templateScroll"
:fieldNames="{
label: 'name',
value: 'projectTemplateId',
}"
@@ -247,26 +282,25 @@
<div class="footer">
<div class="btn">
<a-button v-on:click="createProject" type="primary" class="btn1"
>确定
</a-button
>
>确定
</a-button>
<a-button @click="backPage" class="btn2">取消</a-button>
</div>
</div>
</div>
</template>
<script>
import {onMounted, reactive, toRefs, watch} from "vue";
import {message} from "ant-design-vue";
import {useRoute, useRouter} from "vue-router";
import { onMounted, reactive, toRefs, watch } from "vue";
import { message } from "ant-design-vue";
import { useRoute, useRouter } from "vue-router";
import * as api from "../../api/index";
import {useStore} from "vuex";
import { useStore } from "vuex";
import ProjectClass from "@/components/project/ProjectClass";
import TrainClass from "@/components/project/TrainClass";
import OrgClass from "@/components/project/OrgClass";
import ProjectManager from "@/components/project/ProjectManager";
import ProjectLevel from "@/components/project/ProjectLevel";
import {scrollLoad} from "@/api/method";
import { scrollLoad } from "@/api/method";
export default {
name: "projectAdd",
@@ -275,7 +309,7 @@ export default {
ProjectLevel,
ProjectClass,
TrainClass,
OrgClass
OrgClass,
},
setup() {
const store = useStore();
@@ -294,37 +328,48 @@ export default {
pageSize: 10,
keyWord: "",
},
classifyList5: []
classifyList5: [],
courseSyncFlag: false,
});
onMounted(() => {
state.projectPic = store.state.projectPic.map(e => e.dictValue)
state.viewDetail = routers.query.viewDetail
getProjectInfo()
getTemplate()
})
state.projectPic = store.state.projectPic.map((e) => e.dictValue);
state.viewDetail = routers.query.viewDetail;
getProjectInfo();
getTemplate();
});
watch(routers.query, () => {
state.projectInfo.projectId = routers.query.projectId
state.projectInfo.parentName = routers.query.parentName
state.projectInfo.parentId = routers.query.parentId
})
state.projectInfo.projectId = routers.query.projectId;
state.projectInfo.parentName = routers.query.parentName;
state.projectInfo.parentId = routers.query.parentId;
});
function getProjectInfo() {
if (!routers.query.projectId) {
state.projectInfo = {parentName: routers.query.parentName, parentId: routers.query.parentId}
return
state.projectInfo = {
parentName: routers.query.parentName,
parentId: routers.query.parentId,
};
return;
}
api.getProjectDetail({projectId: routers.query.projectId}).then(res => {
state.projectInfo = res.data.data.projectInfo
state.projectInfo.rangeTime = [state.projectInfo.beginTime, state.projectInfo.endTime]
state.projectInfo.parentName = routers.query.parentName
})
api
.getProjectDetail({ projectId: routers.query.projectId })
.then((res) => {
state.projectInfo = res.data.data.projectInfo;
state.projectInfo.rangeTime = [
state.projectInfo.beginTime,
state.projectInfo.endTime,
];
state.projectInfo.parentName = routers.query.parentName;
state.courseSyncFlag = state.projectInfo.courseSyncFlag
? true
: false;
});
}
const backPage = () => {
router.back()
router.back();
};
//选择分类
@@ -333,24 +378,24 @@ export default {
state.projectType = value; //分类选择的id
};
const classificationChange5 = (key, option) => {
state.projectInfo = option
state.projectInfo.type = 3
state.projectInfo.rangeTime = [option.beginTime, option.endTime]
state.projectInfo.parentName = routers.query.parentName
state.projectInfo.parentId = routers.query.parentId
state.projectInfo = option;
state.projectInfo.type = 3;
state.projectInfo.rangeTime = [option.beginTime, option.endTime];
state.projectInfo.parentName = routers.query.parentName;
state.projectInfo.parentId = routers.query.parentId;
};
//获取模版列表
const getTemplate = () => {
let obj = {
pageNo: state.currentPage,
pageSize: state.pageSize,
status: 1,
};
api.getTemplate(obj).then((res) => {
state.totalPages = Number(res.data.data.pages);
state.classifyList5 = res.data.data.rows
})
state.classifyList5 = res.data.data.rows;
});
};
//模版滚动加载模板信息
@@ -376,18 +421,19 @@ export default {
sourceBelongId: "请选择资源归属",
level: "请填写项目级别",
systemId: "请填写项目培训体系",
boeFlag: "请选择是否BOEU实施",
};
function timeChange(e) {
if (e && e.length === 2) {
state.projectInfo.beginTime = e[0]
state.projectInfo.endTime = e[1]
state.projectInfo.beginTime = e[0];
state.projectInfo.endTime = e[1];
}
}
function validate(obj, errorMsgs) {
for (let i in errorMsgs) {
if (!obj[i]) {
if (!obj[i] && obj[i] !== 0) {
message.destroy();
message.warning(errorMsgs[i]);
return false;
@@ -401,13 +447,13 @@ export default {
if (!validate(state.projectInfo, errorMsgs)) {
return;
}
state.projectInfo.type = 3
state.projectInfo.type = 3;
state.projectInfo.courseSyncFlag = state.courseSyncFlag ? 1 : 0;
api.createProject(state.projectInfo).then(() => {
message.destroy();
message.success("编辑成功");
router.back()
}
)
message.destroy();
message.success("编辑成功");
router.back();
});
};
return {
@@ -417,7 +463,7 @@ export default {
classificationChange5,
createProject,
backPage,
templateScroll
templateScroll,
};
},
};
@@ -521,7 +567,6 @@ export default {
position: relative;
margin-left: 14px;
.box1 {
position: absolute;
left: 50%;

View File

@@ -47,14 +47,14 @@
showSearch
></a-select>
</div>
<!-- <div class="select">-->
<!-- <a-date-picker-->
<!-- v-model:value="searchParam.createTime"-->
<!-- type="date"-->
<!-- placeholder="创建时间"-->
<!-- style="width: 270px"-->
<!-- />-->
<!-- </div>-->
<div class="select">
<a-range-picker
v-model:value="searchParam.valueDate"
style="border-radius: 8px; height: 40px; margin-left: 5px"
:placeholder="[' 开始时间', ' 结束时间']"
valueFormat="X"
/>
</div>
<div style="display: flex; margin-bottom: 20px">
<div class="btnn btn1" @click="searchSubmit">
<div class="search"></div>
@@ -148,7 +148,7 @@
>
<div class="headerLeft" style="margin-left: 32px">
<span class="headerLeftText" style="font-size: 16px"
>{{ projectInfo.projectId ? '编辑' : '创建' }}多层项目</span
>{{ projectInfo.projectId ? "编辑" : "创建" }}多层项目</span
>
</div>
<div style="cursor: pointer; margin-right: 32px" @click="closeModal2">
@@ -159,9 +159,14 @@
</div>
</div>
<div class="modalMain">
<div style="margin-left: 40px; margin-top: 40px;width:78%" v-if="projectInfo.parentName">
<div
style="margin-left: 40px; margin-top: 40px; width: 78%"
v-if="projectInfo.parentName"
>
<span style="color: #000000; font-size: 14px">项目归属</span>
<span style="color: #999999; font-size: 14px; margin-left: 10px">{{ projectInfo.parentName }}</span>
<span style="color: #999999; font-size: 14px; margin-left: 10px">{{
projectInfo.parentName
}}</span>
</div>
<div class="name">
<div class="star" style="margin-top: -4px">
@@ -202,7 +207,11 @@
</div>
<div class="inname">项目经理:</div>
<div class="in">
<ProjectManager v-model:value="projectInfo.managerId" v-model:name="projectInfo.manager" mode="multiple"></ProjectManager>
<ProjectManager
v-model:value="projectInfo.managerId"
v-model:name="projectInfo.manager"
mode="multiple"
></ProjectManager>
</div>
</div>
<div class="name">
@@ -214,16 +223,17 @@
</div>
<div class="inname">资源归属:</div>
<div class="in select">
<OrgClass v-model:value="projectInfo.sourceBelongId"
v-model:name="projectInfo.sourceBelongName"></OrgClass>
<OrgClass
v-model:value="projectInfo.sourceBelongId"
v-model:name="projectInfo.sourceBelongName"
></OrgClass>
</div>
</div>
<div class="pubtn">
<a-button class="pubtn1" @click="closeModal2">取消</a-button>
<a-button class="pubtn2" @click="createStoreyProject"
>确定
</a-button
>
</a-button>
</div>
</div>
</a-modal>
@@ -347,7 +357,11 @@
</div>
</div>
<div class="modalMain">
<router-link :to="`/projectadd?parentId=${projectInfo.parentId || ''}&parentName=${projectInfo.parentName || ''}`">
<router-link
:to="`/projectadd?parentId=${
projectInfo.parentId || ''
}&parentName=${projectInfo.parentName || ''}`"
>
<div
class="taskbox"
style="
@@ -722,7 +736,6 @@
</div>
</div>
</a-modal>
<!-- 授权名单抽屉 -->
<proj-power-list
v-model:ProjPvisible="ProjPvisible"
@@ -762,7 +775,6 @@ import ProjPowerList from "../../components/drawers/ProjPowerList";
import ProjCheckShip from "../../components/drawers/ProjCheckPower";
import * as api from "../../api/index";
import * as api1 from "../../api/index1";
import {toDate} from "../../api/method";
import {storage} from "../../api/storage";
import ProjectManager from "@/components/project/ProjectManager";
import ProjectClass from "@/components/project/ProjectClass";
@@ -776,7 +788,7 @@ export default {
ProjCheckShip,
ProjectManager,
ProjectClass,
OrgClass
OrgClass,
// ProjManageShip
},
setup() {
@@ -803,23 +815,18 @@ export default {
reminderModal: false, //温馨提示弹窗
reviewModal: false, //提交审核
recallReviewModal: false, //撤回审核
ProjOwnervisible: false,
ProjPvisible: false,
ProjCheckvisible: false,
ProjManagevisible: false,
currentProjectId: "",
currentProjectName: "",
currentEdProjectName: "",
currentEditChildrensProjectId: "",
dcProjectID: "",
currentPage: 1, //当前页
tableDataTotal: -1, //学习路径列表总数
pageSize: 10, //每页10条数据
projectStudentsNum: 0, //发布弹窗-学员人
projectStages: 0,
projectTasks: 0,
@@ -833,12 +840,9 @@ export default {
copyProjectId: null, //复制项目id
reviewId: null, //提交审核id
recallReviewId: null, //撤回审核id
selectProjectId: null, //选择的授权id
addAuthList: null, //确定授权列表
authClassify: null, //显示的是管理权还是查看权
currentPage1: 1, //项目经理分页
pageSize1: 10,
projectInfo: {},
@@ -853,11 +857,11 @@ export default {
searchParam: {
pageNo: 1,
pageSize: 10,
}
},
valueDate: [],
});
// 数据接入 - start -
const router = useRouter();
const sProjectStateList = ref([
{value: 0, label: "草稿"},
{value: 1, label: "审核中"},
@@ -865,16 +869,25 @@ export default {
{value: 3, label: "已发布"},
{value: -2, label: "未通过"},
]);
const searchReset = () => {
state.searchParam = {pageNo: 1, pageSize: 10}
getTableDate()
state.searchParam = {pageNo: 1, pageSize: 10};
getTableDate();
};
const searchSubmit = () => {
state.searchParam.pageNo = 1;
getTableDate();
};
const searchSubmit = () => {
state.searchParam.pageNo = 1
getTableDate()
};
function timeChange(e) {
console.log(e);
if (e && e.length === 2) {
state.searchParam.beginTime = e[0];
state.searchParam.endTime = e[1];
} else {
state.searchParam.beginTime = "";
state.searchParam.endTime = "";
}
}
function validate(obj, errorMsgs) {
for (let i in errorMsgs) {
@@ -905,11 +918,11 @@ export default {
message.success("创建成功");
state.currentPage = 1;
getTableDate();
})
}
});
};
// 取消按钮 清空输入的数据
const closeModal2 = () => {
state.projectInfo = {}
state.projectInfo = {};
// value1.value = "";
// type = "";
// manager = "";
@@ -925,7 +938,6 @@ export default {
const closeeditModal2 = () => {
state.eddoublepro = false;
};
// 创建单层子项目 (需要传入多层项目的ProjectID)
const createChildProject = () => {
console.log(state.currentProjectId);
@@ -937,17 +949,13 @@ export default {
},
});
};
// 取消按钮 清空数据
const closeModal3 = () => {
state.doublesonpro = false;
};
const closeeditModal3 = () => {
state.eddoublesonpro = false;
};
//打开发布弹窗
const showProjectPub = (object) => {
state.projectPub = true;
@@ -1114,7 +1122,7 @@ export default {
message.success("模版保存成功");
state.startModal = false;
getTableDate();
})
});
};
//关闭存为模版弹窗
const closeStartModal = () => {
@@ -1135,18 +1143,19 @@ export default {
projectId: state.copyProjectId,
type: 2,
};
api.handleProject(obj).then((res) => {
console.log("复制成功", res);
message.destroy();
message.success("复制成功");
state.copyModal = false;
getTableDate();
})
api
.handleProject(obj)
.then((res) => {
console.log("复制成功", res);
message.destroy();
message.success("复制成功");
state.copyModal = false;
getTableDate();
})
.catch((err) => {
console.log("复制失败", err);
});
};
//打开提交审核弹窗
const showReviewModal = (projectId) => {
state.reviewModal = true;
@@ -1176,7 +1185,6 @@ export default {
const closeReviewModal = () => {
state.reviewModal = false;
};
//打开撤回审核弹窗
const showRecallReviewModal = (projectId) => {
state.recallReviewModal = true;
@@ -1206,15 +1214,12 @@ export default {
const closeRecallReviewModal = () => {
state.recallReviewModal = false;
};
const expandTable = (e, a) => {
// console.log("惦记了");
console.log("e", e, a);
};
// 获取项目列表信息
let tableData = ref([]);
const columns = ref([
{
title: "项目名称",
@@ -1319,255 +1324,288 @@ export default {
fixed: "right",
customRender: (value) => {
// console.log("value", value.record.type, value.record.status);
return <div className="operation">
{value.record.status === 0 || value.record.status === -2 ? <span
onClick={() => {
if (value.record.type === 1 || value.record.type === 2) {
state.doublepro = true;
state.projectInfo = value.record
} else {
console.log(value.record)
router.push({
path: '/projectadd', query: {
projectId: value.record.projectId,
parentId: value.record.parentId,
parentName: value.record.parentName
return (
<div className="operation">
{value.record.status === 0 || value.record.status === -2 ? (
<span
onClick={() => {
if (value.record.type === 1 || value.record.type === 2) {
state.doublepro = true;
state.projectInfo = value.record;
} else {
console.log(value.record);
router.push({
path: "/projectadd",
query: {
projectId: value.record.projectId,
parentId: value.record.parentId,
parentName: value.record.parentName,
},
});
}
})
}
}}
style="cursor:pointer;"
className="operation1"
>
}}
style="cursor:pointer;"
className="operation1"
>
编辑
</span>
: ''}
{(value.record.status === 0 || value.record.status === -2) && value.record.type === 3 ?
<span
onClick={() => {
showReviewModal(value.record.projectId);
}}
style="cursor:pointer"
class="operation3"
>
提交审核
</span>
: ''}
{value.record.status === 1 && value.record.type !== 1 ?
<span
onClick={() => {
showRecallReviewModal(value.record.projectId);
}}
style="cursor:pointer"
class="operation3"
>
撤回审核
</span> : ''}
{value.record.status === 2 ?
<span
onClick={() => {
console.log("value.record", value.record);
let beginTime = value.record.beginTime
? toDate(value.record.beginTime, "Y/M/D")
: "";
let endTime = value.record.beginTime
? toDate(value.record.endTime, "Y/M/D")
: "";
let time =
beginTime && endTime ? beginTime + "-" + endTime : "";
let obj = {
projectId: value.record.projectId,
name: value.record.name,
time: time,
};
showProjectPub(obj);
}}
style="cursor:pointer"
class="operation3"
>
发布
</span>
: ''}
<div className="tableSelect">
<a-select
style="width: 50px"
value="授权"
// options={state.projectNameList}
dropdownClassName="tabledropdown"
>
<a-select-option value="权限名单" label="权限名单">
<div
onClick={() => {
showProjPrower(value.record.projectId);
}}
) : (
""
)}
{(value.record.status === 0 || value.record.status === -2) &&
value.record.type === 3 ? (
<span
onClick={() => {
showReviewModal(value.record.projectId);
}}
style="cursor:pointer"
class="operation3"
>
提交审核
</span>
) : (
""
)}
{value.record.status === 1 && value.record.type !== 1 ? (
<span
onClick={() => {
showRecallReviewModal(value.record.projectId);
}}
style="cursor:pointer"
class="operation3"
>
撤回审核
</span>
) : (
""
)}
{value.record.status === 2 ? (
<span
onClick={() => {
let time = value.record.beginTime + "-" + value.record.beginTime;
let obj = {
projectId: value.record.projectId,
name: value.record.name,
time: time,
};
showProjectPub(obj);
}}
style="cursor:pointer"
class="operation3"
>
发布
</span>
) : (
""
)}
<div className="tableSelect">
<a-select
style="width: 50px"
value="授权"
// options={state.projectNameList}
dropdownClassName="tabledropdown"
>
权限名单
</div>
</a-select-option>
<a-select-option value="归属权" label="归属权">
<div
onClick={() => {
console.log("点击了111");
showProjOwner(value.record.projectId);
}}
>
归属权
</div>
</a-select-option>
<a-select-option value="查看权" label="查看权">
<div
onClick={() => {
console.log("点击了111");
showProjCheck(value.record.projectId);
}}
>
查看权
</div>
</a-select-option>
<a-select-option value="管理权" label="管理权">
<div
onClick={() => {
showProjManage(value.record.projectId);
}}
>
管理权
</div>
</a-select-option>
</a-select>
</div>
{value.record.type === 1 ? <span
className="operation3"
style="cursor: pointer"
onClick={() => {
state.projectInfo = {parentName: value.record.name, parentId: value.record.projectId,type:2};
state.reminderModal = true;
}}
>
创建子项目
</span> : ''}
{value.record.type === 2 ? <span
className="operation3"
style="cursor: pointer"
onClick={() => {
router.push({
path: '/projectadd', query: {
parentId: value.record.projectId,
parentName: value.record.name
}
})
}}
>
创建班级
</span> : ''}
<div className="tableSelect">
<a-select
style="width: 50px"
value="更多"
// options={state.projectNameList}
dropdownClassName="tabledropdown"
>
<a-select-option value="复制" label="复制">
<div
onClick={() => {
showCopyModal(value.record.projectId);
}}
>
复制
</div>
</a-select-option>
<a-select-option value="删除" label="删除">
<div
onClick={() => {
showDeleteModal(value.record.projectId);
}}
>
删除
</div>
</a-select-option>
{value.record.type === 3 ?
<a-select-option value="存为模版" label="存为模版">
<a-select-option value="权限名单" label="权限名单">
<div
onClick={() => {
showStartModal(value.record.projectId);
showProjPrower(value.record.projectId);
}}
>
存为模版
权限名单
</div>
</a-select-option> : ''}
{value.record.type === 3 ?
<a-select-option value="基础信息" label="基础信息">
</a-select-option>
<a-select-option value="归属权" label="归属权">
<div
onClick={() => {
router.push({
path: "/taskpage",
});
storage.set("projectId", value.record.projectId);
console.log("点击了111");
showProjOwner(value.record.projectId);
}}
>
基础信息
归属权
</div>
</a-select-option> : ''}
</a-select>
</div>
</div>
}
}
</a-select-option>
<a-select-option value="查看权" label="查看权">
<div
onClick={() => {
console.log("点击了111");
showProjCheck(value.record.projectId);
}}
>
查看权
</div>
</a-select-option>
<a-select-option value="管理权" label="管理权">
<div
onClick={() => {
showProjManage(value.record.projectId);
}}
>
管理权
</div>
</a-select-option>
</a-select>
</div>
{value.record.type === 1 ? (
<span
className="operation3"
style="cursor: pointer"
onClick={() => {
state.projectInfo = {
parentName: value.record.name,
parentId: value.record.projectId,
type: 2,
};
state.reminderModal = true;
}}
>
创建子项目
</span>
) : (
""
)}
{value.record.type === 2 ? (
<span
className="operation3"
style="cursor: pointer"
onClick={() => {
router.push({
path: "/projectadd",
query: {
parentId: value.record.projectId,
parentName: value.record.name,
},
});
}}
>
创建班级
</span>
) : (
""
)}
<div className="tableSelect">
<a-select
style="width: 50px"
value="更多"
// options={state.projectNameList}
dropdownClassName="tabledropdown"
>
<a-select-option value="复制" label="复制">
<div
onClick={() => {
showCopyModal(value.record.projectId);
}}
>
复制
</div>
</a-select-option>
<a-select-option value="删除" label="删除">
<div
onClick={() => {
showDeleteModal(value.record.projectId);
}}
>
删除
</div>
</a-select-option>
{value.record.type === 3 ? (
<a-select-option value="存为模版" label="存为模版">
<div
onClick={() => {
showStartModal(value.record.projectId);
}}
>
存为模版
</div>
</a-select-option>
) : (
""
)}
{value.record.type === 3 ? (
<a-select-option value="基础信息" label="基础信息">
<div
onClick={() => {
router.push({
path: "/taskpage",
});
storage.set("projectId", value.record.projectId);
}}
>
基础信息
</div>
</a-select-option>
) : (
""
)}
</a-select>
</div>
</div>
);
},
},
]);
const getTableDate = () => api.getProjectList(state.searchParam).then((res) => {
console.log(res);
state.tableDataTotal = Number(res.data.data.total);
const data = res.data.data.rows;
initDataSublist('', data)
console.log(data)
tableData.value = data;
console.log("tableData", tableData);
});
const getTableDate = () =>
api
.getProjectList({
...state.searchParam,
beginTime:
state.searchParam.valueDate &&
state.searchParam.valueDate.length === 2
? state.searchParam.valueDate[0]
: "",
endTime:
state.searchParam.valueDate &&
state.searchParam.valueDate.length === 2
? state.searchParam.valueDate[1]
: "",
})
.then((res) => {
console.log(res);
state.tableDataTotal = Number(res.data.data.total);
const data = res.data.data.rows;
initDataSublist("", data);
console.log(data);
tableData.value = data;
console.log("tableData", tableData);
});
function initDataSublist(parentName, data) {
if (data && data.length) {
data.forEach(e => {
e.parentName = parentName
e.key = e.projectId
initDataSublist(e.name, e.subList)
e.subList && e.subList.length && (e.children = e.subList)
})
data.forEach((e) => {
e.parentName = parentName;
e.key = e.projectId;
initDataSublist(e.name, e.subList);
e.subList && e.subList.length && (e.children = e.subList);
});
}
}
getTableDate();
// 翻页
const changePagination = (page) => {
state.searchParam.pageNo = page
getTableDate()
state.searchParam.pageNo = page;
getTableDate();
};
const showModal = () => {
state.sonproject = true;
};
const closeModal = () => {
state.sonproject = false;
};
const showModal1 = () => {
state.projectInfo = {}
state.projectInfo = {};
state.reminderModal = true;
};
const closeModal1 = () => {
state.estabish = false;
};
const showModal2 = () => {
state.doublepro = true;
state.estabish = false;
};
const showModal3 = () => {
state.doublesonpro = true;
state.sonproject = false;
};
const showProjOwner = (id) => {
state.ProjOwnervisible = true;
state.selectProjectId = id;
@@ -1587,7 +1625,6 @@ export default {
// state.ProjManagevisible = true;
state.ProjCheckvisible = true;
};
const closeReminderModal = () => {
state.reminderModal = false;
};
@@ -1595,9 +1632,10 @@ export default {
state.reminderModal = false;
state.estabish = true;
};
//添加权限
watch(() => state.addAuthList, (res) => {
watch(
() => state.addAuthList,
(res) => {
console.log("res", res, state.addAuthList);
let obj = {
type: 2,
@@ -1623,9 +1661,10 @@ export default {
console.log("添加授权失败", err);
});
}
)
);
return {
...toRefs(state),
timeChange,
expandTable,
showModal,
closeModal,
@@ -1657,7 +1696,6 @@ export default {
showRecallReviewModal,
recallReviewProject,
closeRecallReviewModal,
tableData,
columns,
createStoreyProject,
@@ -1679,8 +1717,7 @@ export default {
okReminderModal,
};
},
}
;
};
</script>
<style lang="scss">
.projectManage {
@@ -1801,7 +1838,6 @@ export default {
.btns {
display: flex;
// flex-wrap: wrap;
.btn {
padding: 0px 26px 0px 26px;
@@ -1884,7 +1920,6 @@ export default {
font-size: 14px;
font-weight: 400;
color: #4ea6ff;
// line-height: 36px;
.operation1 {
margin-left: 21px;
@@ -1905,7 +1940,6 @@ export default {
margin-left: 21px;
position: relative;
text-align: left;
// z-index: 99999;
.moreArrow {
width: 13px;
@@ -1971,7 +2005,6 @@ export default {
align-items: center;
height: 40px;
// border: 1px solid black;
.inname {
color: #000000;
font-size: 14px;
@@ -2009,7 +2042,6 @@ export default {
display: flex;
justify-content: center;
margin-top: 25px;
//margin-bottom: 29px;
.pubtn1 {
width: 100px;
@@ -2070,7 +2102,6 @@ export default {
align-items: center;
height: 40px;
// border: 1px solid black;
.inname {
color: #000000;
font-size: 14px;
@@ -2108,7 +2139,6 @@ export default {
display: flex;
justify-content: center;
margin-top: 25px;
//margin-bottom: 29px;
.pubtn1 {
width: 100px;
@@ -2159,7 +2189,6 @@ export default {
display: flex;
justify-content: center;
margin-top: 48px;
//margin-bottom: 40px;
.taskbox {
width: 310px;
@@ -2227,7 +2256,6 @@ export default {
flex-direction: column;
align-items: center;
margin-top: 48px;
//margin-bottom: 40px;
.taskbox {
width: 438px;
@@ -2319,7 +2347,6 @@ export default {
background: #ffffff;
box-shadow: 0px 1px 35px 0px rgba(118, 136, 166, 0.21);
border-radius: 4px;
// position: absolute;
// left: 50%;
// top: 10%;
@@ -2396,7 +2423,6 @@ export default {
display: flex;
align-items: center;
justify-content: center;
flex-shrink: 0;
cursor: pointer;

File diff suppressed because it is too large Load Diff

View File

@@ -343,7 +343,14 @@
<span class="editext">编辑</span>
</router-link>
</div> -->
<div class="taskSyllabus">
<div
class="taskSyllabus"
v-if="
taskSyllabus &&
taskSyllabus.length &&
(taskSyllabus.length > 1 || taskSyllabus[0].name)
"
>
<a-collapse v-model:activeKey="taskSyllabusActive" accordion>
<template #expandIcon="{ isActive }">
<img
@@ -383,31 +390,33 @@
>
<img
:src="
item.type == '1'
item.type == 1
? require('../../assets/images/leveladd/zai.png')
: item.type == '2'
: item.type == 2
? require('../../assets/images/leveladd/mian.png')
: item.type == '3'
: item.type == 3
? require('../../assets/images/leveladd/an.png')
: item.type == '4'
: item.type == 4
? require('../../assets/images/leveladd/zuo.png')
: item.type == '5'
: item.type == 5
? require('../../assets/images/leveladd/kao.png')
: item.type == '6'
: item.type == 6
? require('../../assets/images/leveladd/zhi.png')
: item.type == '7'
: item.type == 7
? require('../../assets/images/leveladd/wai.png')
: item.type == '8'
: item.type == 8
? require('../../assets/images/leveladd/tao.png')
: item.type == '9'
: item.type == 9
? require('../../assets/images/leveladd/huo.png')
: item.type == '10'
: item.type == 10
? require('../../assets/images/leveladd/ce.png')
: item.type == '11'
? require('../../assets/images/leveladd/diao.png')
: item.type == '12'
: item.type == 11
? require('../../assets/images/leveladd/pinggu.png')
: item.type == 12
? require('../../assets/images/leveladd/tou.png')
: null
: item.type == 13
? require('../../assets/images/leveladd/tou.png')
: require('../../assets/images/leveladd/xiangmu.png')
"
/>
</div>
@@ -427,11 +436,23 @@
</div>
<div class="time">
<div class="timetext">开始时间</div>
<div class="timetext">{{item.createTime?toDate(Number(item.createTime),"Y-M-D"):'---'}}</div>
<div class="timetext">
{{
item.startTime !== null ? item.startTime: ''
}}
</div>
</div>
<div class="progress">
<div class="progresstext">
{{ item.finishStuCnt&&item.finishStuCnt!==null?item.finishStuCnt:0 }}/{{ item.totalStuCnt&&item.totalStuCnt!==null?item.totalStuCnt:0 }}
{{
item.finishStuCnt && item.finishStuCnt !== null
? item.finishStuCnt
: 0
}}/{{
item.totalStuCnt && item.totalStuCnt !== null
? item.totalStuCnt
: 0
}}人
</div>
<div style="display: flex">
<a-progress
@@ -442,7 +463,12 @@
/>
<span class="progresstext" style="margin-left: 10px"
>{{
(item.finishStuCnt&&item.finishStuCnt!==null?item.finishStuCnt:0 / item.totalStuCnt&&item.totalStuCnt!==null?item.totalStuCnt:0) * 100
(item.finishStuCnt && item.finishStuCnt !== null
? item.finishStuCnt
: 0 / item.totalStuCnt &&
item.totalStuCnt !== null
? item.totalStuCnt
: 0) * 100
}}%</span
>
</div>
@@ -533,6 +559,31 @@
</router-link>
<!-- 无数据创建任务 -->
</div>
<div v-else>
<div
class="taskbox"
@click="
() => {
routered.push({ path: '/taskadd' });
}
"
style="background: linear-gradient(180deg, #fef3dd, #fffaf0)"
>
<div class="leftt">
<img src="../../assets/images/taskpage/left1.png" />
</div>
<div class="photo">
<img src="../../assets/images/taskpage/picture1.png" />
</div>
<div class="rightt">
<img src="../../assets/images/taskpage/right1.png" />
</div>
<div class="centerbox" style="color: rgba(255, 182, 78, 1)">
添加任务
</div>
<div class="centermain">快速添加任务/阶段</div>
</div>
</div>
<div style="display: flex; height: 20px"></div>
</div>
</a-tab-pane>
@@ -666,11 +717,11 @@
style="border: 1px solid #f2f6fe"
:columns="studentColumns()"
:data-source="tabledata"
:loading="tableDataTotal === -1 ? true : false"
expandRowByClick="true"
:scroll="{ x: 1400 }"
@expand="expandTable"
:pagination="false"
:loading="loading"
:row-selection="{
columnWidth: 30,
selectedRowKeys: selectedRowKeys,
@@ -766,28 +817,28 @@
@click="showMemberList(item.projectGroupId)"
>
<div class="ftext">组员名单 ></div>
<div class="peoples">
<!-- <div class="peoples">
<div class="people1">
<img
src="../../assets/images/taskpage/people1.png"
src="../../assets/images/taskpage/people1.png"
/>
</div>
<div class="people2">
<img
src="../../assets/images/taskpage/people2.png"
src="../../assets/images/taskpage/people2.png"
/>
</div>
<div class="people3">
<img
src="../../assets/images/taskpage/people3.png"
src="../../assets/images/taskpage/people3.png"
/>
</div>
<div class="people4">
<img
src="../../assets/images/taskpage/people4.png"
src="../../assets/images/taskpage/people4.png"
/>
</div>
</div>
</div> -->
</div>
</div>
</div>
@@ -799,12 +850,12 @@
<a-tab-pane key="4" tab="公告">
<div class="split"></div>
<a-tabs v-model:activeKey="activeKeyNotice">
<a-tab-pane key="11" tab="公告"
><NoticePub v-model:projectId="projectId"></NoticePub
></a-tab-pane>
<a-tab-pane key="12" tab="历史公告" force-render
><NoticeHis v-model:projectId="projectId"></NoticeHis
></a-tab-pane>
<a-tab-pane key="11" tab="公告">
<NoticePub v-model:projectId="projectId"></NoticePub>
</a-tab-pane>
<a-tab-pane key="12" tab="历史公告" force-render>
<NoticeHis v-model:projectId="projectId"></NoticeHis>
</a-tab-pane>
</a-tabs>
</a-tab-pane>
<!-- 2022-11-30注释 后面放开 -->
@@ -992,7 +1043,7 @@
<div class="set_content">
<div class="setc_name"><span>同步学习记录:</span></div>
<div class="setc_main">
<a-radio v-model:checked="checkedSty"
<a-radio v-model:checked="checkedSty" :disabled="true"
><span style="color: #333333"
>同步课程学习记录(如学员在课程库中拥有课程的学习记录,自动免修该课程)</span
></a-radio
@@ -1002,19 +1053,29 @@
<div class="set_content">
<div class="setc_name"><span>项目级别:</span></div>
<div class="setc_main">
<span style="color: #999999">{{ level }}</span>
<span style="color: #999999"
><ProjectLevel
v-model:value="level"
:disabled="true"
></ProjectLevel
></span>
</div>
</div>
<div class="set_content">
<div class="setc_name"><span>培训体系:</span></div>
<div class="setc_main">
<span style="color: #999999">{{ systemId }}</span>
<span style="color: #999999"
><TrainClass
v-model:value="systemId"
:disabled="true"
></TrainClass
></span>
</div>
</div>
<div class="set_content">
<div class="setc_name"><span>是否BOEU实施</span></div>
<div class="setc_main">
<a-radio v-model:checked="checkedBOEU"
<a-radio v-model:checked="checkedBOEU" :disabled="true"
><span style="color: #333333">BOEU实施</span></a-radio
>
</div>
@@ -1036,7 +1097,7 @@
</div>
<div class="btnbox" style="margin: 20px">
<a-upload
v-if="(docChecked==true)"
v-if="docChecked == true"
v-model:file-list="fileList"
name="file"
action="/manageApi/file/upload"
@@ -1053,7 +1114,11 @@
alt=""
/>
</a-upload>
<div v-if="(docChecked==true)" class="btnbox" style="margin: 20px">
<div
v-if="docChecked == true"
class="btnbox"
style="margin: 20px"
>
<span style="color: #999999">
支持pdf.ppt.pptx.doc.docx.xls.xlsx.jpeg.png.gif.zip
</span>
@@ -1394,11 +1459,11 @@
<span>您确定要删除此学员吗</span>
</div>
<div class="del_btnbox">
<div class="del_btn btn1">
<div class="btnText" @click="closeDeleteOne">取消</div>
<div class="del_btn btn1" @click="closeDeleteOne">
<div class="btnText">取消</div>
</div>
<div class="del_btn btn2">
<div class="btnText" @click="closeDeleteOneConfirm">确定</div>
<div class="del_btn btn2" @click="closeDeleteOneConfirm">
<div class="btnText">确定</div>
</div>
</div>
</div>
@@ -1462,11 +1527,11 @@
<span>您确定批量删除吗?</span>
</div>
<div class="del_btnbox">
<div class="del_btn btn1">
<div class="btnText" @click="closeCancelDelete">取消</div>
<div class="del_btn btn1" @click="closeCancelDelete">
<div class="btnText">取消</div>
</div>
<div class="del_btn btn2">
<div class="btnText" @click="closeAllDelete">确定</div>
<div class="del_btn btn2" @click="closeAllDelete">
<div class="btnText">确定</div>
</div>
</div>
</div>
@@ -1700,9 +1765,14 @@ import projSet from "../../components/Modals/projSet";
import { overview } from "../../api/indexProjStu";
import TwoDimensionalCode from "../../components/TwoDimensionalCode.vue";
import { useStore } from "vuex";
import ProjectLevel from "@/components/project/ProjectLevel";
import TrainClass from "@/components/project/TrainClass";
export default {
name: "taskPage",
components: {
ProjectLevel,
TrainClass,
TimeManage,
FaceManage,
SubsetManage,
@@ -1726,6 +1796,7 @@ export default {
setup() {
const store = useStore();
const state = reactive({
loading: false,
projectId: storage.get("projectId")
? JSON.parse(storage.get("projectId"))
: null,
@@ -2914,18 +2985,18 @@ export default {
</div>
{/**
2022-11-30注释 后面放开
<div
class="studentopea2"
onClick={() => {
2022-11-30注释 后面放开
<div
class="studentopea2"
onClick={() => {
state.Seevisible = true;
console.log(text.record.studentId, "点击了查看");
state.checkStuId = text.record.studentId;
}}
>
查看
</div>
*/}
>
查看
</div>
*/}
<div class="studentSelect">
<a-select
style="width: 50px"
@@ -3047,6 +3118,7 @@ export default {
//点击确认删除单个学员
const closeDeleteOneConfirm = () => {
state.deleteOneStu = false;
state.loading = true;
deleteStu({
projectId: state.projectId,
studentIds: state.chooseDeleteOne,
@@ -3077,6 +3149,7 @@ export default {
};
//点击确定的批量删除弹窗
const closeAllDelete = () => {
state.loading = true;
deleteStu({
projectId: state.projectId,
studentIds: state.selectedRows,
@@ -3236,6 +3309,7 @@ export default {
// studentData();
}
}
state.loading = false;
})
.catch((err) => {
console.log("获取学员列表失败", err);
@@ -3249,39 +3323,21 @@ export default {
console.log("get task", res.data.data);
let info = res.data.data.projectInfo;
// let start = toDate(info.beginTime / 1000, "Y-M-D h:m");
let start = info.beginTime
let start = info.beginTime;
// let end = toDate(info.endTime / 1000, "Y-M-D h:m");
let end = info.endTime
let end = info.endTime;
state.tstartTime = info.beginTime;
state.tendTime = info.endTime;
state.tsourceBelong = info.sourceBelongId;
state.tsourceBelong = info.sourceBelongName;
state.parentId = info.parentId;
state.name = info.name;
state.startTime = start;
state.endTime = end;
state.manager = info.manager;
state.remark = info.remark;
state.level =
info.level == 1
? "集团级"
: info.level == 2
? "组织级"
: info.level == 3
? "现地级"
: info.level == 4
? "部门级"
: "-";
state.level = info.level;
state.tlevel = info.level;
state.systemId =
info.systemId == 1
? "集团级"
: info.systemId == 2
? "组织级"
: info.systemId == 3
? "现地级"
: info.systemId == 4
? "部门级"
: "-";
state.systemId = info.systemId;
state.tsystemId = info.systemId;
state.checkedSty = info.courseSyncFlag == 1 ? true : false;
state.courseSyncFlag = info.courseSyncFlag;
@@ -3296,14 +3352,7 @@ export default {
state.noticeFlag = info.noticeFlag;
// state.attach = info.attach;
// state.templateId = info.templateId;
state.sourceBelong =
info.sourceBelongId == 1
? "项目一"
: info.sourceBelongId == 2
? "项目二"
: info.sourceBelongId == 3
? "项目三"
: "-";
state.sourceBelong = info.sourceBelongName;
// state.fileList=info.attach.split(",")
let d = info.attach.indexOf(",");
// console.log(info.attach, "xgo", info.attach.length);
@@ -3713,6 +3762,7 @@ export default {
projectGroupId: 0,
};
console.log("obj", obj);
state.loading = true;
api
.addStudentProject(obj)
.then((res) => {
@@ -3825,7 +3875,8 @@ export default {
templateProject,
changeGrouped,
deFile,
toDate
toDate,
routered,
};
},
};
@@ -4497,12 +4548,14 @@ export default {
.ant-modal {
.ant-modal-body {
padding: 0;
.modalHeader {
background: linear-gradient(
rgba(78, 166, 255, 0.2) 0%,
rgba(78, 166, 255, 0) 100%
);
}
.modalMain {
.projectname {
color: rgba(79, 81, 86, 1);
@@ -4512,23 +4565,28 @@ export default {
font-weight: 500;
text-align: center;
}
.projecttime {
margin-left: 221px;
.timeti {
color: rgba(153, 155, 163, 1);
font-size: 14px;
line-height: 36px;
}
.timeme {
color: rgba(79, 81, 86, 1);
font-size: 14px;
line-height: 36px;
}
}
.projectbox {
margin-top: 26px;
display: flex;
justify-content: center;
.promessage {
width: 280px;
height: 110px;
@@ -4539,6 +4597,7 @@ export default {
);
border-radius: 10px;
margin-right: 7px;
.messageme {
color: rgba(255, 182, 78, 1);
font-size: 14px;
@@ -4546,12 +4605,14 @@ export default {
margin-top: 17px;
margin-left: 30px;
}
.messagege {
color: rgba(153, 155, 163, 1);
font-size: 14px;
margin-left: 30px;
}
}
.stumessage {
width: 280px;
height: 110px;
@@ -4561,6 +4622,7 @@ export default {
rgba(240, 248, 254, 1)
);
border-radius: 10px;
.messageme1 {
color: rgba(78, 166, 255, 1);
font-size: 14px;
@@ -4568,6 +4630,7 @@ export default {
margin-top: 17px;
margin-left: 30px;
}
.messagege1 {
color: rgba(153, 155, 163, 1);
font-size: 14px;
@@ -4575,26 +4638,32 @@ export default {
}
}
}
.send {
margin-top: 30px;
margin-left: 61px;
.sendtext {
margin-left: 11px;
color: rgba(109, 117, 132, 1);
font-size: 14px;
}
}
.ckb {
margin-top: 20px;
margin-left: 62px;
.sendpeo {
color: rgba(109, 117, 132, 1);
font-size: 14px;
}
.ant-checkbox-inner {
border-radius: 4px;
}
}
.pubtn {
display: flex;
justify-content: center;
@@ -4613,6 +4682,7 @@ export default {
align-items: center;
background: rgba(255, 255, 255, 1);
}
.pubtn2 {
width: 100px;
height: 40px;
@@ -6139,6 +6209,7 @@ export default {
}
}
}
//设置的共享文档
.sametab {
// margin-left: 30px;
@@ -6148,35 +6219,43 @@ export default {
// background-color: green;
.Gcon {
display: flex;
.pad {
height: 100%;
width: 40px;
}
.Gin {
// background-color: #bfa;
margin-top: 30px;
.headone {
// background-color: red;
display: flex;
text-align: center;
.box {
width: 4px;
height: 20px;
background-color: #409eff;
border-radius: 2px;
}
.onetitle {
margin-left: 15px;
color: #333333;
font-size: 14px;
}
.oneedi {
margin-left: 15px;
color: #4ea6ff;
cursor: pointer;
}
.twobtn {
display: flex;
.btnone {
width: 42px;
height: 24px;
@@ -6186,6 +6265,7 @@ export default {
margin-left: 20px;
cursor: pointer;
}
.btntwo {
width: 42px;
height: 24px;
@@ -6198,38 +6278,46 @@ export default {
}
}
}
.btnbox {
.ant-upload-list {
display: none !important;
}
}
.onemain {
margin-top: 20px;
margin-left: 55px;
color: #6f6f6f;
font-size: 14px;
.checkcon {
position: relative;
.in {
position: absolute;
// margin-top: 10px;
left: 0;
top: 3px;
}
.yulan {
// color: yellow;
margin-left: 22px;
// display: inline-block;
}
.yulan2 {
margin-left: 22px;
}
.ant-input-number {
height: 24px;
width: 24px;
margin: 10px;
border-radius: 4px;
border: 1px solid #6d7584;
.ant-input-number-input {
width: 100%;
height: 100%;
@@ -6241,58 +6329,72 @@ export default {
}
}
}
.twomain {
margin-left: 20px;
margin-top: 20px;
.ant-switch-checked {
background-color: #5dc988;
}
.info {
margin-left: 10px;
color: #6f6f6f;
font-size: 14px;
// margin-top: 10px;
}
.infor {
margin-left: 38px;
margin-top: 10px;
color: #c7cbd2;
font-size: 14px;
}
.chooseshow {
// background-color: red;
margin-left: 38px;
margin-top: 12px;
.fane {
color: #6f6f6f;
font-size: 14px;
}
}
.choo {
display: none;
}
.btm {
margin-left: 38px;
margin-top: 20px;
.bmo {
color: #6f6f6f;
font-size: 14px;
}
.bmt {
color: #c7cbd2;
font-size: 14px;
margin-top: 3px;
}
.chosecon {
display: flex;
margin-top: 6px;
margin-bottom: 20px;
.chose {
position: relative;
.inl {
position: absolute;
top: 2px;
}
.sh {
margin-left: 23px;
color: #6f6f6f;
@@ -6303,8 +6405,10 @@ export default {
}
}
}
.Lhead {
display: flex;
.btns {
display: flex;
margin-left: 20px;
@@ -6321,9 +6425,11 @@ export default {
margin-right: 14px;
flex-shrink: 0;
cursor: pointer;
.search {
background-size: 100%;
}
.btnText {
font-size: 14px;
font-weight: 400;
@@ -6332,6 +6438,7 @@ export default {
margin-left: 5px;
}
}
.btn1 {
.search {
width: 15px;
@@ -6339,6 +6446,7 @@ export default {
background-image: url("../../assets/images/courseManage/search1.png");
}
}
.btn2 {
.search {
width: 16px;
@@ -6346,46 +6454,59 @@ export default {
background-image: url("../../assets/images/courseManage/reset1.png");
}
}
.btn3 {
margin-right: 0px;
.search {
width: 17px;
height: 18px;
background-image: url("../../assets/images/courseManage/add1.png");
}
}
.btn1:hover {
background: rgba(64, 158, 255, 1);
.search {
background-image: url("../../assets/images/courseManage/search0.png");
}
.btnText {
color: #ffffff;
}
}
.btn2:hover {
background: rgba(64, 158, 255, 1);
.search {
background-image: url("../../assets/images/courseManage/reset0.png");
}
.btnText {
color: #ffffff;
}
}
.btn3:hover {
background: rgba(64, 158, 255, 1);
.search {
background-image: url("../../assets/images/courseManage/add0.png");
}
.btnText {
color: #ffffff;
}
}
}
}
.Lbom {
position: relative;
margin-bottom: 20px;
.item {
width: 100%;
height: 200px;
@@ -6393,6 +6514,7 @@ export default {
margin-top: 40px;
border-radius: 8px;
border: 1px solid #f0f4fe;
.itemhead {
height: 50px;
width: 100%;
@@ -6400,6 +6522,7 @@ export default {
display: flex;
align-items: center;
position: relative;
.lev {
margin-left: 27px;
margin-right: 16px;
@@ -6407,64 +6530,77 @@ export default {
color: #409eff;
font-size: 16px;
}
.lin {
width: 1px;
height: 35%;
background-color: #c7cbd2;
}
.nam {
margin-left: 16px;
color: #4f5156;
line-height: 100%;
font-size: 16px;
}
.count {
position: absolute;
line-height: 100%;
color: #4f5156;
font-size: 14px;
right: 40px;
span:nth-child(2) {
color: #63ca8c;
}
}
}
.itembomm {
display: flex;
align-items: center;
height: 150px;
.it {
// margin-left: 110px;
// margin-right: 110px;
width: 13%;
text-align: center;
.on {
font-size: 30px;
}
.ittext {
color: #4f5156;
margin-top: 16px;
margin-left: -5px;
}
}
.linee {
background-color: #ecf2fb;
width: 1px;
height: 55%;
}
.itright {
position: absolute;
right: 45px;
display: flex;
.te {
color: #4ea6ff;
font-size: 14px;
cursor: pointer;
}
.more {
position: relative;
height: 30px;
display: flex;
.moreArrow {
width: 13px;
height: 7px;
@@ -6475,6 +6611,7 @@ export default {
margin-left: 7px;
margin-top: 6px;
}
.moreItems {
width: 80px;
height: 70px;
@@ -6487,6 +6624,7 @@ export default {
left: 0px;
top: 20px;
z-index: 100;
.roleItem {
font-size: 14px;
font-weight: 400;
@@ -6496,14 +6634,17 @@ export default {
justify-content: center;
cursor: pointer;
}
.roleItem:hover {
color: #4ea6ff;
}
}
}
.more:hover .moreArrow {
background-image: url("../../assets/images/navtop/up.png");
}
.more:hover .moreItems {
display: block;
}
@@ -6513,12 +6654,15 @@ export default {
.show {
color: blue;
}
.noshow {
display: none;
}
}
.create {
margin-top: 40px;
.taskbox {
width: 412px;
height: 160px;
@@ -6527,21 +6671,25 @@ export default {
// margin-left: 68px;
margin-bottom: 40px;
cursor: pointer;
.leftt {
position: absolute;
top: 18px;
left: 0;
}
.photo {
position: absolute;
top: 42px;
left: 37px;
}
.rightt {
position: absolute;
top: 69px;
right: 26px;
}
.centerbox {
position: absolute;
top: 52px;
@@ -6550,6 +6698,7 @@ export default {
font-weight: 700;
//line-height: 36px;
}
.centermain {
color: rgba(135, 139, 146, 1);
font-size: 14px;

View File

@@ -37,8 +37,23 @@
</div>
<div class="tmpl_body">
<div class="tmpl_tabbox">
<a-table :columns="columns1" :data-source="tableData1" :loading="tableDataTotal === -1 ? true : false"
expandRowByClick="true" @expand="expandTable" :pagination="pagination" />
<a-table :columns="columns1" :data-source="tableData1"
expandRowByClick="true" @expand="expandTable" :pagination="false"/>
<div class="tableBox" style="display:flex;justify-content:center;padding:20px;">
<div class="pa">
<a-pagination
v-if="tableDataTotal > 10"
showSizeChanger="true"
showQuickJumper="true"
hideOnSinglePage="true"
:pageSize="pageSize"
v-model:current="currentPage"
:total="tableDataTotal"
class="pagination"
@change="changePagination"
/>
</div>
</div>
</div>
</div>
</div>
@@ -73,13 +88,13 @@ const columns1 = [
key: "creator",
align: "center",
},
{
title: "最近学习时间",
width: "25%",
dataIndex: "stutime",
key: "stutime",
align: "center",
},
// {
// title: "最近学习时间",
// width: "25%",
// dataIndex: "stutime",
// key: "stutime",
// align: "center",
// },
{
title: "操作",
width: "22%",
@@ -100,6 +115,7 @@ export default defineComponent({
currentPage: 1,
pageSize: 10,
total:50,
tableDataTotal:0,
tableData1: [
{
key: "1",
@@ -180,6 +196,12 @@ export default defineComponent({
getLibraryList();
})
// 翻页
const changePagination = (page) => {
pagination.current = page;
getLibraryList();
};
// 获取模板列表
const getLibraryList = () => {
let date = Math.ceil(new Date(state.time).getTime() / 1000);
@@ -193,6 +215,7 @@ export default defineComponent({
}
api.templateList(obj).then((res) => {
state.tableData1 = []
state.tableDataTotal = res.data.data.total;
console.log(res);
let resData = res.data.data.rows
if (resData.length) {
@@ -253,6 +276,7 @@ export default defineComponent({
resetLevel,
pagination,
toLibraryAdd,
changePagination
};
},
});

View File

@@ -15,8 +15,7 @@ module.exports = defineConfig({
proxy: {
"/manageApi": {
target:"http://111.231.196.214:30001/",
// target: "http://localhost:30001/", //这里后台的地址模拟的;应该填写你们真实的后台接口
changeOrigin: true, //表示是否改变原域名
changeOrigin: true, //表示是否改变原域名
// secure: false,
// ws: false, //表示WebSocket协议
pathRewrite: {