提交代码
姜玉琦
parent
8642883461
commit
62c918b516
|
|
@ -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
|
||||
|
|
|
|||
|
|
@ -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{
|
||||
|
|
|
|||
Loading…
Reference in New Issue