Merge branch 'dev' of http://110.41.163.243:9980/kd-aiot/kd-aiot-frontend-portal into dev

src/styles/index.scss

@@ -3,3 +3,18 @@ $--ele-font-path: '~ele-admin/es/style/fonts';
 @import '~ele-admin/es/style/themes/dynamic.scss';
 @import '~ele-admin/es/style/index.scss';
 @import './transition/index.scss';
+
+  .ele-pro-table-fullscreen .el-table{
+    height: calc(100vh - 160px) !important;
+    max-height: none !important;
+    .el-table__body-wrapper{
+        
+    max-height: none !important;
+    height: calc(100% - 27px);
+    }
+    .el-table__fixed-body-wrapper{
+    max-height: none !important;
+    height: calc(100% - 27px);
+
+    }
+  }

src/views/singleLogin/index.vue

@@ -414,9 +414,9 @@
           //   this.infoForm.factoryName = res.factoryName;
           // } else {
           const data = this.factoryList.find((it) => it.id == res.factoryId);
-          console.log(data, '数据111');
           // }
           this.infoForm.factoryId = res.factoryId;
+          this.infoForm.factoryName = res.factoryName;
           this.teamList = res.teamList;
           this.userData = res;
         });