From 62c918b5160a5970b666b47b94b188c7ce59ebbc Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E5=A7=9C=E7=8E=89=E7=90=A6?=
 <7507756+jiang_yuqi@user.noreply.gitee.com>
Date: Sun, 3 Sep 2023 23:01:17 +0800
Subject: [PATCH] =?UTF-8?q?=E6=8F=90=E4=BA=A4=E4=BB=A3=E7=A0=81?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/pages/dlg/projectSpecialDlg.vue |  3 +-
 src/pages/projectQuality.vue        | 43 ++++++++++++++---------------
 2 files changed, 23 insertions(+), 23 deletions(-)

diff --git a/src/pages/dlg/projectSpecialDlg.vue b/src/pages/dlg/projectSpecialDlg.vue
index f297187..6b83a96 100644
--- a/src/pages/dlg/projectSpecialDlg.vue
+++ b/src/pages/dlg/projectSpecialDlg.vue
@@ -8,6 +8,7 @@
             
         </div>
         <el-table :data="dataList" class="mytable" style="width: 100%;background: transparent;" height="470">
+            <el-table-column prop="deptName" align="center" label="所属单位" width="100"></el-table-column>
             <el-table-column prop="name" align="center" label="人员名称" width="80"></el-table-column>
             <el-table-column prop="sex" align="center" label="性别" width="60">
                 <template slot-scope="scope">
@@ -21,7 +22,7 @@
             <el-table-column label="证书编号" align="center" prop="credentialNumber"></el-table-column>
             <el-table-column label="证书过期时间" align="center" prop="credentialExpirationTime"></el-table-column>
             <el-table-column label="证书类型" align="center" prop="credentialType" v-if="false"></el-table-column>
-            <el-table-column label="提交时间" align="center" prop="createTime"></el-table-column>
+            <el-table-column label="提交时间" align="center" prop="createTime" width="100"></el-table-column>
             <el-table-column label="操作" align="center">
                 <template slot-scope="scope">
                     <el-button
diff --git a/src/pages/projectQuality.vue b/src/pages/projectQuality.vue
index 9ad861b..de91382 100644
--- a/src/pages/projectQuality.vue
+++ b/src/pages/projectQuality.vue
@@ -80,6 +80,7 @@
                     <module-one-1-1 label="材料进场取样复试">
                         <div class="warning-info">
                             <div class="warning-info-title">
+                                <div :class="samplingNav==0?'active':''" @click="checkDetection(0)">汇总</div>
                                 <div :class="samplingNav==1?'active':''" @click="checkDetection(1)">钢筋原材料</div>
                                 <div :class="samplingNav==2?'active':''" @click="checkDetection(2)">钢筋试拉件</div>
                                 <div :class="samplingNav==3?'active':''" @click="checkDetection(3)">混凝土试件</div>
@@ -160,8 +161,9 @@
                     </module-one-1-1>                    
                     <module-one-1-1 label="实测实量" :key="elCheck">
                         <div class="warning-info-title measured-data-list" style="padding-left: 20px;">
+                            <div :class="measuredNav==0?'active':''" @click="doMeasuredNav(0,'汇总')">汇总</div>
                             <div :class="measuredNav==1?'active':''" @click="doMeasuredNav(1,'混泥土工程')">混泥土工程</div>
-                            <div :class="measuredNav==2?'active':''" @click="doMeasuredNav(2,'二次构建工程')">二次构建工程</div>
+                            <div :class="measuredNav==2?'active':''" @click="doMeasuredNav(2,'二次构建')">二次构建</div>
                             <div :class="measuredNav==3?'active':''" @click="doMeasuredNav(3,'房间尺寸')">房间尺寸</div>
                             <div :class="measuredNav==4?'active':''" @click="doMeasuredNav(4,'抹灰工程')">抹灰工程</div>
                             <div :class="measuredNav==5?'active':''" @click="doMeasuredNav(5,'其它')">其它</div>
@@ -256,7 +258,7 @@ export default {
                     fontSize:'12px',
                     height:'32px'
                 },             
-                samplingNav:1,                   
+                samplingNav:0,                   
                 measuredNav:0,
                 measuredTotal:0,
                 measuredText:"   全部",
@@ -337,15 +339,15 @@ export default {
             this.$bus.$on("projectChange", res => {                
                 this.projectInfo=res;
                 this.doDeptChane();
-                this.checkDetection(1);
-                this.doMeasuredNav(1,'混泥土工程')
+                this.checkDetection(0);
+                this.doMeasuredNav(0,'汇总')
                 this.selectTop20materialSeal();
             });
             this.$bus.$on("deptChange",dept=>{
                 this.dept=dept;
                 this.doDeptChane();
-                this.checkDetection(1);
-                this.doMeasuredNav(1,'混泥土工程')
+                this.checkDetection(0);
+                this.doMeasuredNav(0,'汇总')
                 this.selectTop20materialSeal();
             });
         },
@@ -355,11 +357,8 @@ export default {
             },
             selectTop20materialSeal(){
                 let postData={};
-                if(this.projectInfo?.id||0==0){
-                    postData.deptId=this.dept?.id||0;
-                }else{
-                    postData.projectId=this.projectInfo.id;
-                }
+                postData.deptId=this.dept?.id||0;
+                postData.projectId=this.projectInfo.id;
                 this.$api.materialSeal.selectTop20(postData).then(d=>{
                     this.materialSealList=d.data||[];
                     this.materialSealEl++;
@@ -376,11 +375,8 @@ export default {
                 let postData={
                     checkType:""+n
                 };
-                if(this.projectInfo?.id||0==0){
-                    postData.deptId=this.dept?.id||0;
-                }else{
-                    postData.projectId=this.projectInfo?.id||0;
-                }
+                postData.deptId=this.dept?.id||0;
+                postData.projectId=this.projectInfo?.id||0;
                 this.$api.checkDetection.groupByCheckType(postData).then(d=>{
                     let datas=d.data||[];
                     let tmps=datas.filter(it=>it.id==1);
@@ -475,11 +471,8 @@ export default {
                 let postData={
                     measureType:n
                 };
-                if(this.projectInfo?.id||0==0){
-                    postData.deptId=this.dept.id;
-                }else{
-                    postData.projectId=this.projectInfo.id;
-                }
+                postData.deptId=this.dept.id;
+                postData.projectId=this.projectInfo.id;
                 this.$api.measure.groupMeasureInfo(postData).then(d=>{
                     this.measuredData=(d.data||[]).map(it=>{
                         return {
@@ -549,7 +542,13 @@ export default {
 </script>
 
 <style lang="less">
+.warning-info-title div{
+    padding: 0 7px 0 7px!important;
+    color: #69839e;
+    cursor: pointer;
+}
 .project-quality{
+
     .problemmodify_list{
         .el-table__body-wrapper {
             &::-webkit-scrollbar {
@@ -728,7 +727,7 @@ export default {
         }
         .measured-data-list{
             &>div{
-                padding:0px 8px;
+                padding:0px 5px;
             }
         }
         .material-seal-list{