Skip to content

S
SmartAgricWeb
Commit edd05f12 authored by zhanglw's avatar zhanglw
Browse files
Options

x

parent 0f15f49b
Show whitespace changes
Inline Side-by-side
Showing with 72 additions and 67 deletions
src/api/common.js
View file @ edd05f12
...@@ -53,6 +53,13 @@ export const HttpReq = { ...@@ -53,6 +53,13 @@ export const HttpReq = {
method: 'get' method: 'get'
}) })
}, },
dynamic: function(params) {
return request({
url: 'api/dynamic?' + qs.stringify(params, { indices: false }),
dataType: 'json',
method: 'get'
})
},
api: null api: null
} }
} }
......
src/utils/index.js
View file @ edd05f12
...@@ -41,6 +41,21 @@ export function randNum(min, max, len, isRound) { ...@@ -41,6 +41,21 @@ export function randNum(min, max, len, isRound) {
return arr; return arr;
} }
export function randNormality(min, k, s, len, isRound) {
var arr = []
let std = s
for (let x = 0; x < len; x++) {
let p = 1 / (std * Math.sqrt(2 * (Math.PI))) * Math.exp(-(Math.pow(x - len / 2, 2)) / (2 * (Math.pow(std, 2))))
let num = min + k * p * 10
if (isRound) {
arr.push(Math.round(num))
} else {
arr.push(num.toFixed(2))
}
}
return arr
}
// 日期格式化 // 日期格式化
// time: 时间戳 // time: 时间戳
// format: yyyy-MM-dd HH:mm:ss 时间格式 或者传入 new Date() // format: yyyy-MM-dd HH:mm:ss 时间格式 或者传入 new Date()
......
src/views/daping.vue
View file @ edd05f12
...@@ -50,63 +50,64 @@ ...@@ -50,63 +50,64 @@
<ul> <ul>
<li> <li>
<div> <div>
<span>{{ vData2.xx }}</span> <span v-if="vData2.connectionStatus" style="font-weight: 400;color: white">已连接</span>
<span v-else style="font-weight: 400;color: #c3c3c3">未连接</span>
<font>&nbsp;</font> <font>&nbsp;</font>
</div> </div>
<p>连接状态</p> <p>连接状态</p>
</li> </li>
<li> <li>
<div> <div>
<span>{{ vData2.xx }}</span> <span>{{ vData2.soilMoisture||'-' }}</span>
<font>%</font> <font>%</font>
</div> </div>
<p>土壤湿度</p> <p>土壤湿度</p>
</li> </li>
<li> <li>
<div> <div>
<span style="color:#FFBB2E">{{ vData2.xx }}</span> <span style="color:#FFBB2E">{{ vData2.soilTemperature||'-' }}</span>
<font>°C</font> <font>°C</font>
</div> </div>
<p>土壤温度</p> <p>土壤温度</p>
</li> </li>
<li> <li>
<div> <div>
<span style="color:#FFBB2E">{{ vData2.xx }}</span> <span style="color:#FFBB2E">{{ vData2.tsp||'-' }}</span>
<font>ug/m3</font> <font>ug/m3</font>
</div> </div>
<p>TSP</p> <p>TSP</p>
</li> </li>
<li> <li>
<div> <div>
<span>{{ vData2.xx }}</span> <span>{{ vData2.windSpeed||'-' }}</span>
<font>m/s</font> <font>m/s</font>
</div> </div>
<p>风速</p> <p>风速</p>
</li> </li>
<li> <li>
<div> <div>
<span style="color:#FF547C">{{ vData2.xx }}</span> <span style="color:#FF547C">{{ vData2.windDirection||'-' }}</span>
<font>风</font> <font>风</font>
</div> </div>
<p>风向</p> <p>风向</p>
</li> </li>
<li> <li>
<div> <div>
<span style="color:#FFBB2E">{{ vData2.xx }}</span> <span style="color:#FFBB2E">{{ vData2.airTemperature||'-' }}</span>
<font>°C</font> <font>°C</font>
</div> </div>
<p>空气温度</p> <p>空气温度</p>
</li> </li>
<li> <li>
<div> <div>
<span>{{ vData2.xx }}</span> <span>{{ vData2.airHumidity||'-' }}</span>
<font>%</font> <font>%</font>
</div> </div>
<p>空气湿度</p> <p>空气湿度</p>
</li> </li>
<li> <li>
<div> <div>
<span style="color:#FF547C">{{ vData2.xx }}</span> <span style="color:#FF547C">{{ vData2.atmosphericPressure||'-' }}</span>
<font>kpa</font> <font>kpa</font>
</div> </div>
<p>大气压</p> <p>大气压</p>
...@@ -234,6 +235,7 @@ import enterpriseImg from '@/assets/home/enterpriseImg.png' ...@@ -234,6 +235,7 @@ import enterpriseImg from '@/assets/home/enterpriseImg.png'
import linePoint from '@/assets/home/point.png' import linePoint from '@/assets/home/point.png'
import { HttpReq } from '@/api/common' import { HttpReq } from '@/api/common'
import mark from '@/assets/home/mark.png' import mark from '@/assets/home/mark.png'
import { randNormality } from '../utils'
export default { export default {
data() { data() {
...@@ -247,9 +249,7 @@ export default { ...@@ -247,9 +249,7 @@ export default {
name: '' name: ''
}, },
vData1: {}, vData1: {},
vData2: { vData2: {},
xx: '10.5'
},
vData34: { vData34: {
realTimeAlarm: [], realTimeAlarm: [],
alarmList: [] alarmList: []
...@@ -295,14 +295,20 @@ export default { ...@@ -295,14 +295,20 @@ export default {
this.loadData() this.loadData()
}, },
loadData() { loadData() {
this.$nextTick(() => {
HttpReq.webClientApi.population({}).then((res) => { HttpReq.webClientApi.population({}).then((res) => {
this.vData1 = res.data.equipmentMonitoringStatus this.vData1 = res.data.equipmentMonitoringStatus
this.vData34 = res.data this.vData34 = res.data
}) })
this.initChart2() HttpReq.webClientApi.dynamic({}).then((res) => {
this.initChart3() const d = res.data
this.initChart4() this.vData2 = d['equipmentMonitoringDto']
this.initChart5() this.initChart2(d['meteorologicalMonitoring'])
// this.initChart3(d['soilMonitoring'])
// this.initChart4(d['temperatureAndHumidityMonitoring'])
// this.initChart5(d['co2Monitoring'])
})
})
}, },
initMap() { initMap() {
/* eslint-disable */ /* eslint-disable */
...@@ -559,7 +565,7 @@ export default { ...@@ -559,7 +565,7 @@ export default {
} }
this.chart1.setOption(option) this.chart1.setOption(option)
}, },
initChart2() { initChart2(rData) {
this.chart2 = echarts.init(this.$refs.chart2, 'macarons') this.chart2 = echarts.init(this.$refs.chart2, 'macarons')
const count = 24 const count = 24
const dataX = [] const dataX = []
...@@ -637,7 +643,7 @@ export default { ...@@ -637,7 +643,7 @@ export default {
color: '#FFEA00' color: '#FFEA00'
} }
}, },
data: utils.randNum(0, 20, count, true) data: rData.tempList
}, },
{ {
type: 'line', type: 'line',
...@@ -651,7 +657,7 @@ export default { ...@@ -651,7 +657,7 @@ export default {
color: '#00FC0C' color: '#00FC0C'
} }
}, },
data: utils.randNum(40, 60, count, true) data: rData.humidityList
}, },
{ {
type: 'line', type: 'line',
...@@ -665,7 +671,7 @@ export default { ...@@ -665,7 +671,7 @@ export default {
color: '#FF7534' color: '#FF7534'
} }
}, },
data: utils.randNum(20, 60, count, true) data: rData.illuminationList
}, },
{ {
type: 'line', type: 'line',
...@@ -679,7 +685,7 @@ export default { ...@@ -679,7 +685,7 @@ export default {
color: '#3BF6EC' color: '#3BF6EC'
} }
}, },
data: utils.randNum(0, 10, count, true) data: rData.windSpeedList
}, },
{ {
type: 'line', type: 'line',
...@@ -693,45 +699,22 @@ export default { ...@@ -693,45 +699,22 @@ export default {
color: '#8ED1FC' color: '#8ED1FC'
} }
}, },
data: utils.randNum(10, 30, count, true) data: rData.rainSnowList
} }
] ]
} }
this.chart2.setOption(option) this.chart2.setOption(option)
}, },
initChart3() { initChart3(rData) {
this.chart3 = echarts.init(this.$refs.chart3) this.chart3 = echarts.init(this.$refs.chart3)
const labels = ['周一', '周二', '周三', '周四', '周五', '周六', '周天'] const labels = rData.timeList || []
const seriesData = [ const seriesData = []
{ for (let i = 0; i < labels.length; i++) {
label: '周一', seriesData.push({
value: [32] label: labels[i],
}, value: [rData.data[i]]
{ })
label: '周二',
value: [24]
},
{
label: '周三',
value: [42]
},
{
label: '周四',
value: [32]
},
{
label: '周五',
value: [24]
},
{
label: '周六',
value: [42]
},
{
label: '周天',
value: [20]
} }
]
const colors = [ const colors = [
[ [
{ offset: 0, color: 'rgba(26, 132, 191, 1)' }, { offset: 0, color: 'rgba(26, 132, 191, 1)' },
...@@ -940,7 +923,7 @@ export default { ...@@ -940,7 +923,7 @@ export default {
} }
this.chart3.setOption(option) this.chart3.setOption(option)
}, },
initChart4() { initChart4(rData) {
this.chart4 = echarts.init(this.$refs.chart4, 'macarons') this.chart4 = echarts.init(this.$refs.chart4, 'macarons')
const count = 24 const count = 24
const dataX = [] const dataX = []
...@@ -1041,7 +1024,7 @@ export default { ...@@ -1041,7 +1024,7 @@ export default {
shadowBlur: 20 shadowBlur: 20
} }
}, },
data: utils.randNum(0, 20, count, true) data: rData.tempList
}, },
{ {
type: 'line', type: 'line',
...@@ -1078,7 +1061,7 @@ export default { ...@@ -1078,7 +1061,7 @@ export default {
shadowBlur: 20 shadowBlur: 20
} }
}, },
data: utils.randNum(40, 60, count, true) data: rData.humidityList
}, },
{ {
type: 'line', type: 'line',
...@@ -1115,13 +1098,13 @@ export default { ...@@ -1115,13 +1098,13 @@ export default {
shadowBlur: 20 shadowBlur: 20
} }
}, },
data: utils.randNum(5, 20, count, true) data: rData.illuminationList
} }
] ]
} }
this.chart4.setOption(option) this.chart4.setOption(option)
}, },
initChart5() { initChart5(rData) {
this.chart5 = echarts.init(this.$refs.chart5, 'macarons') this.chart5 = echarts.init(this.$refs.chart5, 'macarons')
const count = 24 const count = 24
const dataX = [] const dataX = []
...@@ -1199,7 +1182,7 @@ export default { ...@@ -1199,7 +1182,7 @@ export default {
color: '#FFEA00' color: '#FFEA00'
} }
}, },
data: utils.randNum(0, 6, count, true) data: rData.co2List
}, },
{ {
type: 'line', type: 'line',
...@@ -1213,7 +1196,7 @@ export default { ...@@ -1213,7 +1196,7 @@ export default {
color: '#F23593' color: '#F23593'
} }
}, },
data: utils.randNum(5, 25, count, true) data: rData.tempList
}, },
{ {
type: 'line', type: 'line',
...@@ -1227,7 +1210,7 @@ export default { ...@@ -1227,7 +1210,7 @@ export default {
color: '#00FC0C' color: '#00FC0C'
} }
}, },
data: utils.randNum(40, 60, count, true) data: rData.humidityList
}, },
{ {
type: 'line', type: 'line',
...@@ -1283,7 +1266,7 @@ export default { ...@@ -1283,7 +1266,7 @@ export default {
shadowBlur: 20 shadowBlur: 20
} }
}, },
data: utils.randNum(35, 40, count, true) data: rData.illuminationList
} }
] ]
} }
......
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