diff --git a/client/src/views/supervisionNew/mytask.vue b/client/src/views/supervisionNew/mytask.vue index 5ea64b9..00268c6 100644 --- a/client/src/views/supervisionNew/mytask.vue +++ b/client/src/views/supervisionNew/mytask.vue @@ -251,7 +251,7 @@ fit stripe highlight-current-row - :height="tableHeight" + max-height="300" > @@ -286,7 +286,6 @@ fit stripe highlight-current-row - :height="tableHeight" id="oinspect" style="display: none;" > @@ -326,7 +325,7 @@ fit stripe highlight-current-row - :height="tableHeight" + max-height="300" > @@ -386,7 +385,7 @@ fit stripe highlight-current-row - :height="tableHeight" + max-height="300" > @@ -453,7 +452,7 @@ fit stripe highlight-current-row - :height="tableHeight" + max-height="300" > @@ -540,7 +539,7 @@ fit stripe highlight-current-row - :height="tableHeight" + max-height="300" > @@ -619,7 +618,7 @@ fit stripe highlight-current-row - :height="tableHeight" + max-height="300" > @@ -841,7 +840,7 @@ }, mounted(){ let height1 = document.getElementsByClassName('app-main')[0].clientHeight; - this.leftHeight = height1-15; + this.leftHeight = height1-25; this.listQuery.belong_dept =this.$store.getters.dept; this.getOrgList(); this.getList(); @@ -989,46 +988,46 @@ }, getRcList(){ let that = this; - getRcList({task2do:that.task2do,etype:10}).then((res) => { + getRcList({task2do:that.task2do,etype:10,page:0}).then((res) => { if (res.code >= 200) { - that.rcList =res.data.results; + that.rcList =res.data; } }); - getRcList({task2do:that.task2do,etype:20}).then((res) => { + getRcList({task2do:that.task2do,etype:20,page:0}).then((res) => { if (res.code >= 200) { - that.rc2List =res.data.results; + that.rc2List =res.data; } }); }, getPtList(){ let that = this; - getPtList({task2do:that.task2do}).then((res) => { + getPtList({task2do:that.task2do,page:0}).then((res) => { if (res.code >= 200) { - that.ptList=res.data.results; + that.ptList=res.data; } }); }, getRiskList(){ let that = this; - getRiskList({task2do:that.task2do}).then((res) => { + getRiskList({task2do:that.task2do,page:0}).then((res) => { if (res.code >= 200) { - that.riskList = res.data.results; + that.riskList = res.data; } }); }, getComplaintList(){ let that = this; - getComplaintList({task2do:that.task2do}).then((res) => { + getComplaintList({task2do:that.task2do,page:0}).then((res) => { if (res.code >= 200) { - that.complaintList = res.data.results; + that.complaintList = res.data; } }); }, getOinspectList(){ let that = this; - getOinspectList({task2do:that.task2do}).then((res) => { + getOinspectList({task2do:that.task2do,page:0}).then((res) => { if (res.code >= 200) { - that.oinspectList=res.data.results; + that.oinspectList=res.data; } }); }, diff --git a/client/src/views/supervisionNew/taskdo.vue b/client/src/views/supervisionNew/taskdo.vue index 75955ee..09eb9ad 100644 --- a/client/src/views/supervisionNew/taskdo.vue +++ b/client/src/views/supervisionNew/taskdo.vue @@ -641,48 +641,46 @@ export default { }, getRcList(){ let that = this; - getRcList({task2do:that.task2do,etype:10}).then((res) => { + getRcList({task2do:that.task2do,etype:10,page:0}).then((res) => { if (res.code >= 200) { - that.rcList =res.data.results; + that.rcList =res.data; } }); - getRcList({task2do:that.task2do,etype:20}).then((res) => { + getRcList({task2do:that.task2do,etype:20,page:0}).then((res) => { if (res.code >= 200) { - that.rc2List =res.data.results; + that.rc2List =res.data; } }); }, getPtList(){ let that = this; - getPtList({task2do:that.task2do}).then((res) => { + getPtList({task2do:that.task2do,page:0}).then((res) => { if (res.code >= 200) { - that.ptList=res.data.results; + that.ptList=res.data; } }); }, getRiskList(){ let that = this; - getRiskList({task2do:that.task2do}).then((res) => { + getRiskList({task2do:that.task2do,page:0}).then((res) => { if (res.code >= 200) { - // debugger; - console.log(res) - that.riskList = res.data.results; + that.riskList = res.data; } }); }, getComplaintList(){ let that = this; - getComplaintList({task2do:that.task2do}).then((res) => { + getComplaintList({task2do:that.task2do,page:0}).then((res) => { if (res.code >= 200) { - that.complaintList = res.data.results; + that.complaintList = res.data; } }); }, getOinspectList(){ let that = this; - getOinspectList({task2do:that.task2do}).then((res) => { + getOinspectList({task2do:that.task2do,page:0}).then((res) => { if (res.code >= 200) { - that.oinspectList=res.data.results; + that.oinspectList=res.data; } }); },