修改样式

main
jn517618 2 years ago
parent f01a3e5566
commit acc5ed372d
  1. 4
      src/views/energySources/component/all.vue
  2. 4
      src/views/energySources/component/dosage.vue
  3. 4
      src/views/energySources/component/equipmentAnalyze.vue
  4. 5
      src/views/energySources/component/equipmentLoad.vue
  5. 36
      src/views/energySources/component/equipmentStatus.vue
  6. 2
      src/views/energySources/component/header.vue
  7. 2
      src/views/energySources/component/load.vue
  8. 2
      src/views/energySourcesProvince/component/electricity.vue
  9. 2
      src/views/energySourcesProvince/component/emissionAll.vue
  10. 2
      src/views/energySourcesProvince/component/header.vue
  11. 2
      src/views/energySourcesProvince/component/intensity.vue
  12. 2
      src/views/energySourcesProvince/component/statistics.vue
  13. 3
      src/views/energySourcesProvince/component/tendency.vue

@ -11,7 +11,7 @@
<div class="tit-r"> <div class="tit-r">
<span style="color: #fff;">选择时间</span> <span style="color: #fff;">选择时间</span>
<el-date-picker size="mini" v-model="selectMonth" type="month" placeholder="选择月" @change="changeMonth" <el-date-picker size="mini" v-model="selectMonth" type="month" placeholder="选择月" @change="changeMonth"
style="width: 1.2rem;margin-right: 0.26rem;" format="yyyy-MM" value-format="yyyy-MM"> :clearable="false" style="width: 1.2rem;margin-right: 0.26rem;" format="yyyy-MM" value-format="yyyy-MM">
</el-date-picker> </el-date-picker>
单位kw·h 单位kw·h
</div> </div>
@ -120,7 +120,7 @@ export default {
}, 300000) }, 300000)
} }
}, },
beforeDestroyed() { beforeDestroy() {
clearInterval(this.timeFun) clearInterval(this.timeFun)
}, },
computed: { computed: {

@ -7,7 +7,7 @@
&nbsp;&nbsp;&nbsp; &nbsp;&nbsp;&nbsp;
<span style="color: #fff;">选择时间</span> <span style="color: #fff;">选择时间</span>
<el-date-picker size="mini" v-model="selectDay" type="date" placeholder="选择月" @change="changeDate" <el-date-picker size="mini" v-model="selectDay" type="date" placeholder="选择月" @change="changeDate"
style="width: 1.3rem;margin-right: 0.26rem;" value-format="yyyy-MM-dd" format="yyyy-MM-dd"> :clearable="false" style="width: 1.3rem;margin-right: 0.26rem;" value-format="yyyy-MM-dd" format="yyyy-MM-dd">
</el-date-picker> </el-date-picker>
单位kw·h 单位kw·h
</div> </div>
@ -119,7 +119,7 @@ export default {
}, 300000) }, 300000)
} }
}, },
beforeDestroyed() { beforeDestroy() {
clearInterval(this.timeFun) clearInterval(this.timeFun)
}, },
computed: { computed: {

@ -4,7 +4,7 @@
<div class="tit-r"> <div class="tit-r">
<span style="color: #fff;">选择时间</span> <span style="color: #fff;">选择时间</span>
<el-date-picker size="mini" v-model="selectDay" type="date" placeholder="选择月" @change="changeDate" <el-date-picker size="mini" v-model="selectDay" type="date" placeholder="选择月" @change="changeDate"
style="width: 1.3rem;margin-right: 0.26rem;" value-format="yyyy-MM-dd" format="yyyy-MM-dd"> :clearable="false" style="width: 1.3rem;margin-right: 0.26rem;" value-format="yyyy-MM-dd" format="yyyy-MM-dd">
</el-date-picker> </el-date-picker>
</div> </div>
</tit> </tit>
@ -84,7 +84,7 @@ export default {
}, 300000) }, 300000)
} }
}, },
beforeDestroyed() { beforeDestroy() {
clearInterval(this.timeFun) clearInterval(this.timeFun)
}, },
methods: { methods: {

@ -40,7 +40,8 @@ export default {
data() { data() {
return { return {
tableData: [], tableData: [],
visible: false visible: false,
timeFun: null
}; };
}, },
components: { components: {
@ -58,7 +59,7 @@ export default {
}, 300000) }, 300000)
} }
}, },
beforeDestroyed() { beforeDestroy() {
clearInterval(this.timeFun) clearInterval(this.timeFun)
}, },
methods: { methods: {

@ -39,7 +39,7 @@ export default {
}) })
} }
}, },
beforeDestroyed() { beforeDestroy() {
clearInterval(this.funt) clearInterval(this.funt)
}, },
computed: { computed: {
@ -81,22 +81,27 @@ export default {
let yAxisData = arr.map(r => r.name) let yAxisData = arr.map(r => r.name)
let d = yAxisData.map(r => day20) let d = yAxisData.map(r => day20)
let source = arr.map(r => r.list) let source = arr.map(r => r.list)
let maxLengthArr = this.getLongestSubArray(source)
let seriesArr = [] let seriesArr = []
for (let i = 0; i < source[0].length; i++) { for (let i = 0; i < maxLengthArr.length; i++) {
// for (let i = 0; i < source[0].length; i++) {
let arr = [] let arr = []
source.forEach(e => { source.forEach(e => {
arr.push(e[i]) arr.push(e[i])
}) })
seriesArr = [...seriesArr, arr] seriesArr = [...seriesArr, arr]
} }
console.log(source, 'source')
console.log(seriesArr, 'seriesArr')
let seriesData = [] let seriesData = []
seriesArr.forEach((e, idx) => { seriesArr.forEach((e, idx) => {
let sdata = e.map(m => { let sdata = e.map(m => {
let y = this.$moment().format('yyyy-MM-DD') let y = this.$moment().format('yyyy-MM-DD')
// let s = `${y} ${m.time}` let value = m ? this.$moment(`${y} ${m ? m.time : null}`).valueOf() : ''
return { return {
value: this.$moment(`${y} ${m ? m.time : null}`).valueOf(), // value: this.$moment(`${y} ${m ? m.time : null}`).valueOf(),
value,
itemStyle: { itemStyle: {
normal: { normal: {
color: m ? m.runStatus == 2 ? "#44516d" : '#0084FF' : '', color: m ? m.runStatus == 2 ? "#44516d" : '#0084FF' : '',
@ -114,26 +119,7 @@ export default {
z: seriesArr.length - idx z: seriesArr.length - idx
}) })
}) })
// let seriesDataF = seriesData[seriesData.length - 1].data console.log(seriesData, 'seriesData')
// for (let k in seriesDataF) {
// if (seriesDataF[k].runStatus == 1) {
// seriesDataF[k].itemStyle.normal.color = '#0084FF'
// }
// }
console.log(seriesData)
// return {
// type: 'bar',
// stack: 'Total',
// barWidth: "14",
// showBackground: false,
// itemStyle: {
// normal: {
// color: "#44516d",
// },
// },
// data: [1704675600000, '-'],
// z: 5
// }
const chartDom = document.getElementById('mainEquipmentStatus'); const chartDom = document.getElementById('mainEquipmentStatus');
const myChart = this.$echarts.init(chartDom); const myChart = this.$echarts.init(chartDom);
const option = { const option = {
@ -223,7 +209,7 @@ export default {
] ]
} }
console.log(option.series) console.log(option.series, 'option.series')
myChart.setOption(option); myChart.setOption(option);
} }
} }

@ -65,7 +65,7 @@ export default {
}, },
methods: { methods: {
}, },
beforeDestroyed() { beforeDestroy() {
clearInterval(this.timeFun) clearInterval(this.timeFun)
}, },
}; };

@ -3,7 +3,7 @@
<tit :title="'负荷分析'"> <tit :title="'负荷分析'">
<div class="tit-r"> <div class="tit-r">
<span style="color: #fff;">选择时间</span> <span style="color: #fff;">选择时间</span>
<el-date-picker size="mini" v-model="selectDate" type="date" placeholder="选择月" :prefix-icon="null" <el-date-picker size="mini" v-model="selectDate" type="date" placeholder="选择月" :prefix-icon="null" :clearable="false"
style="width: 1.3rem;margin-right: 0.26rem;" format="yyyy-MM-dd" value-format="yyyy-MM-dd" @change="changeDate"> style="width: 1.3rem;margin-right: 0.26rem;" format="yyyy-MM-dd" value-format="yyyy-MM-dd" @change="changeDate">
</el-date-picker> </el-date-picker>
单位kw·h 单位kw·h

@ -53,7 +53,7 @@ export default {
if (i == 0) { if (i == 0) {
e.label.offset = [12, 0] e.label.offset = [12, 0]
} else if (i == arr.length - 1) { } else if (i == arr.length - 1) {
e.label.offset = [-12, 0] e.label.offset = [-30, 0]
} else { } else {
e.label.offset = [0, 0] e.label.offset = [0, 0]
} }

@ -47,7 +47,7 @@ export default {
this.getData() this.getData()
}, 300000) }, 300000)
}, },
beforeDestroyed() { beforeDestroy() {
clearInterval(this.timeFun) clearInterval(this.timeFun)
}, },
methods: { methods: {

@ -53,7 +53,7 @@ export default {
}, },
methods: { methods: {
}, },
beforeDestroyed() { beforeDestroy() {
clearInterval(this.timesFun) clearInterval(this.timesFun)
}, },
}; };

@ -43,7 +43,7 @@ export default {
if (i == 0) { if (i == 0) {
json.label.offset = [12, 0] json.label.offset = [12, 0]
} else if (i == datas.length - 1) { } else if (i == datas.length - 1) {
json.label.offset = [-12, 0] json.label.offset = [-20, 0]
} else { } else {
json.label.offset = [0, 0] json.label.offset = [0, 0]
} }

@ -65,7 +65,7 @@ export default {
}, 300000) }, 300000)
}, },
beforeDestroyed() { beforeDestroy() {
clearInterval(this.timeFun) clearInterval(this.timeFun)
}, },
methods: { methods: {

@ -42,12 +42,13 @@ export default {
if (i == 0) { if (i == 0) {
json.label.offset = [12, 0] json.label.offset = [12, 0]
} else if (i == datas.length - 1) { } else if (i == datas.length - 1) {
json.label.offset = [-12, 0] json.label.offset = [-20, 0]
} else { } else {
json.label.offset = [0, 0] json.label.offset = [0, 0]
} }
return json return json
}) })
this.echartsInit(xAxisData, seriesData) this.echartsInit(xAxisData, seriesData)
}) })
}, },

Loading…
Cancel
Save