Merge remote-tracking branch 'origin/master'

smart-office-manager-ui/admin/.env

@@ -7,7 +7,8 @@ VUE_APP_BASE_API =/basics_api
 
 
 # 门户登录地址
-VUE_APP_PORTAL_URL = /portal_home
+# VUE_APP_PORTAL_URL = /portal_home
+ VUE_APP_PORTAL_URL = http://192.168.0.98:11072
 
 VUE_APP_PORTAL_PORT = 21085
 

smart-office-manager-ui/admin/src/components/Header.vue

@@ -41,7 +41,13 @@
              {{userData.currUserName}}
              <i class="el-icon-arrow-down el-icon--right"></i>
           </span> -->
-
+        <span class="admin-header-right">
+          <a-tooltip class="header-item" title="返回门户" placement="bottom">
+            <a :href="portal">
+              <i class="el-icon-s-home"></i> 返回门户
+            </a>
+          </a-tooltip>
+        </span>
         <el-dropdown @command="handleCommand">
           <span class="el-dropdown-link" style="color:white">
             {{ userData.currUserName }}
@@ -49,7 +55,7 @@
           </span>
           <el-dropdown-menu slot="dropdown">
             <el-dropdown-item command="update">修改密码</el-dropdown-item>
-            <el-dropdown-item command="logout">退出登录</el-dropdown-item>
+            <!-- <el-dropdown-item command="logout">退出登录</el-dropdown-item> -->
           </el-dropdown-menu>
         </el-dropdown>
       </div>
@@ -202,6 +208,7 @@ export default {
       sysLogo: localStorage.getItem("sysLogo")
         ? localStorage.getItem("sysLogo")
         : "",
+      portal: process.env.VUE_APP_PORTAL_URL+'/#/home/siteArrange',//门户地址
     };
   },
 };
@@ -209,6 +216,21 @@ export default {
 
 <style lang="less">
 .layout-header {
+  .admin-header-right{
+    color: inherit;
+    .header-item{
+      color: inherit;
+      padding: 0 12px;
+      cursor: pointer;
+      align-self: center;
+      a{
+        color: inherit;
+        i{
+          font-size: 16px;
+        }
+      }
+    }
+  }
   .mobile-menu-list {
     display: none;
   }

smart-office-manager-ui/admin/src/views/basic/set/list.vue

@@ -126,3 +126,9 @@
         }
     };
 </script>
+
+<style lang="less" scoped>
+/deep/ .table-head{
+  display: none !important;
+}
+</style>

smart-office-manager-ui/admin/src/views/workman/drawershow.vue

@@ -65,7 +65,7 @@
           }
           let phoneReg = (rule, value, callback) =>{
             if(!value){
-              callback(new Error('请输入手机号码'))
+              callback()
             }
             let regExp=/^(((\+86)|(\+86-))|((86)|(86\-))|((0086)|(0086\-)))?1[3|5|7|8]\d{9}$/;
             if(regExp.test(value)){
@@ -103,14 +103,14 @@
                   roomId: [
                     {required: true,message: "请选择人员所属房间", trigger: "blur" }
                   ],
-/*                  phone: [
-                    {required: true,trigger: "blur" ,validator: mobileReg},
-                    {max: 64,message: "最多只能录入64个字符",trigger: "blur",},
-                  ],
+                // phone: [
+                //     {required: true,trigger: "blur" ,validator: mobileReg},
+                //     {max: 64,message: "最多只能录入64个字符",trigger: "blur",},
+                //   ],
                   mobile: [
-                    {required: true,trigger: "blur" ,validator:phoneReg},
+                    {required: false,trigger: "blur" ,validator:phoneReg},
                     {max: 64,message: "最多只能录入64个字符",trigger: "blur",},
-                  ],*/
+                  ],
                     workStatus: [
                         {required: true,message: "请输入工作状态，来源基础设置", trigger: "blur" },
                         {max: 64,message: "最多只能录入64个字符",trigger: "blur",},