From a318701d74eb99cc507b0530ea0bbf04265140de Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E5=A7=9C=E7=8E=89=E7=90=A6?= <7507756+jiang_yuqi@user.noreply.gitee.com> Date: Sun, 20 Aug 2023 19:20:22 +0800 Subject: [PATCH] =?UTF-8?q?=E6=8F=90=E4=BA=A4=E4=BB=A3=E7=A0=81?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/api/index.js | 4 +- src/api/projectChecking/index.js | 19 ++++++++ src/pages/index.vue | 2 +- src/pages/projectQuality.vue | 78 ++++++++++++++++++++++---------- vue.config.js | 3 +- 5 files changed, 80 insertions(+), 26 deletions(-) create mode 100644 src/api/projectChecking/index.js diff --git a/src/api/index.js b/src/api/index.js index 4bc8b3a..884d080 100644 --- a/src/api/index.js +++ b/src/api/index.js @@ -11,6 +11,7 @@ import attendance from './attendance/index' import insurance from './insurance/index' import journalism from './journalism/index' import buildNode from './buildNode' +import projectChecking from './projectChecking/index' export default { project, dept, @@ -24,5 +25,6 @@ export default { attendance, insurance, journalism, - buildNode + buildNode, + projectChecking } \ No newline at end of file diff --git a/src/api/projectChecking/index.js b/src/api/projectChecking/index.js new file mode 100644 index 0000000..ab22fab --- /dev/null +++ b/src/api/projectChecking/index.js @@ -0,0 +1,19 @@ +import request from '@/utils/request' + +const getProjectCheckingList=(deptId,projectId)=> { + return request({ + url: `bgscreen/projectChecking/getProjectCheckingList?deptId=${deptId||0}&projectId=${projectId||0}`, + method: 'get' + }) + } + + const getProjectCheckingView=(deptId,projectId)=> { + return request({ + url: `bgscreen/projectChecking/getProjectCheckingView?deptId=${deptId||0}&projectId=${projectId||0}`, + method: 'get' + }) + } +export default{ + getProjectCheckingList, + getProjectCheckingView +} \ No newline at end of file diff --git a/src/pages/index.vue b/src/pages/index.vue index a9bb59f..b014aa7 100644 --- a/src/pages/index.vue +++ b/src/pages/index.vue @@ -145,7 +145,7 @@ - +
diff --git a/src/pages/projectQuality.vue b/src/pages/projectQuality.vue index 2dba44c..c1425f3 100644 --- a/src/pages/projectQuality.vue +++ b/src/pages/projectQuality.vue @@ -129,7 +129,7 @@
-
+
设备总数: 100 台 @@ -147,40 +147,41 @@ - +
首次验收: - 42 + {{acceptanceDataView.sum}} 次 合格率: - 96 + {{acceptanceDataView.okSum}} %
-
-
+
+
- 举牌验收 - {{it.date}} +
验收合格
+
验收不合格
+
{{it.checkingDate}}
项目: - {{it.name}} + {{it.projectName}}
区域: - {{it.area}} + {{it.checkWorkingPosition}}
- 描述:{{it.detail}} + 验收描述:{{it.intro}}
@@ -238,12 +239,11 @@ export default { { name:'激光垂准仪', value:'1' }, ], //举牌验收 - acceptanceData:[ - {name:'泾河新城荟锦坊二期项目',date:'2023-06-08 11:11:11',area:'基础施工',img:'./images/850.jpg', detail:'锚索验收12次,结果为合格'}, - {name:'泾河新城荟锦坊二期项目',date:'2023-06-08 11:11:11',area:'基础施工',img:'./images/851.jpg',detail:'筏板钢筋验收15次,结果为合格'}, - {name:'泾河新城荟锦坊二期项目',date:'2023-06-08 11:11:11',area:'基础施工',img:'./images/852.jpg',detail:'墙柱钢筋验收6，复查结果不合格'}, - {name:'泾河新城荟锦坊二期项目',date:'2023-06-08 11:11:11',area:'基础施工',img:'./images/853.jpg',detail:'模板及脚手架验收5次，复查结果为合格'}, - ], + acceptanceDataView:{ + sum:0, + okSum:100, + }, + acceptanceData:[], summary:[], summaryTotal:0, summaryPrj:[], @@ -318,6 +318,7 @@ export default { }) this.elKey++; }); + this.doProjectChecking(); }, doMeasuredNav(n,t){ this.measuredNav=n; @@ -328,8 +329,20 @@ export default { this.safeText=t; this.doDeptChane(); }, + //查询举牌验收 + doProjectChecking(){ + this.acceptanceData=[]; + //举牌验收数据列表 + this.$api.projectChecking.getProjectCheckingList(this.dept?.id||0,this.projectInfo?.id||0).then(d=>{ + 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; + }); + }, init(){ - this.localStorage = JSON.parse(localStorage.getItem("data1")) //设备概况点击事件定时器 this.overviewInterval = setInterval(this.overviewClick,5000); @@ -340,7 +353,13 @@ export default { //预警类型 定时器 this.warningTypeInterval = setInterval(this.automaticRollType,5000); }, - + // 获取图片映射 + getProfileImage(url) { + if (url) { + return '/jhapi' + url + ".min.jpg"; + } + return url; + }, }, }; @@ -460,11 +479,10 @@ export default { margin-top: 10px; } .acceptance-item{ - margin-top: 20px; - padding:20px; + padding:12px; } .acceptance-item .row-5{ - margin-top:10px; + //margin-top:10px; line-height:30px; color: #C7DAFD; } @@ -482,6 +500,7 @@ export default { overflow: hidden; } .acceptance-item .div-img img{ + width: 125px; height: 90px; } .acceptance-item .sp-lbl{ @@ -489,11 +508,24 @@ export default { border:solid 1px #1D642C; color: #41AA20; padding:2px 8px; + float: left; + width: 35%; + } + .acceptance-item .sp-err{ + background: #351717; + border: solid 1px #5a0303; + color: #bb2424; + padding: 2px 8px; + float: left; + width: 35%; } .acceptance-item .sp-date{ font-size: 12px; - margin-left: 50px; color: #aaa; + float: left; + width: 58%; + line-height: 36px; + text-align: right; } } \ No newline at end of file diff --git a/vue.config.js b/vue.config.js index 7653f35..f7654db 100644 --- a/vue.config.js +++ b/vue.config.js @@ -16,7 +16,8 @@ module.exports = defineConfig({ } }, '/jhapi/profile':{ - target: `http://62.234.3.186/jhapi/profile`, + //target: `http://62.234.3.186/jhapi/profile`, + target: `http://127.0.0.1:8090/jhapi/profile`, changeOrigin: true, pathRewrite: { ['^/jhapi/profile']:''