suojin
/
jiahe_device
15
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

dit

Browse Source
main
jn517618 2 years ago
parent 9da510fb5c
commit e02007730a
7 changed files with 112 additions and 383 deletions
Whitespace
Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL
Unified View
Diff Options
Show Stats Download Patch File Download Diff File
  1. 265
      src/views/energySources/component/equipmentStatus.vue
  2. 53
      src/views/energySourcesProvince/component/electricity.vue
  3. 1
      src/views/energySourcesProvince/component/emissionAll.vue
  4. 6
      src/views/energySourcesProvince/component/header.vue
  5. 45
      src/views/energySourcesProvince/component/pathMap.vue
  6. 79
      src/views/energySourcesProvince/component/ringPercent.vue
  7. 46
      src/views/energySourcesProvince/component/togetherPercent.vue

265
src/views/energySources/component/equipmentStatus.vue
Unescape View File

@ -22,8 +22,7 @@ export default {
}, },
created() { created() {
this.$nextTick(() => { this.$nextTick(() => {
// this.getData() this.getData()
this.echartsInit()
}) })
}, },
@ -37,11 +36,12 @@ export default {
getData() { getData() {
getInstrumentRunStatus({ manufacturerBrand: this.userInfo.dept_name }).then(res => { getInstrumentRunStatus({ manufacturerBrand: this.userInfo.dept_name }).then(res => {
// this.tableData = res.data.data; // this.tableData = res.data.data;
console.log(res.data.data)
// this.yearNum = data.currentYear.toString().split('') // this.yearNum = data.currentYear.toString().split('')
// this.monthNum = data.currentMonth.toString().split('') // this.monthNum = data.currentMonth.toString().split('')
// this.yesterdayNum = data.yesterday.toString().split('') // this.yesterdayNum = data.yesterday.toString().split('')
// this.todayNum = data.today.toString().split('') // this.todayNum = data.today.toString().split('')
this.echartsInit(res.data.data)
}) })
}, },
getLongestSubArray(obj) { getLongestSubArray(obj) {
@ -57,260 +57,13 @@ export default {
return longest; return longest;
}, },
echartsInit() { echartsInit(arr) {
let arr = [
{
"name": "浇筑风机", //设备名称
"list": [
{
"time": "8:00", //时间
"runStatus": "1" //运行状态 1：运行 2：关机
},
{
"time": "10:41",
"runStatus": "2"
},
{
"time": "11:42",
"runStatus": "1"
},
{
"time": "11:52",
"runStatus": "1"
},
{
"time": "12:02",
"runStatus": "1"
},
{
"time": "12:46",
"runStatus": "1"
}
]
},
{
"name": "炉台风机",
"list": [
{
"time": "8:00", //时间
"runStatus": "1" //运行状态 1：运行 2：关机
},
{
"time": "13:41",
"runStatus": "1"
},
{
"time": "13:42",
"runStatus": "1"
},
{
"time": "13:52",
"runStatus": "1"
},
{
"time": "14:02",
"runStatus": "2"
},
{
"time": "14:46",
"runStatus": "1"
}
]
},
// {
// "name": "车间总成",
// "list": [
// {
// "time": "11:40",
// "runStatus": "1"
// },
// {
// "time": "11:41",
// "runStatus": "1"
// },
// {
// "time": "11:42",
// "runStatus": "1"
// },
// {
// "time": "11:46",
// "runStatus": "1"
// }
// ]
// },
// {
// "name": "立床1",
// "list": [
// {
// "time": "11:40",
// "runStatus": "1"
// },
// {
// "time": "11:41",
// "runStatus": "1"
// },
// {
// "time": "11:42",
// "runStatus": "1"
// },
// {
// "time": "11:46",
// "runStatus": "1"
// }
// ]
// },
// {
// "name": "立床2",
// "list": [
// {
// "time": "11:40",
// "runStatus": "1"
// },
// {
// "time": "11:41",
// "runStatus": "1"
// },
// {
// "time": "11:42",
// "runStatus": "1"
// },
// {
// "time": "11:46",
// "runStatus": "1"
// }
// ]
// },
// {
// "name": "烘干箱",
// "list": [
// {
// "time": "11:40",
// "runStatus": "1"
// },
// {
// "time": "11:41",
// "runStatus": "1"
// },
// {
// "time": "11:42",
// "runStatus": "1"
// },
// {
// "time": "11:46",
// "runStatus": "1"
// }
// ]
// },
// {
// "name": "打磨风机",
// "list": [
// {
// "time": "11:40",
// "runStatus": "1"
// },
// {
// "time": "11:41",
// "runStatus": "1"
// },
// {
// "time": "11:42",
// "runStatus": "1"
// },
// {
// "time": "11:46",
// "runStatus": "1"
// }
// ]
// },
// {
// "name": "离心车间排风机",
// "list": [
// {
// "time": "11:40",
// "runStatus": "1"
// },
// {
// "time": "11:41",
// "runStatus": "1"
// },
// {
// "time": "11:42",
// "runStatus": "1"
// },
// {
// "time": "11:46",
// "runStatus": "1"
// }
// ]
// },
// {
// "name": "空压机3",
// "list": [
// {
// "time": "11:40",
// "runStatus": "1"
// },
// {
// "time": "11:41",
// "runStatus": "1"
// },
// {
// "time": "11:42",
// "runStatus": "1"
// },
// {
// "time": "11:46",
// "runStatus": "1"
// }
// ]
// },
// {
// "name": "空压机2",
// "list": [
// {
// "time": "11:40",
// "runStatus": "1"
// },
// {
// "time": "11:41",
// "runStatus": "1"
// },
// {
// "time": "11:42",
// "runStatus": "1"
// },
// {
// "time": "11:46",
// "runStatus": "1"
// }
// ]
// },
// {
// "name": "空压机1",
// "list": [
// {
// "time": "11:40",
// "runStatus": "1"
// },
// {
// "time": "11:41",
// "runStatus": "1"
// },
// {
// "time": "11:42",
// "runStatus": "1"
// },
// {
// "time": "11:46",
// "runStatus": "1"
// }
// ]
// }
]
let day8 = this.$moment().startOf('day').add(8, 'hours').valueOf(); let day8 = this.$moment().startOf('day').add(8, 'hours').valueOf();
let day20 = this.$moment().startOf('day').add(20, 'hours').valueOf(); let day20 = this.$moment().startOf('day').add(20, 'hours').valueOf();
let yAxisData = arr.map(r => r.name) let yAxisData = arr.map(r => r.name)
let d = yAxisData.map(r => '-')
let source = arr.map(r => r.list) let source = arr.map(r => r.list)
let seriesArr = [] let seriesArr = []
@ -330,7 +83,7 @@ export default {
value: this.$moment(`${y} ${m.time}`).valueOf(), value: this.$moment(`${y} ${m.time}`).valueOf(),
itemStyle: { itemStyle: {
normal: { normal: {
color: m.runStatus == 2 ? "#0084FF" : '#44516d', color: m.runStatus == 2 ? "#44516d" : '#0084FF',
}, },
}, },
runStatus: m.runStatus runStatus: m.runStatus
@ -342,7 +95,7 @@ export default {
barWidth: "14", barWidth: "14",
showBackground: false, showBackground: false,
data: sdata, data: sdata,
// z: seriesArr.length - idx z: seriesArr.length - idx
}) })
}) })
let seriesDataF = seriesData[seriesData.length - 1].data let seriesDataF = seriesData[seriesData.length - 1].data
@ -448,7 +201,7 @@ export default {
}, },
}, },
z: -1, z: -1,
data: ['-', '-'], data: d,
}, },
...seriesData ...seriesData
] ]

53
src/views/energySourcesProvince/component/electricity.vue
Unescape View File

@ -9,6 +9,8 @@
<script> <script>
import tit from "./tit.vue"; import tit from "./tit.vue";
import { getSixMonthElectricity } from "@/api/energySourcesProvince/energySourcesProvince"
export default { export default {
data() { data() {
return { return {
@ -19,7 +21,7 @@ export default {
}, },
created() { created() {
this.$nextTick(() => { this.$nextTick(() => {
this.echartsInit() this.getData()
}) })
}, },
@ -27,7 +29,32 @@ export default {
}, },
methods: { methods: {
echartsInit() { getData() {
getSixMonthElectricity().then(res => {
const data = res.data.data
const sortedKeys = Object.keys(data).sort()
let json = {}
sortedKeys.forEach(e => {
json[e] = data[e]
})
let yAxisData = sortedKeys.map(r => this.$moment(r).format('M') + '月')
let arr = []
for (let k in json) {
arr.push({
value: json[k],
label: {
offset: [12, 0]
}
})
}
this.echartsInit(arr, yAxisData)
})
},
echartsInit(seriesData,yAxisData) {
const chartDom = document.getElementById('mainElectricity'); const chartDom = document.getElementById('mainElectricity');
const myChart = this.$echarts.init(chartDom); const myChart = this.$echarts.init(chartDom);
const option = { const option = {
@ -72,21 +99,7 @@ export default {
{ {
type: "category", type: "category",
boundaryGap: false, boundaryGap: false,
data: [ data: yAxisData,
// "0",
"1月",
"2月",
"3月",
"4月",
"5月",
"6月",
// "7月",
// "8月",
// "9月",
// "10月",
// "11月",
// "12月",
],
axisLabel: { axisLabel: {
//y轴文字的配置 //y轴文字的配置
textStyle: { textStyle: {
@ -175,11 +188,7 @@ export default {
global: false, // 缺省为 false global: false, // 缺省为 false
}, },
}, },
data: [{ data: seriesData,
value: 18, label: {
offset: [12, 0]
}
}, 20, 15, 3022, 2225, 10, 15, 16, 18, 30, 20, 25, 30],
// markPoint: { // markPoint: {
// symbolSize: 40, // symbolSize: 40,
// itemStyle: { // itemStyle: {

1
src/views/energySourcesProvince/component/emissionAll.vue
Unescape View File

@ -53,7 +53,6 @@ export default {
}) })
}, },
echartsInit(source) { echartsInit(source) {
console.log(source)
const chartDom = document.getElementById('mainEmissionAll'); const chartDom = document.getElementById('mainEmissionAll');
const myChart = this.$echarts.init(chartDom); const myChart = this.$echarts.init(chartDom);
const color = this.$echarts.graphic.LinearGradient(0, 0, 1, 0, [ const color = this.$echarts.graphic.LinearGradient(0, 0, 1, 0, [

6
src/views/energySourcesProvince/component/header.vue
Unescape View File

@ -39,10 +39,8 @@ export default {
}, },
created() { created() {
console.log('1111111111111') // getWeather().then(res => {
console.log(this.axios, '1111111111111') // })
getWeather().then(res => {
})
this.timesFun = setInterval(() => { this.timesFun = setInterval(() => {
this.time = this.$moment().format('HH:mm:ss') this.time = this.$moment().format('HH:mm:ss')
}, 1000) }, 1000)

45
src/views/energySourcesProvince/component/pathMap.vue
Unescape View File

@ -34,6 +34,8 @@
// console.log(Highmaps) // console.log(Highmaps)
// Highmaps(Highcharts); // Highmaps(Highcharts);
import { getEnterprisePower } from "@/api/energySourcesProvince/energySourcesProvince"
import { styleJson } from "../json/mapStyle.js" import { styleJson } from "../json/mapStyle.js"
import { dateFormat } from "@/util/date"; import { dateFormat } from "@/util/date";
export const appKey = '69800851-4554-4EEC-8D12-E4211B952798';//轮子appkey export const appKey = '69800851-4554-4EEC-8D12-E4211B952798';//轮子appkey
@ -77,18 +79,37 @@ export default {
// clearInterval(this.setInterval); // clearInterval(this.setInterval);
}, },
created() { created() {
this.$nextTick(() => {
this.getData()
})
}, },
mounted() { mounted() {
setTimeout(() => {
this.initMap();
}, 0);
window.addEventListener('resize', () => {
if (this.baiduMap) {
this.backMap();
}
});
}, },
methods: { methods: {
getData() {
getEnterprisePower({ today: this.$moment().format('yyyy-MM-DD') }).then(res => {
let data = res.data.data
this.markList.forEach(e => {
data.forEach(r => {
if (e.name.includes(r.name)) {
e.carbon = r.carbon
e.electricity = r.electricity
}
})
})
setTimeout(() => {
this.initMap();
}, 0);
window.addEventListener('resize', () => {
if (this.baiduMap) {
this.backMap();
}
});
// this.echartsInit(this.gffdzb, this.gyyhzb, this.sbghzb)
})
},
//回到原中心点 //回到原中心点
backMap() { backMap() {
var point = new BMapGL.Point(118.880278, 35.649947); var point = new BMapGL.Point(118.880278, 35.649947);
@ -179,8 +200,8 @@ export default {
} }
}) })
this.baiduMap.setMapStyleV2({ styleJson: styleJson }); this.baiduMap.setMapStyleV2({ styleJson: styleJson });
this.baiduMap.removeEventListener('tilesloaded', this.handleEvent); this.baiduMap.removeEventListener('tilesloaded', this.handleEvent);
this.baiduMap.addEventListener('tilesloaded', this.handleEvent); this.baiduMap.addEventListener('tilesloaded', this.handleEvent);
@ -205,12 +226,12 @@ export default {
<div class="mapslabel-b"> <div class="mapslabel-b">
<div> <div>
<div>用电量</div> <div>用电量</div>
<div class="mapslabel-b-font">111</div> <div class="mapslabel-b-font">${r.electricity}</div>
<span style="margin-top:0.08rem;display: inline-block;float: left;">kw·h</span> <span style="margin-top:0.08rem;display: inline-block;float: left;">kw·h</span>
</div> </div>
<div> <div>
<div>碳排放量</div> <div>碳排放量</div>
<div class="mapslabel-b-font">1111</div> <div class="mapslabel-b-font">${r.carbon}</div>
<span style="margin-top:0.08rem;display: inline-block;float: left;">t</span> <span style="margin-top:0.08rem;display: inline-block;float: left;">t</span>
</div> </div>
</div> </div>

79
src/views/energySourcesProvince/component/ringPercent.vue
Unescape View File

@ -32,31 +32,29 @@ export default {
getSixMonthCarbonQoq().then(res => { getSixMonthCarbonQoq().then(res => {
const data = res.data.data const data = res.data.data
const sortedKeys = Object.keys(data).sort() const sortedKeys = Object.keys(data).sort()
// let monthData = data.map(r => Object.keys(r)[0])
// console.log(monthData, 'monthData')
let json = {} let json = {}
sortedKeys.forEach(e => { sortedKeys.forEach(e => {
json[e] = data[e] json[e] = data[e]
}) })
// let yAxisData = sortedKeys.map(r => this.$moment(r).format('M') + '月') let yAxisData = sortedKeys.map(r => this.$moment(r).format('M') + '月')
// , let arr = []
// let arr = [] for (let k in json) {
// for(let k in json){ arr.push({
// arr.push({
// { value: json[k],
// value: 12, label: { position: 'right' }, label: { position: json[k] >= 0 ? 'right': 'left' },
// itemStyle: { itemStyle: {
// color: "#63D5FF" color: "#63D5FF"
// } }
// }
// }) })
// } }
this.echartsInit(yAxisData) this.echartsInit(arr, yAxisData)
}) })
}, },
echartsInit(yAxisData) { echartsInit(seriesData, yAxisData) {
const chartDom = document.getElementById('mainRingPercent'); const chartDom = document.getElementById('mainRingPercent');
const myChart = this.$echarts.init(chartDom); const myChart = this.$echarts.init(chartDom);
const option = { const option = {
@ -79,7 +77,6 @@ export default {
xAxis: { xAxis: {
type: 'value', type: 'value',
// position: 'top', // position: 'top',
axisLabel: { formatter: '{value}%' }, axisLabel: { formatter: '{value}%' },
color: "#fff", color: "#fff",
splitLine: { splitLine: {
@ -107,44 +104,7 @@ export default {
formatter: '{b}', formatter: '{b}',
color: "#fff" color: "#fff"
}, },
data: [ data: seriesData
{
value: 12, label: { position: 'right' },
itemStyle: {
color: "#63D5FF"
}
},
{
value: -12, label: { position: 'left' },
itemStyle: {
color: "#1BE9BB"
}
},
{
value: 24, label: { position: 'right' },
itemStyle: {
color: "#63D5FF"
}
},
{
value: -24, label: { position: 'left' },
itemStyle: {
color: "#1BE9BB"
}
},
{
value: -17, label: { position: 'left' },
itemStyle: {
color: "#1BE9BB"
}
},
{
value: 50, label: { position: 'right' },
itemStyle: {
color: "#63D5FF"
}
},
]
} }
] ]
}; };
@ -176,4 +136,5 @@ export default {
#mainRingPercent { #mainRingPercent {
height: 1.8rem; height: 1.8rem;
} }
}</style> }
</style>

46
src/views/energySourcesProvince/component/togetherPercent.vue
Unescape View File

@ -20,7 +20,7 @@ export default {
}, },
created() { created() {
this.$nextTick(() => { this.$nextTick(() => {
// this.getData() this.getData()
}) })
}, },
@ -31,14 +31,20 @@ export default {
getData() { getData() {
getSixMonthCarbonYoy().then(res => { getSixMonthCarbonYoy().then(res => {
const data = res.data.data const data = res.data.data
console.log(data) // let monthData = data.map(r => r.jn)
let monthData = data.map(r => Object.keys(r)[0]) // monthData.sort()
console.log(monthData, 'monthData') data.sort((a, b) => {
monthData.sort() return a.jn.localeCompare(b.jn)
let xAxisData = monthData.map(r => this.$moment(r).format('M') + '月') })
let xAxisData = data.map(r => this.$moment(r.jn).format('M') + '月')
let jnpf = data.map(r => r.jnpf)
let qnpf = data.map(r => r.qnpf)
let tongbi = data.map(r => r.tongbi)
this.echartsInit(jnpf, qnpf, tongbi, xAxisData)
}) })
}, },
echartsInit() { echartsInit(jnpf, qnpf, tongbi, xAxisData) {
const chartDom = document.getElementById('mainTogetherPercent'); const chartDom = document.getElementById('mainTogetherPercent');
const myChart = this.$echarts.init(chartDom); const myChart = this.$echarts.init(chartDom);
const option = { const option = {
@ -103,21 +109,7 @@ export default {
axisPointer: { axisPointer: {
type: 'shadow' type: 'shadow'
}, },
data: [ data: xAxisData,
// "0",
"1月",
"2月",
"3月",
"4月",
"5月",
"6月",
// "7月",
// "8月",
// "9月",
// "10月",
// "11月",
// "12月",
],
axisTick: { axisTick: {
show: true, show: true,
inside: true, inside: true,
@ -187,9 +179,7 @@ export default {
itemStyle: { itemStyle: {
color: "#11A0EB" color: "#11A0EB"
}, },
data: [ data: qnpf
2.0, 4.9, 7.0, 23.2, 25.6, 76.7, 135.6, 162.2, 32.6, 20.0, 6.4, 3.3
]
}, },
{ {
name: '本期', name: '本期',
@ -202,9 +192,7 @@ export default {
itemStyle: { itemStyle: {
color: "#63EEFF" color: "#63EEFF"
}, },
data: [ data: jnpf
2.6, 5.9, 9.0, 26.4, 28.7, 70.7, 175.6, 182.2, 48.7, 18.8, 6.0, 2.3
]
}, },
{ {
name: '同比', name: '同比',
@ -224,7 +212,7 @@ export default {
itemStyle: { itemStyle: {
color: "#11A0EB" color: "#11A0EB"
}, },
data: [2.0, 2.2, 3.3, 4.5, 6.3, 10.2, 20.3, 23.4, 23.0, 16.5, 12.0, 6.2] data: tongbi
} }
] ]
}; };

Write Preview
Loading…
Cancel
Save