Merge remote-tracking branch 'origin/feature-ui-fix' into feature-ui-fix

jero-web/src/components/page/GlobalLayout.vue

@@ -326,7 +326,39 @@ export default {
       .user-wrapper {
         float: right;
         height: 100%;
+        .small-action {
+          cursor: pointer;
+          padding: 0 5px;
+          display: inline-block;
+          transition: all .3s;
 
+          height: 70%;
+          line-height: 46px;
+
+          &.action-full {
+            height: 100%;
+          }
+
+          &:hover {
+            background: rgba(255, 255, 255, 0.3);
+          }
+
+          .avatar {
+            margin: 20px 10px 20px 0;
+            color: #1890ff;
+            background: hsla(0, 0%, 100%, .85);
+            vertical-align: middle;
+          }
+
+          .icon {
+            font-size: 16px;
+            padding: 4px;
+          }
+
+          .anticon {
+            color: inherit;
+          }
+        }
         .action {
           cursor: pointer;
           padding: 0 14px;

jero-web/src/components/tools/UserMenu.vue

@@ -33,11 +33,18 @@
       </a>
     </span>
     <header-notice class="action"/>
-    <span style="padding: 12px">
+    <span style="display:inline-block;padding: 0 0 0 16px">
-      <a-avatar class="avatar" size="small" :src="getAvatar()"/>
+      <template v-if='getAvatar()'>
+         <a-avatar class="avatar" size="small" :src="getAvatar()"/>
+      </template>
+       <template v-else>
+         <a-avatar :size="20">
+          <template #icon>  <a-icon type="user"></a-icon></template>
+        </a-avatar>
+      </template>
     </span>
     <a-dropdown>
-      <span class="action">
+      <span class=" small-action">
         <span v-if="isDesktop()">欢迎您，{{ nickname() }}</span>
       </span>
       <a-menu slot="overlay" class="user-dropdown-menu-wrapper">
@@ -104,7 +111,7 @@ import { mixinDevice } from '@/utils/mixin.js'
 import { getFileAccessHttpUrl, getAction } from '@/api/manage'
 import Vue from 'vue'
 import { UI_CACHE_DB_DICT_DATA } from '@/store/mutation-types'
-
+import { UserOutlined } from '@ant-design/icons-vue';
 export default {
   name: 'UserMenu',
   mixins: [mixinDevice],
@@ -118,6 +125,7 @@ export default {
     }
   },
   components: {
+    UserOutlined,
     HeaderNotice,
     UserPassword,
     DepartSelect,
@@ -269,6 +277,7 @@ export default {
   .user-wrapper .search-input {
     width: 210px;
     color: inherit;
+    margin-right: 8px;
 
     /deep/ .ant-select-selection {
       background-color: #F7F8FA !important;
@@ -284,7 +293,13 @@ export default {
   /* update_end author:zhaoxin date:20191129 for: 让搜索框颜色能随主题颜色变换*/
 </style>
 
-<style scoped>
+<style lang="less" scoped>
+  .ant-avatar {
+    background-color: #fff;
+    color: #333 !important;
+    border: 1px solid #333;
+    vertical-align: sub;
+  }
   .logout_title {
     color: inherit;
     text-decoration: none;

jero-web/src/views/system/modules/PermissionModal.vue

@@ -73,7 +73,6 @@
         </a-form-model-item>
 
         <a-form-model-item
-          v-show="!show"
           :labelCol="labelCol"
           :wrapperCol="wrapperCol"
           prop="perms"