Skip to content
Projects
Groups
Snippets
Help
Loading...
Help
Support
Submit feedback
Contribute to GitLab
Sign in / Register
Toggle navigation
S
SmartAgricWeb
Project
Project
Details
Activity
Releases
Cycle Analytics
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Charts
Issues
0
Issues
0
List
Boards
Labels
Milestones
Merge Requests
0
Merge Requests
0
CI / CD
CI / CD
Pipelines
Jobs
Schedules
Charts
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Charts
Create a new issue
Jobs
Commits
Issue Boards
Open sidebar
zhanglw
SmartAgricWeb
Commits
edd05f12
Commit
edd05f12
authored
Oct 23, 2023
by
zhanglw
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
x
parent
0f15f49b
Changes
3
Show whitespace changes
Inline
Side-by-side
Showing
3 changed files
with
72 additions
and
67 deletions
+72
-67
common.js
src/api/common.js
+7
-0
index.js
src/utils/index.js
+16
-1
daping.vue
src/views/daping.vue
+49
-66
No files found.
src/api/common.js
View file @
edd05f12
...
...
@@ -53,6 +53,13 @@ export const HttpReq = {
method
:
'
get
'
})
},
dynamic
:
function
(
params
)
{
return
request
({
url
:
'
api/dynamic?
'
+
qs
.
stringify
(
params
,
{
indices
:
false
}),
dataType
:
'
json
'
,
method
:
'
get
'
})
},
api
:
null
}
}
...
...
src/utils/index.js
View file @
edd05f12
...
...
@@ -41,6 +41,21 @@ export function randNum(min, max, len, isRound) {
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: 时间戳
// format: yyyy-MM-dd HH:mm:ss 时间格式 或者传入 new Date()
...
...
src/views/daping.vue
View file @
edd05f12
...
...
@@ -50,63 +50,64 @@
<ul>
<li>
<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>
</font>
</div>
<p>
连接状态
</p>
</li>
<li>
<div>
<span>
{{
vData2
.
xx
}}
</span>
<span>
{{
vData2
.
soilMoisture
||
'
-
'
}}
</span>
<font>
%
</font>
</div>
<p>
土壤湿度
</p>
</li>
<li>
<div>
<span
style=
"color:#FFBB2E"
>
{{
vData2
.
xx
}}
</span>
<span
style=
"color:#FFBB2E"
>
{{
vData2
.
soilTemperature
||
'
-
'
}}
</span>
<font>
°C
</font>
</div>
<p>
土壤温度
</p>
</li>
<li>
<div>
<span
style=
"color:#FFBB2E"
>
{{
vData2
.
xx
}}
</span>
<span
style=
"color:#FFBB2E"
>
{{
vData2
.
tsp
||
'
-
'
}}
</span>
<font>
ug/m3
</font>
</div>
<p>
TSP
</p>
</li>
<li>
<div>
<span>
{{
vData2
.
xx
}}
</span>
<span>
{{
vData2
.
windSpeed
||
'
-
'
}}
</span>
<font>
m/s
</font>
</div>
<p>
风速
</p>
</li>
<li>
<div>
<span
style=
"color:#FF547C"
>
{{
vData2
.
xx
}}
</span>
<span
style=
"color:#FF547C"
>
{{
vData2
.
windDirection
||
'
-
'
}}
</span>
<font>
风
</font>
</div>
<p>
风向
</p>
</li>
<li>
<div>
<span
style=
"color:#FFBB2E"
>
{{
vData2
.
xx
}}
</span>
<span
style=
"color:#FFBB2E"
>
{{
vData2
.
airTemperature
||
'
-
'
}}
</span>
<font>
°C
</font>
</div>
<p>
空气温度
</p>
</li>
<li>
<div>
<span>
{{
vData2
.
xx
}}
</span>
<span>
{{
vData2
.
airHumidity
||
'
-
'
}}
</span>
<font>
%
</font>
</div>
<p>
空气湿度
</p>
</li>
<li>
<div>
<span
style=
"color:#FF547C"
>
{{
vData2
.
xx
}}
</span>
<span
style=
"color:#FF547C"
>
{{
vData2
.
atmosphericPressure
||
'
-
'
}}
</span>
<font>
kpa
</font>
</div>
<p>
大气压
</p>
...
...
@@ -234,6 +235,7 @@ import enterpriseImg from '@/assets/home/enterpriseImg.png'
import
linePoint
from
'
@/assets/home/point.png
'
import
{
HttpReq
}
from
'
@/api/common
'
import
mark
from
'
@/assets/home/mark.png
'
import
{
randNormality
}
from
'
../utils
'
export
default
{
data
()
{
...
...
@@ -247,9 +249,7 @@ export default {
name
:
''
},
vData1
:
{},
vData2
:
{
xx
:
'
10.5
'
},
vData2
:
{},
vData34
:
{
realTimeAlarm
:
[],
alarmList
:
[]
...
...
@@ -295,14 +295,20 @@ export default {
this
.
loadData
()
},
loadData
()
{
this
.
$nextTick
(()
=>
{
HttpReq
.
webClientApi
.
population
({}).
then
((
res
)
=>
{
this
.
vData1
=
res
.
data
.
equipmentMonitoringStatus
this
.
vData34
=
res
.
data
})
this
.
initChart2
()
this
.
initChart3
()
this
.
initChart4
()
this
.
initChart5
()
HttpReq
.
webClientApi
.
dynamic
({}).
then
((
res
)
=>
{
const
d
=
res
.
data
this
.
vData2
=
d
[
'
equipmentMonitoringDto
'
]
this
.
initChart2
(
d
[
'
meteorologicalMonitoring
'
])
// this.initChart3(d['soilMonitoring'])
// this.initChart4(d['temperatureAndHumidityMonitoring'])
// this.initChart5(d['co2Monitoring'])
})
})
},
initMap
()
{
/* eslint-disable */
...
...
@@ -559,7 +565,7 @@ export default {
}
this
.
chart1
.
setOption
(
option
)
},
initChart2
()
{
initChart2
(
rData
)
{
this
.
chart2
=
echarts
.
init
(
this
.
$refs
.
chart2
,
'
macarons
'
)
const
count
=
24
const
dataX
=
[]
...
...
@@ -637,7 +643,7 @@ export default {
color
:
'
#FFEA00
'
}
},
data
:
utils
.
randNum
(
0
,
20
,
count
,
true
)
data
:
rData
.
tempList
},
{
type
:
'
line
'
,
...
...
@@ -651,7 +657,7 @@ export default {
color
:
'
#00FC0C
'
}
},
data
:
utils
.
randNum
(
40
,
60
,
count
,
true
)
data
:
rData
.
humidityList
},
{
type
:
'
line
'
,
...
...
@@ -665,7 +671,7 @@ export default {
color
:
'
#FF7534
'
}
},
data
:
utils
.
randNum
(
20
,
60
,
count
,
true
)
data
:
rData
.
illuminationList
},
{
type
:
'
line
'
,
...
...
@@ -679,7 +685,7 @@ export default {
color
:
'
#3BF6EC
'
}
},
data
:
utils
.
randNum
(
0
,
10
,
count
,
true
)
data
:
rData
.
windSpeedList
},
{
type
:
'
line
'
,
...
...
@@ -693,45 +699,22 @@ export default {
color
:
'
#8ED1FC
'
}
},
data
:
utils
.
randNum
(
10
,
30
,
count
,
true
)
data
:
rData
.
rainSnowList
}
]
}
this
.
chart2
.
setOption
(
option
)
},
initChart3
()
{
initChart3
(
rData
)
{
this
.
chart3
=
echarts
.
init
(
this
.
$refs
.
chart3
)
const
labels
=
[
'
周一
'
,
'
周二
'
,
'
周三
'
,
'
周四
'
,
'
周五
'
,
'
周六
'
,
'
周天
'
]
const
seriesData
=
[
{
label
:
'
周一
'
,
value
:
[
32
]
},
{
label
:
'
周二
'
,
value
:
[
24
]
},
{
label
:
'
周三
'
,
value
:
[
42
]
},
{
label
:
'
周四
'
,
value
:
[
32
]
},
{
label
:
'
周五
'
,
value
:
[
24
]
},
{
label
:
'
周六
'
,
value
:
[
42
]
},
{
label
:
'
周天
'
,
value
:
[
20
]
const
labels
=
rData
.
timeList
||
[]
const
seriesData
=
[]
for
(
let
i
=
0
;
i
<
labels
.
length
;
i
++
)
{
seriesData
.
push
({
label
:
labels
[
i
],
value
:
[
rData
.
data
[
i
]]
})
}
]
const
colors
=
[
[
{
offset
:
0
,
color
:
'
rgba(26, 132, 191, 1)
'
},
...
...
@@ -940,7 +923,7 @@ export default {
}
this
.
chart3
.
setOption
(
option
)
},
initChart4
()
{
initChart4
(
rData
)
{
this
.
chart4
=
echarts
.
init
(
this
.
$refs
.
chart4
,
'
macarons
'
)
const
count
=
24
const
dataX
=
[]
...
...
@@ -1041,7 +1024,7 @@ export default {
shadowBlur
:
20
}
},
data
:
utils
.
randNum
(
0
,
20
,
count
,
true
)
data
:
rData
.
tempList
},
{
type
:
'
line
'
,
...
...
@@ -1078,7 +1061,7 @@ export default {
shadowBlur
:
20
}
},
data
:
utils
.
randNum
(
40
,
60
,
count
,
true
)
data
:
rData
.
humidityList
},
{
type
:
'
line
'
,
...
...
@@ -1115,13 +1098,13 @@ export default {
shadowBlur
:
20
}
},
data
:
utils
.
randNum
(
5
,
20
,
count
,
true
)
data
:
rData
.
illuminationList
}
]
}
this
.
chart4
.
setOption
(
option
)
},
initChart5
()
{
initChart5
(
rData
)
{
this
.
chart5
=
echarts
.
init
(
this
.
$refs
.
chart5
,
'
macarons
'
)
const
count
=
24
const
dataX
=
[]
...
...
@@ -1199,7 +1182,7 @@ export default {
color
:
'
#FFEA00
'
}
},
data
:
utils
.
randNum
(
0
,
6
,
count
,
true
)
data
:
rData
.
co2List
},
{
type
:
'
line
'
,
...
...
@@ -1213,7 +1196,7 @@ export default {
color
:
'
#F23593
'
}
},
data
:
utils
.
randNum
(
5
,
25
,
count
,
true
)
data
:
rData
.
tempList
},
{
type
:
'
line
'
,
...
...
@@ -1227,7 +1210,7 @@ export default {
color
:
'
#00FC0C
'
}
},
data
:
utils
.
randNum
(
40
,
60
,
count
,
true
)
data
:
rData
.
humidityList
},
{
type
:
'
line
'
,
...
...
@@ -1283,7 +1266,7 @@ export default {
shadowBlur
:
20
}
},
data
:
utils
.
randNum
(
35
,
40
,
count
,
true
)
data
:
rData
.
illuminationList
}
]
}
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment