From b91b60258db7bb3760ff1a5bde5f156e72d7ad86 Mon Sep 17 00:00:00 2001
From: "382696293@qq.com" <382696293@qq.com>
Date: Tue, 27 Feb 2024 17:31:37 +0800
Subject: [PATCH] =?UTF-8?q?=E3=80=90ID1000399=E3=80=91=E4=BB=AA=E5=99=A8?=
 =?UTF-8?q?=E7=AE=A1=E7=90=86-=E7=94=A8=E6=88=B7=E4=BB=AA=E5=99=A8?=
 =?UTF-8?q?=E7=BB=91=E5=AE=9A-=E8=AE=B0=E5=BD=95=E8=AF=A6=E6=83=85?=
 =?UTF-8?q?=E5=8F=AA=E6=98=BE=E7=A4=BA=E6=9C=80=E6=96=B0=E8=AE=B0=E5=BD=95?=
 =?UTF-8?q?=E8=AF=A6=E6=83=85=EF=BC=8C=E5=BA=94=E8=AF=A5=E6=98=BE=E7=A4=BA?=
 =?UTF-8?q?=E5=85=A8=E9=83=A8=E8=AE=B0=E5=BD=95=E8=AF=A6=E6=83=85?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../flossom/system/controller/WxInstrumentController.java | 5 +++++
 flossom-ui/src/api/system/instrument.js                   | 8 ++++++++
 flossom-ui/src/views/system/userInstrument/index.vue      | 7 ++++---
 3 files changed, 17 insertions(+), 3 deletions(-)

diff --git a/flossom-modules/flossom-system/src/main/java/com/flossom/system/controller/WxInstrumentController.java b/flossom-modules/flossom-system/src/main/java/com/flossom/system/controller/WxInstrumentController.java
index 461be31..ac28863 100644
--- a/flossom-modules/flossom-system/src/main/java/com/flossom/system/controller/WxInstrumentController.java
+++ b/flossom-modules/flossom-system/src/main/java/com/flossom/system/controller/WxInstrumentController.java
@@ -50,6 +50,11 @@ public class WxInstrumentController extends BaseController {
         return getDataTable(list);
     }
 
+    @GetMapping("/listAll")
+    public List<WxInstrument> listAll(WxInstrumentReq wxInstrumentReq) {
+        return wxInstrumentService.selectWxInstrumentPage(wxInstrumentReq);
+    }
+
     /**
      * 获取全部的仪器
      */
diff --git a/flossom-ui/src/api/system/instrument.js b/flossom-ui/src/api/system/instrument.js
index f911792..5945476 100644
--- a/flossom-ui/src/api/system/instrument.js
+++ b/flossom-ui/src/api/system/instrument.js
@@ -9,6 +9,14 @@ export function listInstrument(query) {
   })
 }
 
+export function listAllInstrument(query) {
+  return request({
+    url: '/system/instrument/listAll',
+    method: 'get',
+    params: query
+  })
+}
+
 // 查询仪器列详细
 export function getInstrument(id) {
   return request({
diff --git a/flossom-ui/src/views/system/userInstrument/index.vue b/flossom-ui/src/views/system/userInstrument/index.vue
index c75be03..d63e29d 100644
--- a/flossom-ui/src/views/system/userInstrument/index.vue
+++ b/flossom-ui/src/views/system/userInstrument/index.vue
@@ -367,7 +367,7 @@
 
 <script>
 import { listUserInstrument, getInstrument, delInstrument, addInstrument, updateInstrument,changeSerial,changeGuarantee } from "@/api/system/userInstrument";
-import {listInstrument} from "@/api/system/instrument";
+import {listAllInstrument, listInstrument} from "@/api/system/instrument";
 import {listLog,addLog} from "@/api/system/userInstrumentLog"
 export default {
   name: "Instrument",
@@ -500,8 +500,9 @@ export default {
       this.guaranteeForm.guarantee = "";
     },
     queryInstrument(){
-      listInstrument({}).then(response => {
-        this.instrumentList = response.rows;
+      listAllInstrument({}).then(response => {
+        console.log(response)
+        this.instrumentList = response;
       });
     },
     /** 查询用户仪器绑定列表 */