页面优化

src/views/pro/preCommencementWorks/ContractorAdmissionQualification/consDetailsInfo.vue

@@ -115,7 +115,26 @@
             border
           />
           <el-table-column label="姓名" width="70" align="center" prop="name" />
-          <el-table-column label="岗位" width="100" align="center" prop="postName" />
+          <el-table-column label="人脸照片" align="center" prop="faceUrl">
+            <template slot-scope="scope">
+              <el-popover placement="right" title="" trigger="hover">
+                <img
+                  :src="`${scope.row.faceUrl ? lookFaceFile + scope.row.faceUrl : ''}`"
+                  :min-width="300"
+                  :height="300"
+                  alt="照片"
+                />
+                <img
+                  slot="reference"
+                  :src="`${scope.row.faceUrl ? lookFaceFile + scope.row.faceUrl : ''}`"
+                  style="max-height: 50px; max-width: 50px"
+                  :alt="`${scope.row.faceUrl ? lookFaceFile + scope.row.faceUrl : ''}`"
+                />
+              </el-popover>
+            </template>
+          </el-table-column>
+          <el-table-column label="性别" width="50" align="center" prop="sex" />
+          <el-table-column label="年龄" width="50" align="center" prop="age" />
           <el-table-column label="特殊工种种类" width="100" align="center" prop="specialJobType" />
           <el-table-column label="体检文件" width="100" align="center">
             <template slot-scope="scope">
@@ -137,16 +156,16 @@
               <el-button size="mini" @click="handleShow(scope.row, 4)">查看</el-button>
             </template>
           </el-table-column>
-          <el-table-column label="性别" width="50" align="center" prop="sex" />
+
-          <el-table-column label="年龄" width="50" align="center" prop="age" />
+          <el-table-column label="进场日期" width="100" align="center" prop="admissionDate" />
+          <el-table-column label="离场日期" width="100" align="center" prop="departureDate" />
           <el-table-column label="联系方式" width="120" align="center">
             <template slot-scope="scope">
-              <!-- 检查是否存在身份证号 -->
+              <!-- 检查是否存在手机号 -->
               <span v-if="scope.row.phone">{{ hideSensitiveInfo(scope.row.phone) }}</span>
               <span v-else>-</span>
             </template>
           </el-table-column>
-          <el-table-column label="籍贯" width="70" align="center" prop="nativePlace" />
           <el-table-column label="身份证号码" width="160" align="center">
             <template slot-scope="scope">
               <!-- 检查是否存在身份证号 -->
@@ -154,29 +173,13 @@
               <span v-else>-</span>
             </template>
           </el-table-column>
+          <el-table-column label="岗位" width="100" align="center" prop="postName" />
+          <el-table-column label="籍贯" width="70" align="center" prop="nativePlace" />
+
           <el-table-column label="民族" width="70" align="center" prop="nation" />
           <el-table-column label="家庭地址" width="200" align="center" prop="homeAddress" />
           <el-table-column label="现地址" width="200" align="center" prop="currentAddress" />
-          <el-table-column label="进场日期" width="100" align="center" prop="admissionDate" />
+
-          <el-table-column label="离场日期" width="100" align="center" prop="departureDate" />
-          <el-table-column label="人脸照片" align="center" prop="faceUrl">
-            <template slot-scope="scope">
-              <el-popover placement="right" title="" trigger="hover">
-                <img
-                  :src="`${scope.row.faceUrl ? lookFaceFile + scope.row.faceUrl : ''}`"
-                  :min-width="300"
-                  :height="300"
-                  alt="照片"
-                />
-                <img
-                  slot="reference"
-                  :src="`${scope.row.faceUrl ? lookFaceFile + scope.row.faceUrl : ''}`"
-                  style="max-height: 50px; max-width: 50px"
-                  :alt="`${scope.row.faceUrl ? lookFaceFile + scope.row.faceUrl : ''}`"
-                />
-              </el-popover>
-            </template>
-          </el-table-column>
           <el-table-column label="批阅状态" align="center" prop="annotation">
             <template slot-scope="scope">
               <!-- 检查是否存在身份证号 -->

src/views/screen/components/dataManagement/DataOverview.vue

@@ -195,9 +195,9 @@ export default {
     getPersonData() {
       getPersonData().then(res => {
         this.personData = [
-          { value: res.data[0].consNum, name: '承包商项目经理' },
+          // { value: res.data[0].consNum, name: '承包商项目经理' },
           { value: res.data[0].normalNum, name: '普通施工人员' },
-          { value: res.data[0].subNum, name: '分包商项目经理' },
+          // { value: res.data[0].subNum, name: '分包商项目经理' },
           { value: res.data[0].specialNum, name: '特殊工种人数' }
         ]
       })