Merge remote-tracking branch 'origin/master'

attendance-performance-manager-ui/admin/src/components/tabPane.vue

 <template>
-    <div style="margin-bottom:20px">
-        <el-menu :default-active="activeName" class="el-menu-demo" mode="horizontal" @select="handleClick" v-if="thirdList.length>0">
-            <el-menu-item :index="item.path"  v-for="(item,index) in thirdList" :key="index">{{item.name}}</el-menu-item>
+  <div style="margin-bottom:15px;">
+    <el-menu
+      :default-active="activeName"
+      class="el-menu-demo"
+      mode="horizontal"
+      @select="handleClick"
+      v-if="thirdList.length > 0"
+    >
+      <el-menu-item
+        :index="item.path"
+        v-for="(item, index) in thirdList"
+        :key="index"
+        >{{ item.name }}</el-menu-item
+      >
     </el-menu>
   </div>
 </template>
 
 <script>
 export default {
-    props:{
-        thirdList:{
-            type:Boolean,
-            default:[]
+  props: {
+    thirdList: {
+      type: Boolean,
+      default: [],
     },
-        activeName:{
-            type:String,
-            default:''
-        }
+    activeName: {
+      type: String,
+      default: "",
     },
-    methods:{
-        handleClick(key, keyPath){
-            this.$emit('handleClick',key)
-        }
   },
-    mounted(){
-        console.log(this.activeName,';ss')
-    }
-}
+  methods: {
+    handleClick(key, keyPath) {
+      this.$emit("handleClick", key);
+    },
+  },
+  mounted() {
+    console.log(this.activeName, ";ss");
+  },
+};
 </script>
 
-<style>
-
+<style lang="less" scoped>
+/deep/.el-menu-item {
+  height: 41px;
+  line-height: 41px;
+}
 </style>

attendance-performance-manager-ui/admin/src/views/Layout.vue

@@ -9,7 +9,7 @@
       :isOpen="isOpen"
       v-if="menuPage === 'left'"
     />
-    <div style="padding:20px">
+    <div style="padding:15px">
       <router-view :class="{ active: !isOpen }" />
     </div>
   </div>
@@ -63,8 +63,8 @@ export default {
   position: relative;
   background: #fff;
   // var(--padding-top) 5px 5px 5px;
-  padding: 20px;
   // margin-left: 60px;
+  padding: 10px;
   &.active {
     margin-left: var(--margin-left);
   }