diff --git a/src/api/foodManage/supplierManage.js b/src/api/foodManage/supplierManage.js
index bfb7a0a4..8073be2e 100644
--- a/src/api/foodManage/supplierManage.js
+++ b/src/api/foodManage/supplierManage.js
@@ -3,7 +3,7 @@ import request from '@/utils/request'
 // 查询用户列表-全量查询
 export function listUserAll(query) {
   return request({
-    url: '/system/user/query/listAll',
+    url: '/system/user/list',
     method: 'get',
     params: query
   })
diff --git a/src/views/foodManage/supplierManage/supplierList/index.vue b/src/views/foodManage/supplierManage/supplierList/index.vue
index 71c2c25f..95e2d6f0 100644
--- a/src/views/foodManage/supplierManage/supplierList/index.vue
+++ b/src/views/foodManage/supplierManage/supplierList/index.vue
@@ -801,7 +801,8 @@ export default {
         },
         getSupplierUserList(){
             let param = {
-                deptId:225
+                deptId:225,
+                queryTyoe:2
             }
             listUserAll(param).then((response) => {
                 this.supplierUserList = response.rows;
diff --git a/src/views/kitchen/environment/alarmRecord/index.vue b/src/views/kitchen/environment/alarmRecord/index.vue
index 32c59aec..dd3e188d 100644
--- a/src/views/kitchen/environment/alarmRecord/index.vue
+++ b/src/views/kitchen/environment/alarmRecord/index.vue
@@ -8,8 +8,8 @@
       </el-tabs>
     </div> 
     <el-form :model="queryParams" ref="queryForm" size="small" :inline="true" v-show="showSearch" label-width="68px">
-        <el-form-item label="关键字" prop="searchValue">
-            <el-input v-model="queryParams.searchValue" placeholder="请输入设备名称，编号" maxlength="20" clearable style="width: 240px"/>
+        <el-form-item label="关键字" prop="keyWord">
+            <el-input v-model="queryParams.keyWord" placeholder="请输入设备名称，编号" maxlength="20" clearable style="width: 240px"/>
         </el-form-item>    
         <el-form-item label="设备类型" prop="deviceType5" v-if="activeName==5">
             <el-select v-model="queryParams.deviceType5" style="width: 240px" clearable> 
@@ -86,7 +86,7 @@ export default {
       queryParams: {
         pageNum: 1,
         pageSize: 10,
-        searchValue:undefined, 
+        keyWord:undefined, 
         deviceType5:undefined, 
         deviceType6:undefined,
       }, 
@@ -112,7 +112,7 @@ export default {
           this. queryParams = {
             pageNum: 1,
             pageSize: 10,
-            searchValue:undefined, 
+            keyWord:undefined, 
             deviceType5:undefined, 
             deviceType6:undefined,
           }
@@ -130,6 +130,7 @@ export default {
             "deviceCategory": this.activeName, 
             "pageNum": this.queryParams.pageNum, 
             "pageSize": this.queryParams.pageSize,
+            "keyWord": this.queryParams.keyWord,
             "deviceType": null,
             "onlyWarn":1
           }
diff --git a/src/views/kitchen/environment/videoMonitoring/history.vue b/src/views/kitchen/environment/videoMonitoring/history.vue
index 97195a2f..0e743b3a 100644
--- a/src/views/kitchen/environment/videoMonitoring/history.vue
+++ b/src/views/kitchen/environment/videoMonitoring/history.vue
@@ -151,9 +151,8 @@ methods:{
         }
     }, 
     async handleNodeClick2(data) { 
-        if(data.deviceExtendInfo&&data.deviceExtendInfo!=""){
-            let obj = JSON.parse(data.deviceExtendInfo) 
-            this.chosenChannel2 = 15 
+        if(data.channel&&data.channel!=""){ 
+            this.chosenChannel2 = data.channel 
             this.iframeLoaded2()  
         }else{
             this.$modal.msgError("设备未绑定通道号");
diff --git a/src/views/kitchen/environment/videoMonitoring/index.vue b/src/views/kitchen/environment/videoMonitoring/index.vue
index 916cfbff..7357431a 100644
--- a/src/views/kitchen/environment/videoMonitoring/index.vue
+++ b/src/views/kitchen/environment/videoMonitoring/index.vue
@@ -158,9 +158,9 @@ methods:{
         } 
     },
     async handleNodeClick(data) { 
-        if(data.deviceExtendInfo&&data.deviceExtendInfo!=""){
-            let obj = JSON.parse(data.deviceExtendInfo)  
-            this.chosenChannel = 22;
+        console.log(data)
+        if(data.channel&&data.channel!=""){ 
+            this.chosenChannel = data.channel;
             this.iframeLoaded(this.chosenWinNo,this.chosenChannel)  
         }else{
             this.$modal.msgError("设备未绑定通道号");