ly.fan
/
xy-frontend
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

优化微气象图表

Browse Source
menu1.0
fanluyan 7 months ago
parent 2da372fb23
commit 6bec0b82ce
4 changed files with 179 additions and 48 deletions
Show Stats Download Patch File Download Diff File

42
src/views/iceWeather/icing/index.vue
Unescape Escape View File

@ -228,7 +228,12 @@
<el-table-column prop="minwindWind" label="最小风偏角(°)"> <el-table-column prop="minwindWind" label="最小风偏角(°)">
<template slot-scope="scope"> <template slot-scope="scope">
<span v-if="scope.row.lastLeadPulls !== null"> <span v-if="scope.row.lastLeadPulls !== null">
<span v-if="scope.row.lastLeadPulls.minwindWind != 65535"> <span
v-if="
scope.row.lastLeadPulls.minwindWind != 65535 &&
scope.row.lastLeadPulls.minwindWind != 255
"
>
{{ {{
scope.row.lastLeadPulls.minwindWind.toFixed(2) scope.row.lastLeadPulls.minwindWind.toFixed(2)
}}</span }}</span
@ -244,7 +249,12 @@
> >
<template slot-scope="scope"> <template slot-scope="scope">
<span v-if="scope.row.lastLeadPulls !== null"> <span v-if="scope.row.lastLeadPulls !== null">
<span v-if="scope.row.lastLeadPulls.minwindTilt != 65535"> <span
v-if="
scope.row.lastLeadPulls.minwindTilt != 65535 &&
scope.row.lastLeadPulls.minwindTilt != 255
"
>
{{ {{
scope.row.lastLeadPulls.minwindTilt.toFixed(2) scope.row.lastLeadPulls.minwindTilt.toFixed(2)
}}</span }}</span
@ -260,7 +270,12 @@
> >
<template slot-scope="scope"> <template slot-scope="scope">
<span v-if="scope.row.lastLeadPulls !== null"> <span v-if="scope.row.lastLeadPulls !== null">
<span v-if="scope.row.lastLeadPulls.minwindPull != 65535"> <span
v-if="
scope.row.lastLeadPulls.minwindPull != 65535 &&
scope.row.lastLeadPulls.minwindPull != 255
"
>
{{ {{
scope.row.lastLeadPulls.minwindPull.toFixed(2) scope.row.lastLeadPulls.minwindPull.toFixed(2)
}}</span }}</span
@ -413,7 +428,12 @@
<el-table-column prop="minwindWind" label="最小风偏角(°)"> <el-table-column prop="minwindWind" label="最小风偏角(°)">
<template slot-scope="scope"> <template slot-scope="scope">
<span v-if="scope.row !== null"> <span v-if="scope.row !== null">
<span v-if="scope.row.minwindWind != 65535"> <span
v-if="
scope.row.minwindWind != 65535 &&
scope.row.minwindWind != 255
"
>
{{ scope.row.minwindWind.toFixed(2) }}</span {{ scope.row.minwindWind.toFixed(2) }}</span
> >
<span v-else> - </span> <span v-else> - </span>
@ -427,7 +447,12 @@
> >
<template slot-scope="scope"> <template slot-scope="scope">
<span v-if="scope.row !== null"> <span v-if="scope.row !== null">
<span v-if="scope.row.minwindTilt != 65535"> <span
v-if="
scope.row.minwindTilt != 65535 &&
scope.row.minwindTilt != 255
"
>
{{ scope.row.minwindTilt.toFixed(2) }}</span {{ scope.row.minwindTilt.toFixed(2) }}</span
> >
<span v-else> - </span> <span v-else> - </span>
@ -441,7 +466,12 @@
> >
<template slot-scope="scope"> <template slot-scope="scope">
<span v-if="scope.row !== null"> <span v-if="scope.row !== null">
<span v-if="scope.row.minwindPull != 65535"> <span
v-if="
scope.row.minwindPull != 65535 &&
scope.row.minwindPull != 255
"
>
{{ scope.row.minwindPull.toFixed(2) }}</span {{ scope.row.minwindPull.toFixed(2) }}</span
> >
<span v-else> - </span> <span v-else> - </span>

169
src/views/iceWeather/weather/index.vue
Unescape Escape View File

@ -38,7 +38,12 @@
<el-table-column prop="humidity" label="湿度(%RH)"> <el-table-column prop="humidity" label="湿度(%RH)">
<template slot-scope="scope"> <template slot-scope="scope">
<span v-if="scope.row.lastWeathers !== null" <span v-if="scope.row.lastWeathers !== null"
><span v-if="scope.row.lastWeathers.humidity != 65535"> ><span
v-if="
scope.row.lastWeathers.humidity != 65535 &&
scope.row.lastWeathers.humidity != 255
"
>
{{ scope.row.lastWeathers.humidity.toFixed(1) }}</span {{ scope.row.lastWeathers.humidity.toFixed(1) }}</span
><span v-else> - </span></span ><span v-else> - </span></span
> >
@ -67,17 +72,25 @@
</el-table-column> </el-table-column>
<el-table-column prop="precipitation" label="雨量(mm/hour)"> <el-table-column prop="precipitation" label="雨量(mm/hour)">
<template slot-scope="scope"> <template slot-scope="scope">
<span v-if="scope.row.lastWeathers !== null">{{ <span
scope.row.lastWeathers.precipitation.toFixed(1) v-if="
}}</span> scope.row.lastWeathers !== null &&
scope.row.lastWeathers.precipitation != 255
"
>{{ scope.row.lastWeathers.precipitation.toFixed(1) }}</span
>
<span v-else> - </span> <span v-else> - </span>
</template> </template>
</el-table-column> </el-table-column>
<el-table-column prop="airPressure" label="气压(hPa(百帕))"> <el-table-column prop="airPressure" label="气压(hPa(百帕))">
<template slot-scope="scope"> <template slot-scope="scope">
<span v-if="scope.row.lastWeathers !== null">{{ <span
scope.row.lastWeathers.airPressure.toFixed(1) v-if="
}}</span> scope.row.lastWeathers !== null &&
scope.row.lastWeathers.airPressure != 255
"
>{{ scope.row.lastWeathers.airPressure.toFixed(1) }}</span
>
<span v-else> - </span> <span v-else> - </span>
</template> </template>
</el-table-column> </el-table-column>
@ -85,7 +98,10 @@
<template slot-scope="scope"> <template slot-scope="scope">
<span v-if="scope.row.lastWeathers !== null" <span v-if="scope.row.lastWeathers !== null"
><span ><span
v-if="scope.row.lastWeathers.radiationIntensity != 65535" v-if="
scope.row.lastWeathers.radiationIntensity != 255 &&
scope.row.lastWeathers.radiationIntensity != 65535
"
> >
{{ {{
scope.row.lastWeathers.radiationIntensity.toFixed(0) scope.row.lastWeathers.radiationIntensity.toFixed(0)
@ -204,39 +220,85 @@
<span v-else> - </span> <span v-else> - </span>
</template> </template>
</el-table-column> </el-table-column>
<el-table-column <el-table-column prop="airTemperature" label="温度(℃)">
prop="airTemperature" <template slot-scope="scope">
label="温度(℃)" <span
></el-table-column> v-if="
scope.row.airTemperature !== null &&
scope.row.airTemperature != 255
"
>{{ scope.row.airTemperature.toFixed(1) }}</span
>
<span v-else> - </span>
</template>
</el-table-column>
<el-table-column prop="humidity" label="湿度(%RH)"> <el-table-column prop="humidity" label="湿度(%RH)">
<template slot-scope="scope"> <template slot-scope="scope">
<span v-if="scope.row.humidity != 65535"> <span
{{ scope.row.humidity.toFixed(1) }}</span v-if="
scope.row.humidity !== null && scope.row.humidity != 255
"
>{{ scope.row.humidity.toFixed(1) }}</span
> >
<span v-else> - </span> <span v-else> - </span>
</template> </template>
</el-table-column> </el-table-column>
<el-table-column prop="maxWindSpeed" label="瞬时风速(m/s)"> <el-table-column prop="maxWindSpeed" label="瞬时风速(m/s)">
<template slot-scope="scope"> <template slot-scope="scope">
<span> {{ scope.row.maxWindSpeed.toFixed(1) }} </span> <span
v-if="
scope.row.maxWindSpeed !== null &&
scope.row.maxWindSpeed != 255
"
>{{ scope.row.maxWindSpeed.toFixed(1) }}</span
>
<span v-else> - </span>
</template></el-table-column </template></el-table-column
> >
<el-table-column <el-table-column prop="windDirection" label="瞬时风向(°)">
prop="windDirection" <template slot-scope="scope">
label="瞬时风向(°)" <span
></el-table-column> v-if="
<el-table-column scope.row.windDirection !== null &&
prop="precipitation" scope.row.windDirection != 255
label="雨量(mm/hour)" "
></el-table-column> >{{ scope.row.windDirection.toFixed(1) }}</span
<el-table-column >
prop="airPressure" <span v-else> - </span>
label="气压(hPa(百帕))" </template>
></el-table-column> </el-table-column>
<el-table-column prop="precipitation" label="雨量(mm/hour)">
<template slot-scope="scope">
<span
v-if="
scope.row.precipitation !== null &&
scope.row.precipitation != 255
"
>{{ scope.row.precipitation.toFixed(1) }}</span
>
<span v-else> - </span>
</template>
</el-table-column>
<el-table-column prop="airPressure" label="气压(hPa(百帕))">
<template slot-scope="scope">
<span
v-if="
scope.row.airPressure !== null &&
scope.row.airPressure != 255
"
>{{ scope.row.airPressure.toFixed(1) }}</span
>
<span v-else> - </span>
</template>
</el-table-column>
<el-table-column prop="radiationIntensity" label="日照(W/m2)"> <el-table-column prop="radiationIntensity" label="日照(W/m2)">
<template slot-scope="scope"> <template slot-scope="scope">
<span v-if="scope.row.radiationIntensity !== 65535"> <span
{{ scope.row.radiationIntensity.toFixed(0) }}</span v-if="
scope.row.radiationIntensity !== null &&
scope.row.radiationIntensity != 255
"
>{{ scope.row.radiationIntensity.toFixed(1) }}</span
> >
<span v-else> - </span> <span v-else> - </span>
</template> </template>
@ -248,7 +310,18 @@
<el-table-column <el-table-column
prop="avgWindSpeed1min" prop="avgWindSpeed1min"
label="1分钟平均风向(°)" label="1分钟平均风向(°)"
></el-table-column> >
<template slot-scope="scope">
<span
v-if="
scope.row.avgWindSpeed1min !== null &&
scope.row.avgWindSpeed1min != 255
"
>{{ scope.row.avgWindSpeed1min.toFixed(1) }}</span
>
<span v-else> - </span>
</template>
</el-table-column>
<el-table-column <el-table-column
prop="avgWindSpeed10min" prop="avgWindSpeed10min"
label="10分钟平均风速(m/s)" label="10分钟平均风速(m/s)"
@ -570,7 +643,7 @@ export default {
var xData = []; var xData = [];
var yData = []; var yData = [];
xData = wd.map((item) => xData = wd.map((item) =>
this.$moment(item.updateTime * 1000).format("HH:mm:ss") this.$moment(item.updateTime * 1000).format("YYYY-MM-DD HH:mm:ss")
); );
yData = wd.map((item) => item.airTemperature); yData = wd.map((item) => item.airTemperature);
let option = { let option = {
@ -580,7 +653,7 @@ export default {
grid: { grid: {
//left: "6%", //图表距离容器左侧多少距离 //left: "6%", //图表距离容器左侧多少距离
//right: "6%", //图表距离容器右侧侧多少距离 //right: "6%", //图表距离容器右侧侧多少距离
bottom: "6%", //图表距离容器上面多少距离 bottom: "15%", //图表距离容器上面多少距离
//top: "2%", //图表距离容器下面多少距离 //top: "2%", //图表距离容器下面多少距离
}, },
title: { title: {
@ -602,6 +675,20 @@ export default {
saveAsImage: {}, saveAsImage: {},
}, },
}, },
dataZoom: [
{
show: true,
realtime: true,
start: 0,
end: 100,
},
{
type: "inside",
realtime: true,
start: 0,
end: 100,
},
],
xAxis: { xAxis: {
name: "时间", // 坐标轴名称 name: "时间", // 坐标轴名称
type: "category", type: "category",
@ -640,7 +727,7 @@ export default {
var xData = []; var xData = [];
var yData = []; var yData = [];
xData = sd.map((item) => xData = sd.map((item) =>
this.$moment(item.updateTime * 1000).format("HH:mm:ss") this.$moment(item.updateTime * 1000).format("YYYY-MM-DD HH:mm:ss")
); );
yData = sd.map((item) => item.humidity); yData = sd.map((item) => item.humidity);
let option = { let option = {
@ -650,7 +737,7 @@ export default {
grid: { grid: {
//left: "6%", //图表距离容器左侧多少距离 //left: "6%", //图表距离容器左侧多少距离
//right: "6%", //图表距离容器右侧侧多少距离 //right: "6%", //图表距离容器右侧侧多少距离
bottom: "6%", //图表距离容器上面多少距离 bottom: "15%", //图表距离容器上面多少距离
//top: "2%", //图表距离容器下面多少距离 //top: "2%", //图表距离容器下面多少距离
}, },
title: { title: {
@ -672,6 +759,20 @@ export default {
saveAsImage: {}, saveAsImage: {},
}, },
}, },
dataZoom: [
{
show: true,
realtime: true,
start: 0,
end: 100,
},
{
type: "inside",
realtime: true,
start: 0,
end: 100,
},
],
xAxis: { xAxis: {
name: "时间", // 坐标轴名称 name: "时间", // 坐标轴名称
type: "category", type: "category",

6
src/views/otherCommon/index.vue
Unescape Escape View File

@ -7,7 +7,7 @@
<h5>装置编号</h5> <h5>装置编号</h5>
<el-input <el-input
type="textarea" type="textarea"
:rows="18" :rows="16"
placeholder="请输入装置编号" placeholder="请输入装置编号"
v-model="cmdidtextarea" v-model="cmdidtextarea"
> >
@ -17,7 +17,7 @@
<h5>新装置编号</h5> <h5>新装置编号</h5>
<el-input <el-input
type="textarea" type="textarea"
:rows="18" :rows="16"
placeholder="请输入左侧水印" placeholder="请输入左侧水印"
v-model="newCmdidText" v-model="newCmdidText"
> >
@ -42,7 +42,7 @@
<h5>装置编号</h5> <h5>装置编号</h5>
<el-input <el-input
type="textarea" type="textarea"
:rows="18" :rows="16"
placeholder="请输入装置编号" placeholder="请输入装置编号"
v-model="cmdidCmatextarea" v-model="cmdidCmatextarea"
> >

10
src/views/waterMark/index.vue
Unescape Escape View File

@ -22,7 +22,7 @@
<h5>装置编号</h5> <h5>装置编号</h5>
<el-input <el-input
type="textarea" type="textarea"
:rows="18" :rows="16"
placeholder="请输入装置编号" placeholder="请输入装置编号"
v-model="cmdidtextarea" v-model="cmdidtextarea"
> >
@ -32,7 +32,7 @@
<h5>左侧水印</h5> <h5>左侧水印</h5>
<el-input <el-input
type="textarea" type="textarea"
:rows="18" :rows="16"
placeholder="请输入左侧水印" placeholder="请输入左侧水印"
v-model="leftWatertextarea" v-model="leftWatertextarea"
> >
@ -42,7 +42,7 @@
<h5>右侧水印</h5> <h5>右侧水印</h5>
<el-input <el-input
type="textarea" type="textarea"
:rows="18" :rows="16"
placeholder="请输入右侧水印" placeholder="请输入右侧水印"
v-model="rightWatertextarea" v-model="rightWatertextarea"
> >
@ -152,7 +152,7 @@ export default {
for (let j = 0; j < this.checkList.length; j++) { for (let j = 0; j < this.checkList.length; j++) {
for (let i = 0; i < this.cmdidArr.length; i++) { for (let i = 0; i < this.cmdidArr.length; i++) {
var command = var command =
"./bin/xympadmn.exe --server=61.169.135.150 --port=6891 --act=osd --cmdid=" + ".\\bin\\xympadmn.exe --server=61.169.135.150 --port=6891 --act=osd --cmdid=" +
this.cmdidArr[i] + this.cmdidArr[i] +
" --flag=1 --channel=" + " --flag=1 --channel=" +
this.checkList[j] + this.checkList[j] +
@ -164,7 +164,7 @@ export default {
"<br/>" + "<br/>" +
"sleep 1;" + "sleep 1;" +
"<br/>" + "<br/>" +
"./bin/xympadmn.exe --server=61.169.135.150 --port=6891 --act=capture --cmdid=" + ".\\bin\\xympadmn.exe --server=61.169.135.150 --port=6891 --act=capture --cmdid=" +
this.cmdidArr[i] + this.cmdidArr[i] +
" --channel=" + " --channel=" +
this.checkList[j] + this.checkList[j] +

Write Preview
Loading…
Cancel
Save