修改样式

src/components/school/manager/employee-info.vue

@@ -25,7 +25,7 @@
   .empInfo_Dialog .normalInner {
     color: #111111;
     font-weight: bold;
-    font-size:12px;
+    font-size:13px;
     margin-top:5px;
   }
   .Employee_Top{
@@ -37,14 +37,14 @@
   .Employee_Top .q-avatar__content{
     font-size:30px!important;
   }
-  .Employee_Name{
+  .empInfo_Dialog .Employee_Name{
     margin:5px 0 0 10px;
     color:#111111;
   }
-  .Employee_Name div:first-child{
+  .empInfo_Dialog .Employee_Name div:first-child{
     font-size:12px;
   }
-  .Employee_Name div:last-child{
+  .empInfo_Dialog .Employee_Name div:last-child{
     font-weight: bold;
     margin-top:5px;
     font-size:15px;

src/components/school/manager/employee_details.vue

+<style>
+  .EmployeeDetails{
+    margin:0 20px;
+  }
+  .EmployeeDetails .role_Line{
+    width: 3px;
+    height: 11px;
+    margin-right: 10px;
+    background-color: #3FC4FF;
+    display: inline-block;
+  }
+  .EmployyBaseInfo div{
+    height:50px;
+    background-color: #F7F7F7;
+    margin-right:10px;
+  }
+  .EmployeeDetails .EmpList{
+    background-color: #F7F7F7;
+    height:70px;
+    margin-right:15px;
+    border-radius:3px;
+    padding:15px;
+  }
+  .EmployeeDetails .EmpList:last-child{
+    margin-right:0;
+  }
+  .EmployeeDetails .baseInfo_Item{
+    margin-bottom:20px;
+  }
+</style>
 <template>
   <div class="EmployeeDetails">
-    <div>
-      基础信息<br />
-      姓名:{{empData.EmployeeName}}
-      性别:{{empData.SexStr}}
-      生日:{{empData.BirthDateStr}}
-      学历:{{empData.EducationStr}}
-      <br />
-      电话:{{empData.EmployeeTel}}
-      身份证:{{empData.IDCard}}
-
-      <br />
-      邮箱:
-      <br />
-      住址:{{empData.Address}}
+    <div class="baseInfo_Item">
+      <span class="role_Line"></span>基本信息
     </div>
-    <div>
-      职务信息<br />
-
-      职位:{{empData.PostName}}
-      入职时间:{{empData.EntryTime}}
-      状态:{{empData.LeaveStatusStr}}
-
-      <br />
-      公司:{{empData.SchoolName}}
-      部门:{{empData.DeptName}}
+    <div class="row baseInfo_Item">
+      <div class="col EmpList">
+        <div class="normalName">姓名</div>
+        <div class="normalInner">{{empData.EmployeeName}}</div>
+      </div>
+      <div class="col EmpList">
+        <div class="normalName">性别</div>
+        <div class="normalInner">{{empData.SexStr}}</div>
+      </div>
+      <div class="col EmpList">
+        <div class="normalName">生日</div>
+        <div class="normalInner">{{empData.BirthDateStr}}</div>
+      </div>
+      <div class="col EmpList">
+        <div class="normalName">学历</div>
+        <div class="normalInner">{{empData.EducationStr}}</div>
+      </div>
+    </div>
+    <div class="row baseInfo_Item">
+      <div class="col EmpList">
+        <div class="normalName">电话</div>
+        <div class="normalInner">{{empData.EmployeeTel}}</div>
+      </div>
+      <div class="col EmpList">
+        <div class="normalName">身份证</div>
+        <div class="normalInner">{{empData.IDCard}}</div>
+      </div>
+    </div>
+    <div class="row baseInfo_Item">
+      <div class="col EmpList">
+        <div class="normalName">邮箱</div>
+        <div class="normalInner"></div>
+      </div>
+    </div>
+    <div class="row baseInfo_Item">
+      <div class="col EmpList">
+        <div class="normalName">住址</div>
+        <div class="normalInner">{{empData.Address}}</div>
+      </div>
+    </div>
+    <div class="baseInfo_Item">
+      <span class="role_Line"></span>职务信息
+    </div>
+    <div class="row baseInfo_Item">
+      <div class="col EmpList">
+        <div class="normalName">职位</div>
+        <div class="normalInner">{{empData.PostName}}</div>
+      </div>
+      <div class="col EmpList">
+        <div class="normalName">入职时间</div>
+        <div class="normalInner">{{empData.EntryTime}}</div>
+      </div>
+      <div class="col EmpList">
+        <div class="normalName">状态</div>
+        <div class="normalInner">{{empData.LeaveStatusStr}}</div>
+      </div>
+    </div>
+    <div class="row baseInfo_Item">
+      <div class="col EmpList">
+        <div class="normalName">公司</div>
+        <div class="normalInner">{{empData.SchoolName}}</div>
+      </div>
+      <div class="col EmpList">
+        <div class="normalName">部门</div>
+        <div class="normalInner">{{empData.DeptName}}</div>
+      </div>
     </div>
   </div>
 </template>

src/components/school/manager/employee_file.vue

+<style>
+  .EmployeeFile{
+    margin:0 20px;
+  }
+</style>
 <template>
   <div class="EmployeeFile">
     <q-table :pagination="msg" :loading="loading" no-data-label="暂无相关附件信息" flat  

src/components/school/manager/employee_finace.vue

 <template>
-  <div class="EmployeeFinace">
+  <div class="EmployeeFinace" style="margin:0 20px;">
     <q-table :pagination="msg" :loading="loading" no-data-label="暂无相关单据信息" flat
       class="sticky-right-column-table sticky-column-table" separator="none" :data="data" :columns="columns">
     </q-table>

src/components/school/manager/employee_log.vue

+<style>
+  .EmployeeLog{
+    margin:20px;
+    font-size:13px;
+  }
+  .Employee_TimeLine{
+    display: flex;
+    align-items: center;
+    font-size:13px;
+  }
+</style>
 <template>
   <div class="EmployeeLog">
     <div v-for="(item,index) in LogList">
-      <span>{{item.NewTime}} {{item.WeekStr}}</span>
+      <span style="font-weight:bold;">{{item.NewTime}} {{item.WeekStr}}</span>
       <q-timeline>
         <template v-for="(subItem,subIndex) in item.LogList">
           <q-timeline-entry>
             <template v-slot:title>
-              {{subItem.TimeStr}}
-              <q-avatar rounded size="sm" v-if="subItem.UserIcon">
-                <img :src="subItem.UserIcon" />
-              </q-avatar>
-              {{subItem.CreateName}}
+              <div class="Employee_TimeLine">
+                {{subItem.TimeStr}}
+                <q-avatar size="sm" v-if="subItem.UserIcon" style="margin:0 5px 0 10px" >
+                  <img :src="subItem.UserIcon"/>
+                </q-avatar>
+                <q-avatar size="sm" color="teal-10" text-color="white" style="margin:0 5px 0 10px" v-if="!subItem.UserIcon">
+                  {{setingObj.CreateName.substring(0,1)}}
+                </q-avatar>
+                {{subItem.CreateName}}
+               </div>
             </template>
             <div>
               {{subItem.LogContent}}
@@ -58,6 +74,7 @@
         queryEmpChangeLog(this.qMsg).then(res => {
           if (res.Code == 1) {
             this.LogList = res.Data;
+            console.log(this.LogList,'lolist');
           }
         });
       }