diff --git a/src/api/ywry.js b/src/api/ywry.js index 5c94dd3..9f58653 100644 --- a/src/api/ywry.js +++ b/src/api/ywry.js @@ -7,9 +7,9 @@ export function getList(data) { param += '&OrderString=date'; param += '&orderType=desc'; // } - // if (data.tuyaDeviceId != '' && data.tuyaDeviceId != undefined) { - // param += '&tuyaDeviceId=' + data.tuyaDeviceId; - // } + if (data.billNo != '' && data.billNo != undefined) { + param += '&billNo=' + data.billNo; + } return request({ url: '/k3Cloud/salStock/list' + param, method: 'get', diff --git a/src/views/iot/sensor/add.vue b/src/views/iot/sensor/add.vue index bf85c62..e94ecd6 100644 --- a/src/views/iot/sensor/add.vue +++ b/src/views/iot/sensor/add.vue @@ -154,20 +154,20 @@ > - - - - - - - - - - - - - - + + + (设备->平台) + + + + (平台->设备) + diff --git a/src/views/iot/ywry/index.vue b/src/views/iot/ywry/index.vue index ca4d3c0..d3ac88a 100644 --- a/src/views/iot/ywry/index.vue +++ b/src/views/iot/ywry/index.vue @@ -6,7 +6,7 @@ @@ -175,7 +175,7 @@ export default { queryForm: { page: 1, size: 10, - name: '', + billNo: '', }, codeUrl: '', data: {}, diff --git a/src/views/server/siteDetails/image.vue b/src/views/server/siteDetails/image.vue index 08a47e7..5c6f085 100644 --- a/src/views/server/siteDetails/image.vue +++ b/src/views/server/siteDetails/image.vue @@ -6,7 +6,7 @@ {{ img.turbidity }}