合并jzl

gassafetyprogress-web/src/components/bigWindow/UserCenter.vue

@@ -14,7 +14,7 @@
             size="mini"
             :data="tableData"
             style="width: 100%"
-            :height="tableHeight"
+
             class="el-bottom"
             :key="Math.random()"
           >

gassafetyprogress-web/src/views/bigWindow/index.vue

 <!--
  * @Author: your name
  * @Date: 2022-01-11 13:44:17
- * @LastEditTime: 2022-02-26 22:06:26
+ * @LastEditTime: 2022-02-26 22:54:46
  * @LastEditors: Please set LastEditors
  * @Description: 打开koroFileHeader查看配置 进行设置: https://github.com/OBKoro1/koro1FileHeader/wiki/%E9%85%8D%E7%BD%AE
  * @FilePath: /test/hello-world/src/views/Home.vue
@@ -270,7 +270,7 @@ export default {
       this.goMap(getFm, this.addDevice, DeviceA);
       this.goMap(getCz, this.addDevice, DeviceA);
       this.goMap(getVideo, this.addDevice, VideoView);
-      this.goMap(getUser, this.addDevice, User);
+      this.goMap(detectorUserList, this.addDevice, User);
       // getVideo().then((res) => {
       //   console.log("getVideo", res);
       // });
@@ -302,7 +302,11 @@ export default {
     },
     goMap(httpFunc, addFunc, component) {
       httpFunc().then((res) => {
-        console.log("resresres", res);
+        if(res.data&&!res.data[0].iconType){
+          res.data.forEach(item=>{
+            item.iconType =6;
+          })
+        }
         // 根据数据格式不同，赋值不同，如果是个数组，就用res，如果不是就用res.data
         let config = {};
         if (Array.isArray(res)) {