From 2bab395e8926860a4d71d4dbc594516c4f04fae0 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E9=AA=86=E4=B9=90?= <342503599@qq.com>
Date: Thu, 21 Jul 2022 16:19:45 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E5=A4=8D=E8=A1=A2=E5=B7=9E=E7=89=88?=
 =?UTF-8?q?=E7=9A=84=E6=A0=B7=E5=BC=8F=E4=BB=A5=E5=8F=8A=E8=B7=B3=E8=BD=AC?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/components/account.vue                    | 10 ++++-----
 src/components/selectWorker.vue               |  9 +++++---
 .../laborManage/EpidemicPrevention/index.vue  |  2 +-
 .../projectFront/laborManage/Payoff/index.vue |  7 +++++--
 .../laborManage/safeeducation/index.vue       | 21 ++++++++++---------
 .../laborManage/visitorsManage.vue            |  4 ++--
 .../nucleicAcidOvertimePersonnel/index.vue    |  6 +++---
 src/views/projectThree/homePage.vue           |  8 +++++--
 8 files changed, 39 insertions(+), 28 deletions(-)

diff --git a/src/components/account.vue b/src/components/account.vue
index 9a086618..f50429b7 100644
--- a/src/components/account.vue
+++ b/src/components/account.vue
@@ -140,19 +140,19 @@ export default {
     this.seeEquipment = this.$store.state.userInfo.seeEquipment;
     this.loginData = JSON.parse(localStorage.getItem('systemInfo'))
     console.log(' this.loginData', this.loginData)
-    if( this.loginData.headerConfiguration != null){
+    if( this.loginData.headerConfiguration != ""){
        this.headerConfiguration = this.loginData.headerConfiguration
     }
-    if( this.loginData.projectBackground != null){
+    if( this.loginData.projectBackground != ""){
        this.projectBackground = this.loginData.projectBackground
     }
-    if( this.loginData.enterpriseBackground != null){
+    if( this.loginData.enterpriseBackground != ""){
        this.enterpriseBackground = this.loginData.enterpriseBackground
     }
-    if(this.loginData.equipmentChina !=null ){
+    if(this.loginData.equipmentChina != "" ){
        this.equipmentChina = this.loginData.equipmentChina
     }
-    if(this.loginData.dataCenter != null){
+    if(this.loginData.dataCenter != ""){
       this.dataCenter1 = this.loginData.dataCenter
     }
     // console.log('项目后台',this.projectBackground)
diff --git a/src/components/selectWorker.vue b/src/components/selectWorker.vue
index 84171971..6730f472 100644
--- a/src/components/selectWorker.vue
+++ b/src/components/selectWorker.vue
@@ -52,13 +52,15 @@
       @selection-change="handleSelectionChange" :empty-text="'请选择条件进行查询'"
     >
       <el-table-column type="selection" width="55"> </el-table-column>
-      <el-table-column :label="$t('message.laborMange.compellation')">
+      <el-table-column :label="$t('message.laborMange.compellation')" width="100">
         <template slot-scope="scope">{{ scope.row.workerName }}</template>
       </el-table-column>
-      <el-table-column prop="sex" :label="$t('message.laborMange.sex')">
+      <el-table-column prop="sex" :label="$t('message.laborMange.sex')" width="80">
           <template slot-scope="scope">{{ scope.row.sex==1?$t('message.laborMange.man'):$t('message.laborMange.female') }}</template>
         </el-table-column>
-      <el-table-column prop="idCard" :label="$t('message.laborMange.IdNumber')">
+      <el-table-column prop="idCard" :label="$t('message.laborMange.IdNumber')" width="200">
+      </el-table-column>
+      <el-table-column prop="nativePlace" label="籍贯">
       </el-table-column>
       <el-table-column prop="teamName" :label="$t('message.laborMange.team')">
       </el-table-column>
@@ -138,6 +140,7 @@ export default {
     getTableData() {
       getWorkerInfoList(this.searchForm).then((res) => {
           this.multipleSelection=[]
+          console.log('有籍贯吗',res.result.records)
         this.tableListData = res.result.records;
       });
     },
diff --git a/src/views/projectFront/laborManage/EpidemicPrevention/index.vue b/src/views/projectFront/laborManage/EpidemicPrevention/index.vue
index 55325628..1679ef55 100644
--- a/src/views/projectFront/laborManage/EpidemicPrevention/index.vue
+++ b/src/views/projectFront/laborManage/EpidemicPrevention/index.vue
@@ -2,7 +2,7 @@
 <template>
   <div class="epidemicPrevention">
     <div class="query" :class="styleType == 3 ? 'changeStyle' : ''">
-      <el-form ref="queryParams" :model="queryParams" :inline="true" label-width="120px">
+      <el-form size="medium" ref="queryParams" :model="queryParams" :inline="true" label-width="120px">
         <el-form-item label="人员类型" prop="personType">
           <el-select v-model="queryParams.personType" placeholder="请选择人员类型" clearable
             :style="{width: '100%'}">
diff --git a/src/views/projectFront/laborManage/Payoff/index.vue b/src/views/projectFront/laborManage/Payoff/index.vue
index 80872eb6..e652d6ea 100644
--- a/src/views/projectFront/laborManage/Payoff/index.vue
+++ b/src/views/projectFront/laborManage/Payoff/index.vue
@@ -15,7 +15,7 @@
       <el-col class="right-col" :span="19">
         <el-row style="width: 100%;height: 100%">
           <el-col class="top-col" :span="4" :class="styleType == 3 ? 'changeStyle' : ''">
-            <el-form :model="queryParams" ref="queryForm" :inline="true" label-width="120px">
+            <el-form size="medium" :model="queryParams" ref="queryForm" :inline="true" label-width="120px">
               <el-form-item label="工资发放状态" prop="payStatus">
                 <el-select v-model="queryParams.payStatus" placeholder="请选择工资发放状态" clearable
                   :style="{width: '100%'}"
@@ -70,7 +70,7 @@
           </el-col>
           <el-col class="bottom-col" :span="20" :class="styleType == 3 ? 'bottomTwo' : ''">
             <vue-scroll>
-              <div class="scroll">
+              <div class="scroll" :class="styleType == 3 ? 'boxBottom' : ''">
                 <el-table v-loading="loading" :data="userList">
                   <el-table-column label="月份" align="center" prop="payMonth" />
                   <el-table-column label="姓名" align="center" prop="workerName" />
@@ -468,4 +468,7 @@ export default {
 .scroll {
   overflow-y: auto;
 }
+.boxBottom{
+  margin-top:30px;
+}
 </style>
\ No newline at end of file
diff --git a/src/views/projectFront/laborManage/safeeducation/index.vue b/src/views/projectFront/laborManage/safeeducation/index.vue
index b30d52c1..b09bdc4f 100644
--- a/src/views/projectFront/laborManage/safeeducation/index.vue
+++ b/src/views/projectFront/laborManage/safeeducation/index.vue
@@ -2,7 +2,7 @@
 <template>
   <div class="epidemicPrevention">
     <div class="query">
-      <el-form ref="eduType" :model="queryParams" :inline="true" label-width="120px">
+      <el-form size="medium" ref="eduType" :model="queryParams" :inline="true" label-width="120px">
         <el-form-item label="培训类型" prop="personType">
           <el-select v-model="queryParams.eduType" placeholder="请选择培训类型" clearable
             :style="{width: '100%'}">
@@ -15,7 +15,7 @@
           </el-input>
         </el-form-item>
         <el-form-item>
-          <el-button @click="handleQuery">查询</el-button>
+          <el-button size="medium" @click="handleQuery">查询</el-button>
         </el-form-item>
       </el-form>
     </div>
@@ -236,16 +236,17 @@ export default {
 }
 
 /* 查询表单 按钮样式 */
-.query ::v-deep .el-button,
-::v-deep .border-btn.el-button {
-  border-color: #4E7CFF;
-  color: #4E7CFF;
-}
+// .query ::v-deep .el-button,
+// ::v-deep .border-btn.el-button {
+//   border-color: #4E7CFF;
+//   color: #4E7CFF;
+// }
 
 .scroll {
   overflow-y: auto;
 }
-::v-deep .el-input__inner {
-  height: 40px !important;
-}
+// ::v-deep .el-input__inner {
+//   height: 32px !important;
+// }
+
 </style>
\ No newline at end of file
diff --git a/src/views/projectFront/laborManage/visitorsManage.vue b/src/views/projectFront/laborManage/visitorsManage.vue
index c0d11c42..6eb15cda 100644
--- a/src/views/projectFront/laborManage/visitorsManage.vue
+++ b/src/views/projectFront/laborManage/visitorsManage.vue
@@ -50,8 +50,8 @@
           >
           <div id="qrCode" ref="qrCodeDiv"></div>
             <el-button slot="reference" @click="showQrCode = !showQrCode" style=" margin-left: 10px;"
-              >添加<i class="el-icon-arrow-down"></i></el-button
-            >
+              >添加</el-button>
+              <!-- <i class="el-icon-arrow-down"></i> -->
           </el-popover>
         </el-form-item>
       </el-form>
diff --git a/src/views/projectFront/nucleicAcidOvertimePersonnel/index.vue b/src/views/projectFront/nucleicAcidOvertimePersonnel/index.vue
index 762c743d..db373f23 100644
--- a/src/views/projectFront/nucleicAcidOvertimePersonnel/index.vue
+++ b/src/views/projectFront/nucleicAcidOvertimePersonnel/index.vue
@@ -159,12 +159,12 @@ export default {
   box-sizing: border-box;
 }
 .screenItem {
-  width: 110px;
-  height: 40px;
+  width: 62px;
+  height: 32px;
   border: 1px solid #606266;
   border-radius: 5px;
   color: #606266;
-  line-height: 40px;
+  line-height: 32px;
   text-align: center;
   margin-right: 20px;
 }
diff --git a/src/views/projectThree/homePage.vue b/src/views/projectThree/homePage.vue
index cef1329e..22bc95c6 100644
--- a/src/views/projectThree/homePage.vue
+++ b/src/views/projectThree/homePage.vue
@@ -16,7 +16,7 @@
       <div class="bigScreen">
         <img v-if="accountType == 5 || accountType == 6" style="width:18px; margin-right:6px;" src='@/assets/images/menu/screenicon.png' class="icon" /> 
         <span v-if="accountType == 5 || accountType == 6" @click="toBigScreen()" style="margin-right:20px;">数据看板</span>
-        <img style="width:18px; margin-right:6px;" src='@/assets/images/menu/closeicon.png' class="icon" /> 
+        <img style="width:16px; margin-right:6px; margin-top:2px;" src='@/assets/images/menu/closeicon.png' class="icon" /> 
         <span @click="toBack()">退出</span>
       </div>
     </div>
@@ -171,7 +171,11 @@ export default {
   methods: {
     // 退出
     toBack(){
-      window.open("/index.html#/projectList", "_self");
+      if(this.accountType == 5 || this.accountType == 6){
+        window.open("/index.html#/login", "_self");
+      }else{
+        window.open("/index.html#/projectList", "_self"); 
+      }
       localStorage.setItem('model','defaultModel')
       localStorage.removeItem("active");
       localStorage.removeItem("path");