Skip to content
Projects
Groups
Snippets
Help
Loading...
Help
Support
Submit feedback
Contribute to GitLab
Sign in / Register
Toggle navigation
卡
卡车调度系统
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
caicaicai
卡车调度系统
Commits
1b8e70f8
Commit
1b8e70f8
authored
Apr 29, 2022
by
caicaicai
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
修改
parent
c65cfa55
Changes
2
Show whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
52 additions
and
20 deletions
+52
-20
common.js
src/assets/js/common.js
+32
-1
index.vue
src/views/DeviceManage/callPolice/index.vue
+20
-19
No files found.
src/assets/js/common.js
View file @
1b8e70f8
...
...
@@ -881,7 +881,7 @@ var HttpReq = function(){
data
:
data
,
})
},
//设备管理——报警管理
//设备管理——报警管理
1
callPoliceQuery
:
function
(
param
){
return
request
({
url
:
'
/api/Alarm
'
,
...
...
@@ -912,6 +912,37 @@ var HttpReq = function(){
data
:
data
,
})
},
//设备管理——报警管理2
callPoliceHistroyQuery
:
function
(
param
){
return
request
({
url
:
'
/mineAlarmHistory
'
,
method
:
'
get
'
,
params
:
param
,
})
},
callPoliceHistroyAdd
:
function
(
data
){
return
request
({
url
:
'
/mineAlarmHistory
'
,
method
:
'
POST
'
,
data
:
data
,
}).
then
((
res
)
=>
{
return
res
})
},
callPoliceHistroyUpdate
:
function
(
data
){
return
request
({
url
:
'
/mineAlarmHistory
'
,
method
:
'
PUT
'
,
data
:
data
,
})
},
callPoliceHistroyDel
:
function
(
data
){
return
request
({
url
:
'
/mineAlarmHistory
'
,
method
:
'
Delete
'
,
data
:
data
,
})
},
//智能派单——智能派单历史数据
IntelligentDispatchHistoryQuery
:
function
(
param
){
return
request
({
...
...
src/views/DeviceManage/callPolice/index.vue
View file @
1b8e70f8
...
...
@@ -5,8 +5,8 @@
<!--工具栏-->
<div
class=
"head-container"
>
<label
class=
"el-form-item-label"
style=
"font-weight: 500;"
>
车牌
号
</label>
<el-input
v-model=
"query.n
umber"
clearable
size=
"small"
placeholder=
"请输入车牌
号"
style=
"width:180px;"
/>
<label
class=
"el-form-item-label"
style=
"font-weight: 500;"
>
设备编
号
</label>
<el-input
v-model=
"query.n
ame"
clearable
size=
"small"
placeholder=
"请输入设备编
号"
style=
"width:180px;"
/>
<el-button
size=
"mini"
type=
"success"
icon=
"el-icon-search"
@
click=
"toSearch"
>
搜索
</el-button>
<el-button
size=
"mini"
icon=
"el-icon-refresh"
@
click=
"clearLimit"
>
重置
</el-button>
...
...
@@ -24,12 +24,12 @@
</div>
<div
class=
"content"
>
<el-table
:data=
"tableData"
v-loading=
"loading"
border
style=
"width:auto"
:row-class-name=
"tableRowClassName"
>
<el-table-column
prop=
"n
umber"
label=
"车牌
号"
align=
"center"
></el-table-column>
<el-table-column
prop=
"
create
Time"
label=
"报警时间"
align=
"center"
></el-table-column>
<el-table-column
prop=
"
alarmclass"
label=
"报警类型"
align=
"center
"
></el-table-column>
<el-table-column
prop=
"a
larmexplain"
label=
"报警说明
"
align=
"center"
></el-table-column>
<el-table-column
prop=
"
updateBy
"
label=
"处理人"
align=
"center"
></el-table-column>
<el-table-column
prop=
"
updat
eTime"
label=
"处理时间"
align=
"center"
></el-table-column>
<el-table-column
prop=
"n
ame"
label=
"设备编
号"
align=
"center"
></el-table-column>
<el-table-column
prop=
"
alarm
Time"
label=
"报警时间"
align=
"center"
></el-table-column>
<el-table-column
prop=
"
type"
label=
"报警类型"
align=
"center"
:formatter=
"baojingleixingChange
"
></el-table-column>
<el-table-column
prop=
"a
reaName"
label=
"报警区域
"
align=
"center"
></el-table-column>
<el-table-column
prop=
"
operator
"
label=
"处理人"
align=
"center"
></el-table-column>
<el-table-column
prop=
"
handl
eTime"
label=
"处理时间"
align=
"center"
></el-table-column>
<el-table-column
label=
"解除报警"
align=
"center"
>
<template
slot-scope=
"scope"
>
<el-button
size=
"mini"
type=
"primary"
@
click=
"toRelieveAlarm(scope.row)"
v-if=
"scope.row.status == 1"
>
解除报警
</el-button>
...
...
@@ -127,7 +127,7 @@ export default {
},
methods
:
{
loadData
()
{
var
sort
=
'
id
,desc
'
;
var
sort
=
'
alarmTime
,desc
'
;
var
param
=
this
.
query
;
param
.
page
=
this
.
page
-
1
;
param
.
size
=
this
.
size
;
...
...
@@ -135,12 +135,10 @@ export default {
this
.
$nextTick
(()
=>
{
//获取报警信息
HttpReq
.
truckDispatching
.
callPoliceQuery
(
param
).
then
((
res
)
=>
{
if
(
res
.
code
==
200
){
HttpReq
.
truckDispatching
.
callPoliceHistroyQuery
(
param
).
then
((
res
)
=>
{
this
.
loading
=
false
;
this
.
tableData
=
res
.
data
.
content
;
this
.
total
=
res
.
data
.
totalElements
;
}
this
.
tableData
=
res
;
this
.
total
=
res
.
length
;
})
})
...
...
@@ -222,7 +220,7 @@ export default {
//新增报警
reqAddItem
(
form
,
item
){
let
lastData
=
{...
item
};
HttpReq
.
truckDispatching
.
callPoliceAdd
(
lastData
).
then
((
res
)
=>
{
HttpReq
.
truckDispatching
.
callPolice
Histroy
Add
(
lastData
).
then
((
res
)
=>
{
form
.
visible
=
false
;
if
(
res
.
code
==
200
){
this
.
$notify
({
...
...
@@ -245,7 +243,7 @@ export default {
//修改报警
reqUpdateItem
(
form
,
item
){
let
lastData
=
{...
item
};
HttpReq
.
truckDispatching
.
callPoliceUpdate
(
lastData
).
then
((
res
)
=>
{
HttpReq
.
truckDispatching
.
callPolice
Histroy
Update
(
lastData
).
then
((
res
)
=>
{
form
.
visible
=
false
;
if
(
res
.
code
==
200
){
this
.
$notify
({
...
...
@@ -267,7 +265,7 @@ export default {
},
//删除报警
reqRemoveProject
(
item
){
HttpReq
.
truckDispatching
.
callPoliceDel
(
item
).
then
((
res
)
=>
{
HttpReq
.
truckDispatching
.
callPolice
Histroy
Del
(
item
).
then
((
res
)
=>
{
if
(
res
.
status
==
400
){
this
.
$notify
({
title
:
res
.
msg
,
...
...
@@ -298,7 +296,7 @@ export default {
relieveAlarm
(
item
){
let
lastData
=
{...
item
};
lastData
.
status
=
0
;
HttpReq
.
truckDispatching
.
callPoliceUpdate
(
lastData
).
then
((
res
)
=>
{
HttpReq
.
truckDispatching
.
callPolice
Histroy
Update
(
lastData
).
then
((
res
)
=>
{
if
(
res
.
code
==
200
){
this
.
$notify
({
title
:
'
报警解除成功!
'
,
...
...
@@ -316,6 +314,9 @@ export default {
}).
catch
(
function
(
error
)
{
form
.
status
.
cu
=
0
});
},
baojingleixingChange
(
row
){
return
row
.
type
==
'
1
'
?
'
限入电子围栏报警
'
:
row
.
type
==
'
2
'
?
'
限出电子围栏报警
'
:
'
其他
'
}
}
}
...
...
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