Skip to content

E
energyai_vue
Commit fee0d87e authored by co_dengxiongwen's avatar co_dengxiongwen
Browse files
Options

tj

parent 73149147
Hide whitespace changes
Inline Side-by-side
Showing with 68 additions and 120 deletions
src/App.vue
View file @ fee0d87e
......@@ -228,94 +228,10 @@ export default {
sessionStorage.getItem('token') &&
sessionStorage.getItem('token') != undefined
) {
var alarmsInfo = JSON.parse(e.data)
//console.log(alarmsInfo, '-------')
if (alarmsInfo.status != 1) {
for (var i in this.tipList) {
if (alarmsInfo.id === this.tipList[i].id) {
this.tipList.splice(i, 1)
break
}
}
} else {
var flag = true
for (var index in this.tipList) {
if (alarmsInfo.id === this.tipList[index].id) {
flag = false
this.tipList.splice(index, 1)
break
}
}
this.tipList.push(alarmsInfo)
// this.sendMessage(alarmsInfo.resourceCode)
if (flag) {
var x = 0
var resourceCode = this.$store.state.d2admin.bjCode.resourceCode
console.log(this.$store.state.d2admin.bjCode.resourceCode)
if (
resourceCode &&
resourceCode.split('+')[0] === alarmsInfo.resourceCode &&
resourceCode.split('+')[2] === alarmsInfo.lineId &&
resourceCode.split('+')[3] === alarmsInfo.stationId
) {
x =
Number(resourceCode.substring(resourceCode.indexOf('+') + 1)) +
1
this.$store.dispatch(
'd2admin/bjCode/set',
alarmsInfo.resourceCode +
'+' +
x +
'+' +
alarmsInfo.lineId +
'+' +
alarmsInfo.stationId
)
} else {
this.$store.dispatch(
'd2admin/bjCode/set',
alarmsInfo.resourceCode +
'+0+' +
alarmsInfo.lineId +
'+' +
alarmsInfo.stationId
)
}
}
this.tipList.sort(this.sortBy('occurrenceTime', false)) //按发生时间降序
var alarmId = this.$store.state.d2admin.alramfj.alarmId
var num = 0
if (
alarmId &&
alarmId.substring(0, alarmId.indexOf('-')) === alarmsInfo.id
) {
num = Number(alarmId.substring(alarmId.indexOf('-') + 1)) + 1
this.$store.dispatch(
'd2admin/alramfj/set',
alarmsInfo.id + '-' + num
)
} else {
this.$store.dispatch('d2admin/alramfj/set', alarmsInfo.id + '-0')
}
// console.log(this.$store.state.d2admin.alramfj.alarmId)
// console.log(this.$store.state.d2admin.alramfj.alarmId.substring(0,this.$store.state.d2admin.alramfj.alarmId.indexOf('-')))
}
if (this.tipList.length < 4) {
this.tipList.forEach((element) => {
this.showList.push(element)
})
} else if (this.tipList.length >= 4) {
for (let index = 0; index < 4; index++) {
this.showList.push(this.tipList[index])
}
}
if (this.showList) {
this.showList.sort(this.sortBy('occurrenceTime', true))
}
this.$store.dispatch('d2admin/toast/set', this.tipList.length)
var paramsInfo = JSON.parse(e.data)
console.log('paramsInfo:', paramsInfo)
sessionStorage.setItem('paramsList', JSON.stringify(paramsInfo))
this.$store.dispatch('d2admin/paramsList/set', paramsInfo)
}
},
//连接建立失败重连
......@@ -505,7 +421,10 @@ export default {
}).then((data) => {
if (data && data.code === 0) {
this.paramsList = data.bean
sessionStorage.setItem('paramsList', JSON.stringify(this.paramsList))
sessionStorage.setItem(
'paramsList',
JSON.stringify(this.paramsList)
)
console.log('paramsList:', this.paramsList)
this.$store.dispatch('d2admin/paramsList/set', this.paramsList)
}
......
src/pages/home/page.vue
View file @ fee0d87e
......@@ -8,7 +8,7 @@
<div class="card-desc">
<span>系统运行时间</span>
</div>
<div class="card-text" v-if='dataList.systemRunningTime'>
<div class="card-text" v-if="dataList.systemRunningTime">
<span>{{ dataList.systemRunningTime[0] }}</span
><span class="date-color" style="font-size: 16px">天</span
><span>{{ dataList.systemRunningTime[1] }}</span
......@@ -76,7 +76,12 @@
</div>
<div slot="content" class="content-wrap">
<el-row :gutter="12" type="flex" justify="center" v-if="dataList.energy">
<el-row
:gutter="12"
type="flex"
justify="center"
v-if="dataList.energy"
>
<el-col :span="6">
<div class="energy-save-mode-wrap" style="">
<div class="font-style font_14">
......@@ -85,14 +90,22 @@
<div class="flex-save-warp">
<div>
<div>
<p class="font_30" v-if="activeIndex==0">{{dataList.energy.jnSystemRunningTimeDay}}</p>
<p class="font_30" v-else>{{dataList.energy.jnSystemRunningTimeMonth}}</p>
<p class="font_30" v-if="activeIndex == 0">
{{ dataList.energy.jnSystemRunningTimeDay }}
</p>
<p class="font_30" v-else>
{{ dataList.energy.jnSystemRunningTimeMonth }}
</p>
<p class="font-style font_14">运行时间（h）</p>
</div>
</div>
<div>
<p class="font_30" v-if="activeIndex==0">{{dataList.energy.jnEnergyDay}}</p>
<p class="font_30" v-else>{{dataList.energy.jnEnergyMonth}}</p>
<p class="font_30" v-if="activeIndex == 0">
{{ dataList.energy.jnEnergyDay }}
</p>
<p class="font_30" v-else>
{{ dataList.energy.jnEnergyMonth }}
</p>
<p class="font-style font_14">总能耗（kwh）</p>
</div>
......@@ -107,14 +120,22 @@
<div class="flex-save-warp">
<div>
<div>
<p class="font_30" v-if="activeIndex==0">{{dataList.energy.sdSystemRunningTimeDay}}</p>
<p class="font_30" v-else>{{dataList.energy.sdSystemRunningTimeMonth}}</p>
<p class="font_30" v-if="activeIndex == 0">
{{ dataList.energy.sdSystemRunningTimeDay }}
</p>
<p class="font_30" v-else>
{{ dataList.energy.sdSystemRunningTimeMonth }}
</p>
<p class="font-style font_14">运行时间（h）</p>
</div>
</div>
<div>
<p class="font_30" v-if="activeIndex==0">{{dataList.energy.sdEnergyDay}}</p>
<p class="font_30" v-else>{{dataList.energy.sdEnergyMonth}}</p>
<p class="font_30" v-if="activeIndex == 0">
{{ dataList.energy.sdEnergyDay }}
</p>
<p class="font_30" v-else>
{{ dataList.energy.sdEnergyMonth }}
</p>
<p class="font-style font_14">总能耗（kwh）</p>
</div>
......@@ -128,8 +149,12 @@
</div>
<div>
<div>
<p class="font_30" v-if="activeIndex==0">{{dataList.energy.totalEnergyDay}}</p>
<p class="font_30" v-else>{{dataList.energy.totalEnergyMonth}}</p>
<p class="font_30" v-if="activeIndex == 0">
{{ dataList.energy.totalEnergyDay }}
</p>
<p class="font_30" v-else>
{{ dataList.energy.totalEnergyMonth }}
</p>
<p class="font-style font_14">（kwh）</p>
</div>
......@@ -195,14 +220,7 @@ export default {
label: '本月'
}
],
data: [
// ['2019-8-14 8:00:00', 70],
// ['2019-8-14 8:00:01', 60],
// ['2019-8-14 8:00:02', 30],
// ['2019-8-14 8:00:03', 79],
// ['2019-8-14 8:00:06', 10],
// ['2019-8-14 8:00:20', 31]
]
data: []
}
},
methods: {
......@@ -231,7 +249,7 @@ export default {
}
</script>
<style lang="scss" scoped>
@import "~@/assets/style/public.scss";
@import '~@/assets/style/public.scss';
.home-page {
height: calc(100vh - 155px);
width: 100%;
......
src/pages/kb/outdoor/index.vue
View file @ fee0d87e
......@@ -6,6 +6,7 @@ card-warp(title="室外气象数据", height="45px", showBackground)
el-input(size="mini", v-model="formData.code", readOnly)
el-form-item(label="设备名称:")
el-input(size="mini", v-model="formData.name", readOnly)
el-button(@click="csHandle" size="mini" icon="el-icon-search" type="primary") 发送消息
.data-warp
.data-item(v-for="item in typeList")
......@@ -228,17 +229,27 @@ export default {
this.typeList[7].num = this.socketData.radiation
this.typeList[8].num = this.socketData.region
//列表
this.dataList[0].temperature = this.socketData.temperature
this.dataList[0].humidity = this.socketData.humidity
this.dataList[0].wind_speed = this.socketData.wind_speed
this.dataList[0].Illuminance = this.socketData.Illuminance
this.dataList[0].carbon_dioxide = this.socketData.carbon_dioxide
this.dataList[0].fine_particles = this.socketData.fine_particles
this.dataList[0].radiation = this.socketData.radiation
this.dataList[0].temperature = this.socketData.temperature
this.dataList[0].humidity = this.socketData.humidity
this.dataList[0].wind_speed = this.socketData.wind_speed
this.dataList[0].Illuminance = this.socketData.Illuminance
this.dataList[0].carbon_dioxide = this.socketData.carbon_dioxide
this.dataList[0].fine_particles = this.socketData.fine_particles
this.dataList[0].radiation = this.socketData.radiation
// for (var i = 0; i < this.dataList.length; i++) {
// this.$set(this.dataList[i], 'temperature', this.socketData.temperature)
// }
},
csHandle() {
this.$http({
url: this.$http.adornUrl('/equipment/sendParamsInfo'),
method: 'post',
params: this.$http.adornParams({})
}).then((data) => {
if (data && data.code === 0) {
}
})
},
// 获取数据列表
getDataList(page, size) {
this.$http({
......@@ -256,7 +267,7 @@ export default {
this.formData.name = this.dataList[0].name
this.formData.code = this.dataList[0].code
this.totalPage = data.page.total
this.setTypeList()
this.setTypeList()
} else {
this.dataList = []
this.totalPage = 0
......@@ -349,7 +360,7 @@ export default {
color: #000000;
line-height: 40px;
&::before {
content: "";
content: '';
display: inline-block;
width: 10px;
height: 10px;
......@@ -361,7 +372,7 @@ export default {
}
}
.clearfix:after {
content: "";
content: '';
display: block;
height: 0;
clear: both;
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment