hz/fe-manage
1
0
Fork 0
mirror of https://codeup.aliyun.com/67762337eccfc218f6110e0e/vue/fe-manage.git synced 2025-12-08 02:16:45 +08:00
Code Issues Packages Projects Releases Wiki Activity

feat:合并

Browse Source
This commit is contained in:
lixg
2022-12-14 17:24:27 +08:00
parent 37cb81763a 1ce9bf7c4d
commit a97d9d023d
7 changed files with 347 additions and 1001 deletions
Download Patch File Download Diff File Expand all files Collapse all files

16
src/components/drawers/MemberList.vue
View File

@@ -239,14 +239,14 @@ export default {
// align: "center",
// className: "h",
// },
{
title: "进度",
dataIndex: "progress",
key: "progress",
width: 60,
align: "center",
className: "h",
},
// {
// title: "进度",
// dataIndex: "progress",
// key: "progress",
// width: 60,
// align: "center",
// className: "h",
// },
{
title: "操作",
dataIndex: "operations",

16
src/views/learningpath/LevelAdd.vue
View File

@@ -1499,14 +1499,14 @@ export default {
align: "center",
className: "h",
},
{
title: "进度",
dataIndex: "jin",
key: "jin",
width: 110,
align: "center",
className: "h",
},
// {
// title: "进度",
// dataIndex: "jin",
// key: "jin",
// width: 110,
// align: "center",
// className: "h",
// },
{
title: "开始时间",
dataIndex: "time",

16
src/views/learningpath/LevelAddDetail.vue
View File

@@ -1547,14 +1547,14 @@ export default {
align: "center",
className: "h",
},
{
title: "进度",
dataIndex: "jin",
key: "jin",
width: 110,
align: "center",
className: "h",
},
// {
// title: "进度",
// dataIndex: "jin",
// key: "jin",
// width: 110,
// align: "center",
// className: "h",
// },
{
title: "开始时间",
dataIndex: "time",

2
src/views/projectcenter/ProjectManage.vue
View File

@@ -1328,7 +1328,7 @@ export default {
title: "项目名称",
dataIndex: "name",
key: "name",
width: 480,
width: 380,
// align: "center",
ellipsis: true,
// scopedSlots: { customRender: "action" }, //引入的插槽

1119
src/views/projectcenter/SonProject.vue
View File

File diff suppressed because it is too large Load Diff

14
src/views/projectcenter/TaskPage.vue
View File

@@ -3165,14 +3165,14 @@ export default {
// align: "center",
// className: "h",
// },
{
title: "进度",
dataIndex: "progress",
key: "progress",
// {
// title: "进度",
// dataIndex: "progress",
// key: "progress",
// width: 30,
align: "center",
className: "h",
},
// align: "center",
// className: "h",
// },
// {
// title: "证书",
// dataIndex: "diploma",

165
src/views/projectcenter/templateAdd.vue
View File

@@ -4,10 +4,10 @@
<div class="header">
<span class="title">创建/编辑单层模板</span>
<div
@click="backPage"
style="cursor: pointer"
to="/libraryAdd"
class="goback"
@click="backPage"
style="cursor: pointer"
to="/libraryAdd"
class="goback"
>
<span class="return"></span><span class="returntext">返回</span>
</div>
@@ -17,32 +17,32 @@
<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"
v-model:value="projectInfo.name"
placeholder="请输入模板名称"
show-count
:maxlength="30"
/>
</div>
</div>
<div class="name" style="align-items: flex-start">
<div class="namebox" style="margin-top: 10px">
<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" style="display: flex">
<div
:class="`box ${projectInfo.picUrl === src.value ? 'active' : ''}`"
style="
:class="`box ${projectInfo.picUrl === src.value ? 'active' : ''}`"
style="
width: 100px;
height: 100px;
border-radius: 5px;
@@ -50,19 +50,19 @@
position: relative;
overflow: hidden;
"
v-for="(src, index) in projectPic"
:key="index"
@click="() => (projectInfo.picUrl = src.value)"
v-for="(src, index) in projectPic"
:key="index"
@click="() => (projectInfo.picUrl = src.value)"
>
<img
style="
style="
width: 100px;
height: 100px;
margin-bottom: 4px;
margin-right: 4px;
"
:src="src.value"
alt="avatar"
:src="src.value"
alt="avatar"
/>
</div>
</div>
@@ -70,61 +70,61 @@
<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"
separator="至"
:placeholder="[' 开始时间', ' 结束时间']"
v-model:value="projectInfo.rangeTime"
style="width: 100%; height: 40px; border-radius: 5px"
valueFormat="YYYY-MM-DD HH:mm:ss"
@change="timeChange"
/>
</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"
@onChange="managerChange"
mode="multiple"
v-model:value="projectInfo.managerId"
v-model:name="projectInfo.manager"
@onChange="managerChange"
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"
v-model:value="projectInfo.sourceBelongId"
v-model:name="projectInfo.sourceBelongName"
></OrgClass>
</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>
@@ -135,8 +135,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>
@@ -147,8 +147,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">是否BOEU实施</div>
</div>
@@ -165,16 +165,16 @@
</div>
<div class="in">
<a-checkbox
v-model:checked="courseSyncFlag"
:disabled="viewDetail ? true : false"
><span
v-model:checked="courseSyncFlag"
:disabled="viewDetail ? true : false"
><span
style="
width: 100%;
color: rgba(109, 117, 132, 1);
font-size: 14px;
"
>同步课程学习记录（如学员在课程库中拥有课程的学习记录，自动免修该课程）</span
></a-checkbox
>同步课程学习记录（如学员在课程库中拥有课程的学习记录，自动免修该课程）</span
></a-checkbox
>
</div>
</div>
@@ -184,11 +184,11 @@
</div>
<div class="in">
<a-textarea
v-model:value="projectInfo.remark"
style="height: 80px"
placeholder="请输入说明"
show-count
:maxlength="200"
v-model:value="projectInfo.remark"
style="height: 80px"
placeholder="请输入说明"
show-count
:maxlength="200"
/>
</div>
</div>
@@ -197,7 +197,7 @@
<div class="footer">
<div class="btn">
<a-button v-on:click="createProject" type="primary" class="btn1"
>确定
>确定
</a-button>
<a-button @click="backPage" class="btn2">取消</a-button>
</div>
@@ -205,12 +205,11 @@
</div>
</template>
<script setup>
import { useStore } from "vuex";
import { ref, onMounted, watch } from "vue";
import { message } from "ant-design-vue";
import { useRouter, useRoute } from "vue-router";
import {useStore} from "vuex";
import {ref, onMounted, watch} from "vue";
import {message} from "ant-design-vue";
import {useRouter, useRoute} from "vue-router";
import * as api from "../../api/indexTemplate";
// import ProjectClass from "@/components/project/ProjectClass";
import TrainClass from "@/components/project/TrainClass";
import OrgClass from "@/components/project/OrgClass";
import ProjectManager from "@/components/project/ProjectManagerNew";
@@ -221,7 +220,7 @@ const router = useRouter();
const store = useStore();
const projectInfo = ref({});
const projectPic = ref([]);
const courseSyncFlag = ref(false);
const courseSyncFlag = ref(false)
onMounted(() => {
getDetail();
projectPic.value = store.state.projectPic.map((e) => ({
@@ -231,22 +230,22 @@ onMounted(() => {
});
watch(
() => route.query.projectTemplateId,
() => {
getDetail();
}
() => route.query.projectTemplateId,
() => {
getDetail();
}
);
const getDetail = () =>
route.query.projectTemplateId &&
api.templateDetail(route.query.projectTemplateId).then((res) => {
projectInfo.value = res.data.data.projectTemplateInfo;
projectInfo.value.rangeTime = [
projectInfo.value.beginTime,
projectInfo.value.endTime,
];
projectInfo.value.courseSyncFlag = !!projectInfo.value.courseSyncFlag;
});
route.query.projectTemplateId &&
api.templateDetail(route.query.projectTemplateId).then((res) => {
projectInfo.value = res.data.data.projectTemplateInfo;
projectInfo.value.rangeTime = [
projectInfo.value.beginTime,
projectInfo.value.endTime,
];
projectInfo.value.courseSyncFlag = !!projectInfo.value.courseSyncFlag
});
const backPage = () => {
router.back();
@@ -283,15 +282,15 @@ const createProject = () => {
}
projectInfo.value.courseSyncFlag = courseSyncFlag.value ? 1 : 0;
api
.templateEdit({
...projectInfo.value,
courseSyncFlag: projectInfo.value.courseSyncFlag ? 1 : 0,
})
.then(() => {
message.destroy();
message.success("编辑成功");
router.back();
});
.templateEdit({
...projectInfo.value,
courseSyncFlag: projectInfo.value.courseSyncFlag ? 1 : 0,
})
.then(() => {
message.destroy();
message.success("编辑成功");
router.back();
});
};
function managerChange(e, l, d, t) {