diff --git a/src/components/videoModule/videoModule.less b/src/components/videoModule/videoModule.less index f4efde8c..3487641a 100644 --- a/src/components/videoModule/videoModule.less +++ b/src/components/videoModule/videoModule.less @@ -1,6 +1,6 @@ .videoOverview{ position: relative; - background-color: #03112b; + // background-color: #03112b; height: 100%; .videoTop{ position: absolute; diff --git a/src/views/projectAdmin/common/jChart/bar/JBarChart.vue b/src/views/projectAdmin/common/jChart/bar/JBarChart.vue index d562c392..9b43cadb 100644 --- a/src/views/projectAdmin/common/jChart/bar/JBarChart.vue +++ b/src/views/projectAdmin/common/jChart/bar/JBarChart.vue @@ -29,6 +29,11 @@ export default { type: Array, default: () => [] }, + legend: { + required: true, + type: Array, + default: () => [] + }, yData: { type: Array, default: () => [] @@ -66,12 +71,12 @@ export default { }, methods: { createChart() { - const { title, tooltip, grid, color, xData, yData, series } = this + const { title, tooltip, grid, color, xData, yData, series,legend } = this const configSeries = (series => { - console.log(series[0].data,'=========================yyyyyyyyyy') - console.log(series[1].data,'=========================yyyyyyyyyy') + // console.log(series[3].data,'=========================yyyyyyyyyy') + // console.log(series[1].data,'=========================yyyyyyyyyy') if (series.length) { - return series.map(item => ({ name: item.name, type: 'bar', data: item.data, barWidth: 20, itemStyle: item.itemStyle })) + return series.map(item => ({ name: item.name, type: item.type, data: item.data, barWidth: 20, itemStyle: item.itemStyle })) } else { return [{ data: yData, type: 'bar', barWidth: 15 }] } @@ -93,7 +98,7 @@ export default { left: 20, itemWidth: 8, textStyle: { color: '#fff' }, - data: [{ name: '计划用量' }, { name: '实际用量' }] + data: legend }, tooltip, grid: { diff --git a/src/views/projectAdmin/fourEngin/assets/images/carbon/bottom1.png b/src/views/projectAdmin/fourEngin/assets/images/carbon/bottom1.png new file mode 100644 index 00000000..c54586de Binary files /dev/null and b/src/views/projectAdmin/fourEngin/assets/images/carbon/bottom1.png differ diff --git a/src/views/projectAdmin/fourEngin/assets/images/carbon/bottom2.png b/src/views/projectAdmin/fourEngin/assets/images/carbon/bottom2.png new file mode 100644 index 00000000..1435fae1 Binary files /dev/null and b/src/views/projectAdmin/fourEngin/assets/images/carbon/bottom2.png differ diff --git a/src/views/projectAdmin/fourEngin/assets/images/carbon/bottom3.png b/src/views/projectAdmin/fourEngin/assets/images/carbon/bottom3.png new file mode 100644 index 00000000..8c54802c Binary files /dev/null and b/src/views/projectAdmin/fourEngin/assets/images/carbon/bottom3.png differ diff --git a/src/views/projectAdmin/fourEngin/assets/images/carbon/bottom4.png b/src/views/projectAdmin/fourEngin/assets/images/carbon/bottom4.png new file mode 100644 index 00000000..6d3ea603 Binary files /dev/null and b/src/views/projectAdmin/fourEngin/assets/images/carbon/bottom4.png differ diff --git a/src/views/projectAdmin/fourEngin/assets/images/carbon/top1.png b/src/views/projectAdmin/fourEngin/assets/images/carbon/top1.png new file mode 100644 index 00000000..5b442590 Binary files /dev/null and b/src/views/projectAdmin/fourEngin/assets/images/carbon/top1.png differ diff --git a/src/views/projectAdmin/fourEngin/assets/images/carbon/top2.png b/src/views/projectAdmin/fourEngin/assets/images/carbon/top2.png new file mode 100644 index 00000000..f8125ab2 Binary files /dev/null and b/src/views/projectAdmin/fourEngin/assets/images/carbon/top2.png differ diff --git a/src/views/projectAdmin/fourEngin/assets/images/carbon/top3.png b/src/views/projectAdmin/fourEngin/assets/images/carbon/top3.png new file mode 100644 index 00000000..0e6affd1 Binary files /dev/null and b/src/views/projectAdmin/fourEngin/assets/images/carbon/top3.png differ diff --git a/src/views/projectAdmin/fourEngin/assets/images/carbon/top4.png b/src/views/projectAdmin/fourEngin/assets/images/carbon/top4.png new file mode 100644 index 00000000..bf9ce179 Binary files /dev/null and b/src/views/projectAdmin/fourEngin/assets/images/carbon/top4.png differ diff --git a/src/views/projectAdmin/fourEngin/sourse/leftCenter.vue b/src/views/projectAdmin/fourEngin/sourse/leftCenter.vue index 313776e7..bfcacd4f 100644 --- a/src/views/projectAdmin/fourEngin/sourse/leftCenter.vue +++ b/src/views/projectAdmin/fourEngin/sourse/leftCenter.vue @@ -14,16 +14,7 @@ export default { components: { Card, CarTable }, data() { return { - list: [ - { name: '钢筋', number: '100' }, - { name: '加砌块', number: '50' }, - { name: '混凝土', number: '50' }, - { name: '钢构', number: '100' }, - { name: '砂浆', number: '20' }, - { name: '幕墙', number: '10' }, - { name: '水泥', number: '50' }, - { name: '瓷砖', number: '50' } - ] + } }, mounted() { @@ -58,8 +49,8 @@ export default { // backgroundColor: '#100c29', grid: { top:'0', - left: '15%', - right: '15%', + left: '10%', + right: '10%', bottom: '0', containLabel: true }, @@ -80,17 +71,16 @@ export default { } }, yAxis: { - type: 'category', - inverse: true, - axisLine: { - show: false - }, - axisTick: { - show: false - }, axisLabel: { - inside: true - }, + show: true, + textStyle: { + color: '#FFFFFF', //y轴字体颜色 + fontSize:'15px' + }, + }, + splitLine: {show: false}, //横向的线 + axisTick: {show: false}, //y轴的端点 + axisLine: {show: false}, //y轴的线 data: ["钢筋","混凝土","砂浆","水泥"] }, series: [ @@ -106,7 +96,7 @@ export default { } }, z: 9999, - data: data + data: data, }, { type: 'bar', @@ -118,7 +108,18 @@ export default { color: '#30373f' } }, - data: [100,100,100,100] + label: { + show: true, + offset: [30, 0], + position: 'right', + align: 'right', + formatter: function(data) { + for (let i = 0; i < data.length; i++) { + return data[i] + '%' + } + } + }, + data: data }, { // 分隔 @@ -171,8 +172,8 @@ export default { // backgroundColor: '#100c29', grid: { top:'0', - left: '15%', - right: '15%', + left: '10%', + right: '10%', bottom: '0', containLabel: true }, @@ -193,17 +194,16 @@ export default { } }, yAxis: { - type: 'category', - inverse: true, - axisLine: { - show: false - }, - axisTick: { - show: false - }, axisLabel: { - inside: true - }, + show: true, + textStyle: { + color: '#FFFFFF', //y轴字体颜色 + fontSize:'15px' + }, + }, + splitLine: {show: false}, //横向的线 + axisTick: {show: false}, //y轴的端点 + axisLine: {show: false}, //y轴的线 data: ["加砌块","钢构","幕墙","瓷砖"] }, series: [ @@ -231,7 +231,18 @@ export default { color: '#30373f' } }, - data: [100,100,100,100] + label: { + show: true, + offset: [30, 0], + position: 'right', + align: 'right', + formatter: function(data) { + for (let i = 0; i < data.length; i++) { + return data[i] + '%' + } + } + }, + data: data }, { // 分隔 diff --git a/src/views/projectAdmin/fourEngin/sourse/leftTop.vue b/src/views/projectAdmin/fourEngin/sourse/leftTop.vue index 5726d848..ad75280a 100644 --- a/src/views/projectAdmin/fourEngin/sourse/leftTop.vue +++ b/src/views/projectAdmin/fourEngin/sourse/leftTop.vue @@ -2,9 +2,17 @@
-
材料类别
-
下拉框一
-
下拉框二
+
材料类别
+
+ + + +
+
+ + + +
@@ -36,7 +44,11 @@ export default { data(){ return{ messageList:[], - sn:'' + sn:'', + typesList:["水泥","钢筋","玻璃"], + dateList:["2021","2022"], + typeValue:"钢筋", + yearValue:"2021" } }, mounted(){ @@ -88,29 +100,17 @@ export default { margin-left: 10px; color: #fff; .person { + margin-top: 4%; + margin-left: 46%; + height: 20px; + line-height: 25px; display: flex; - justify-content: end; - div:nth-child(2),div:nth-child(3) { - margin: 5px 5px 10px 0px; - display: inline-block; - width: 88px; + .typeName{ + width: 65px; height: 40px; - text-align: center; + font-weight: 500; line-height: 40px; - font-size: 16px; - background-image: url(../assets/images/common/num_bg.png); - background-repeat: no-repeat; - background-size: 100%; - color: #6ee4f0; - } - div:nth-child(1){ - margin: 5px 5px 10px 0px; - display: inline-block; - width: 88px; - height: 40px; - text-align: center; - line-height: 40px; - font-size: 16px; + margin: 0 20px 0 0; } } @@ -223,7 +223,7 @@ export default { // height: 100%; display: flex; flex-wrap: wrap; - margin-top: 25px; + margin-top: 50px; align-items: center; justify-content: center; .photovoltaicOne { @@ -273,4 +273,10 @@ export default { margin: 79px 0 0 0; } } +::v-deep .el-input--suffix .el-input__inner { + background: transparent !important; + color: #fff !important; + border: 1px solid #66D3D8 !important ; + z-index: 999; + } diff --git a/src/views/projectAdmin/fourEngin/sourse/rightBottom.vue b/src/views/projectAdmin/fourEngin/sourse/rightBottom.vue index 942e7d2d..a35fc938 100644 --- a/src/views/projectAdmin/fourEngin/sourse/rightBottom.vue +++ b/src/views/projectAdmin/fourEngin/sourse/rightBottom.vue @@ -1,9 +1,12 @@ @@ -14,16 +17,45 @@ import MaterialTable from './components/MaterialTable.vue' export default { components: { Card, MaterialTable }, + data() { + return { + list: [ + { name: '混凝土', number: '1000t', url: require('../assets/images/carbon/top1.png') }, + { name: '钢筋', number: '500t', url: require('../assets/images/carbon/top2.png') }, + { name: '水泥', number: '100t', url: require('../assets/images/carbon/top3.png') }, + { name: '幕墙', number: '100㎡', url: require('../assets/images/carbon/top4.png') }, + { name: '砂浆', number: '600t', url: require('../assets/images/carbon/bottom1.png') }, + { name: '加砌块', number: '5000t', url: require('../assets/images/carbon/bottom2.png') }, + { name: '瓷砖', number: '200㎡', url: require('../assets/images/carbon/bottom3.png') }, + { name: '钢构', number: '200t', url: require('../assets/images/carbon/bottom4.png') } + ] + } + } } diff --git a/src/views/projectAdmin/fourEngin/sourse/rightTop.vue b/src/views/projectAdmin/fourEngin/sourse/rightTop.vue index e1ddbedb..16bd8c05 100644 --- a/src/views/projectAdmin/fourEngin/sourse/rightTop.vue +++ b/src/views/projectAdmin/fourEngin/sourse/rightTop.vue @@ -1,5 +1,5 @@