diff --git a/sample-form-client-ui/admin/src/api/index.js b/sample-form-client-ui/admin/src/api/index.js index 2da0b31e8be4eb1d4916613a9a8b4ca55b1c2c6f..b463cb058abb041803f55d2eaa7a03c25ab5151d 100644 --- a/sample-form-client-ui/admin/src/api/index.js +++ b/sample-form-client-ui/admin/src/api/index.js @@ -35,13 +35,11 @@ export const getdeptList = (data) => { export const getSampleformMatterList = (data) => { let baseUrl = local.getLocal("serverUrl"); let siteId = local.getLocal("siteId"); - let devicenum = local.getLocal("devicenum"); return request({ url: `${baseUrl}sampleform/matter/list`, method: "post", data: { siteId, - devicenum, ...data, }, }); diff --git a/sample-form-manager-ui/admin/src/pages/hardware/NumberWriteDevice.vue b/sample-form-manager-ui/admin/src/pages/hardware/NumberWriteDevice.vue index a31a1c7a7a9c8da13cc0d3e49ae2775ab6b42a3f..aa837ac1be532a894ef93b1a471b72004aaa7bc8 100644 --- a/sample-form-manager-ui/admin/src/pages/hardware/NumberWriteDevice.vue +++ b/sample-form-manager-ui/admin/src/pages/hardware/NumberWriteDevice.vue @@ -199,7 +199,7 @@ export default { : "", tableData: [], pageSizes: [10, 20, 30, 40, 50, 100, 200], - total: 10, + total: 0, current: 1, size: 10, dialogVisible: false, @@ -223,7 +223,8 @@ export default { productName: "鏍疯〃鏈�", }); this.loading = false; - let { data } = res.data.data; + let { data, total } = res.data.data; + this.total = total; this.tableData = data; this.$refs.multipleTable.bodyWrapper.scrollTop = 0; }, diff --git a/sample-form-manager-ui/admin/src/pages/hardware/modal/AddMatter.vue b/sample-form-manager-ui/admin/src/pages/hardware/modal/AddMatter.vue index 0db4dc5104410c9fc458460f1476d211721ef43f..fb7972577b995b2a4cf078c78b94d10dfefcb1b2 100644 --- a/sample-form-manager-ui/admin/src/pages/hardware/modal/AddMatter.vue +++ b/sample-form-manager-ui/admin/src/pages/hardware/modal/AddMatter.vue @@ -317,7 +317,7 @@ export default { let { code, msg } = res.data; if (code == 1) { this.$message.success(msg); - this.getDeviceMatterList(); + this.getDeviceMatterList(this.devInfo.id); } }, // 鍒犻櫎璁惧浜嬮」 @@ -333,7 +333,7 @@ export default { let { code, msg } = res.data; if (code == 1) { this.$message.success(msg); - this.getDeviceMatterList(); + this.getDeviceMatterList(this.devInfo.id); } }) .catch(() => {