diff --git a/package.json b/package.json index 4c7b626..a7f28f7 100644 --- a/package.json +++ b/package.json @@ -20,6 +20,7 @@ "less": "^4.1.3", "less-loader": "^11.1.3", "lodash.debounce": "^4.0.8", + "lodash.throttle": "^4.1.1", "logt": "^1.4.1", "nprogress": "0.2.0", "vue": "^2.6.14", diff --git a/src/api/projectChecking/index.js b/src/api/projectChecking/index.js index ab22fab..849734b 100644 --- a/src/api/projectChecking/index.js +++ b/src/api/projectChecking/index.js @@ -13,7 +13,33 @@ const getProjectCheckingList=(deptId,projectId)=> { method: 'get' }) } + + const getProjectCheckingGroupFoChart=(deptId,projectId)=> { + return request({ + url: `bgscreen/projectChecking/getProjectCheckingGroupFoChart?deptId=${deptId||0}&projectId=${projectId||0}`, + method: 'get' + }) + } + + const groupCheckingByProjectId=(lvl,deptId,projectId)=> { + return request({ + url: `bgscreen/projectChecking/groupCheckingByProjectId?lvl=${lvl}&deptId=${deptId||0}&projectId=${projectId||0}`, + method: 'get' + }) + } + const queryProjectCheckingList=(pageNum,pageSize,data)=> { + return request({ + url: `bgscreen/projectChecking/queryProjectCheckingList??pageNum=${pageNum}&pageSize=${pageSize}`, + method: 'post', + data:data + }) + } + + export default{ getProjectCheckingList, - getProjectCheckingView + getProjectCheckingView, + getProjectCheckingGroupFoChart, + groupCheckingByProjectId, + queryProjectCheckingList } \ No newline at end of file diff --git a/src/api/workTrain/index.js b/src/api/workTrain/index.js index cda0725..c18e494 100644 --- a/src/api/workTrain/index.js +++ b/src/api/workTrain/index.js @@ -13,7 +13,16 @@ const getGroupByDataType=(deptId,projectId)=> { }) } +const queryWorkTrainList=(pageNum,pageSize,data)=> { + return request({ + url: `bgscreen/workTrain/queryWorkTrainList?pageNum=${pageNum}&pageSize=${pageSize}`, + method: 'post', + data:data + }) +} + export default{ getWorkTrainList, - getGroupByDataType + getGroupByDataType, + queryWorkTrainList } \ No newline at end of file diff --git a/src/pages/projectQuality.vue b/src/pages/projectQuality.vue index 57a45fe..fe67bc1 100644 --- a/src/pages/projectQuality.vue +++ b/src/pages/projectQuality.vue @@ -46,7 +46,7 @@ :color="scope.$index < 3 && +scope.row.id > 0 ? '#f05e35' : '#6ab9fe'"> - + @@ -155,8 +155,10 @@ :typedata="measuredData" :text="measuredText" :height="230"> - - + + + + + @@ -220,10 +222,11 @@ import checkDetectionDlg from './quality/checkDetectionDlg.vue' import measuredDlg from './quality/measuredDlg.vue' import materialSealChart from './quality/materialSealChart.vue' import materialSealListDlg from './quality/materialSealListDlg.vue' +import projectChecking from './quality/projectChecking.vue' import debounce from 'lodash.debounce' export default { components:{ - materialSealListDlg, materialSealChart, ProblemmodifyDetail,showCheckingDlg,materialSealDetialDlg,checkDetectionDlg,measuredDlg + materialSealListDlg, materialSealChart, ProblemmodifyDetail,showCheckingDlg,materialSealDetialDlg,checkDetectionDlg,measuredDlg,projectChecking }, data() { return { @@ -483,8 +486,8 @@ export default { }) this.elSummaryPrjKey++; }); - this.doProjectChecking(); - }, + //this.doProjectChecking(); + }, doMeasuredNav(n,t){ this.measuredNav=n; this.measuredText=t; @@ -523,10 +526,10 @@ export default { this.acceptanceData=d.rows; }); //举牌验收统计 - this.$api.projectChecking.getProjectCheckingView(this.dept?.id||0,this.projectInfo?.id||0).then(d=>{ - this.acceptanceDataView.sum=d.data.sum; - this.acceptanceDataView.okSum=d.data.okSum; - }); + // this.$api.projectChecking.getProjectCheckingView(this.dept?.id||0,this.projectInfo?.id||0).then(d=>{ + // this.acceptanceDataView.sum=d.data.sum; + // this.acceptanceDataView.okSum=d.data.okSum; + // }); }, init(){ this.localStorage = JSON.parse(localStorage.getItem("data1")) @@ -753,37 +756,6 @@ export default { padding:0px 5px; } } - .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/projectSafety.vue b/src/pages/projectSafety.vue index 60998f0..095d11d 100644 --- a/src/pages/projectSafety.vue +++ b/src/pages/projectSafety.vue @@ -72,7 +72,10 @@ - + + - + +