Skip to content
Projects
Groups
Snippets
Help
Loading...
Help
Support
Submit feedback
Contribute to GitLab
Sign in / Register
Toggle navigation
K
kd_control
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
kd_control
Commits
2931d88f
Commit
2931d88f
authored
May 23, 2023
by
zhanglw
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
修复降雨量计算错误等bug
parent
cfa3425a
Changes
3
Hide whitespace changes
Inline
Side-by-side
Showing
3 changed files
with
10 additions
and
9 deletions
+10
-9
.env.development
.env.development
+4
-4
index.vue
src/views/personnelPositioning/peopleAlarm/index.vue
+4
-4
index.vue
src/views/slopeMonitoring/precipitationLog/index.vue
+2
-1
No files found.
.env.development
View file @
2931d88f
...
@@ -5,11 +5,11 @@ ENV = 'development'
...
@@ -5,11 +5,11 @@ ENV = 'development'
#VUE_APP_BASE_API = 'http://39.164.225.220:5002'
#VUE_APP_BASE_API = 'http://39.164.225.220:5002'
#VUE_APP_LOCAL_API = 'http://39.164.225.220:5002'
#VUE_APP_LOCAL_API = 'http://39.164.225.220:5002'
#
VUE_APP_BASE_API = 'http://192.168.3.23:9092'
VUE_APP_BASE_API = 'http://192.168.3.23:9092'
#
VUE_APP_LOCAL_API = 'http://192.168.3.23:9092'
VUE_APP_LOCAL_API = 'http://192.168.3.23:9092'
VUE_APP_BASE_API = 'http://192.168.3.216:9092'
#
VUE_APP_BASE_API = 'http://192.168.3.216:9092'
VUE_APP_LOCAL_API = 'http://192.168.3.216:9092'
#
VUE_APP_LOCAL_API = 'http://192.168.3.216:9092'
VUE_APP_LOCAL_API2 = 'http://8.143.203.103:9091/'
VUE_APP_LOCAL_API2 = 'http://8.143.203.103:9091/'
VUE_APP_WS_API = 'ws://8.143.203.103:9092/webSocket'
VUE_APP_WS_API = 'ws://8.143.203.103:9092/webSocket'
...
...
src/views/personnelPositioning/peopleAlarm/index.vue
View file @
2931d88f
...
@@ -49,8 +49,8 @@
...
@@ -49,8 +49,8 @@
<el-table-column
prop=
"time"
label=
"报警时间"
align=
"center"
></el-table-column>
<el-table-column
prop=
"time"
label=
"报警时间"
align=
"center"
></el-table-column>
<el-table-column
label=
"报警类型"
align=
"center"
>
<el-table-column
label=
"报警类型"
align=
"center"
>
<
template
slot-scope=
"scope"
>
<
template
slot-scope=
"scope"
>
<span
v-show=
"scope.row.alarmtype===1"
>
人员求救
</span>
<span
v-show=
"scope.row.alarmtype===1"
>
电子围栏
</span>
<span
v-show=
"scope.row.alarmtype===2"
>
电子围栏
</span>
<span
v-show=
"scope.row.alarmtype===2"
>
人员求救
</span>
<span
v-show=
"scope.row.alarmtype===3"
>
电池欠压
</span>
<span
v-show=
"scope.row.alarmtype===3"
>
电池欠压
</span>
</
template
>
</
template
>
</el-table-column>
</el-table-column>
...
@@ -113,8 +113,8 @@ export default {
...
@@ -113,8 +113,8 @@ export default {
graphicLayer
:
null
,
graphicLayer
:
null
,
stuOpts
:
[
stuOpts
:
[
{
label
:
'
全部
'
,
value
:
undefined
},
{
label
:
'
全部
'
,
value
:
undefined
},
{
label
:
'
人员求救
'
,
value
:
1
},
{
label
:
'
电子围栏
'
,
value
:
1
},
{
label
:
'
电子围栏
'
,
value
:
2
},
{
label
:
'
人员求救
'
,
value
:
2
},
{
label
:
'
电池欠压
'
,
value
:
3
},
{
label
:
'
电池欠压
'
,
value
:
3
},
],
],
tableData
:
[],
tableData
:
[],
...
...
src/views/slopeMonitoring/precipitationLog/index.vue
View file @
2931d88f
...
@@ -39,7 +39,8 @@
...
@@ -39,7 +39,8 @@
<el-table
:data=
"tableData"
v-loading=
"loading"
border
style=
"width:auto"
:row-class-name=
"tableRowClassName"
>
<el-table
:data=
"tableData"
v-loading=
"loading"
border
style=
"width:auto"
:row-class-name=
"tableRowClassName"
>
<el-table-column
prop=
"sensorname"
label=
"设备名称"
align=
"center"
></el-table-column>
<el-table-column
prop=
"sensorname"
label=
"设备名称"
align=
"center"
></el-table-column>
<el-table-column
prop=
"sensorid"
label=
"设备编号"
align=
"center"
></el-table-column>
<el-table-column
prop=
"sensorid"
label=
"设备编号"
align=
"center"
></el-table-column>
<el-table-column
prop=
"zongliang"
label=
"检测值"
align=
"center"
></el-table-column>
<el-table-column
prop=
"rainfall"
label=
"检测值"
align=
"center"
></el-table-column>
<el-table-column
prop=
"zongliang"
label=
"总计量"
align=
"center"
></el-table-column>
<el-table-column
label=
"单位"
align=
"center"
>
<el-table-column
label=
"单位"
align=
"center"
>
<template
slot-scope=
"scope"
>
<template
slot-scope=
"scope"
>
mm
mm
...
...
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