From 81fae6a1f53e68afc30fd2292ff2cf315f32995f Mon Sep 17 00:00:00 2001 From: haha Date: Sat, 26 Aug 2023 01:23:16 +0800 Subject: [PATCH] update code --- src/api/checkDetection/index.js | 13 ++++ src/api/index.js | 4 ++ src/api/measure/index.js | 13 ++++ src/api/project/index.js | 1 + src/pages/projectQuality.vue | 124 +++++++++++++++++++++++++------- src/pages/projectSafety.vue | 1 + src/pages/style/index.less | 3 + src/utils/request.js | 2 +- 8 files changed, 136 insertions(+), 25 deletions(-) create mode 100644 src/api/checkDetection/index.js create mode 100644 src/api/measure/index.js diff --git a/src/api/checkDetection/index.js b/src/api/checkDetection/index.js new file mode 100644 index 0000000..1508128 --- /dev/null +++ b/src/api/checkDetection/index.js @@ -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 +} \ No newline at end of file diff --git a/src/api/index.js b/src/api/index.js index ec03b79..68923c8 100644 --- a/src/api/index.js +++ b/src/api/index.js @@ -12,6 +12,8 @@ import insurance from './insurance/index' import journalism from './journalism/index' import buildNode from './buildNode' import projectChecking from './projectChecking/index' +import measure from './measure/index' +import checkDetection from './checkDetection/index' import {axios} from '@/utils/request' export default { project, @@ -28,5 +30,7 @@ export default { journalism, buildNode, projectChecking, + measure, + checkDetection, http:axios } \ No newline at end of file diff --git a/src/api/measure/index.js b/src/api/measure/index.js new file mode 100644 index 0000000..436e6f0 --- /dev/null +++ b/src/api/measure/index.js @@ -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 +} \ No newline at end of file diff --git a/src/api/project/index.js b/src/api/project/index.js index d48c484..b3306e1 100644 --- a/src/api/project/index.js +++ b/src/api/project/index.js @@ -91,6 +91,7 @@ const getInfo=()=>{ }) } + export default{ findProjectByDept, getProjectBuildNode, diff --git a/src/pages/projectQuality.vue b/src/pages/projectQuality.vue index da26b56..8fbba97 100644 --- a/src/pages/projectQuality.vue +++ b/src/pages/projectQuality.vue @@ -8,7 +8,7 @@
- +
汇总
集团
@@ -74,9 +74,10 @@
-
钢筋原材料
-
钢筋试拉件
-
混凝土试件
+
钢筋原材料
+
钢筋试拉件
+
混凝土试件
+
其他
@@ -87,7 +88,7 @@

送检数

-
4次
+
{{ chkDetection.chk1 }}次
@@ -98,7 +99,7 @@

待检数

-
0次
+
{{ chkDetection.chk2 }}次
@@ -109,7 +110,7 @@

合格数

-
4次
+
{{ chkDetection.chk3 }}次
@@ -120,7 +121,7 @@

合格率

-
100%
+
{{ chkDetection.percent }}%
@@ -136,13 +137,16 @@ - +
-
全部
-
正常
-
待校准
+
混泥土工程
+
二次构建工程
+
房间尺寸
+
抹灰工程
- @@ -211,6 +215,7 @@ export default { data() { return { elKey:0, + elCheck:0, dept:null, projectInfo:null, safeNav:0, @@ -220,7 +225,7 @@ export default { fontSize:'12px', height:'32px' }, - samplingNav:0, + samplingNav:1, //机械设备管理 mechanicalData:[ {value: '5',prop: '62.5', text: '履带挖掘机'}, @@ -231,13 +236,7 @@ export default { measuredNav:0, measuredTotal:7, measuredText:" 全部", - measuredData:[ - { name:'钢卷尺', value:'2' }, - { name:'光学水准仪', value:'2' }, - { name:'电子经纬仪', value:'1' } , - { name:'数字回弹仪', value:'1' }, - { name:'激光垂准仪', value:'1' }, - ], + measuredData:[], //举牌验收 acceptanceDataView:{ sum:0, @@ -247,7 +246,29 @@ export default { summary:[], summaryTotal:0, 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() { @@ -257,13 +278,45 @@ export default { this.$bus.$on("projectChange", res => { this.projectInfo=res; this.doDeptChane(); + this.checkDetection(1); + this.doMeasuredNav(1,'混泥土工程') }); this.$bus.$on("deptChange",dept=>{ this.dept=dept; this.doDeptChane(); + this.checkDetection(1); + this.doMeasuredNav(1,'混泥土工程') }); }, 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){ this.$refs.probDlg.showDialog(a,1,this.safeNav); }, @@ -272,7 +325,7 @@ export default { return " ".substring(0,3-n.length)+n; }, 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=>{ return { text:it.problemArea, @@ -295,7 +348,7 @@ export default { 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=>{ return { ...it, @@ -323,6 +376,26 @@ export default { doMeasuredNav(n,t){ this.measuredNav=n; 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){ this.safeNav=n; @@ -539,5 +612,8 @@ export default { border-radius: 4px; } } + .hide-scroll>.screen-one-3-1{ + overflow: hidden; + } } \ No newline at end of file diff --git a/src/pages/projectSafety.vue b/src/pages/projectSafety.vue index 67324dd..f14f21c 100644 --- a/src/pages/projectSafety.vue +++ b/src/pages/projectSafety.vue @@ -714,6 +714,7 @@ export default { max-height: calc(100% - 90px); margin-right: 12px; overflow-y: auto; + overflow-x: hidden; } .transition-item { diff --git a/src/pages/style/index.less b/src/pages/style/index.less index 40540e1..e8eb592 100644 --- a/src/pages/style/index.less +++ b/src/pages/style/index.less @@ -55,4 +55,7 @@ } .finish-4{ color: #a2c8f9; +} +.hide-scroll{ + overflow: hidden; } \ No newline at end of file diff --git a/src/utils/request.js b/src/utils/request.js index 36ff886..5d992d5 100644 --- a/src/utils/request.js +++ b/src/utils/request.js @@ -51,7 +51,7 @@ service.interceptors.request.use(config => { const interval = 1000; // 间隔时间(ms)，小于此时间视为重复提交 if (s_data === requestObj.data && requestObj.time - s_time < interval && s_url === requestObj.url) { const message = '数据正在处理，请勿重复提交'; - console.warn(`[${s_url}]: ` + message) + console.warn(`[${s_url}]: ` + message+",",config,s_url) return Promise.reject(new Error(message)) } else { cache.session.setJSON('sessionObj', requestObj)