diff --git a/pages/station/config.js b/pages/station/config.js new file mode 100644 index 0000000..72ae6db --- /dev/null +++ b/pages/station/config.js @@ -0,0 +1,142 @@ +export const AREA_SECOND_STATIONS = ['30', '31'] +export const END_NUM = 65535 + // 1集中，2组串 +export const FIRST_STATIONS = [ + '1052758019', '1052758018', '1052758020', '1052758021', '1052758022' + ] + // 不需要显示采集器的电站,分组 +export const UN_SHOW_STATIONS = [ + '23', '22', '2' + ] +export const STATION_LIST = { + '1052758018': [ + { + id: '1', + stationName: '伟创力北厂1区' + }, { + id: '3', + stationName: '伟创力北厂2区' + }, + { + id: '4', + stationName: '伟创力南厂区' + }, + { + id: '5', + stationName: '伟创力超毅厂区' + }, + { + id: '30', + stationName: '三期中央车棚' + }, + { + id: '31', + stationName: '三期B9' + } + ], + '1052758019': [ + { + id: '6', + stationName: '7# 厂房' + },{ + id: '7', + stationName: '8# 厂房' + }, + { + id: '8', + stationName: '15#-1 厂房' + }, { + id: '9', + stationName: '15#-2 厂房' + }], + '1052758020': [ + { + id: '25', + stationName: '总装车间' + }, + { + id: '26', + stationName: '综合车间' + },], + '1052758021': [ + { + id: '10', + stationName: '红塔一期电房' + },{ + id: '11', + stationName: '红塔二期电房' + },], + '1052758022': [ + { + id: '27', + stationName: '林殷厂区' + },], + '1052758023': [ + { + id: '18', + stationName: 'A栋' + }, + { + id: '19', + stationName: 'C2' + }, + { + id: '20', + stationName: 'C3' + }, + { + id: '21', + stationName: '食堂' + },], + '1052758025': [ + { + id: '12', + stationName: 'A16' + }, { + id: '13', + stationName: 'D3' + }, { + id: '14', + stationName: 'A20' + }, { + id: '15', + stationName: 'A7' + }], + '1052758026': [ + { + id: '16', + stationName: 'A3' + },{ + id: '17', + stationName: 'C3' + }], + '1052758027': [ + { + id: '2', + stationName: '堂悠口园区' + },], + '1052758028': [ + { + id: '22', + stationName: '枫泾总厂1、2号楼' + }, + { + id: '23', + stationName: '枫泾总厂5号楼' + }, + ], + '1052758029': [ { + id: '24', + stationName: '汉钟兴塔厂' + }], + '1052758031': [ { + id: '28', + stationName: '组装车间' + }, + { + id: '29', + stationName: '冲压车间' + } + ], + } + \ No newline at end of file diff --git a/pages/station/item1.vue b/pages/station/item1.vue index 040af2a..4720e72 100644 --- a/pages/station/item1.vue +++ b/pages/station/item1.vue @@ -245,16 +245,9 @@ import { scrollSmoothTo } from '@/common/util/index.js' import _mixin from './mixin.js' + import { AREA_SECOND_STATIONS, FIRST_STATIONS, UN_SHOW_STATIONS, END_NUM } from './config' import { getBigScreenPowerInverterInfo, getBigScreenPowerInverterInfo2 } from '@/api/modules/station.js' - // 1集中，2组串 - const FIRST_STATIONS = [ - '1052758019', '1052758018', '1052758020', '1052758021', '1052758022' - ] - // 不需要显示采集器的电站,分组 - const UN_SHOW_STATIONS = [ - '23', '22', '2' - ] - const END_NUM = 65535 + export default { data() { return { @@ -324,7 +317,7 @@ this.station = this.stationData.filter(v => { return v.id === data[0] })[0] - const AREA_SECOND_STATIONS = ['30'] + this.type = AREA_SECOND_STATIONS.includes(data[1]) ? 'second' : FIRST_STATIONS.includes(data[0]) ? 'first' : 'second' // this.type = FIRST_STATIONS.includes(data[0]) ? 'first' : 'second' this.getDataInfo(this.type) diff --git a/pages/station/item2.vue b/pages/station/item2.vue index 15f8f8a..c4b51b9 100644 --- a/pages/station/item2.vue +++ b/pages/station/item2.vue @@ -264,17 +264,8 @@ getBigScreenPowerInverterMqttBySn } from '@/api/modules/station.js' import _mixin from './mixin.js' + import { AREA_SECOND_STATIONS, FIRST_STATIONS, UN_SHOW_STATIONS, END_NUM } from './config' let myChart = null - // 1集中，2组串 - const FIRST_STATIONS = [ - '1052758019', '1052758018', '1052758020', '1052758021', '1052758022' - ] - // 不需要显示采集器的电站,分组 - const UN_SHOW_STATIONS = [ - '23', '22', '2' - ] - const AREA_SECOND_STATIONS = ['30'] - const END_NUM = 65535 let SECOND_VALUE = '' let timer = null export default { diff --git a/pages/station/list.vue b/pages/station/list.vue index 40a70f3..5732f15 100644 --- a/pages/station/list.vue +++ b/pages/station/list.vue @@ -89,134 +89,7 @@ import { getStationList } from '@/api/modules/station.js' import _mixin from './mixin.js' - const stationDetailInfo = { - '1052758018': [ - { - id: '1', - stationName: '伟创力北厂1区' - }, { - id: '3', - stationName: '伟创力北厂2区' - }, - { - id: '4', - stationName: '伟创力南厂区' - }, - { - id: '5', - stationName: '伟创力超毅厂区' - }, - { - id: '30', - stationName: '三期中央车棚' - } - ], - '1052758019': [ - { - id: '6', - stationName: '7# 厂房' - },{ - id: '7', - stationName: '8# 厂房' - }, - { - id: '8', - stationName: '15#-1 厂房' - }, { - id: '9', - stationName: '15#-2 厂房' - }], - '1052758020': [ - { - id: '25', - stationName: '总装车间' - }, - { - id: '26', - stationName: '综合车间' - },], - '1052758021': [ - { - id: '10', - stationName: '红塔一期电房' - },{ - id: '11', - stationName: '红塔二期电房' - },], - '1052758022': [ - { - id: '27', - stationName: '林殷厂区' - },], - '1052758023': [ - { - id: '18', - stationName: 'A栋' - }, - { - id: '19', - stationName: 'C2' - }, - { - id: '20', - stationName: 'C3' - }, - { - id: '21', - stationName: '食堂' - },], - '1052758025': [ - { - id: '12', - stationName: 'A16' - }, { - id: '13', - stationName: 'D3' - }, { - id: '14', - stationName: 'A20' - }, { - id: '15', - stationName: 'A7' - }], - '1052758026': [ - { - id: '16', - stationName: 'A3' - },{ - id: '17', - stationName: 'C3' - }], - '1052758027': [ - { - id: '2', - stationName: '堂悠口园区' - },], - '1052758028': [ - { - id: '22', - stationName: '枫泾总厂1、2号楼' - }, - { - id: '23', - stationName: '枫泾总厂5号楼' - }, - ], - '1052758029': [ { - id: '24', - stationName: '汉钟兴塔厂' - }], - '1052758031': [ { - id: '28', - stationName: '组装车间' - }, - { - id: '29', - stationName: '冲压车间' - } - ], - } - + import { STATION_LIST　} from './config' export default { data() { return { @@ -238,7 +111,7 @@ this.stationData = res.data.result.records.filter(v => { return !v.stationName.includes('户用光伏电站') }).map(v => { - v.children = stationDetailInfo[v.id] + v.children = STATION_LIST[v.id] return v }) this.station = this.stationData[this.index]