diff --git a/smart-office-manager-ui/admin/.env b/smart-office-manager-ui/admin/.env index e0b345e6899aecfcc8f08f5d67f44b5ce40f9683..8516a177744b32bc1c7f462dfb5c23e7702a708a 100644 --- a/smart-office-manager-ui/admin/.env +++ b/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 diff --git a/smart-office-manager-ui/admin/src/components/Header.vue b/smart-office-manager-ui/admin/src/components/Header.vue index 5ccad5de529dbc7ecb406172d491c5b90df15212..2d946682666d556d1178967403f3436f891a46e6 100644 --- a/smart-office-manager-ui/admin/src/components/Header.vue +++ b/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; } diff --git a/smart-office-manager-ui/admin/src/views/basic/set/list.vue b/smart-office-manager-ui/admin/src/views/basic/set/list.vue index d2327a705162527c52800f39920406637086e656..edab82e9df0417f11af7ee5e2b7dfd33431adce8 100644 --- a/smart-office-manager-ui/admin/src/views/basic/set/list.vue +++ b/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> diff --git a/smart-office-manager-ui/admin/src/views/workman/drawershow.vue b/smart-office-manager-ui/admin/src/views/workman/drawershow.vue index 856ad415b70f01d1383cde29c5c1c2584ad5c466..06083c693e6e65c75b299a15977c715a73066bca 100644 --- a/smart-office-manager-ui/admin/src/views/workman/drawershow.vue +++ b/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",},