【ID1000399】仪器管理-用户仪器绑定-记录详情只显示最新记录详情，应该显示全部记录详情

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);
+    }
+
     /**
      * 获取全部的仪器
      */

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({

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;
       });
     },
     /** 查询用户仪器绑定列表 */