feat:合并

This commit is contained in:
lixg
2022-12-11 10:54:01 +08:00
15 changed files with 1961 additions and 1103 deletions

View File

@@ -86,7 +86,7 @@ export default defineComponent({
async function getUserInfo() {
const userInfo = await api2.userInfo();
store.commit("SET_USER", userInfo);
store.commit("SET_USER", userInfo.data.data);
}
async function initDict(key, localStory = false) {

View File

@@ -131,6 +131,7 @@ export const addStudentCourse = (obj) => http.post("/admin/offcourse/addStudent"
// 获取组织结构树
export const orgtree = () => http.get("/org/tree");
export const saveStu = obj => http.post("/admin/student/addStudent", obj);
export const validateName = obj => http.post("/admin/validate/validateName", obj);
//获取积分列表
export const noticeList = (projectId) =>

View File

@@ -196,6 +196,22 @@ export default {
},
];
}
if (
n.indexOf("/onlinemanage") !== -1 ||
n.indexOf("/OnlineManage") !== -1
) {
state.list = [
{
name: "课程库",
href: "",
// href: "#/coursewaremanage",
},
{
name: "在线管理",
href: "",
},
];
}
if (
n.indexOf("/coursewaremanage") !== -1 ||
n.indexOf("/CoursewareManage") !== -1

View File

@@ -430,6 +430,7 @@ export default {
pageNo: 1,
pageSize: 10,
projectId: props.projectId,
groupId: props.chooseGroupId,
topFlag: "",
};
//重新获取列表

View File

@@ -897,26 +897,8 @@ export default {
console.log("selectedRowKeys changed: ", selectedRowKeys, item);
console.log("choosepeople : ", state.choosepeople);
state.selectedRowKeys = selectedRowKeys;
const se = state.studentList.map(e => e.id).join(',') || ''
const addItem = item.filter(e => (e && !se.includes(e.id + '')))
addItem.forEach(e => {
e.name = e.realName
})
const selectStr = selectedRowKeys.join(',')
console.log(selectStr)
state.studentList = state.studentList.filter(e => selectStr.includes(e.id + ''))
console.log(state.studentList)
state.choosepeople = [...addItem.reverse(), ...state.studentList];
state.choosepeople = item.map(e => ({...e, name: e.realName})).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) => {

View File

@@ -0,0 +1,63 @@
<template>
<a-input
v-model:value="modelV"
:placeholder="placeholder"
:show-count="showCount"
:maxlength="maxlength"
@blur="validateProName"
/>
<div style="color:red;font-size: 10px" v-if="value && !validate">名称重复请重新输入</div>
</template>
<script setup>
import {defineProps, defineEmits, watch, ref} from "vue";
import {validateName} from "@/api/index1";
const props = defineProps({
value: {
type: String,
},
validate: {
type: Boolean,
default: true
},
id: {
type: String,
},
placeholder: {
type: String,
},
type: {
type: Number,
default: 1
},
maxlength: {
type: Number,
default: 30
},
showCount: {
type: Boolean,
default: false
}
})
const emit = defineEmits({})
const modelV = ref()
watch(() => props.value, () => {
if (props.value !== modelV.value) {
modelV.value = props.value
}
})
watch(modelV, () => {
emit('update:value', modelV.value)
})
function validateProName() {
props.value && validateName({name: props.value, type: props.type, id: props.id}).then(res => {
emit('update:validate', res.data.data !== 1)
})
}
</script>

View File

@@ -39,7 +39,7 @@
</a-select>
</div>
<div class="select fitems">
<a-select
<!-- <a-select
v-model:value="categoryId"
dropdownClassName="dropdown-style"
style="width: 200px"
@@ -47,22 +47,42 @@
:options="options2"
allowClear
showSearch
></a-select>
></a-select> -->
<a-tree-select
:getPopupContainer="
(triggerNode) => {
return triggerNode.parentNode || document.body;
}
"
v-model:value="categoryId"
show-search
style="width: 200px"
:dropdown-style="{ maxHeight: '400px', overflow: 'auto' }"
placeholder="请选择内容分类"
allow-clear
tree-default-expand-all
:tree-data="options2222"
>
<template #title="{ value: val, title }">
<b v-if="val === '11111'" style="color: #08c">sss</b>
<template v-else>{{ title }}</template>
</template>
</a-tree-select>
</div>
<div class="select fitems">
<div class="select addTimeBox">
<div class="addTime">创建时间</div>
<a-range-picker
v-model:value="projectTime"
style="width: 420px"
valueFormat="X"
separator="至"
:placeholder="[
' 开始时间(创建时间)',
' 结束时间(创建时间)',
]"
:placeholder="[' 开始时间', ' 结束时间']"
/>
</div>
</div>
</div>
</div>
<div class="btns">
<div class="btn btn1" @click="handleSearch1">
<div class="search"></div>
@@ -73,10 +93,10 @@
<div class="btnText">重置</div>
</div>
<!-- 2022-11-30注释 后面放开 -->
<div class="btn btn3" @click="openMessage">
<!-- <div class="btn btn3" @click="openMessage">
<div class="search"></div>
<div class="btnText">导出</div>
</div>
</div> -->
<div class="btn btn4" @click="of_hShow">
<div class="search"></div>
<div class="btnText">新建课程</div>
@@ -115,16 +135,24 @@
</div>
<span style="margin-right: 3px">课程名称</span>
</div>
<div class="b_input">
<a-input
v-model:value="xzinputV1"
maxlength="20"
style="width: 440px; height: 40px; border-radius: 8px"
<div class="in b_input">
<NameInput
placeholder="请输入课程名称"
/>
<div class="inp_num">
<span style="color: #c7cbd2">{{ xzinputV1.length }}/20</span>
</div>
v-model:value="xzinputV1"
v-model:validate="validate"
:maxlength="20"
show-count
:type="2"
></NameInput>
<!-- <a-input-->
<!-- v-model:value="xzinputV1"-->
<!-- maxlength="20"-->
<!-- style="width: 440px; height: 40px; border-radius: 8px"-->
<!-- placeholder="请输入课程名称"-->
<!-- />-->
<!-- <div class="inp_num">-->
<!-- <span style="color: #c7cbd2">{{ xzinputV1.length }}/20</span>-->
<!-- </div>-->
</div>
</div>
<div class="b_sub">
@@ -319,14 +347,22 @@
<span style="margin-right: 14px">课程名称</span>
</div>
<div class="item_inp">
<div class="i1_input">
<a-input
aria-readonly="true"
v-model:value="qdms_inputV1"
maxlength="90"
style="width: 440px; height: 40px; border-radius: 8px"
<div class="in i1_input">
<!-- <a-input-->
<!-- aria-readonly="true"-->
<!-- v-model:value="qdms_inputV1"-->
<!-- maxlength="90"-->
<!-- style="width: 440px; height: 40px; border-radius: 8px"-->
<!-- placeholder="请输入课程名称"-->
<!-- />-->
<NameInput
placeholder="请输入课程名称"
/>
v-model:value="qdms_inputV1"
v-model:validate="validate"
:maxlength="20"
show-count
:type="2"
></NameInput>
<div class="inp_num">
<span style="color: #c7cbd2">
{{ qdms_inputV1.length }}/90
@@ -492,7 +528,7 @@
</div>
<div class="item_inp">
<div class="select i6_input">
<a-select
<!-- <a-select
:getPopupContainer="
(triggerNode) => {
return triggerNode.parentNode || document.body;
@@ -505,7 +541,30 @@
:options="options2"
allowClear
showSearch
></a-select>
></a-select> -->
<a-tree-select
:getPopupContainer="
(triggerNode) => {
return triggerNode.parentNode || document.body;
}
"
v-model:value="fen_lei"
show-search
style="width: 440px"
:dropdown-style="{
maxHeight: '400px',
overflow: 'auto',
}"
placeholder="请选择内容分类"
allow-clear
tree-default-expand-all
:tree-data="options2222"
>
<template #title="{ value: val, title }">
<b v-if="val === '11111'" style="color: #08c">sss</b>
<template v-else>{{ title }}</template>
</template>
</a-tree-select>
</div>
</div>
</div>
@@ -1674,6 +1733,7 @@
>
签到
</a> -->
<a
@click="
() => {
@@ -2717,6 +2777,7 @@ import { useRouter, useRoute } from "vue-router";
import addOnlineCourse from "../../components/Modals/addOnlineCourse.vue";
import ProjOwnerShip from "../../components/drawers/ProjectOwn";
import NameInput from "../../components/project/NameInput";
import ProjPowerList from "../../components/drawers/ProjPowerList";
import ProjCheckShip from "../../components/drawers/ProjCheckPower";
import AssessmentList from "../../components/drawers/AssessmentList.vue";
@@ -3270,6 +3331,7 @@ export default defineComponent({
ProjPowerList,
ProjCheckShip,
AssessmentList,
NameInput,
// VNodes: (_, {attrs}) => {
// return attrs.vnodes;
// },
@@ -3500,6 +3562,7 @@ export default defineComponent({
imageUrl: "",
imgList: [],
validate: true,
pageSize2: 10,
currentPage2: 0,
@@ -3546,6 +3609,130 @@ export default defineComponent({
codevisible: false, //二维码弹窗
codeInfo: null, //二维码内容
codeUrl: codeUrl,
// 课程三级分类
options2222: [
{
title: "领导力",
value: "100",
selectable: false,
children: [
{
title: "领导业务",
value: "1001",
},
{
title: "领导团队",
value: "1002",
},
{
title: "领导自我",
value: "1003",
},
],
},
{
title: "专业力",
value: "200",
selectable: false,
children: [
{
title: "研发",
value: "2001",
},
{
title: "产品和解决方案",
value: "2002",
},
{
title: "生产技术与制造",
value: "2003",
},
{
title: "供应链",
value: "2004",
},
{
title: "营销",
value: "2005",
},
{
title: "品质",
value: "2006",
},
{
title: "战略与企划",
value: "2007",
},
{
title: "流程管理",
value: "2008",
},
{
title: "业绩管理",
value: "2009",
},
{
title: "项目管理",
value: "20010",
},
{
title: "信息技术",
value: "20011",
},
{
title: "环境与安全",
value: "20012",
},
{
title: "人力资源",
value: "20013",
},
{
title: "企业文化",
value: "20014",
},
{
title: "品牌",
value: "20015",
},
{
title: "财务",
value: "20016",
},
{
title: "法务",
value: "20017",
},
{
title: "行政",
value: "20018",
},
{
title: "医工",
value: "20019",
},
],
},
{
title: "通用力",
value: "300",
selectable: false,
children: [
{
title: "职业操守与道德",
value: "3001",
},
{
title: "职业素养与技能",
value: "3002",
},
{
title: "规章制度",
value: "3003",
},
],
},
],
});
const showStuAdd = (record) => {
@@ -3767,15 +3954,35 @@ export default defineComponent({
},
true
);
// datas.forEach((itm) => {
// itm.pageNo = pageNo;
// for (let item of options2.value) {
// if (String(item.value) === String(itm.content)) {
// itm.contentTxt = item.label;
// return false;
// }
// }
// });
datas.forEach((itm) => {
itm.pageNo = pageNo;
for (let item of options2.value) {
if (String(item.value) === String(itm.content)) {
itm.contentTxt = item.label;
console.log(itm);
for (let i = 0; i < options2.value.length; i++) {
for (let j = 0; j < options2.value[i].children.length; j++) {
if (
String(options2.value[i].children[j].value) ===
String(itm.categoryId)
) {
console.log();
itm.contentTxt = options2.value[i].children[j].title;
return false;
}
}
}
});
console.log(datas, options2.value);
state.tableData1 = datas;
};
getTableDate();
@@ -4009,15 +4216,16 @@ export default defineComponent({
// }
}
if (param === "faceclassClass") {
let arr = res.data.data.rows;
let newArr = [];
arr.forEach((item) => {
newArr.push({
value: item.dictCode,
label: item.dictName,
});
});
options2.value = newArr;
// let arr = res.data.data.rows;
// let newArr = [];
// arr.forEach((item) => {
// newArr.push({
// value: item.dictCode,
// label: item.dictName,
// });
// });
// console.log(newArr)
options2.value = state.options2222;
}
if (param === "faceclassScene") {
let arr = res.data.data.rows;
@@ -4303,6 +4511,10 @@ export default defineComponent({
message.destroy();
return message.warning("请输入必填项");
}
if (!state.validate) {
message.destroy();
return message.warning("路径图名称重复");
}
console.log(
"state.bs_hs && state.valueE1 == 2",
state.bs_hs,
@@ -4416,7 +4628,10 @@ export default defineComponent({
} else {
state.addLoading = true;
}
if (!state.validate) {
message.destroy();
return message.warning("路径图名称重复");
}
edit(postData).then((res) => {
if (res.data.code === 200) {
getTableDate();
@@ -5496,6 +5711,27 @@ export default defineComponent({
});
</script>
<style lang="scss">
.addTimeBox {
position: relative;
display: flex;
align-items: center;
.addTime {
position: absolute;
z-index: 10;
margin-left: 10px;
color: rgba(0, 0, 0, 0.4);
}
.ant-picker {
padding-left: 85px;
}
.ant-picker-range .ant-picker-active-bar {
margin-left: 85px;
}
}
.aeLoading {
z-index: 10000;
}

View File

@@ -265,6 +265,129 @@ export default defineComponent({
console.log(props);
const state = reactive({
imgList: [],
options2222: [
{
title: '领导力',
value: '100',
selectable:false,
children: [
{
title: '领导业务',
value: '1001',
},
{
title: '领导团队',
value: '1002',
},
{
title: '领导自我',
value: '1003',
},
],
},
{
title: '专业力',
value: '200',
selectable:false,
children: [
{
title: '研发',
value: '2001',
},
{
title: '产品和解决方案',
value: '2002',
},
{
title: '生产技术与制造',
value: '2003',
},
{
title: '供应链',
value: '2004',
},
{
title: '营销',
value: '2005',
},
{
title: '品质',
value: '2006',
},
{
title: '战略与企划',
value: '2007',
},
{
title: '流程管理',
value: '2008',
},
{
title: '业绩管理',
value: '2009',
},
{
title: '项目管理',
value: '20010',
},
{
title: '信息技术',
value: '20011',
},
{
title: '环境与安全',
value: '20012',
},
{
title: '人力资源',
value: '20013',
},
{
title: '企业文化',
value: '20014',
},
{
title: '品牌',
value: '20015',
},
{
title: '财务',
value: '20016',
},
{
title: '法务',
value: '20017',
},
{
title: '行政',
value: '20018',
},
{
title: '医工',
value: '20019',
}
],
},
{
title: '通用力',
value: '300',
selectable:false,
children: [
{
title: '职业操守与道德',
value: '3001',
},
{
title: '职业素养与技能',
value: '3002',
},
{
title: '规章制度',
value: '3003',
},
],
}
]
});
const filterTxt = (txt) => {
@@ -277,11 +400,13 @@ export default defineComponent({
const filterClassTxt = (txt) => {
let str = "-";
if (txt) {
options2.value.forEach((item) => {
if (item.value === String(txt)) {
str = item.label;
for(let i =0; i<options2.value.length;i++){
for(let j=0;j<options2.value[i].children.length;j++){
if (String(options2.value[i].children[j].value) === String(txt)) {
str = options2.value[i].children[j].title;
}
}
}
});
}
return str;
};
@@ -323,7 +448,7 @@ export default defineComponent({
label: item.dictName,
});
});
options2.value = newArr;
options2.value = state.options2222;
}
if (param === "faceclassScene") {
let arr = res.data.data.rows;

View File

@@ -50,17 +50,19 @@
</div>
<div class="item_inp">
<div class="i1_input">
<a-input
v-model:value="qdms_inputV1"
maxlength="90"
style="width: 440px; height: 40px; border-radius: 8px"
placeholder="请输入课程名称"
/>
<div class="inp_num">
<span style="color: #c7cbd2">
{{ qdms_inputV1.length }}/90
</span>
</div>
<NameInput placeholder="请输入课程名称" v-model:value="qdms_inputV1" v-model:validate="validate"
:maxlength="20" show-count :type="2" :id="offcourseId"></NameInput>
<!-- <a-input-->
<!-- v-model:value="qdms_inputV1"-->
<!-- maxlength="90"-->
<!-- style="width: 440px; height: 40px; border-radius: 8px"-->
<!-- placeholder="请输入课程名称"-->
<!-- />-->
<!-- <div class="inp_num">-->
<!-- <span style="color: #c7cbd2">-->
<!-- {{ qdms_inputV1.length }}/90-->
<!-- </span>-->
<!-- </div>-->
</div>
</div>
</div>
@@ -94,10 +96,10 @@
:style="{ display: hideshow ? 'block' : 'none' }"
>
<span style="color: #999ba3">
1课程名称统一不加书名号<br />
1课程名称统一不加书名号<br/>
2项目名称属地等信息如需体现在课程名称中请放在课程名称信息
之后时间管理GROW180项目时间管理B*确保首先
看到的是课程内容主题<br />
看到的是课程内容主题<br/>
3同一课程如先后有多个版本原则上仅开放最新版本旧版本应停用
版本如必须以年份标明请以沟通技巧2022的方式呈现
</span>
@@ -192,41 +194,33 @@
</div>
<div class="item_inp">
<div class="select i6_input">
<!-- <a-select-->
<!-- :getPopupContainer="-->
<!-- (triggerNode) => {-->
<!-- return triggerNode.parentNode || document.body;-->
<!-- }-->
<!-- "-->
<!-- v-model:value="fen_lei"-->
<!-- dropdownClassName="dropdown-style"-->
<!-- style="width: 440px"-->
<!-- placeholder="请选择"-->
<!-- :options="options2"-->
<!-- allowClear-->
<!-- showSearch-->
<!-- />-->
<a-tree-select
style="width: 440px"
placeholder="请选择内容分类"
:treeDefaultExpandAll="true"
:getPopupContainer="
(triggerNode) => {
return triggerNode.parentNode || document.body;
}
"
v-model:value="fen_lei"
show-search
style="width: 440px"
:dropdown-style="{ maxHeight: '400px', overflow: 'auto' }"
placeholder="请选择"
allow-clear
tree-default-expand-all
:tree-data="options2222"
>
<template #title="{ value: val, title }">
<b v-if="val === '11111'" style="color: #08c">sss</b>
<template v-else>{{ title }}</template>
</template>
</a-tree-select>
<!-- <a-select
:getPopupContainer="
(triggerNode) => {
return triggerNode.parentNode || document.body;
}
"
v-model:value="fen_lei"
dropdownClassName="dropdown-style"
style="width: 440px"
placeholder="请选择"
:options="options2"
allowClear
showSearch
/> -->
</div>
</div>
</div>
@@ -343,7 +337,7 @@
<span style="margin-right: 10px">附件</span>
</div>
<div class="item_inp">
<FJUpload v-model:value="attach" />
<FJUpload v-model:value="attach"/>
</div>
</div>
</div>
@@ -396,45 +390,57 @@ import {
// onMounted,
onUnmounted,
} from "vue";
import { message } from "ant-design-vue";
import { edit, detail, handle } from "@/api/indexCourse";
import { fileUp } from "../../api/indexEval";
import {message} from "ant-design-vue";
import {edit, detail, handle} from "@/api/indexCourse";
import {fileUp} from "../../api/indexEval";
import * as api1 from "../../api/index1";
import "@wangeditor/editor/dist/css/style.css";
import { Editor, Toolbar } from "@wangeditor/editor-for-vue";
import {Editor, Toolbar} from "@wangeditor/editor-for-vue";
import ProjectManager from "@/components/project/ProjectManagerNew";
import NameInput from "@/components/project/NameInput";
import FJUpload from "@/components/common/FJUpload";
import * as moment from "moment";
import * as api2 from "../../api/indexAudit";
export default defineComponent({
components: {
Editor,
Toolbar,
FJUpload,
NameInput,
ProjectManager,
},
setup(props, { expose, emit }) {
setup(props, {expose, emit}) {
const state = reactive({
hideshow: true,
ft_eidt: false,
attach: "",
validate: true,
ft_hs: false,
addLoading: false,
statusJuJue: 0,
statusTingQi: 1,
member: { name: "", value: "" },
member: {name: "", value: ""},
offcourseId: null,
qdms_inputV1: "",
qdms_inputV2: "",
qdms_inputV3: "",
fen_lei: null,
fen_lei_neirong: null,
options2222:[
feng_mian_1: null,
chang_jin: null,
tags_val_single: "",
tags_val: [],
qdms_inputV6: "",
imgList: [],
auditDescription: "",
contentClassify: [],
// 课程三级分类
options2222: [
{
title: '领导力',
value: '100',
selectable:false,
selectable: false,
children: [
{
title: '领导业务',
@@ -453,7 +459,7 @@ export default defineComponent({
{
title: '专业力',
value: '200',
selectable:false,
selectable: false,
children: [
{
title: '研发',
@@ -536,7 +542,7 @@ export default defineComponent({
{
title: '通用力',
value: '300',
selectable:false,
selectable: false,
children: [
{
title: '职业操守与道德',
@@ -553,13 +559,6 @@ export default defineComponent({
],
}
],
feng_mian_1: null,
chang_jin: null,
tags_val_single: "",
tags_val: [],
qdms_inputV6: "",
imgList: [],
auditDescription: "",
});
const visibleOpen = (offcourseId, name) => {
@@ -599,7 +598,7 @@ export default defineComponent({
state.addLoading = false;
state.statusJuJue = 0;
state.statusTingQi = 1;
state.member = { name: "", value: "" };
state.member = {name: "", value: ""};
state.offcourseId = null;
state.qdms_inputV1 = "";
@@ -613,7 +612,7 @@ export default defineComponent({
state.qdms_inputV6 = "";
state.imgList = [];
state.attach = "";
state.auditDescription="";
state.auditDescription = "";
// valueHtml.value = "";
};
@@ -638,7 +637,7 @@ export default defineComponent({
const toolbarConfig = {
excludeKeys: ["insertVideo", "insertImage"],
};
const editorConfig = { placeholder: "请输入内容...", MENU_CONF: {} };
const editorConfig = {placeholder: "请输入内容...", MENU_CONF: {}};
editorConfig.MENU_CONF["uploadImage"] = {
// 自定义上传
async customUpload(file, insertFn) {
@@ -721,15 +720,29 @@ export default defineComponent({
});
options3.value = newArr;
}
if (param === "contentClassify") {
state.contentClassify = dealDickTree(res.data.data.rows) || []
}
}
})
.catch((err) => {
console.log("获取字典失败", err);
});
};
function dealDickTree(data, level = 1) {
return data?.filter(e => e.levelId == level).map(({dictName, dictCode}) => ({
title: dictName,
value: dictCode,
key: dictCode,
children: dealDickTree(data, dictCode)
}))
}
getDictList("faceclassClass");
getDictList("faceclassScene");
getDictList("faceclassPic");
getDictList("contentClassify");
//获取分类、场景、封面图、----------------字典配置---------------------------
const hideShow = () => {
@@ -831,8 +844,8 @@ export default defineComponent({
if (res.data.code === 200) return res.data.data;
});
if (res.rows && res.rows.length > 0) {
let i =res.rows.length;
state.auditDescription = res.rows[i-1].description?res.rows[i-1].description :"-";
let i = res.rows.length;
state.auditDescription = res.rows[i - 1].description ? res.rows[i - 1].description : "-";
}
}
@@ -844,12 +857,12 @@ export default defineComponent({
state.chang_jin = String(item.sceneId);
state.tags_val = item.tips ? item.tips.split(",") : [];
state.qdms_inputV6 = item.intro;
state.member = { value: item.teacherId, name: item.teacher };
state.member = {value: item.teacherId, name: item.teacher};
valueHtml.value = item.outline;
let arrss = item.attach.split(',')
let str =''
for(let i=0;i<arrss.length;i++){
i == arrss.length -1 ? str += arrss[i].slice(arrss[i].lastIndexOf('/')+1) : str += arrss[i].slice(arrss[i].lastIndexOf('/')+1) + ','
let str = ''
for (let i = 0; i < arrss.length; i++) {
i == arrss.length - 1 ? str += arrss[i].slice(arrss[i].lastIndexOf('/') + 1) : str += arrss[i].slice(arrss[i].lastIndexOf('/') + 1) + ','
}
console.log(str)
state.attach = str;
@@ -1316,8 +1329,8 @@ export default defineComponent({
}
.choiceoptionurl {
width:60px;
height:60px;
width: 60px;
height: 60px;
margin-right: 10px;
border-radius: 8px;
}

View File

@@ -203,9 +203,7 @@ export default {
title: "内容分类",
dataIndex: "content",
key: "content",
align: "center",
customRender: ({ text }) =>
state.calssifyList.find((e) => e.value == text)?.label,
align: "center"
},
{
title: "审核状态",
@@ -245,7 +243,7 @@ export default {
style="color:#387DF7;cursor:pointer;"
onClick={() => {
console.log(value);
showProjAuditModal(value.record.auditLogDtoList);
showProjAuditModal(value.record.auditLogDtoList.length!==0?value.record.auditLogDtoList.slice(0,1):[]);
}}
>
审核日志
@@ -269,8 +267,147 @@ export default {
//审核记录的数据
tableDataAudit: [],
projAuditModal: false,
loading:false
loading:false,
// 课程三级分类
options2222:[
{
title: '领导力',
value: '100',
selectable:false,
children: [
{
title: '领导业务',
value: '1001',
},
{
title: '领导团队',
value: '1002',
},
{
title: '领导自我',
value: '1003',
},
],
},
{
title: '专业力',
value: '200',
selectable:false,
children: [
{
title: '研发',
value: '2001',
},
{
title: '产品和解决方案',
value: '2002',
},
{
title: '生产技术与制造',
value: '2003',
},
{
title: '供应链',
value: '2004',
},
{
title: '营销',
value: '2005',
},
{
title: '品质',
value: '2006',
},
{
title: '战略与企划',
value: '2007',
},
{
title: '流程管理',
value: '2008',
},
{
title: '业绩管理',
value: '2009',
},
{
title: '项目管理',
value: '20010',
},
{
title: '信息技术',
value: '20011',
},
{
title: '环境与安全',
value: '20012',
},
{
title: '人力资源',
value: '20013',
},
{
title: '企业文化',
value: '20014',
},
{
title: '品牌',
value: '20015',
},
{
title: '财务',
value: '20016',
},
{
title: '法务',
value: '20017',
},
{
title: '行政',
value: '20018',
},
{
title: '医工',
value: '20019',
}
],
},
{
title: '通用力',
value: '300',
selectable:false,
children: [
{
title: '职业操守与道德',
value: '3001',
},
{
title: '职业素养与技能',
value: '3002',
},
{
title: '规章制度',
value: '3003',
},
],
}
],
});
// 课程三级分类回显
const sHX = (data) => {
let str = '-'
let sdata = state.options2222
for(let i =0; i<sdata.length;i++){
for(let j=0;j<sdata[i].children.length;j++){
if (String(sdata[i].children[j].value) === String(data)) {
str = sdata[i].children[j].title;
}
}
}
return str
}
const getList = () => {
state.loading=true
let objn = {
@@ -305,7 +442,7 @@ export default {
number: n + 1 + (state.currentPage - 1) * 10,
name: item.name || "- ",
type: item.type == 1 ? "线上" : "线下",
content: item.categoryId,
content: sHX(item.categoryId),
status:
item.auditStatus == 0
? "未提交"

View File

@@ -232,9 +232,7 @@ export default {
title: "内容分类",
dataIndex: "content",
key: "content",
align: "center",
customRender: ({ text }) =>
state.calssifyList.find((e) => e.value == text)?.label,
align: "center"
},
{
title: "状态",
@@ -302,8 +300,146 @@ export default {
//审核在线课嵌套页面
onlineClassesVisible: false,
iframeUrl: iframeUrl,
// 课程三级分类
options2222:[
{
title: '领导力',
value: '100',
selectable:false,
children: [
{
title: '领导业务',
value: '1001',
},
{
title: '领导团队',
value: '1002',
},
{
title: '领导自我',
value: '1003',
},
],
},
{
title: '专业力',
value: '200',
selectable:false,
children: [
{
title: '研发',
value: '2001',
},
{
title: '产品和解决方案',
value: '2002',
},
{
title: '生产技术与制造',
value: '2003',
},
{
title: '供应链',
value: '2004',
},
{
title: '营销',
value: '2005',
},
{
title: '品质',
value: '2006',
},
{
title: '战略与企划',
value: '2007',
},
{
title: '流程管理',
value: '2008',
},
{
title: '业绩管理',
value: '2009',
},
{
title: '项目管理',
value: '20010',
},
{
title: '信息技术',
value: '20011',
},
{
title: '环境与安全',
value: '20012',
},
{
title: '人力资源',
value: '20013',
},
{
title: '企业文化',
value: '20014',
},
{
title: '品牌',
value: '20015',
},
{
title: '财务',
value: '20016',
},
{
title: '法务',
value: '20017',
},
{
title: '行政',
value: '20018',
},
{
title: '医工',
value: '20019',
}
],
},
{
title: '通用力',
value: '300',
selectable:false,
children: [
{
title: '职业操守与道德',
value: '3001',
},
{
title: '职业素养与技能',
value: '3002',
},
{
title: '规章制度',
value: '3003',
},
],
}
],
});
// 课程三级分类回显
const sHX = (data) => {
let str = '-'
let sdata = state.options2222
for(let i =0; i<sdata.length;i++){
for(let j=0;j<sdata[i].children.length;j++){
if (String(sdata[i].children[j].value) === String(data)) {
str = sdata[i].children[j].title;
}
}
}
return str
}
/*
* 获取字典列表
* param faceclassPic | faceclassClass | faceclassScene
@@ -433,7 +569,7 @@ export default {
number: i + 1 + (state.currentPage - 1) * 10,
name: item.name,
type: item.type == 1 ? "线上" : "线下",
content: item.categoryId,
content: sHX(item.categoryId),
status:
item.status == 0
? "未提交"
@@ -546,6 +682,7 @@ export default {
contentList11,
sceneist11,
onEditorFocus,
sHX
};
},
};

View File

@@ -261,7 +261,7 @@ export default {
<div>
<span
onClick={() => {
showProjAuditModal(value.record.auditList);
showProjAuditModal(value.record.auditList.length!==0?value.record.auditList.slice(value.record.auditList.length-1):[]);
}}
style="cursor:pointer;color:#387DF7"
>

View File

@@ -74,15 +74,15 @@
<div class="datanull" v-if="tableDataTotal === 0">
<div class="nodata_box">
<div class="left">
<img src="../../assets/images/taskpage/left1.png" />
<img src="../../assets/images/taskpage/left1.png"/>
</div>
<div class="center">
<img src="../../assets/images/leveladd/picture.png" />
<img src="../../assets/images/leveladd/picture.png"/>
</div>
<div class="text1">无数据</div>
<div class="text2">请添加路径</div>
<div class="right">
<img src="../../assets/images/leveladd/right.png" />
<img src="../../assets/images/leveladd/right.png"/>
</div>
</div>
</div>
@@ -132,7 +132,7 @@
>
<div class="out">
<div class="top">
<img class="topimg" src="../../assets/images/courseManage/add1.png" />
<img class="topimg" src="../../assets/images/courseManage/add1.png"/>
<div class="topc">创建路径</div>
<div @click="handleOut" style="margin-left: 500px; cursor: pointer">
<img
@@ -151,13 +151,15 @@
</div>
<div class="inname">路径图名称</div>
<div class="in">
<a-input
v-model:value="pathName"
maxlength="20"
style="border-radius: 4px"
placeholder="请输入学习路径名称"
/>
<div class="showcount">{{ pathName.length }}/20</div>
<!-- <a-input-->
<!-- v-model:value="pathName"-->
<!-- maxlength="20"-->
<!-- style="border-radius: 4px"-->
<!-- placeholder="请输入学习路径名称"-->
<!-- />-->
<!-- <div class="showcount">{{ pathName.length }}/20</div>-->
<NameInput placeholder="请输入路径名称" v-model:value="pathName" v-model:validate="validate"
:maxlength="20" show-count :type="3"></NameInput>
</div>
</div>
<div class="name" style="margin-left: 27px">
@@ -215,14 +217,14 @@
v-if="imgData.length > 5"
class="learnBgItem learnBgMore"
>
查看更多 <img src="../../assets/images/projectadd/go.png" />
查看更多 <img src="../../assets/images/projectadd/go.png"/>
</div>
</div>
</div>
<div class="info">
<div class="inname">路径说明</div>
<div class="in">
<a-textarea v-model:value="pathIntro" maxlength="150" />
<a-textarea v-model:value="pathIntro" maxlength="150"/>
<div class="showcount">{{ pathIntro.length }}/150</div>
</div>
</div>
@@ -235,7 +237,7 @@
class="aeLoading"
:style="{ display: lpLoading ? 'flex' : 'none' }"
>
<a-spin :spinning="lpLoading" tip="添加中..." />
<a-spin :spinning="lpLoading" tip="添加中..."/>
</div>
</div>
</div>
@@ -251,7 +253,7 @@
>
<div class="out">
<div class="top">
<img class="topimg" src="../../assets/images/courseManage/add1.png" />
<img class="topimg" src="../../assets/images/courseManage/add1.png"/>
<div class="topc">编辑路径</div>
<div @click="handleOut1" style="margin-left: 500px; cursor: pointer">
<img
@@ -270,13 +272,15 @@
</div>
<div class="inname">路径图名称</div>
<div class="in">
<a-input
v-model:value="pathName"
maxlength="20"
style="border-radius: 4px"
placeholder="请输入学习路径名称"
/>
<div class="showcount">{{ pathName.length }}/20</div>
<!-- <a-input-->
<!-- v-model:value="pathName"-->
<!-- maxlength="20"-->
<!-- style="border-radius: 4px"-->
<!-- placeholder="请输入学习路径名称"-->
<!-- />-->
<!-- <div class="showcount">{{ pathName.length }}/20</div>-->
<NameInput placeholder="请输入路径名称" v-model:value="pathName" v-model:validate="validate"
:maxlength="20" show-count :type="3" :id="editPathId"></NameInput>
</div>
</div>
<div class="name" style="margin-left: 27px">
@@ -336,14 +340,14 @@
v-if="imgData.length > 5"
class="learnBgItem learnBgMore"
>
查看更多 <img src="../../assets/images/projectadd/go.png" />
查看更多 <img src="../../assets/images/projectadd/go.png"/>
</div>
</div>
</div>
<div class="info">
<div class="inname">路径说明</div>
<div class="in">
<a-textarea v-model:value="pathIntro" maxlength="150" />
<a-textarea v-model:value="pathIntro" maxlength="150"/>
<div class="showcount">{{ pathIntro.length }}/150</div>
</div>
</div>
@@ -428,7 +432,7 @@
</div>
<!-- 加载动画 -->
<div class="aeLoading" :style="{ display: pubLoading ? 'flex' : 'none' }">
<a-spin :spinning="pubLoading" />
<a-spin :spinning="pubLoading"/>
</div>
</a-modal>
<!-- 复制路径弹窗 -->
@@ -670,8 +674,8 @@
</div>
</template>
<script>
import { reactive, toRefs, onMounted, watch, computed } from "vue";
import { useRouter } from "vue-router";
import {reactive, toRefs, onMounted, watch, computed} from "vue";
import {useRouter} from "vue-router";
// import OwnerShip from "../../components/drawers/Ownership";
// import PowerList from "../../components/drawers/PowerList";
// import QueryRight from "../../components/drawers/QueryRight";
@@ -680,15 +684,17 @@ import ProjPowerList from "../../components/drawers/ProjPowerList";
import ProjCheckShip from "../../components/drawers/ProjCheckPower";
// import ManageRight from "../../components/drawers/ManageRight";
import * as api from "../../api/index1";
import { message } from "ant-design-vue";
import {message} from "ant-design-vue";
import {
commonData,
changeOwnership,
// setCookie
} from "../../api/method";
import { storage } from "../../api/storage";
import { useStore } from "vuex";
import {storage} from "../../api/storage";
import {useStore} from "vuex";
import OrgClass from "@/components/project/OrgClass";
import NameInput from "@/components/project/NameInput";
export default {
name: "learningPath",
components: {
@@ -698,6 +704,7 @@ export default {
// ManageRight,
ProjOwnerShip,
OrgClass,
NameInput,
ProjPowerList,
ProjCheckShip,
},
@@ -711,6 +718,7 @@ export default {
number: null,
selectTime: null,
sh: false,
validate: true,
tableData: [
// {
// key: 1,
@@ -835,12 +843,13 @@ export default {
console.log("e", e, a);
};
const handleOut = () => {
console.log(store.state)
// console.log("打开创建路径弹窗");
state.pathName = "";
state.pathBg = "";
state.pathBgId = "";
state.organizationSelectName = null;
state.organizationSelectId = null;
state.organizationSelectName = store.state.userInfo.departId;
state.organizationSelectId = store.state.userInfo.departName;
state.pathIntro = "";
state.out = !state.out;
};
@@ -1156,7 +1165,7 @@ export default {
width: 200,
align: "center",
fixed: "right",
scopedSlots: { customRender: "action" }, //引入的插槽
scopedSlots: {customRender: "action"}, //引入的插槽
customRender: (text) => {
// console.log(text);
return (
@@ -1457,6 +1466,11 @@ export default {
message.destroy();
return message.warning("请选择背景图");
}
if (!state.validate) {
message.destroy();
message.warning("路径图名称重复");
return
}
state.lpLoading = true;
let obj = {
name: state.pathName,
@@ -1497,7 +1511,7 @@ export default {
});
//添加归属权 [id: '966735050643083264', name: '丁舟航']
let selectPeopleArr = [
{ id: res.data.data.createId, name: res.data.data.createName },
{id: res.data.data.createId, name: res.data.data.createName},
];
changeOwnership(
"learnPath",
@@ -1623,6 +1637,10 @@ export default {
message.destroy();
return message.warning("请选择背景图");
}
if (!state.validate) {
message.destroy();
return message.warning("路径图名称重复");
}
// state.pathName = detail.name;
// state.pathBg = detail.picUrl;
// state.pathBgId = "";
@@ -1844,17 +1862,21 @@ export default {
display: block;
clear: both;
}
.CreatePath {
.ant-modal {
width: 680px !important;
height: 528px !important;
.ant-modal-content {
width: 680px !important;
height: 528px !important;
.ant-modal-body {
width: 680px !important;
height: 528px !important;
padding: 0 !important;
.out {
display: block;
position: absolute;
@@ -1867,6 +1889,7 @@ export default {
left: 50%;
top: 50%;
transform: translate(-50%, -50%);
.top {
width: 100%;
height: 68px;
@@ -1877,18 +1900,21 @@ export default {
);
display: flex;
align-items: center;
.topimg {
width: 18px;
height: 18px;
margin-left: 27px;
margin-top: -2px;
}
.topc {
color: #000000;
font-size: 16px;
margin-left: 8px;
}
}
.mid {
width: 100%;
height: 100%;
@@ -1902,6 +1928,7 @@ export default {
// color: #ff4e4e;
margin-left: -5px;
}
.name {
width: 78%;
// background-color: lightcoral;
@@ -1916,16 +1943,19 @@ export default {
font-size: 14px;
margin-left: 7px;
}
.in {
margin-left: 14px;
width: 81%;
position: relative;
.ant-input {
border-radius: 5px;
// height: 120%;
width: 100%;
height: 40px;
}
.showcount {
position: absolute;
right: 10px;
@@ -1934,6 +1964,7 @@ export default {
}
}
}
.bac {
width: 78%;
// background-color: lightcoral;
@@ -1944,12 +1975,14 @@ export default {
margin-top: 18px;
color: #ff4e4e;
}
.inname {
color: #6f6f6f;
font-size: 14px;
margin-left: 7px;
margin-top: 15px;
}
.in {
margin-left: 14px;
width: 81%;
@@ -1964,11 +1997,13 @@ export default {
cursor: pointer;
}
}
.learnBg {
display: flex;
flex-wrap: wrap;
min-height: 110px;
max-height: 300px;
.learnBgItem {
border-radius: 8px;
width: 136px;
@@ -1978,6 +2013,7 @@ export default {
margin-bottom: 20px;
margin-right: 6px;
}
.learnBgMore {
display: flex;
align-items: center;
@@ -1991,6 +2027,7 @@ export default {
}
}
}
.info {
width: 78%;
// background-color: lightcoral;
@@ -2006,10 +2043,12 @@ export default {
margin-left: 26px;
margin-top: 15px;
}
.in {
margin-left: 14px;
width: 81%;
position: relative;
.ant-input {
border-radius: 5px;
// height: 120%;
@@ -2017,6 +2056,7 @@ export default {
height: 130px;
resize: none;
}
.showcount {
position: absolute;
right: 10px;
@@ -2025,12 +2065,14 @@ export default {
}
}
}
.btn {
width: 33%;
margin-top: 30px;
display: flex;
justify-content: space-between;
margin-bottom: 30px;
.samtn {
width: 100px;
height: 40px;
@@ -2039,10 +2081,12 @@ export default {
border-radius: 8px;
cursor: pointer;
}
.btn1 {
background-color: #fff;
color: #4ea6ff;
}
.btn2 {
background-color: #4ea6ff;
color: #fff;
@@ -2054,20 +2098,25 @@ export default {
}
}
}
.learnBgMoreModal {
.ant-modal {
width: 680px !important;
height: 528px !important;
.ant-modal-content {
width: 680px !important;
height: 528px !important;
.ant-modal-body {
width: 680px !important;
height: 528px !important;
padding: 0 !important;
.main {
display: flex;
flex-direction: column;
.top {
padding-left: 51px;
padding-right: 51px;
@@ -2076,6 +2125,7 @@ export default {
align-items: center;
justify-content: space-between;
cursor: pointer;
.topc {
font-size: 16px;
font-weight: bold;
@@ -2083,6 +2133,7 @@ export default {
line-height: 36px;
}
}
.imagesBox {
display: flex;
// justify-content: space-between;
@@ -2092,6 +2143,7 @@ export default {
margin-top: 20px;
height: 350px;
overflow-y: auto;
.learnBgItem {
border-radius: 8px;
width: 136px;
@@ -2102,6 +2154,7 @@ export default {
margin-right: 10px;
}
}
.btn {
width: 100%;
position: absolute;
@@ -2109,6 +2162,7 @@ export default {
margin-top: 30px;
display: flex;
justify-content: center;
.samtn {
width: 100px;
height: 40px;
@@ -2117,10 +2171,12 @@ export default {
border-radius: 8px;
cursor: pointer;
}
.btn1 {
background-color: #fff;
color: #4ea6ff;
}
.btn2 {
background-color: #4ea6ff;
color: #fff;
@@ -2132,16 +2188,19 @@ export default {
}
}
}
.pub {
.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);
@@ -2150,23 +2209,28 @@ export default {
margin-left: 62px;
font-weight: 500;
}
.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;
@@ -2177,6 +2241,7 @@ export default {
);
border-radius: 10px;
margin-right: 7px;
.messageme {
color: rgba(255, 182, 78, 1);
font-size: 14px;
@@ -2184,12 +2249,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;
@@ -2199,6 +2266,7 @@ export default {
rgba(240, 248, 254, 1)
);
border-radius: 10px;
.messageme1 {
color: rgba(78, 166, 255, 1);
font-size: 14px;
@@ -2206,6 +2274,7 @@ export default {
margin-top: 17px;
margin-left: 30px;
}
.messagege1 {
color: rgba(153, 155, 163, 1);
font-size: 14px;
@@ -2213,26 +2282,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;
@@ -2251,6 +2326,7 @@ export default {
align-items: center;
background: rgba(255, 255, 255, 1);
}
.pubtn2 {
width: 100px;
height: 40px;
@@ -2268,17 +2344,21 @@ export default {
}
}
}
.CopyModal {
.ant-modal {
width: 424px !important;
height: 258px !important;
.ant-modal-content {
width: 424px !important;
height: 258px !important;
.ant-modal-body {
width: 424px !important;
height: 258px !important;
padding: 0 !important;
.delete {
z-index: 999;
width: 424px;
@@ -2299,15 +2379,18 @@ export default {
rgba(78, 166, 255, 0) 100%
);
}
.del_main {
width: 100%;
position: relative;
.header {
display: flex;
align-items: center;
padding-top: 20px;
padding-left: 26px;
font-size: 16px;
.icon {
width: 16px;
height: 16px;
@@ -2315,6 +2398,7 @@ export default {
background-image: url(@/assets/images/taskpage/gan.png);
background-size: 100% 100%;
}
.close_exit {
position: absolute;
right: 42px;
@@ -2325,6 +2409,7 @@ export default {
background-size: 100% 100%;
}
}
.body {
width: 100%;
margin: 34px auto 56px auto;
@@ -2334,6 +2419,7 @@ export default {
flex-direction: column;
// background-color: red;
position: relative;
.back {
position: absolute;
top: 30px;
@@ -2342,10 +2428,12 @@ export default {
color: #666666;
}
}
.del_btnbox {
display: flex;
margin: 30px auto;
justify-content: center;
.del_btn {
width: 100px;
height: 40px;
@@ -2357,17 +2445,20 @@ export default {
flex-shrink: 0;
cursor: pointer;
.btnText {
font-size: 14px;
font-weight: 400;
line-height: 40px;
}
}
.btn1 {
border: 1px solid rgba(64, 158, 255, 1);
color: #4ea6ff;
margin-right: 14px;
}
.btn2 {
background-color: #4ea6ff;
color: #ffffff;
@@ -2379,6 +2470,7 @@ export default {
}
}
}
.learningPath {
width: 100%;
// height: 100%;
@@ -2393,22 +2485,26 @@ export default {
//background: red;
justify-content: center;
align-items: center;
.nodata_box {
width: 412px;
height: 212px;
position: relative;
background: linear-gradient(180deg, #fef3dd, #fffaf0);
border-radius: 10px;
.left {
position: absolute;
top: 18px;
left: 0;
}
.center {
position: absolute;
top: 32px;
left: 170px;
}
.text1 {
position: absolute;
top: 128px;
@@ -2417,6 +2513,7 @@ export default {
color: #ffb64e;
font-weight: 500;
}
.text2 {
position: absolute;
bottom: 32px;
@@ -2425,6 +2522,7 @@ export default {
color: #878b92;
font-weight: 500;
}
.right {
position: absolute;
bottom: 18px;
@@ -2432,6 +2530,7 @@ export default {
}
}
}
.filter {
margin-left: 35px;
margin-right: 35px;
@@ -2439,34 +2538,42 @@ export default {
display: flex;
justify-content: space-between;
flex-wrap: wrap;
.filterItems {
display: flex;
flex-wrap: wrap;
.pathnameInp {
margin-right: 20px;
margin-bottom: 20px;
}
.select {
margin-right: 20px;
margin-bottom: 20px;
}
.addTimeBox {
position: relative;
display: flex;
align-items: center;
.addTime {
position: absolute;
z-index: 10;
margin-left: 10px;
color: rgba(0, 0, 0, 0.4);
}
.ant-picker {
padding-left: 85px;
}
.ant-picker-range .ant-picker-active-bar {
margin-left: 85px;
}
}
.btn {
padding: 0px 26px 0px 26px;
height: 38px;
@@ -2479,9 +2586,11 @@ export default {
margin-right: 14px;
flex-shrink: 0;
cursor: pointer;
.search {
background-size: 100%;
}
.btnText {
font-size: 14px;
font-weight: 400;
@@ -2490,6 +2599,7 @@ export default {
margin-left: 5px;
}
}
.btnn {
padding: 0px 26px 0px 26px;
height: 38px;
@@ -2502,9 +2612,11 @@ export default {
margin-right: 14px;
flex-shrink: 0;
cursor: pointer;
.search {
background-size: 100%;
}
.btnText {
font-size: 14px;
font-weight: 400;
@@ -2513,6 +2625,7 @@ export default {
margin-left: 5px;
}
}
.btn1 {
.search {
width: 15px;
@@ -2520,6 +2633,7 @@ export default {
background-image: url("../../assets/images/courseManage/search0.png");
}
}
.btn2 {
.search {
width: 16px;
@@ -2527,25 +2641,32 @@ export default {
background-image: url("../../assets/images/courseManage/reset1.png");
}
}
.btn1:hover {
background: rgba(64, 158, 255, 0.76);
.search {
background-image: url("../../assets/images/courseManage/search0.png");
}
.btnText {
color: #ffffff;
}
}
.btn1:active {
background: #0982ff;
}
.btn2:hover {
background: rgba(64, 158, 255, 0.1);
}
.btn2:active {
background: rgba(64, 158, 255, 0.2);
}
}
.btns {
display: flex;
// flex-wrap: wrap;
@@ -2561,9 +2682,11 @@ export default {
margin-right: 14px;
flex-shrink: 0;
cursor: pointer;
.search {
background-size: 100%;
}
.btnText {
font-size: 14px;
font-weight: 400;
@@ -2572,28 +2695,35 @@ export default {
margin-left: 5px;
}
}
.btn3 {
margin-right: 0px;
.search {
width: 17px;
height: 18px;
background-image: url("../../assets/images/courseManage/add0.png");
}
}
.btn3:hover {
background: rgba(64, 158, 255, 0.76);
.search {
background-image: url("../../assets/images/courseManage/add0.png");
}
.btnText {
color: #ffffff;
}
}
.btn3:active {
background: #0982ff;
}
}
}
.tableBox {
// margin: 20px 38px 30px;
margin: 10px 35px 0px 35px;
@@ -2608,8 +2738,10 @@ export default {
background: #f6f9fd;
}
}
.tableBox {
padding-bottom: 20px;
.pa {
// position: absolute;
// bottom: 20px;
@@ -2624,13 +2756,16 @@ export default {
// bottom: -40px;
}
}
.operation {
display: flex;
justify-content: right;
.nSelect {
.fb {
display: flex;
white-space: nowrap;
.jc {
color: #4ea6ff;
font-size: 14px;
@@ -2640,12 +2775,14 @@ export default {
}
}
}
.tableSelect {
// margin-right: 20px;
display: flex;
align-items: center;
justify-content: right;
white-space: nowrap;
.g1 {
color: #4ea6ff;
font-size: 14px;
@@ -2661,6 +2798,7 @@ export default {
.opa {
display: flex;
justify-content: right;
.opacation {
font-size: 14px;
font-weight: 400;
@@ -2670,12 +2808,15 @@ export default {
.activecls {
display: inline-block;
}
.errorCls {
display: none;
}
.more {
position: relative;
height: 100%;
.moreArrow {
width: 13px;
height: 7px;
@@ -2685,6 +2826,7 @@ export default {
margin: 2px;
margin-left: 7px;
}
.moreItems {
width: 80px;
height: 70px;
@@ -2699,9 +2841,11 @@ export default {
z-index: 999;
}
}
.more:hover .moreArrow {
background-image: url("../../assets/images/navtop/up.png");
}
.more:hover .moreItems {
display: block;
}

View File

@@ -39,13 +39,7 @@
<div class="inname">项目名称</div>
</div>
<div class="in">
<a-input
v-model:value="projectInfo.name"
placeholder="请输入项目名称"
show-count
:maxlength="30"
:disabled="viewDetail ? true : false"
/>
<NameInput placeholder="请输入项目名称" v-model:value="projectInfo.name" v-model:validate="projectInfo.validate" :maxlength="30" show-count :id="projectInfo.projectId"></NameInput>
</div>
</div>
<div class="name flex-top">
@@ -250,25 +244,27 @@
type="primary"
class="btn1"
style="margin-left: 20px"
>确定</a-button
>确定
</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/ProjectManagerNew";
import NameInput from "@/components/project/NameInput";
import ProjectLevel from "@/components/project/ProjectLevel";
import { changeOwnership, scrollLoad } from "@/api/method";
import { storage } from "../../api/storage";
import {changeOwnership, scrollLoad} from "@/api/method";
import {storage} from "../../api/storage";
export default {
name: "projectAdd",
@@ -277,6 +273,7 @@ export default {
ProjectLevel,
// ProjectClass,
TrainClass,
NameInput,
OrgClass,
},
setup() {
@@ -422,19 +419,24 @@ export default {
if (!validate(state.projectInfo, errorMsgs)) {
return;
}
if (!state.projectInfo.validate) {
message.destroy();
message.warning('项目名称重复,请修改名称!');
return;
}
state.projectInfo.type = 3;
state.projectInfo.courseSyncFlag = state.courseSyncFlag ? 1 : 0;
api.createProject(state.projectInfo).then((res) => {
state.projectInfo.projectId ||
changeOwnership("project", res.data.data.projectId, [
{ id: res.data.data.createId, name: res.data.data.createName },
{id: res.data.data.createId, name: res.data.data.createName},
]);
message.destroy();
message.success(state.projectInfo.projectId ? "编辑成功" : "创建成功");
// router.back();
router.push({
path: "/taskpage",
query: { projectId: res.data.data.projectId },
query: {projectId: res.data.data.projectId},
});
storage.set("projectId", res.data.data.projectId);
});

View File

@@ -179,13 +179,7 @@
</div>
<div class="inname">项目名称:</div>
<div class="in">
<a-input
v-model:value="projectInfo.name"
show-count
:maxlength="30"
placeholder="请输入项目名称"
style="border-radius: 8px"
/>
<NameInput placeholder="请输入项目名称" v-model:value="projectInfo.name" v-model:validate="projectInfo.validate" :maxlength="30" show-count :id="projectInfo.projectId"></NameInput>
</div>
</div>
<div class="name">
@@ -691,34 +685,34 @@
</div>
</a-modal>
<!-- 创建项目提示框 -->
<a-modal
v-model:visible="reminderModal"
:footer="null"
:closable="closeBack"
wrapClassName="CopyModal"
centered="true"
>
<div class="delete">
<div class="del_header"></div>
<div class="del_main">
<div class="header">
<div class="icon"></div>
<span>温馨提示</span>
<div class="close_exit" @click="closeReminderModal"></div>
</div>
<div class="body">
<div style="margin-left: 60px; margin-right: 60px">
请您根据自身需求选择对应项目类别多层项目与单层项目操作不同层级不同
</div>
</div>
<div class="del_btnbox">
<div class="del_btn btn2" @click="okReminderModal">
<div class="btnText">好的</div>
</div>
</div>
</div>
</div>
</a-modal>
<!-- <a-modal-->
<!-- v-model:visible="reminderModal"-->
<!-- :footer="null"-->
<!-- :closable="closeBack"-->
<!-- wrapClassName="CopyModal"-->
<!-- centered="true"-->
<!-- >-->
<!-- <div class="delete">-->
<!-- <div class="del_header"></div>-->
<!-- <div class="del_main">-->
<!-- <div class="header">-->
<!-- <div class="icon"></div>-->
<!-- <span>温馨提示</span>-->
<!-- <div class="close_exit" @click="closeReminderModal"></div>-->
<!-- </div>-->
<!-- <div class="body">-->
<!-- <div style="margin-left: 60px; margin-right: 60px">-->
<!-- 请您根据自身需求选择对应项目类别多层项目与单层项目操作不同层级不同-->
<!-- </div>-->
<!-- </div>-->
<!-- <div class="del_btnbox">-->
<!-- <div class="del_btn btn2" @click="okReminderModal">-->
<!-- <div class="btnText">好的</div>-->
<!-- </div>-->
<!-- </div>-->
<!-- </div>-->
<!-- </div>-->
<!-- </a-modal>-->
<!-- 项目提交审核弹窗 -->
<a-modal
v-model:visible="reviewModal"
@@ -828,6 +822,7 @@ import OrgClass from "@/components/project/OrgClass";
import dayjs from "dayjs";
import * as moment from "moment";
import { changeOwnership } from "@/api/method";
import NameInput from "@/components/project/NameInput";
export default {
name: "projectManage",
@@ -835,6 +830,7 @@ export default {
ProjOwnerShip,
ProjPowerList,
ProjCheckShip,
NameInput,
ProjectManager,
// ProjectClass,
OrgClass,
@@ -965,6 +961,11 @@ export default {
if (!validate(state.projectInfo, errorMsgs)) {
return;
}
if (!state.projectInfo.validate) {
message.destroy();
message.warning('项目名称重复,请修改名称!');
return;
}
api.createProject(state.projectInfo).then((res) => {
state.doublepro = false;
message.destroy();
@@ -1551,7 +1552,7 @@ export default {
systemId: value.record.systemId,
type: 2,
};
state.reminderModal = true;
state.estabish = true;
}}
>
创建子项目
@@ -1721,7 +1722,7 @@ export default {
};
const showModal1 = () => {
state.projectInfo = {};
state.reminderModal = true;
state.estabish = true;
};
const closeModal1 = () => {
state.estabish = false;