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

Merge remote-tracking branch 'origin/develop' into develop

Browse Source
This commit is contained in:
yuping
2022-12-14 21:08:46 +08:00
parent dbe1a9b0cd d67b751a4e
commit 13009685a8
5 changed files with 72 additions and 61 deletions
Download Patch File Download Diff File Expand all files Collapse all files

56
src/views/courselibrary/CoursewareManage.vue
View File

@@ -75,7 +75,7 @@
<a-range-picker
v-model:value="projectTime"
style="width: 420px"
valueFormat="X"
format="YYYY-MM-DD"
separator="至"
:placeholder="[' 开始时间', ' 结束时间']"
/>
@@ -2958,26 +2958,26 @@ const columns1 = [
return text ? text : "-";
},
},
{
title: "学习人数",
width: 130,
dataIndex: "stunum",
key: "4",
align: "center",
customRender: ({ text }) => {
return text ? text : "0";
},
},
{
title: "评分",
width: 130,
dataIndex: "grade",
key: "5",
align: "center",
customRender: ({ text }) => {
return text ? text : "0";
},
},
// {
// title: "学习人数",
// width: 130,
// dataIndex: "stunum",
// key: "4",
// align: "center",
// customRender: ({ text }) => {
// // return text ? text : "0";
// },
// },
// {
// title: "评分",
// width: 130,
// dataIndex: "grade",
// key: "5",
// align: "center",
// customRender: ({ text }) => {
// return text ? text : "0";
// },
// },
{
title: "状态",
width: 130,
@@ -3632,7 +3632,7 @@ export default defineComponent({
imageUrl: "",
imgList: [],
validate: false,
validate:true,
pageSize2: 10,
currentPage2: 0,
@@ -3984,8 +3984,16 @@ export default defineComponent({
let startTime = "";
let endTime = "";
if (state.projectTime) {
startTime = state.projectTime[0];
endTime = state.projectTime[1];
startTime = toDate(
new Date(state.projectTime[0].$d).getTime() / 1000,
"Y-M-D"
);
endTime = toDate(
new Date(state.projectTime[1].$d).getTime() / 1000,
"Y-M-D"
);
}
let res = await list({
pageNo: state.currentPage1,

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",

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

@@ -47,12 +47,7 @@
<div class="addTime">创建时间：</div>
<a-range-picker
v-model:value="searchParam.valueDate"
:show-time="{
defaultValue: [
moment('00:00:00', 'HH:mm:ss'),
moment('23:59:59', 'HH:mm:ss'),
],
}"
format="YYYY-MM-DD"
style="border-radius: 8px; height: 40px; margin-left: 5px"
:placeholder="[' 开始时间', ' 结束时间']"
valueFormat="X"
@@ -832,6 +827,7 @@ import * as moment from "moment";
import { changeOwnership } from "@/api/method";
import NameInput from "@/components/project/NameInput";
import { validateName } from "@/api/index1";
import { toDate } from "../../api/method";
export default {
name: "projectManage",
@@ -1701,12 +1697,16 @@ export default {
beginTime:
state.searchParam.valueDate &&
state.searchParam.valueDate.length === 2
? state.searchParam.valueDate[0]
? toDate(
new Date(state.searchParam.valueDate[0].$d).getTime() / 1000,
"Y-M-D")
: "",
endTime:
state.searchParam.valueDate &&
state.searchParam.valueDate.length === 2
? state.searchParam.valueDate[1]
? toDate(
new Date(state.searchParam.valueDate[1].$d).getTime() / 1000,
"Y-M-D")
: "",
})
.then((res) => {

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

@@ -3108,7 +3108,7 @@ export default {
title: "姓名",
dataIndex: "name",
key: "name",
// width: 30,
width:"20%",
align: "left",
className: "h",
// scopedSlots: { customRender: "action" }, //引入的插槽
@@ -3145,9 +3145,10 @@ export default {
title: "部门",
dataIndex: "bum",
key: "bum",
// width: 50,
width:"10%",
align: "center",
className: "h",
ellipsis: true,
},
// {
// title: "岗位",
@@ -3165,14 +3166,15 @@ export default {
// align: "center",
// className: "h",
// },
// {
// title: "进度",
// dataIndex: "progress",
// key: "progress",
// width: 30,
// align: "center",
// className: "h",
// },
{
title: "进度",
dataIndex: "progress",
key: "progress",
width:"10%",
align: "center",
className: "h",
ellipsis: true,
},
// {
// title: "证书",
// dataIndex: "diploma",
@@ -3185,7 +3187,7 @@ export default {
title: "最近学习时间",
dataIndex: "stutime",
key: "stutime",
// width: 50,
width:"20%",
align: "center",
className: "h",
// sorter: {
@@ -3197,15 +3199,16 @@ export default {
title: "加入方式",
dataIndex: "putin",
key: "putin",
// width: 40,
width:"10%",
align: "center",
className: "h",
ellipsis: true,
},
{
title: "操作",
dataIndex: "operation",
key: "operation",
// width: 60,
width:"20%",
align: "center",
className: "h",
scopedSlots: { customRender: "action" }, //引入的插槽