fix: 修改我的档案bug,部门考勤/公司考勤样式修改

client/src/views/OaSystem/attendanceCenter/dep.vue

@@ -72,8 +72,7 @@
             pagesList.pageSize * pagesList.pageNo
           )
         "
-        height="620"
-        style="width: 100%"
+        style="width: 100%; height: 100%"
         stripe
       >
         <!-- <el-table-column type="index" width="50" /> -->
@@ -369,52 +368,58 @@ onMounted(() => {
 </script>
 <style lang="scss" scoped>
 .attendanceCenterDep {
+  position: relative;
   width: 100%;
   height: calc(100% - 15px);
-  background: #ffffff;
-  border-radius: 10px;
-  margin-top: 15px;
   padding: 15px 30px;
-  position: relative;
+  margin-top: 15px;
+  background: #fff;
+  border-radius: 10px;
+
   h1 {
+    margin-bottom: 20px;
     font-size: 20px;
-    color: #121518;
     font-weight: 600;
-    margin-bottom: 20px;
+    color: #121518;
   }
+
   .depSearch {
-    width: 100%;
     display: flex;
+    width: 100%;
+    margin-bottom: 20px;
     align-items: center;
     justify-content: space-between;
-    margin-bottom: 20px;
+
     .depSearchFlex {
       display: flex;
       align-items: center;
+
       .searBox {
         display: flex;
         align-items: center;
         margin-right: 25px;
+
         .span {
-          white-space: nowrap;
           font-size: 16px;
+          white-space: nowrap;
         }
       }
     }
 
     .depStateBox {
+      display: flex;
       width: 30px;
       height: 30px;
+      cursor: pointer;
       border: 2px solid #e1e4ea;
       border-radius: 50%;
-      display: flex;
       align-items: center;
       justify-content: center;
-      cursor: pointer;
+
       p {
-        color: #e1e4ea;
         font-size: 16px;
         font-weight: 600;
+        color: #e1e4ea;
       }
     }
   }
@@ -423,6 +428,7 @@ onMounted(() => {
     width: 100%;
     height: calc(100% - 140px);
   }
+
   .depPages {
     position: absolute;
     right: 30px;
@@ -435,27 +441,32 @@ onMounted(() => {
     .workDayClass {
       color: pink;
     }
+
     .is-group {
       height: 80px;
+
       tr {
         background-color: #e5f0fb;
+
         th {
+          font-weight: 500;
+          color: #233755;
           background-color: #e5f0fb;
           border-color: #fff;
-          color: #233755;
-          font-weight: 500;
         }
       }
     }
+
     .cell {
-      font-size: 16px !important;
-      padding: 0 !important;
-      text-align: center;
       width: 100%;
       height: 100%;
+      padding: 0 !important;
+      font-size: 16px !important;
+      text-align: center;
     }
+
     .el-table__cell {
-      padding: 0px 0;
+      // padding: 0;
     }
 
     .el-table__body-wrapper {
@@ -464,6 +475,7 @@ onMounted(() => {
           border: 0;
         }
       }
+
       .el-table__row--striped {
         td {
           background-color: #f7f7f7;
@@ -472,28 +484,29 @@ onMounted(() => {
     }
 
     .iconsFlex {
+      display: flex;
       width: 100%;
       height: 100%;
-      display: flex;
       align-items: center;
       flex-wrap: wrap;
+
       .spans {
         width: 100%;
         height: 100%;
-        color: #f23c3c;
         font-size: 14px !important;
         font-weight: 800;
+        color: #f23c3c;
         cursor: pointer;
         user-select: none;
       }
 
       .sw {
+        display: flex;
         width: 100%;
         height: 50%;
-        display: flex;
+        user-select: none;
         align-items: center;
         justify-content: center;
-        user-select: none;
       }
 
       .sw:hover {
@@ -501,25 +514,29 @@ onMounted(() => {
           color: #989fa8;
         }
       }
+
       .xw:hover {
         .spans {
           color: #989fa8;
         }
       }
+
       .xw {
+        display: flex;
         width: 100%;
         height: 50%;
-        display: flex;
+        user-select: none;
         align-items: center;
         justify-content: center;
-        user-select: none;
       }
     }
   }
+
   .labelModeRl {
     writing-mode: vertical-rl;
   }
 }
+
 :deep(.workday) {
   color: #989fa8 !important;
 }

client/src/views/OaSystem/mineCenter/components/leftInfo.vue

@@ -88,12 +88,12 @@ const contentList = ref([
     value: 'drzw'
   },
   {
-    icon: 'deptName',
+    icon: 'ssbm',
     name: '所属部门',
     value: 'deptName'
   },
   {
-    icon: 'nj',
+    icon: 'synj',
     name: '剩余年假',
     value: 'nj'
   },

client/src/views/OaSystem/mineCenter/components/rightBox.vue

@@ -34,7 +34,7 @@ const Wdda = defineAsyncComponent(() => {
   return import('../rightChild/wdda.vue')
 })
 const Wdxz = defineAsyncComponent(() => {
-  return import('../rightChild/wdda.vue')
+  return import('../rightChild/MySalary.vue')
 })
 const Clbx = defineAsyncComponent(() => {
   return import('../rightChild/clbx.vue')

client/src/views/OaSystem/mineCenter/rightChild/MySalary.vue

@@ -0,0 +1,3 @@
+<template>
+  <ElRow justify="center" style="margin: 20px; font-size: 20px">开发中......</ElRow>
+</template>

client/src/views/OaSystem/mineCenter/rightChild/wdda.vue

@@ -27,7 +27,7 @@ const tableData = [
 </script>
 <template>
   <div class="my-portrait form-unable-edit">
-    <el-form ref="formRef" :model="data" label-width="150px" :disabled="true">
+    <el-form ref="formRef" v-if="data" :model="data" label-width="150px" :disabled="true">
       <div class="my-portrait-item" v-for="(item, index) in formConfigList" :key="index">
         <div class="title">
           <i></i>