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

修改动态接口及传参

parent e051b6db
......@@ -23,7 +23,8 @@ export default {
return Api.post(`${material}/projectgroupuser/batchdelete`, 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) { //批量添加
return Api.post(`${material}/projectgroupuser/createbatch`, params);
......
......@@ -290,16 +290,10 @@ export default {
}
},
groundTeam() {
let data = {
conditions: [],
isDesc: true,
pageIndex: 1,
pageSize: 20,
sortBy: "id",
};
let data = { conditions: [] };
Api.groundPaged(data).then((r) => {
if (r.success) {
this.teams = r.result.items;
this.teams = r.result;
}
});
},
......
......@@ -426,16 +426,10 @@ export default {
this.modalFormk = false;
},
groundTeam() {
let data = {
conditions: [],
isDesc: true,
pageIndex: 1,
pageSize: 20,
sortBy: "id",
};
let data = { conditions: []};
Api.groundPaged(data).then((r) => {
if (r.success) {
this.teams = r.result.items;
this.teams = r.result;
}
});
},
......
......@@ -4,6 +4,9 @@ export default {
paged(params) {
return Api.post(`${material}/projectlog/paged`, params);
},
listall(params) {
return Api.post(`${material}/projectlog/list`, params);
},
get(params) {
return Api.get(`${material}/projectlog/get`, params);
},
......
......@@ -4,7 +4,7 @@
<Form ref="formInline" :model="easySearch" inline>
<FormItem>
<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="1"> 今天 </MenuItem>
<MenuItem name="2"> 昨天 </MenuItem>
......@@ -75,7 +75,7 @@
>
<p class="TimelineItemli">
<!-- <span class="timeSpan">{{ item.creationTime }}</span> -->
<DTSpan class="timeSpan" :value="item.creationTime" />
<DTSpan class="timeSpan" :value="item.creationTime " />
<User :value="item.creatorUserId" />
<state code="mes.project_log.Action" :value="item.action" />
......@@ -373,10 +373,6 @@ export default {
conditionalType: "Equal",
},
],
isDesc: true,
pageIndex: 1,
pageSize: 20,
sortBy: "id",
};
if (this.startTime && this.endTime) {
params.conditions.push({
......@@ -392,9 +388,9 @@ export default {
fieldValue: this.users,
});
}
Api.paged(params).then((r) => {
Api.listall(params).then((r) => {
if (r.success) {
this.recordList = r.result.items;
this.recordList = r.result;
// this.recordList.forEach((e) => {
// e.creationTime = e.creationTime.slice(11, 16);
// });
......@@ -545,7 +541,7 @@ export default {
watch: {
eid(v) {
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