diff --git a/src/views/projectAdmin/fourEngin/carbon/centerBottom.vue b/src/views/projectAdmin/fourEngin/carbon/centerBottom.vue index 647b565d..7015772f 100644 --- a/src/views/projectAdmin/fourEngin/carbon/centerBottom.vue +++ b/src/views/projectAdmin/fourEngin/carbon/centerBottom.vue @@ -1,8 +1,7 @@ @@ -14,7 +13,7 @@ export default { components: { Card }, data() { return { - time1:'', + time1: '' } }, mounted() { @@ -30,17 +29,17 @@ export default { // text: '日报表' // subtext: '单位:条' }, - + tooltip: { trigger: 'axis', - top:'20%', + top: '20%', axisPointer: { // 坐标轴指示器,坐标轴触发有效 type: 'line' // 默认为直线,可选为:'line' | 'shadow' } }, - grid: { + grid: { // 图表距离边框的距离,可用百分比和数字(px)配置 top: '15%', left: '2%', @@ -50,15 +49,28 @@ export default { }, xAxis: { - boundaryGap: false, + boundaryGap: false, type: 'category', boundaryGap: false, - data: ['1月', '2月', '3月', '4月', '5月', '6月', '7月', '8月', '9月', '10月', '11月', '12月'], + data: [ + '1月', + '2月', + '3月', + '4月', + '5月', + '6月', + '7月', + '8月', + '9月', + '10月', + '11月', + '12月' + ], axisLabel: { color: '#fff' }, splitLine: { lineStyle: { color: '#D0FFF6', type: 'dashed' } }, //x轴 - axisTick: { + axisTick: { show: false }, axisLine: { @@ -76,21 +88,21 @@ export default { color: '#fff' }, // axisLine: { show: true, lineStyle: { color: '#D0FFF6' } }, - splitLine: { - lineStyle:{ - color: 'rgba(255, 255, 255,0.3)', type: 'dashed' - }, - }, // 除x轴的横轴 - axisTick:{ - show:false - }, - axisLine:{ - show:true, - lineStyle:{ - type:'dashed' - } + splitLine: { + lineStyle: { + color: 'rgba(255, 255, 255,0.3)', + type: 'dashed' } - + }, // 除x轴的横轴 + axisTick: { + show: false + }, + axisLine: { + show: true, + lineStyle: { + type: 'dashed' + } + } } ], series: [ @@ -121,32 +133,32 @@ export default { .containerBox { width: 100%; height: 100%; - img{ + img { width: 98%; height: 92%; margin: 13px 0 0 14px; } .DataTime { - cursor:pointer; + cursor: pointer; margin-top: 10px; margin-left: 72%; width: 210; height: 17px; } ::v-deep .el-date-editor--daterange.el-input__inner { - cursor:pointer; + cursor: pointer; width: 235px; height: 30px; background-color: #182337; border: 1px solid #264b5e; } ::v-deep .el-range-input { - cursor:pointer; + cursor: pointer; background-color: #182337; color: #6ee4f0; } ::v-deep .el-date-editor { - cursor:pointer; + cursor: pointer; .el-range__icon { line-height: 23px; color: #6ee4f0; diff --git a/src/views/projectAdmin/fourEngin/carbon/centerTop.vue b/src/views/projectAdmin/fourEngin/carbon/centerTop.vue index 1fe529f1..102109f1 100644 --- a/src/views/projectAdmin/fourEngin/carbon/centerTop.vue +++ b/src/views/projectAdmin/fourEngin/carbon/centerTop.vue @@ -1,7 +1,7 @@ @@ -70,7 +70,7 @@ export default { getDevList() { console.log('环境下拉列表进来了吗--------') environmentDevList({ projectSn: this.$store.state.projectSn }).then( - result => { + (result) => { console.log('环境监测下拉列表', result) this.devList = result.result if (result.result.length > 0) { @@ -100,7 +100,7 @@ export default { projectSn: this.projectSn, deviceId: this.currentDevDetail.deviceId } - selectDustNoiseDataApi(data).then(res => { + selectDustNoiseDataApi(data).then((res) => { // console.log(res) this.dustData_24 = res.result this.createdEcharts2() @@ -111,7 +111,7 @@ export default { let data = { projectSn: this.projectSn } - selectNewEnvironmentAlarmListApi(data).then(res => { + selectNewEnvironmentAlarmListApi(data).then((res) => { if (res.code == 200) { this.alarmList = res.result } @@ -122,14 +122,16 @@ export default { projectSn: this.$store.state.projectSn, operateType: operateType, deviceId: deviceId - }).then(res => { + }).then((res) => { this.sprayDevList = res.result }) }, getSprayDevList() { - sprayDevListApi({ projectSn: this.$store.state.projectSn }).then(res => { - this.sprayDevList = res.result - }) + sprayDevListApi({ projectSn: this.$store.state.projectSn }).then( + (res) => { + this.sprayDevList = res.result + } + ) }, /** 查询 */ handleQuery() { @@ -172,7 +174,7 @@ export default { projectSn: this.projectSn, deviceId: this.currentDevDetail.deviceId } - selectDustNoiseDataApi(data).then(res => { + selectDustNoiseDataApi(data).then((res) => { // console.log(res) this.dustData_24 = res.result this.createdEcharts2() @@ -185,7 +187,7 @@ export default { projectSn: this.$store.state.projectSn } console.log(data) - getRealTimeDustNoiseDataApi(data).then(res => { + getRealTimeDustNoiseDataApi(data).then((res) => { if (res.code == 200) { console.log('获取环境设备详情数据------', res.result) if (res.result != null) { @@ -212,7 +214,7 @@ export default { }) }, //展示数据/视频播放切换 - change: function(index) { + change: function (index) { console.log(111) this.number = index }, diff --git a/src/views/projectAdmin/fourEngin/carbon/image/centerBottomImage.png b/src/views/projectAdmin/fourEngin/carbon/image/centerBottomImage.png new file mode 100644 index 00000000..2373be2a Binary files /dev/null and b/src/views/projectAdmin/fourEngin/carbon/image/centerBottomImage.png differ diff --git a/src/views/projectAdmin/fourEngin/carbon/image/centerTopImage.png b/src/views/projectAdmin/fourEngin/carbon/image/centerTopImage.png new file mode 100644 index 00000000..fa468c7c Binary files /dev/null and b/src/views/projectAdmin/fourEngin/carbon/image/centerTopImage.png differ diff --git a/src/views/projectAdmin/fourEngin/carbon/image/leftBottomImg.png b/src/views/projectAdmin/fourEngin/carbon/image/leftBottomImg.png new file mode 100644 index 00000000..96b2d734 Binary files /dev/null and b/src/views/projectAdmin/fourEngin/carbon/image/leftBottomImg.png differ diff --git a/src/views/projectAdmin/fourEngin/carbon/image/leftCenterImage.png b/src/views/projectAdmin/fourEngin/carbon/image/leftCenterImage.png new file mode 100644 index 00000000..26bec2c8 Binary files /dev/null and b/src/views/projectAdmin/fourEngin/carbon/image/leftCenterImage.png differ diff --git a/src/views/projectAdmin/fourEngin/carbon/image/leftTopImage.png b/src/views/projectAdmin/fourEngin/carbon/image/leftTopImage.png new file mode 100644 index 00000000..ff633f83 Binary files /dev/null and b/src/views/projectAdmin/fourEngin/carbon/image/leftTopImage.png differ diff --git a/src/views/projectAdmin/fourEngin/carbon/image/rightCenterImage.png b/src/views/projectAdmin/fourEngin/carbon/image/rightCenterImage.png new file mode 100644 index 00000000..3918b3e6 Binary files /dev/null and b/src/views/projectAdmin/fourEngin/carbon/image/rightCenterImage.png differ diff --git a/src/views/projectAdmin/fourEngin/carbon/leftCenter.vue b/src/views/projectAdmin/fourEngin/carbon/leftCenter.vue index 1a5531a2..fffaa567 100644 --- a/src/views/projectAdmin/fourEngin/carbon/leftCenter.vue +++ b/src/views/projectAdmin/fourEngin/carbon/leftCenter.vue @@ -1,13 +1,17 @@