diff --git a/public/css/largeScreenLayout.css b/public/css/largeScreenLayout.css index cea2b17..c179257 100644 --- a/public/css/largeScreenLayout.css +++ b/public/css/largeScreenLayout.css @@ -57,6 +57,9 @@ height: 970px; background: url("../images/one/3x3.png") no-repeat center/100% 100%; } +.screen-one-3-3.no-title{ + background: url("../images/one/3x32.png") no-repeat center/100% 100%; +} .screen-one-3-4{ height: 970px; background: url("../images/one/3x4.png") no-repeat center/100% 100%; diff --git a/public/images/one/3x32.png b/public/images/one/3x32.png new file mode 100644 index 0000000..8773cad Binary files /dev/null and b/public/images/one/3x32.png differ diff --git a/src/api/flow/index.js b/src/api/flow/index.js index b11f65b..25bf41d 100644 --- a/src/api/flow/index.js +++ b/src/api/flow/index.js @@ -13,6 +13,29 @@ const groupByUnit=(projectId,deptId)=> { method: 'get' }) } + +const groupByUnitFinish=(projectId,deptId)=> { + return request({ + url: `bgscreen/flow/groupByUnitFinish?projectId=${projectId}&deptId=${deptId}`, + method: 'get' + }) +} + +const groupByUnitTotal=(projectId,deptId)=> { + return request({ + url: `bgscreen/flow/groupByUnitTotal?projectId=${projectId}&deptId=${deptId}`, + method: 'get' + }) +} + +const groupByProject=()=> { + return request({ + url: `bgscreen/flow/groupByProject`, + method: 'get' + }) +} + + const listByUnit=(projectId,deptId,unit,pageNum,pageSize)=>{ return request({ url: `bgscreen/flow/listByUnit?pageNum=${pageNum}&pageSize=${pageSize}`, @@ -39,6 +62,9 @@ const listByState=(projectId,deptId,state,pageNum,pageSize)=>{ export default{ groupByCategory, groupByUnit, + groupByUnitFinish, + groupByUnitTotal, listByUnit, - listByState + listByState, + groupByProject } diff --git a/src/api/project/index.js b/src/api/project/index.js index e98285b..6c4a907 100644 --- a/src/api/project/index.js +++ b/src/api/project/index.js @@ -92,7 +92,12 @@ const getInfo=()=>{ method:'get' }) } - +const listPhotography=id=>{ + return request({ + url: `bgscreen/photography/listPhotography?projectId=${id}`, + method: 'get' + }); +} export default{ findProjectByDept, @@ -102,7 +107,8 @@ export default{ groupByCategory, groupByLevel, getProjectUser, - getInfo + getInfo, + listPhotography } diff --git a/src/api/standard/index.js b/src/api/standard/index.js index 551e5d2..b772d1a 100644 --- a/src/api/standard/index.js +++ b/src/api/standard/index.js @@ -7,6 +7,25 @@ const getList=(projectId,deptId)=> { }) } -export default{ - getList +const groupByType=data=>{ + return request({ + url:'bgscreen/standard/groupByType', + method:'post', + data:data + }) +} + + +const groupByProject=()=>{ + return request({ + url:'bgscreen/standard/groupByProject', + method:'get' + }) +} + + +export default{ + getList, + groupByType, + groupByProject } diff --git a/src/assets/images/bgphoto.png b/src/assets/images/bgphoto.png new file mode 100644 index 0000000..8661215 Binary files /dev/null and b/src/assets/images/bgphoto.png differ diff --git a/src/components/chart-bar.js b/src/components/chart-bar.js index 3c15632..d49226e 100644 --- a/src/components/chart-bar.js +++ b/src/components/chart-bar.js @@ -54,7 +54,7 @@ Vue.component("chart-bar", { dataset: { source: this.optData }, - xAxis: { type: 'category' }, + xAxis: { type: 'category' , axisLabel: {color:"#fff"}}, yAxis: {}, series: [{ type: 'bar' }, { type: 'bar' }, { type: 'bar' }] } diff --git a/src/components/header.vue b/src/components/header.vue index 0075fed..9e778ca 100644 --- a/src/components/header.vue +++ b/src/components/header.vue @@ -21,7 +21,7 @@ @click="pageJump(61, '#/video')">视频监控 - @@ -188,7 +188,7 @@ export default { return it; })] } - this.deptChange(); + this.deptChange((()=>{})); }); } this.$root.isTypeBuser = this.isTypeBuser; @@ -268,11 +268,11 @@ export default { this.loadProject(true); } }, - deptChange() { + deptChange(cb) { if(!this.dept1){ if(this.depts.length>0){ this.dept1=this.depts[0].text; - this.loadProject(true); + this.loadProject(true,cb); } } let tmps = this.depts.filter(d => d.text == this.dept1); @@ -331,7 +331,7 @@ export default { this.deptChange(); this.loadProject(); }, - loadProject(init) { + loadProject(init,cb) { if (this.isTypeBuser) { return; } @@ -348,6 +348,9 @@ export default { } else { this.setScreenLiSel2(null); } + if(cb){ + cb(); + } }); }, setScreenLiSel2(item, init) { diff --git a/src/components/module/module-one-3-3.js b/src/components/module/module-one-3-3.js index d2a8d80..e338473 100644 --- a/src/components/module/module-one-3-3.js +++ b/src/components/module/module-one-3-3.js @@ -2,7 +2,7 @@ import Vue from 'vue' Vue.component('module-one-3-3', { template:`
-
+
{{label}}
@@ -11,6 +11,9 @@ Vue.component('module-one-3-3', { props: { label:{ type:String + }, + notitle:{ + type:Boolean } }, diff --git a/src/pages/engin/enginChart.vue b/src/pages/engin/enginChart.vue new file mode 100644 index 0000000..797f847 --- /dev/null +++ b/src/pages/engin/enginChart.vue @@ -0,0 +1,57 @@ + + + diff --git a/src/pages/index.vue b/src/pages/index.vue index 1f4ef5e..e0470cb 100644 --- a/src/pages/index.vue +++ b/src/pages/index.vue @@ -277,9 +277,9 @@ export default { icon: "rect", orient: "horizontal", left: '50%', - top: '0', - itemGap: 0, - + top: '10%', + itemGap: 20, + itemHeight:30, textStyle: { padding:[0,0,2,0], fontSize: 10, @@ -611,7 +611,7 @@ export default { roleType: 0 }; this.$api.problemmodify.safetySummary(postData).then(d => { - this.dangersDatas = (d || []).map(it => { + let tmps= (d || []).map(it => { return { text: it.problemArea, prop: '0.0', @@ -619,6 +619,8 @@ export default { value: +it.roleType || 0 } }); + tmps.splice(6) + this.dangersDatas =tmps; let sum = 0; this.dangersDatas.forEach(it => { sum += it.value * 1; @@ -633,7 +635,7 @@ export default { }; this.qualityNavTitle = "质量隐患总数"; this.$api.problemmodify.qualitySummary(postData).then(d => { - this.dangersDatas = (d || []).map(it => { + let tmps = (d || []).map(it => { return { text: it.problemArea, prop: '0.0', @@ -641,6 +643,8 @@ export default { value: +it.roleType || 0 } }); + tmps.splice(6) + this.dangersDatas=tmps; let sum = 0; this.dangersDatas.forEach(it => { sum += it.value * 1; diff --git a/src/pages/photography.vue b/src/pages/photography.vue new file mode 100644 index 0000000..4834fbf --- /dev/null +++ b/src/pages/photography.vue @@ -0,0 +1,216 @@ + + + + + \ No newline at end of file diff --git a/src/pages/projectEngin.vue b/src/pages/projectEngin.vue index a6779de..a9bdab2 100644 --- a/src/pages/projectEngin.vue +++ b/src/pages/projectEngin.vue @@ -3,79 +3,84 @@
- - -
- -
暂无数据
-
+ + - - -
- -
暂无数据
+ +
+ + + + + + + + + + + + + +
排名项目名称上传数量上传占比
{{ it.no }}{{ it.name }}{{ it.value }}{{ it.percent }}%
- - - -
- -
暂无数据
-
-
+
- - + + - - - + +
+ + + + + + + + + + + + + +
排名申请项目申请数量申请占比
{{ it.no }}{{ it.name }}{{ it.value }}{{ it.percent }}%
+
- - -
+ + + +
暂无数据
- - -
- -
暂无数据
-
+ + - - -
- -
暂无数据
-
+ + - - -
- -
暂无数据
-
+ +
- -
- - + +
+ +