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/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/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/header.vue b/src/components/header.vue index 0075fed..3da68d9 100644 --- a/src/components/header.vue +++ b/src/components/header.vue @@ -21,7 +21,7 @@ @click="pageJump(61, '#/video')">视频监控 - 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/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..0268112 --- /dev/null +++ b/src/pages/photography.vue @@ -0,0 +1,196 @@ + + + + + \ No newline at end of file diff --git a/src/pages/projectEngin.vue b/src/pages/projectEngin.vue index a6779de..b072d84 100644 --- a/src/pages/projectEngin.vue +++ b/src/pages/projectEngin.vue @@ -116,6 +116,7 @@ export default { itemWidth:20, itemHeight:40, textStyle: { + color: "#c3dbfd", fontSize: 14, rich: { name: { diff --git a/src/pages/projectQuality.vue b/src/pages/projectQuality.vue index 0893e63..57a45fe 100644 --- a/src/pages/projectQuality.vue +++ b/src/pages/projectQuality.vue @@ -272,6 +272,7 @@ export default { itemWidth:50, textStyle: { fontSize: 14, + color: "#c3dbfd", rich: { name: { color: "#c3dbfd", diff --git a/src/router/index.js b/src/router/index.js index 04220fe..8b46cdb 100644 --- a/src/router/index.js +++ b/src/router/index.js @@ -46,6 +46,11 @@ const routes = [ path: '/engin', name: 'engin', component: () => import(/* webpackChunkName: "video" */ '../pages/projectEngin.vue') + }, + { + path: '/photography', + name: 'photography', + component: () => import(/* webpackChunkName: "video" */ '../pages/photography.vue') } ] const router = new VueRouter({