序列号列表新增仪器数据获取

flossom-ui/src/views/system/instrumentSerial/index.vue

@@ -346,7 +346,7 @@
 
 <script>
 import { listSerial, getSerial, delSerial, addSerial, updateSerial,delSerialAll,updateStatus } from "@/api/system/instrumentSerial";
-import {listInstrument} from "@/api/system/instrument";
+import {listAllInstrument, listInstrument} from "@/api/system/instrument";
 import {getToken} from "@/utils/auth";
 import {listLog} from "@/api/system/userInstrumentLog"
 
@@ -478,8 +478,8 @@ export default {
       return false
     },
     queryInstrument(){
-      listInstrument({}).then(response => {
+      listAllInstrument({}).then(response => {
-        this.instrumentList = response.rows;
+        this.instrumentList = response;
       });
     },
     /** 查询仪器序列号关联列表 */