Commit 43eebf61 authored by 骆瑛's avatar 骆瑛

修改动态接口及传参

parent e051b6db
...@@ -23,7 +23,8 @@ export default { ...@@ -23,7 +23,8 @@ export default {
return Api.post(`${material}/projectgroupuser/batchdelete`, params); return Api.post(`${material}/projectgroupuser/batchdelete`, params);
}, },
groundPaged(params) { groundPaged(params) {
return Api.post(`${material}/projectgroup/paged`, params); // return Api.post(`${material}/projectgroup/paged`, params);
return Api.post(`${material}/projectgroup/list`, params);
}, },
importTeam(params) { //批量添加 importTeam(params) { //批量添加
return Api.post(`${material}/projectgroupuser/createbatch`, params); return Api.post(`${material}/projectgroupuser/createbatch`, params);
......
...@@ -289,17 +289,11 @@ export default { ...@@ -289,17 +289,11 @@ export default {
}); });
} }
}, },
groundTeam() { groundTeam() {
let data = { let data = { conditions: [] };
conditions: [],
isDesc: true,
pageIndex: 1,
pageSize: 20,
sortBy: "id",
};
Api.groundPaged(data).then((r) => { Api.groundPaged(data).then((r) => {
if (r.success) { if (r.success) {
this.teams = r.result.items; this.teams = r.result;
} }
}); });
}, },
......
...@@ -426,16 +426,10 @@ export default { ...@@ -426,16 +426,10 @@ export default {
this.modalFormk = false; this.modalFormk = false;
}, },
groundTeam() { groundTeam() {
let data = { let data = { conditions: []};
conditions: [],
isDesc: true,
pageIndex: 1,
pageSize: 20,
sortBy: "id",
};
Api.groundPaged(data).then((r) => { Api.groundPaged(data).then((r) => {
if (r.success) { if (r.success) {
this.teams = r.result.items; this.teams = r.result;
} }
}); });
}, },
......
...@@ -4,6 +4,9 @@ export default { ...@@ -4,6 +4,9 @@ export default {
paged(params) { paged(params) {
return Api.post(`${material}/projectlog/paged`, params); return Api.post(`${material}/projectlog/paged`, params);
}, },
listall(params) {
return Api.post(`${material}/projectlog/list`, params);
},
get(params) { get(params) {
return Api.get(`${material}/projectlog/get`, params); return Api.get(`${material}/projectlog/get`, params);
}, },
......
...@@ -4,7 +4,7 @@ ...@@ -4,7 +4,7 @@
<Form ref="formInline" :model="easySearch" inline> <Form ref="formInline" :model="easySearch" inline>
<FormItem> <FormItem>
<div class="taskMenu"> <div class="taskMenu">
<Menu mode="horizontal" active-name="1" @on-select="onSelectTime"> <Menu mode="horizontal" active-name="0" @on-select="onSelectTime">
<MenuItem name="0"> 所有 </MenuItem> <MenuItem name="0"> 所有 </MenuItem>
<MenuItem name="1"> 今天 </MenuItem> <MenuItem name="1"> 今天 </MenuItem>
<MenuItem name="2"> 昨天 </MenuItem> <MenuItem name="2"> 昨天 </MenuItem>
...@@ -75,7 +75,7 @@ ...@@ -75,7 +75,7 @@
> >
<p class="TimelineItemli"> <p class="TimelineItemli">
<!-- <span class="timeSpan">{{ item.creationTime }}</span> --> <!-- <span class="timeSpan">{{ item.creationTime }}</span> -->
<DTSpan class="timeSpan" :value="item.creationTime" /> <DTSpan class="timeSpan" :value="item.creationTime " />
<User :value="item.creatorUserId" /> <User :value="item.creatorUserId" />
<state code="mes.project_log.Action" :value="item.action" /> <state code="mes.project_log.Action" :value="item.action" />
...@@ -373,10 +373,6 @@ export default { ...@@ -373,10 +373,6 @@ export default {
conditionalType: "Equal", conditionalType: "Equal",
}, },
], ],
isDesc: true,
pageIndex: 1,
pageSize: 20,
sortBy: "id",
}; };
if (this.startTime && this.endTime) { if (this.startTime && this.endTime) {
params.conditions.push({ params.conditions.push({
...@@ -392,9 +388,9 @@ export default { ...@@ -392,9 +388,9 @@ export default {
fieldValue: this.users, fieldValue: this.users,
}); });
} }
Api.paged(params).then((r) => { Api.listall(params).then((r) => {
if (r.success) { if (r.success) {
this.recordList = r.result.items; this.recordList = r.result;
// this.recordList.forEach((e) => { // this.recordList.forEach((e) => {
// e.creationTime = e.creationTime.slice(11, 16); // e.creationTime = e.creationTime.slice(11, 16);
// }); // });
...@@ -545,7 +541,7 @@ export default { ...@@ -545,7 +541,7 @@ export default {
watch: { watch: {
eid(v) { eid(v) {
if (v != "" && v != null) { if (v != "" && v != null) {
this.load(v); this.load();
} }
}, },
}, },
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment