From dc8e5c4bf130fb2ec6ab9fb720170ce061f406fa Mon Sep 17 00:00:00 2001
From: mhsnet <mhsnet@163.com>
Date: Wed, 3 Jul 2024 13:15:31 +0800
Subject: [PATCH] =?UTF-8?q?=E6=96=B0=E5=BB=BA=E5=8F=8A=E7=BC=96=E8=BE=91?=
 =?UTF-8?q?=E6=97=B6=E2=80=9C=E8=AE=BE=E5=A4=87=E7=BC=96=E7=A0=81=E2=80=9D?=
 =?UTF-8?q?=20=E4=B8=8B=E6=8B=89=E6=A1=86=E6=97=A0=E6=95=B0=E6=8D=AE?=
 =?UTF-8?q?=E4=BF=AE=E5=A4=8D?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../jnpf-web/src/views/recycledeviceevent/form.vue  | 13 ++++++++++---
 1 file changed, 10 insertions(+), 3 deletions(-)

diff --git a/jnpf-java-boot/jnpf-web/src/views/recycledeviceevent/form.vue b/jnpf-java-boot/jnpf-web/src/views/recycledeviceevent/form.vue
index c92e60b..c5604cf 100644
--- a/jnpf-java-boot/jnpf-web/src/views/recycledeviceevent/form.vue
+++ b/jnpf-java-boot/jnpf-web/src/views/recycledeviceevent/form.vue
@@ -132,6 +132,7 @@ import {
 import {
     thousandsFormat
 } from "@/components/Generator/utils/index"
+import { getDeviceListOption } from "@/api/device";
 export default {
     components: {},
     props: [],
@@ -178,8 +179,8 @@ export default {
             dataRule: {},
             deviceCodeOptions: [],
             deviceCodeProps: {
-                "label": "device_name",
-                "value": "device_code"
+                "label": "deviceName",
+                "value": "deviceCode"
             },
             bucketCodeOptions: [],
             bucketCodeProps: {
@@ -404,7 +405,13 @@ export default {
             let template = {
                 paramList: templateJsonList
             }
-            getDataInterfaceRes('564713894723988869', template).then(res => {
+            // getDataInterfaceRes('564713894723988869', template).then(res => {
+            //     let data = res.data
+            //     this.deviceCodeOptions = data
+            //     this.changeDataFormData(1, 'deviceCode', 'deviceCode', index, '')
+            // })
+            getDeviceListOption().then(res => {
+                console.log(res.data)
                 let data = res.data
                 this.deviceCodeOptions = data
                 this.changeDataFormData(1, 'deviceCode', 'deviceCode', index, '')