sxyanzhu
/
jhbigscreen
4
0
Fork 0
Code Issues Pull Requests 1 Packages Projects Releases Wiki Activity

update code

dev-login
haha 2023-08-26 01:23:16 +08:00
parent 523cd2e904
commit 81fae6a1f5
8 changed files with 136 additions and 25 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
src/api/checkDetection/index.js 100644
View File

@ -0,0 +1,13 @@
import request from '@/utils/request'
const groupByCheckType=(data)=> {
return request({
url: `bgscreen/checkDetection/groupByCheckType`,
method: 'post',
data:data
})
}
export default{
groupByCheckType
}

4
src/api/index.js
View File

@ -12,6 +12,8 @@ import insurance from './insurance/index'
import journalism from './journalism/index' import journalism from './journalism/index'
import buildNode from './buildNode' import buildNode from './buildNode'
import projectChecking from './projectChecking/index' import projectChecking from './projectChecking/index'
import measure from './measure/index'
import checkDetection from './checkDetection/index'
import {axios} from '@/utils/request' import {axios} from '@/utils/request'
export default { export default {
project, project,
@ -28,5 +30,7 @@ export default {
journalism, journalism,
buildNode, buildNode,
projectChecking, projectChecking,
measure,
checkDetection,
http:axios http:axios
} }

13
src/api/measure/index.js 100644
View File

@ -0,0 +1,13 @@
import request from '@/utils/request'
const groupMeasureInfo=(data)=> {
return request({
url: `bgscreen/measure/groupMeasureInfo`,
method: 'post',
data:data
})
}
export default{
groupMeasureInfo
}

1
src/api/project/index.js
View File

@ -91,6 +91,7 @@ const getInfo=()=>{
}) })
} }
export default{ export default{
findProjectByDept, findProjectByDept,
getProjectBuildNode, getProjectBuildNode,

124
src/pages/projectQuality.vue
View File

@ -8,7 +8,7 @@
<div class="screen-content"> <div class="screen-content">
<el-row :key="elKey"> <el-row :key="elKey">
<el-col :span="12"> <el-col :span="12">
<module-one-3-1 label="质量隐患检查"> <module-one-3-1 label="质量隐患检查" class="hide-scroll">
<div class="warning-info-title" style="padding-left: 20px;"> <div class="warning-info-title" style="padding-left: 20px;">
<div :class="safeNav==0?'active':''" @click="doSafeNav(0,'汇总总数')">汇总</div> <div :class="safeNav==0?'active':''" @click="doSafeNav(0,'汇总总数')">汇总</div>
<div :class="safeNav==3?'active':''" @click="doSafeNav(3,'集团总数')">集团</div> <div :class="safeNav==3?'active':''" @click="doSafeNav(3,'集团总数')">集团</div>
@ -74,9 +74,10 @@
<module-one-1-1 label="材料进场取样复试"> <module-one-1-1 label="材料进场取样复试">
<div class="warning-info"> <div class="warning-info">
<div class="warning-info-title"> <div class="warning-info-title">
<div :class="samplingNav==0?'active':''" @click="samplingNav=0">钢筋原材料</div> <div :class="samplingNav==1?'active':''" @click="checkDetection(1)">钢筋原材料</div>
<div :class="samplingNav==1?'active':''" @click="samplingNav=1">钢筋试拉件</div> <div :class="samplingNav==2?'active':''" @click="checkDetection(2)">钢筋试拉件</div>
<div :class="samplingNav==2?'active':''" @click="samplingNav=2">混凝土试件</div> <div :class="samplingNav==3?'active':''" @click="checkDetection(3)">混凝土试件</div>
<div :class="samplingNav==4?'active':''" @click="checkDetection(4)">其他</div>
</div> </div>
<div class="equipment-list-max quality-target-index"> <div class="equipment-list-max quality-target-index">
<el-row> <el-row>
@ -87,7 +88,7 @@
</div> </div>
<div class="equipment-list-data"> <div class="equipment-list-data">
<p style="font-size: 12px;">送检数</p> <p style="font-size: 12px;">送检数</p>
<div><span>4</span><span style="font-size: 12px;">次</span></div> <div><span>{{ chkDetection.chk1 }}</span><span style="font-size: 12px;">次</span></div>
</div> </div>
</div> </div>
</el-col> </el-col>
@ -98,7 +99,7 @@
</div> </div>
<div class="equipment-list-data"> <div class="equipment-list-data">
<p style="font-size: 12px;">待检数</p> <p style="font-size: 12px;">待检数</p>
<div><span class="fgreen">0</span><span style="font-size: 12px;">次</span></div> <div><span class="fgreen">{{ chkDetection.chk2 }}</span><span style="font-size: 12px;">次</span></div>
</div> </div>
</div> </div>
</el-col> </el-col>
@ -109,7 +110,7 @@
</div> </div>
<div class="equipment-list-data"> <div class="equipment-list-data">
<p>合格数</p> <p>合格数</p>
<div><span>4</span><span style="font-size: 12px;">次</span></div> <div><span>{{ chkDetection.chk3 }}</span><span style="font-size: 12px;">次</span></div>
</div> </div>
</div> </div>
</el-col> </el-col>
@ -120,7 +121,7 @@
</div> </div>
<div class="equipment-list-data"> <div class="equipment-list-data">
<p>合格率</p> <p>合格率</p>
<div><span class="fgreen">100</span><span style="font-size: 12px;">%</span></div> <div><span class="fgreen">{{ chkDetection.percent }}</span><span style="font-size: 12px;">%</span></div>
</div> </div>
</div> </div>
</el-col> </el-col>
@ -136,13 +137,16 @@
</div> </div>
<rank-chart :data="mechanicalData" :showval="true" :height="224"></rank-chart> <rank-chart :data="mechanicalData" :showval="true" :height="224"></rank-chart>
</module-one-1-1> </module-one-1-1>
<module-one-1-1 label="实测实量"> <module-one-1-1 label="实测实量" :key="elCheck">
<div class="warning-info-title" style="padding-left: 20px;"> <div class="warning-info-title" 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==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> </div>
<project-overview-chart :key="measuredNav" :sp="'\n'" :maintitle="measuredTotal" <project-overview-chart :key="measuredNav"
:legend-opt="legendOptCheck"
:sp="'\n'" :maintitle="measuredTotal"
:typedata="measuredData" :text="measuredText" :height="230"></project-overview-chart> :typedata="measuredData" :text="measuredText" :height="230"></project-overview-chart>
</module-one-1-1> </module-one-1-1>
</el-col> </el-col>
@ -211,6 +215,7 @@ export default {
data() { data() {
return { return {
elKey:0, elKey:0,
elCheck:0,
dept:null, dept:null,
projectInfo:null, projectInfo:null,
safeNav:0, safeNav:0,
@ -220,7 +225,7 @@ export default {
fontSize:'12px', fontSize:'12px',
height:'32px' height:'32px'
}, },
samplingNav:0, samplingNav:1,
//机械设备管理 //机械设备管理
mechanicalData:[ mechanicalData:[
{value: '5',prop: '62.5', text: '履带挖掘机'}, {value: '5',prop: '62.5', text: '履带挖掘机'},
@ -231,13 +236,7 @@ export default {
measuredNav:0, measuredNav:0,
measuredTotal:7, measuredTotal:7,
measuredText:" 全部", measuredText:" 全部",
measuredData:[ measuredData:[],
{ name:'钢卷尺', value:'2' },
{ name:'光学水准仪', value:'2' },
{ name:'电子经纬仪', value:'1' } ,
{ name:'数字回弹仪', value:'1' },
{ name:'激光垂准仪', value:'1' },
],
//举牌验收 //举牌验收
acceptanceDataView:{ acceptanceDataView:{
sum:0, sum:0,
@ -247,7 +246,29 @@ export default {
summary:[], summary:[],
summaryTotal:0, summaryTotal:0,
summaryPrj:[], summaryPrj:[],
summaryPrjTotal:0 summaryPrjTotal:0,
chkDetection:{
chk1:0,
chk2:0,
chk3:0,
percent:100
},
legendOptCheck: {
icon: "rect",
textStyle: {
fontSize: 14,
rich: {
name: {
color: "#c3dbfd",
padding: [5, 5, 20, 5],
},
percent: {
color: "#4676FD",
padding: [5, 5, 20, 5],
},
},
},
},
} }
}, },
created() { created() {
@ -257,13 +278,45 @@ export default {
this.$bus.$on("projectChange", res => { this.$bus.$on("projectChange", res => {
this.projectInfo=res; this.projectInfo=res;
this.doDeptChane(); this.doDeptChane();
this.checkDetection(1);
this.doMeasuredNav(1,'混泥土工程')
}); });
this.$bus.$on("deptChange",dept=>{ this.$bus.$on("deptChange",dept=>{
this.dept=dept; this.dept=dept;
this.doDeptChane(); this.doDeptChane();
this.checkDetection(1);
this.doMeasuredNav(1,'混泥土工程')
}); });
}, },
methods: { methods: {
checkDetection(n){
this.samplingNav=n;
if(!this.projectInfo){
return;
}
let postData={
checkType:""+n
};
if(this.projectInfo?.id||0==0){
postData.deptId=this.dept.id;
}else{
postData.projectId=this.projectInfo.id;
}
this.$api.checkDetection.groupByCheckType(postData).then(d=>{
let datas=d.data||[];
let tmps=datas.filter(it=>it.id==1);
this.chkDetection.chk1=tmps.length>0?tmps[0].projectId||0:0;
tmps=datas.filter(it=>it.id==2);
this.chkDetection.chk2=tmps.length>0?tmps[0].projectId||0:0;
tmps=datas.filter(it=>it.id==3);
this.chkDetection.chk3=tmps.length>0?tmps[0].projectId||0:0;
if(this.chkDetection.chk1==0){
this.chkDetection.percent=100;
}else{
this.chkDetection.percent=(this.chkDetection.chk3*100.0/this.chkDetection.chk1).toFixed(1);
}
})
},
doProbleRowClick(a,b,c){ doProbleRowClick(a,b,c){
this.$refs.probDlg.showDialog(a,1,this.safeNav); this.$refs.probDlg.showDialog(a,1,this.safeNav);
}, },
@ -272,7 +325,7 @@ export default {
return " ".substring(0,3-n.length)+n; return " ".substring(0,3-n.length)+n;
}, },
doDeptChane(){ doDeptChane(){
this.$api.problemmodify.qualitySummary(this.dept.id,this.safeNav,this.projectInfo?.id).then(d=>{ this.$api.problemmodify.qualitySummary(this.dept?.id||0,this.safeNav,this.projectInfo?.id||0).then(d=>{
this.summary=(d||[]).map(it=>{ this.summary=(d||[]).map(it=>{
return { return {
text:it.problemArea, text:it.problemArea,
@ -295,7 +348,7 @@ export default {
this.elKey++; this.elKey++;
}); });
this.$api.problemmodify.qualitySummaryByProject(this.dept.id,this.safeNav,this.projectInfo?.id).then(d=>{ this.$api.problemmodify.qualitySummaryByProject(this.dept?.id||0,this.safeNav,this.projectInfo?.id||0).then(d=>{
this.summaryPrj=(d||[]).map(it=>{ this.summaryPrj=(d||[]).map(it=>{
return { return {
...it, ...it,
@ -323,6 +376,26 @@ export default {
doMeasuredNav(n,t){ doMeasuredNav(n,t){
this.measuredNav=n; this.measuredNav=n;
this.measuredText=t; this.measuredText=t;
if(!this.projectInfo){
return;
}
let postData={
measureType:n
};
if(this.projectInfo?.id||0==0){
postData.deptId=this.dept.id;
}else{
postData.projectId=this.projectInfo.id;
}
this.$api.measure.groupMeasureInfo(postData).then(d=>{
this.measuredData=(d.data||[]).map(it=>{
return {
name:it.measureInfo,
value:it.id
}
});
this.elCheck++;
})
}, },
doSafeNav(n,t){ doSafeNav(n,t){
this.safeNav=n; this.safeNav=n;
@ -539,5 +612,8 @@ export default {
border-radius: 4px; border-radius: 4px;
} }
} }
.hide-scroll>.screen-one-3-1{
overflow: hidden;
}
} }
</style> </style>

1
src/pages/projectSafety.vue
View File

@ -714,6 +714,7 @@ export default {
max-height: calc(100% - 90px); max-height: calc(100% - 90px);
margin-right: 12px; margin-right: 12px;
overflow-y: auto; overflow-y: auto;
overflow-x: hidden;
} }
.transition-item { .transition-item {

3
src/pages/style/index.less
View File

@ -55,4 +55,7 @@
} }
.finish-4{ .finish-4{
color: #a2c8f9; color: #a2c8f9;
}
.hide-scroll{
overflow: hidden;
} }

2
src/utils/request.js
View File

@ -51,7 +51,7 @@ service.interceptors.request.use(config => {
const interval = 1000; // 间隔时间(ms)，小于此时间视为重复提交 const interval = 1000; // 间隔时间(ms)，小于此时间视为重复提交
if (s_data === requestObj.data && requestObj.time - s_time < interval && s_url === requestObj.url) { if (s_data === requestObj.data && requestObj.time - s_time < interval && s_url === requestObj.url) {
const message = '数据正在处理，请勿重复提交'; const message = '数据正在处理，请勿重复提交';
console.warn(`[${s_url}]: ` + message) console.warn(`[${s_url}]: ` + message+",",config,s_url)
return Promise.reject(new Error(message)) return Promise.reject(new Error(message))
} else { } else {
cache.session.setJSON('sessionObj', requestObj) cache.session.setJSON('sessionObj', requestObj)