From a5b77289ed895e784b1d59c89d4b58174e9195c8 Mon Sep 17 00:00:00 2001 From: haha Date: Sun, 27 Aug 2023 11:00:24 +0800 Subject: [PATCH 1/4] update code --- src/api/index.js | 2 + src/api/materialSeal/index.js | 13 + src/pages/index/indexDlg2.vue | 6 +- src/pages/projectQuality.vue | 100 +++++-- src/pages/quality/materialSealDetialDlg.vue | 303 ++++++++++++++++++++ src/pages/safe/projectInsuranceDlg.vue | 3 + 6 files changed, 406 insertions(+), 21 deletions(-) create mode 100644 src/api/materialSeal/index.js create mode 100644 src/pages/quality/materialSealDetialDlg.vue diff --git a/src/api/index.js b/src/api/index.js index 861458f..902c04f 100644 --- a/src/api/index.js +++ b/src/api/index.js @@ -13,6 +13,7 @@ import journalism from './journalism/index' import buildNode from './buildNode' import projectChecking from './projectChecking/index' import measure from './measure/index' +import materialSeal from './materialSeal/index' import checkDetection from './checkDetection/index' import video from './video/index' import {axios} from '@/utils/request' @@ -32,6 +33,7 @@ export default { buildNode, projectChecking, measure, + materialSeal, checkDetection, http:axios, video diff --git a/src/api/materialSeal/index.js b/src/api/materialSeal/index.js new file mode 100644 index 0000000..e091ad1 --- /dev/null +++ b/src/api/materialSeal/index.js @@ -0,0 +1,13 @@ +import request from '@/utils/request' + +const selectTop20=(data)=> { + return request({ + url: `bgscreen/materialSeal/selectTop20`, + method: 'post', + data:data + }) + } + +export default{ + selectTop20 +} \ No newline at end of file diff --git a/src/pages/index/indexDlg2.vue b/src/pages/index/indexDlg2.vue index 7a16a64..5c5fdb5 100644 --- a/src/pages/index/indexDlg2.vue +++ b/src/pages/index/indexDlg2.vue @@ -190,7 +190,7 @@ export default { it.existingProblem=objs[0].existingProblem||''; } return it; - }) + }).sort((a,b)=>b.projectSchedule-a.projectSchedule); }) }, @@ -219,7 +219,7 @@ export default { let nds=nodes.filter(item=>item.finish && item.projectId==it.id && findNodes.includes(item.lvl.substring(0,2))); it.nodes=this.$api.buildNode.toTree(nds); return it; - }) + }).sort((a,b)=>b.projectSchedule-a.projectSchedule); }) }, loadData4(n){ @@ -228,7 +228,7 @@ export default { it.projectName=it.surProject?.projectName||'' it.projectSchedule=it.surProject?.projectSchedule||'1' return it; - }); + }).sort((a,b)=>b.projectSchedule-a.projectSchedule);; }) }, showDialog(n,cnts) { diff --git a/src/pages/projectQuality.vue b/src/pages/projectQuality.vue index 79c51b0..98d7de8 100644 --- a/src/pages/projectQuality.vue +++ b/src/pages/projectQuality.vue @@ -135,13 +135,28 @@ - -
- 设备总数: - 100 - 台 -
- + +
+
+
+ +
+
+
封样名称
+
+
{{ it.materialName }}
+
+
使用部位
+
+
{{ it.usePosition }}
+
+
封样日期
+
+
{{ it.sealDate }}
+
+
+
+
@@ -203,6 +218,7 @@
+ @@ -218,14 +234,16 @@ import '../components/idle-list-chart' import '../components/people-number' import ProblemmodifyDetail from './components/ProblemmodifyDetail.vue' import showCheckingDlg from './quality/showCheckingDlg.vue' +import materialSealDetialDlg from './quality/materialSealDetialDlg.vue' export default { components:{ - ProblemmodifyDetail,showCheckingDlg + ProblemmodifyDetail,showCheckingDlg,materialSealDetialDlg }, data() { return { selDate:'', elKey:0, + materialSealEl:0, elSummaryKey:0, elSummaryPrjKey:0, elCheck:0, @@ -238,14 +256,7 @@ export default { fontSize:'12px', height:'32px' }, - samplingNav:1, - //机械设备管理 - mechanicalData:[ - {value: '5',prop: '62.5', text: '履带挖掘机'}, - {value: '1',prop: '12.5', text: '洒水车'}, - {value: '1',prop: '12.5', text: '轮胎装载机'}, - {value: 1,prop: '12.5', text: '小轿车'}, - ], + samplingNav:1, measuredNav:0, measuredTotal:0, measuredText:" 全部", @@ -313,26 +324,47 @@ export default { } }] }, + prjs:[] } }, created() { this.init() }, mounted() { + this.$bus.$on("loadProjects", prjs => { + this.prjs = prjs; + }); this.$bus.$on("projectChange", res => { this.projectInfo=res; this.doDeptChane(); this.checkDetection(1); this.doMeasuredNav(1,'混泥土工程') + this.selectTop20materialSeal(); }); this.$bus.$on("deptChange",dept=>{ this.dept=dept; this.doDeptChane(); this.checkDetection(1); this.doMeasuredNav(1,'混泥土工程') + this.selectTop20materialSeal(); }); }, methods: { + showMaterialSeal(it){ + this.$refs.msDlg.showDialog(it); + }, + selectTop20materialSeal(){ + let postData={}; + if(this.projectInfo?.id||0==0){ + postData.deptId=this.dept?.id||0; + }else{ + postData.projectId=this.projectInfo.id; + } + this.$api.materialSeal.selectTop20(postData).then(d=>{ + this.materialSealList=d.data||[]; + this.materialSealEl++; + }); + }, doShowChecking(it){ this.$refs.checkDlg.showDialog(it); }, @@ -345,9 +377,9 @@ export default { checkType:""+n }; if(this.projectInfo?.id||0==0){ - postData.deptId=this.dept.id; + postData.deptId=this.dept?.id||0; }else{ - postData.projectId=this.projectInfo.id; + postData.projectId=this.projectInfo?.id||0; } this.$api.checkDetection.groupByCheckType(postData).then(d=>{ let datas=d.data||[]; @@ -699,5 +731,37 @@ export default { padding:0px 8px; } } + .material-seal-list{ + .material-seal-item{ + padding:8px; + display: flex; + border-bottom: solid 1px #fff; + box-shadow: inset 7px 0px 11px 5px rgb(36 131 167 / 70%); + &:last-child{ + border-bottom: none; + } + .material-seal-left{ + width:40%; + } + .material-seal-right{ + width:60%; + padding-left:12px; + line-height: 24px; + img{ + width: 8px; + position: relative;; + top:3px; + } + .sp-lbl{ + color: aquamarine; + white-space: nowrap; + } + .div-text{ + margin-left:24px; + } + } + } + + } } \ No newline at end of file diff --git a/src/pages/quality/materialSealDetialDlg.vue b/src/pages/quality/materialSealDetialDlg.vue new file mode 100644 index 0000000..dbfefc6 --- /dev/null +++ b/src/pages/quality/materialSealDetialDlg.vue @@ -0,0 +1,303 @@ + + + + + \ No newline at end of file diff --git a/src/pages/safe/projectInsuranceDlg.vue b/src/pages/safe/projectInsuranceDlg.vue index 2bd9027..af560c6 100644 --- a/src/pages/safe/projectInsuranceDlg.vue +++ b/src/pages/safe/projectInsuranceDlg.vue @@ -204,6 +204,9 @@ export default { border-bottom: solid 1px #fff; padding: 12px 0px 12px 20px; box-shadow: inset 7px 0px 11px 5px rgb(36 131 167 / 70%); + &:last-child{ + border-bottom: none; + } .data-table{ border-collapse:collapse; td{ From 72fb9cb1f3f940d3e8867a687a92e13f77b373e9 Mon Sep 17 00:00:00 2001 From: haha Date: Sun, 27 Aug 2023 13:50:59 +0800 Subject: [PATCH 2/4] update code --- src/pages/projectQuality.vue | 6 +++--- src/pages/projectSafety.vue | 5 ++--- 2 files changed, 5 insertions(+), 6 deletions(-) diff --git a/src/pages/projectQuality.vue b/src/pages/projectQuality.vue index 98d7de8..20ce7c0 100644 --- a/src/pages/projectQuality.vue +++ b/src/pages/projectQuality.vue @@ -63,10 +63,10 @@ @@ -460,7 +460,7 @@ export default { } else { it.prop = (it.value * 100.0 / this.summaryPrjTotal).toFixed(1); } - it.rate = (it.checkState * 100.0 / it.value).toFixed(1); + it.rate =(it.value==0?0:it.isDel * 100.0 / it.value).toFixed(1); }) this.elSummaryPrjKey++; }); diff --git a/src/pages/projectSafety.vue b/src/pages/projectSafety.vue index a8699fb..3f88689 100644 --- a/src/pages/projectSafety.vue +++ b/src/pages/projectSafety.vue @@ -64,10 +64,9 @@ @@ -556,7 +555,7 @@ export default { } else { it.prop = (it.value * 100.0 / this.summaryPrjTotal).toFixed(1); } - it.rate = (it.checkState * 100.0 / it.value).toFixed(1); + it.rate =(it.value==0?0:it.isDel * 100.0 / it.value).toFixed(1); }) this.elSummaryPrjKey++; }) From de5e43ee2ca9524e487e57ecac90e8d477ece65c Mon Sep 17 00:00:00 2001 From: haha Date: Sun, 27 Aug 2023 17:53:33 +0800 Subject: [PATCH 3/4] update code --- src/pages/components/ProblemmodifyDetail.vue | 23 ++++++++++++++++---- src/pages/projectQuality.vue | 2 +- src/pages/projectSafety.vue | 2 +- 3 files changed, 21 insertions(+), 6 deletions(-) diff --git a/src/pages/components/ProblemmodifyDetail.vue b/src/pages/components/ProblemmodifyDetail.vue index dd03881..4c883ad 100644 --- a/src/pages/components/ProblemmodifyDetail.vue +++ b/src/pages/components/ProblemmodifyDetail.vue @@ -147,7 +147,8 @@ export default { }, dataTable: [], dicts: [], - checkStateDicts: [] + checkStateDicts: [], + selDate:[] }; }, @@ -178,6 +179,12 @@ export default { } else { postData.checkState = n } + if(this.selDate.length>0){ + postData.startDate=this.$dt(this.selDate[0]).format("YYYY-MM-DD"); + } + if(this.selDate.length>1){ + postData.endDate=this.$dt(this.selDate[1]).format("YYYY-MM-DD"); + } this.$api.problemmodify.listSspProblemmodify(postData).then(d => { this.dataTable = (d.data || []).map(it => { if(it.updateTime){ @@ -204,7 +211,8 @@ export default { this.elKey++; }) }, - showDialog(row, infoType,roleType) { + showDialog(row, infoType,roleType,selDate) { + this.selDate=selDate; this.row = row; this.infoType = infoType; this.roleType=roleType; @@ -222,11 +230,18 @@ export default { }); this.show = true this.doNav(0, true); - this.$api.problemmodify.groupByInfotypeCheckState({ + let postData={ projectId: this.row.projectId, infoType: this.infoType, roleType:this.roleType - }).then(d => { + }; + if(this.selDate.length>0){ + postData.startDate=this.$dt(this.selDate[0]).format("YYYY-MM-DD"); + } + if(this.selDate.length>1){ + postData.endDate=this.$dt(this.selDate[1]).format("YYYY-MM-DD"); + } + this.$api.problemmodify.groupByInfotypeCheckState(postData).then(d => { for (let i = 0; i <= 5; i++) { this.count["" + i] = 0; } diff --git a/src/pages/projectQuality.vue b/src/pages/projectQuality.vue index 20ce7c0..3007639 100644 --- a/src/pages/projectQuality.vue +++ b/src/pages/projectQuality.vue @@ -397,7 +397,7 @@ export default { }) }, doProbleRowClick(a,b,c){ - this.$refs.probDlg.showDialog(a,1,this.safeNav); + this.$refs.probDlg.showDialog(a,1,this.safeNav,this.selDate); }, fmt(n){ n=""+n; diff --git a/src/pages/projectSafety.vue b/src/pages/projectSafety.vue index 3f88689..d6ac524 100644 --- a/src/pages/projectSafety.vue +++ b/src/pages/projectSafety.vue @@ -406,7 +406,7 @@ export default { this.$refs.insDlg.showDialog(this.projects, this.projectInfo,row) }, doProbleRowClick(a,b,c){ - this.$refs.probDlg.showDialog(a,0,this.safeNav); + this.$refs.probDlg.showDialog(a,0,this.safeNav,this.selDate); }, doSpecialRowClick(row){ row.title = row.projectName+"特种作业人员清单"; From eabdbefab0d22109128233a716aa3f324294b047 Mon Sep 17 00:00:00 2001 From: haha Date: Sun, 27 Aug 2023 22:39:11 +0800 Subject: [PATCH 4/4] update code --- src/components/header.js | 13 ++++++++- src/pages/init.js | 16 +++++++++++ src/pages/progress/indexDlg3.vue | 47 ++++++++++++++++++++++++++------ vue.config.js | 4 +-- 4 files changed, 69 insertions(+), 11 deletions(-) diff --git a/src/components/header.js b/src/components/header.js index 7b8325d..9abb8f1 100644 --- a/src/components/header.js +++ b/src/components/header.js @@ -48,7 +48,10 @@ Vue.component("screen-header", { 11~25℃ - + + + + `, props: { @@ -77,6 +80,7 @@ Vue.component("screen-header", { selDept:'', localStorage1: JSON.parse(localStorage.getItem("data1")), localStorage2: JSON.parse(localStorage.getItem("data2")), + isFullScreen:false } }, mounted(){ @@ -94,6 +98,13 @@ Vue.component("screen-header", { }, methods: { + toggleFullScreen(){ + let el=document.body; + this.$toggleFullScreen(el); + setTimeout(()=>{ + this.isFullScreen=document.fullscreenElement==el; + },400); + }, init(){ try{ this.localStorage1=JSON.parse(localStorage.getItem("data1")) diff --git a/src/pages/init.js b/src/pages/init.js index d0a2476..d0cb36c 100644 --- a/src/pages/init.js +++ b/src/pages/init.js @@ -12,6 +12,22 @@ Vue.prototype.$bus=new Vue(); Vue.prototype.$apiPath="/jhapi" Vue.prototype.$dt=dayjs; Vue.prototype.$tryToJson=tryToJson +Vue.prototype.$toggleFullScreen=(el)=>{ + if(document.fullscreenElement==el){ + let screen = document.cancelFullScreen || document.webkitCancelFullScreen || document.mozCancelFullScreen || document.exitFullScreen + if (typeof screen != "undefined" && screen) { + screen.call(document); + return; + } + + }else{ + let screen = el.requestFullScreen || el.webkitRequestFullScreen || el.mozRequestFullScreen || el.msRequestFullScreen + if (typeof screen != "undefined" && screen) { + screen.call(el); + return; + } + } +} window.jhcaches={}; /* Api.project.getInfo().then(d=>{ diff --git a/src/pages/progress/indexDlg3.vue b/src/pages/progress/indexDlg3.vue index 0b9e877..9a6b1b2 100644 --- a/src/pages/progress/indexDlg3.vue +++ b/src/pages/progress/indexDlg3.vue @@ -1,5 +1,5 @@