[update] 用户编辑

src/components/menu/FirstLevelMenu.vue

@@ -74,13 +74,13 @@ export default {
     // 选择菜单
     selectMenu (menu) {
       console.log(menu)
-      if (menu.path !== '/systemOverview') {
-        this.$warning({
-          title: '系统建设中',
-          onOk: () => {}
-        })
-        return
-      }
+      // if (menu.path !== '/systemOverview') {
+      //   this.$warning({
+      //     title: '系统建设中',
+      //     onOk: () => {}
+      //   })
+      //   return
+      // }
       this.selectPath = menu.path
       if (menu.children && menu.children.length > 0) {
         this.$router.push({ path: menu.children[0].path })
@@ -167,6 +167,7 @@ export default {
          margin: 10px 4px 0;
        }
       .menu-item {
+        overflow: hidden;
         position: relative;
         width: 68px;
         height: 68px;
@@ -205,6 +206,13 @@ export default {
 
         .menu-item {
           background-image: url("~@/assets/images/menu/top-menu-act.png");
+
+          // 将图片移到父元素外侧，溢出隐藏，然后用阴影偏移回来显示激活的图片颜色
+          img {
+            @offset: 100px;
+            transform: translate(-50%, calc(-50% + @offset));
+            filter: drop-shadow(0 -@offset 0 @primary-color);
+          }
         }
         .menu-item-title {
           font-family: Alimama ShuHeiTi, Alimama ShuHeiTi, sans-serif;

src/views/systemOverview/systemSettings/SystemSettings.vue

@@ -111,19 +111,19 @@
                 </a-form-item>
               </a-col>
               <a-col :span="12">
-                <a-form-model-item label="所属单位">
+                <a-form-item label="所属单位">
                   <j-select-depart
                     placeholder="请选择所属单位"
                     v-decorator="['selecteddeparts', validatorRules.selecteddeparts]"
                     :backDepart="true"
                     :treeOpera="true"></j-select-depart>
-                </a-form-model-item>
+                </a-form-item>
               </a-col>
               <a-col :span="12">
-                <a-form-model-item label="联系方式">
+                <a-form-item label="联系方式">
                   <a-input placeholder="请输入联系方式"
                            v-decorator="['phone', validatorRules.phone]" />
-                </a-form-model-item>
+                </a-form-item>
 
               </a-col>
             </a-row>
@@ -498,7 +498,7 @@ export default {
     },
     // 编辑用户
     handleEditUser (record) {
-      // this.$refs.userInfoModal.edit(record)
+      this.$refs.userInfoModal.edit(record)
     },
     // 删除用户
     handleDeleteUser (record) {
@@ -531,7 +531,7 @@ export default {
 <style lang="less" scoped>
 .upload-avatar-box {
   position: relative;
-  width: calc(100% + 40px);
+  width: 100%;
   height: 168px;
   background: url("~@/assets/images/systemOverview/systemSettings/upload-avatar.png") no-repeat center center;
   background-size: 124px 124px;

src/views/systemOverview/systemSettings/modules/UserInfoModal.vue

@@ -156,7 +156,7 @@ export default {
 
 .upload-avatar-box {
   position: relative;
-  width: calc(100% + 40px);
+  width: 100%;
   height: 168px;
   background: url("~@/assets/images/systemOverview/systemSettings/upload-avatar.png") no-repeat center center;
   background-size: 124px 124px;