From f8c4da16d2736609b4039cf0a18811a90d960d1a Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E8=8B=A5=E5=AF=92=E8=8B=A5=E5=86=B0?= <5433708@qq.com> Date: Sun, 27 Nov 2022 11:15:41 +0800 Subject: [PATCH 1/2] =?UTF-8?q?=E5=90=8C=E6=AD=A5=E4=BF=AE=E6=94=B9manager?= =?UTF-8?q?=E7=9A=84=E8=AF=B7=E6=B1=82=E6=96=B9=E5=BC=8F=E4=B8=BApost?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/api/manager.js | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/src/api/manager.js b/src/api/manager.js index 16b5b6a..30eee70 100644 --- a/src/api/manager.js +++ b/src/api/manager.js @@ -191,27 +191,27 @@ export const pointApi = { export const dictionaryApi = { driverDictionary: () => request({ url: 'manager_api/manager/dictionary/driver', - method: 'get' + method: 'post' }), profileDictionary: () => request({ url: 'manager_api/manager/dictionary/profile', - method: 'get' + method: 'post' }), driverAttributeDictionary: () => request({ url: 'manager_api/manager/dictionary/driver_attribute', - method: 'get' + method: 'post' }), pointAttributeDictionary: () => request({ url: 'manager_api/manager/dictionary/point_attribute', - method: 'get' + method: 'post' }), deviceDictionary: () => request({ url: 'manager_api/manager/dictionary/device', - method: 'get' + method: 'post' }), pointDictionary: (parent) => request({ url: 'manager_api/manager/dictionary/point/' + parent, - method: 'get' + method: 'post' }) }; From 3c73be9718f9ad14b7e2859e950e7130b76a0d6f Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E8=8B=A5=E5=AF=92=E8=8B=A5=E5=86=B0?= <5433708@qq.com> Date: Sun, 27 Nov 2022 14:33:17 +0800 Subject: [PATCH 2/2] =?UTF-8?q?=E4=BF=AE=E5=A4=8D=E4=BA=86=E9=A9=B1?= =?UTF-8?q?=E5=8A=A8=E5=B1=9E=E6=80=A7=20=E4=BD=8D=E5=8F=B7=E5=B1=9E?= =?UTF-8?q?=E6=80=A7,=E6=A8=A1=E6=9D=BF,=E4=BD=8D=E5=8F=B7,=E8=AE=BE?= =?UTF-8?q?=E5=A4=87=E7=AD=89=E9=A1=B5=E9=9D=A2=E5=9B=A0=E4=B8=BA=E6=9C=8D?= =?UTF-8?q?=E5=8A=A1=E7=AB=AF=E8=BF=94=E5=9B=9E=E6=95=B0=E6=8D=AE=E6=A0=BC?= =?UTF-8?q?=E5=BC=8F=E5=8F=98=E5=8C=96=E5=AF=BC=E8=87=B4=E6=98=BE=E7=A4=BA?= =?UTF-8?q?=E5=92=8C=E6=B7=BB=E5=8A=A0=E7=9A=84=E5=BC=82=E5=B8=B8?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/views/device/Device.vue | 4 ++-- src/views/driver/DriverAttribute.vue | 2 +- src/views/driver/DriverInfo.vue | 4 ++-- src/views/event/DeviceEvent.vue | 4 ++-- src/views/point/Point.vue | 2 +- src/views/point/PointAttribute.vue | 2 +- src/views/point/PointInfo.vue | 6 +++--- src/views/point/PointValue.vue | 4 ++-- 8 files changed, 14 insertions(+), 14 deletions(-) diff --git a/src/views/device/Device.vue b/src/views/device/Device.vue index 7ef3ec2..f7f50a7 100644 --- a/src/views/device/Device.vue +++ b/src/views/device/Device.vue @@ -257,13 +257,13 @@ }, driver() { dictionaryApi.driverDictionary().then(res => { - this.findObject(this.listOption.column, 'driverId').dicData = res.data; + this.findObject(this.listOption.column, 'driverId').dicData = res.data.records; }).catch(() => { }); }, profile() { dictionaryApi.profileDictionary().then(res => { - this.findObject(this.listOption.column, 'profileIds').dicData = res.data; + this.findObject(this.listOption.column, 'profileIds').dicData = res.data.records; }).catch(() => { }); }, diff --git a/src/views/driver/DriverAttribute.vue b/src/views/driver/DriverAttribute.vue index 1584efb..c913032 100644 --- a/src/views/driver/DriverAttribute.vue +++ b/src/views/driver/DriverAttribute.vue @@ -215,7 +215,7 @@ }, driver() { dictionaryApi.driverDictionary().then(res => { - this.findObject(this.listOption.column,'driverId').dicData = res.data; + this.findObject(this.listOption.column,'driverId').dicData = res.data.records; }).catch(() => { }); }, diff --git a/src/views/driver/DriverInfo.vue b/src/views/driver/DriverInfo.vue index c0575ee..86e25b9 100644 --- a/src/views/driver/DriverInfo.vue +++ b/src/views/driver/DriverInfo.vue @@ -148,13 +148,13 @@ }, device() { dictionaryApi.deviceDictionary().then(res => { - this.findObject(this.listOption.column, 'deviceId').dicData = res.data; + this.findObject(this.listOption.column, 'deviceId').dicData = res.data.records; }).catch(() => { }); }, driverAttribute() { dictionaryApi.driverAttributeDictionary().then(res => { - this.findObject(this.listOption.column, 'driverAttributeId').dicData = res.data; + this.findObject(this.listOption.column, 'driverAttributeId').dicData = res.data.records; }).catch(() => { }); }, diff --git a/src/views/event/DeviceEvent.vue b/src/views/event/DeviceEvent.vue index b7519eb..ef9f3d4 100644 --- a/src/views/event/DeviceEvent.vue +++ b/src/views/event/DeviceEvent.vue @@ -188,13 +188,13 @@ }, device() { dictionaryApi.deviceDictionary('group').then(res => { - this.findObject(this.listOption.column, 'deviceId').dicData = res.data; + this.findObject(this.listOption.column, 'deviceId').dicData = res.data.records; }).catch(() => { }); }, point() { dictionaryApi.pointDictionary('profile').then(res => { - this.findObject(this.listOption.column, 'pointId').dicData = res.data; + this.findObject(this.listOption.column, 'pointId').dicData = res.data.records; }).catch(() => { }); }, diff --git a/src/views/point/Point.vue b/src/views/point/Point.vue index cfa5e00..fe67aeb 100644 --- a/src/views/point/Point.vue +++ b/src/views/point/Point.vue @@ -318,7 +318,7 @@ }, profile() { dictionaryApi.profileDictionary().then(res => { - this.findObject(this.listOption.column,'profileId').dicData = res.data; + this.findObject(this.listOption.column,'profileId').dicData = res.data.records; }).catch(() => { }); }, diff --git a/src/views/point/PointAttribute.vue b/src/views/point/PointAttribute.vue index 5a53314..2ce1d34 100644 --- a/src/views/point/PointAttribute.vue +++ b/src/views/point/PointAttribute.vue @@ -215,7 +215,7 @@ }, driver() { dictionaryApi.driverDictionary().then(res => { - this.findObject(this.listOption.column,'driverId').dicData = res.data; + this.findObject(this.listOption.column,'driverId').dicData = res.data.records; }).catch(() => { }); }, diff --git a/src/views/point/PointInfo.vue b/src/views/point/PointInfo.vue index 240bdce..5a6b659 100644 --- a/src/views/point/PointInfo.vue +++ b/src/views/point/PointInfo.vue @@ -165,19 +165,19 @@ }, device() { dictionaryApi.deviceDictionary().then(res => { - this.findObject(this.listOption.column,'deviceId').dicData = res.data; + this.findObject(this.listOption.column,'deviceId').dicData = res.data.records; }).catch(() => { }); }, point() { dictionaryApi.pointDictionary('profile').then(res => { - this.findObject(this.listOption.column,'pointId').dicData = res.data; + this.findObject(this.listOption.column,'pointId').dicData = res.data.records; }).catch(() => { }); }, pointAttribute() { dictionaryApi.pointAttributeDictionary().then(res => { - this.findObject(this.listOption.column,'pointAttributeId').dicData = res.data; + this.findObject(this.listOption.column,'pointAttributeId').dicData = res.data.records; }).catch(() => { }); }, diff --git a/src/views/point/PointValue.vue b/src/views/point/PointValue.vue index 07ac310..6fa13a1 100644 --- a/src/views/point/PointValue.vue +++ b/src/views/point/PointValue.vue @@ -152,13 +152,13 @@ }, device() { dictionaryApi.deviceDictionary().then(res => { - this.findObject(this.listOption.column, 'deviceId').dicData = res.data; + this.findObject(this.listOption.column, 'deviceId').dicData = res.data.records; }).catch(() => { }); }, point() { dictionaryApi.pointDictionary('profile').then(res => { - this.findObject(this.listOption.column, 'pointId').dicData = res.data; + this.findObject(this.listOption.column, 'pointId').dicData = res.data.records; }).catch(() => { }); },