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
cfa3425a
Commit
cfa3425a
authored
May 22, 2023
by
zhanglw
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
修复0522测试反馈若干问题
parent
9aebbfd4
Changes
7
Show whitespace changes
Inline
Side-by-side
Showing
7 changed files
with
60 additions
and
47 deletions
+60
-47
.env.development
.env.development
+7
-2
index.html
public/wrs/index.html
+15
-11
crud.js
src/components/Crud/crud.js
+8
-4
index.vue
src/views/DeviceManage/callPoliceLog/index.vue
+1
-1
index.vue
...ntelligentDispatchManagement/carVoiceSupplement/index.vue
+10
-14
index.vue
src/views/personnelPositioning/peopleAlarm/index.vue
+2
-2
index.vue
src/views/personnelPositioning/peopleLogData/index.vue
+17
-13
No files found.
.env.development
View file @
cfa3425a
...
@@ -4,8 +4,13 @@ ENV = 'development'
...
@@ -4,8 +4,13 @@ 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_LOCAL_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_BASE_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'
...
...
public/wrs/index.html
View file @
cfa3425a
<html>
<html>
<head>
<head>
<script
src=
"./adapter.min.js"
></script>
<script
src=
"./adapter.min.js"
></script>
<script
src=
"./webrtcstreamer.js"
></script>
<script
src=
"./webrtcstreamer.js"
></script>
<script>
var
webRtcServer
=
null
;
window
.
onload
=
function
()
{
webRtcServer
=
new
WebRtcStreamer
(
"
video
"
,
"
http://192.168.3.38:8041
"
);
webRtcServer
.
connect
(
"
rtsp://admin:gemho10-7@192.168.0.54:554/h264/ch1/main/av_stream
"
);
}
window
.
onbeforeunload
=
function
()
{
webRtcServer
.
disconnect
();
}
</script>
</head>
</head>
<body>
<body>
<div
style=
"width: 100%;height: 100%;"
>
<div
style=
"width: 100%;height: 100%;"
>
<video
id=
"video"
autoplay
/>
<video
id=
"video"
controls
style=
"width: 100%;height: 100%;"
>
您的浏览器不支持:HTML5 video.
</video>
</div>
</div>
<script>
var
webRtcServer
=
null
;
window
.
onload
=
function
()
{
webRtcServer
=
new
WebRtcStreamer
(
"
video
"
,
"
http://192.168.3.38:8041
"
);
webRtcServer
.
connect
(
"
rtsp://admin:gemho10-7@192.168.0.54:554/h264/ch1/main/av_stream
"
);
}
window
.
onbeforeunload
=
function
()
{
webRtcServer
.
disconnect
();
}
</script>
</body>
</body>
</html>
</html>
src/components/Crud/crud.js
View file @
cfa3425a
...
@@ -257,10 +257,12 @@ function CRUD(options) {
...
@@ -257,10 +257,12 @@ function CRUD(options) {
return
return
}
}
crud
.
status
.
add
=
CRUD
.
STATUS
.
PROCESSING
crud
.
status
.
add
=
CRUD
.
STATUS
.
PROCESSING
crud
.
crudMethod
.
add
(
crud
.
form
).
then
(()
=>
{
crud
.
crudMethod
.
add
(
crud
.
form
).
then
((
res
)
=>
{
crud
.
status
.
add
=
CRUD
.
STATUS
.
NORMAL
crud
.
status
.
add
=
CRUD
.
STATUS
.
NORMAL
crud
.
resetForm
()
crud
.
resetForm
()
if
(
!
res
.
status
){
crud
.
addSuccessNotify
()
crud
.
addSuccessNotify
()
}
callVmHook
(
crud
,
CRUD
.
HOOK
.
afterSubmit
)
callVmHook
(
crud
,
CRUD
.
HOOK
.
afterSubmit
)
crud
.
toQuery
()
crud
.
toQuery
()
}).
catch
(()
=>
{
}).
catch
(()
=>
{
...
@@ -276,11 +278,13 @@ function CRUD(options) {
...
@@ -276,11 +278,13 @@ function CRUD(options) {
return
return
}
}
crud
.
status
.
edit
=
CRUD
.
STATUS
.
PROCESSING
crud
.
status
.
edit
=
CRUD
.
STATUS
.
PROCESSING
crud
.
crudMethod
.
edit
(
crud
.
form
).
then
(()
=>
{
crud
.
crudMethod
.
edit
(
crud
.
form
).
then
((
res
)
=>
{
crud
.
status
.
edit
=
CRUD
.
STATUS
.
NORMAL
crud
.
status
.
edit
=
CRUD
.
STATUS
.
NORMAL
crud
.
getDataStatus
(
crud
.
getDataId
(
crud
.
form
)).
edit
=
CRUD
.
STATUS
.
NORMAL
crud
.
getDataStatus
(
crud
.
getDataId
(
crud
.
form
)).
edit
=
CRUD
.
STATUS
.
NORMAL
crud
.
editSuccessNotify
()
crud
.
resetForm
()
crud
.
resetForm
()
if
(
!
res
.
status
){
crud
.
editSuccessNotify
()
}
callVmHook
(
crud
,
CRUD
.
HOOK
.
afterSubmit
)
callVmHook
(
crud
,
CRUD
.
HOOK
.
afterSubmit
)
crud
.
refresh
()
crud
.
refresh
()
}).
catch
(()
=>
{
}).
catch
(()
=>
{
...
...
src/views/DeviceManage/callPoliceLog/index.vue
View file @
cfa3425a
...
@@ -8,7 +8,7 @@
...
@@ -8,7 +8,7 @@
<label
class=
"el-form-item-label"
style=
"font-weight: 500;"
>
车牌号
</label>
<label
class=
"el-form-item-label"
style=
"font-weight: 500;"
>
车牌号
</label>
<el-input
v-model=
"query.carNumber"
clearable
size=
"small"
placeholder=
"请输入车牌号"
style=
"width:180px;"
/>
<el-input
v-model=
"query.carNumber"
clearable
size=
"small"
placeholder=
"请输入车牌号"
style=
"width:180px;"
/>
<label
class=
"el-form-item-label"
style=
"font-weight: 500;"
>
司机姓名
</label>
<label
class=
"el-form-item-label"
style=
"font-weight: 500;"
>
司机姓名
</label>
<el-input
v-model=
"query.
carNumb
er"
clearable
size=
"small"
placeholder=
"请输入姓名"
style=
"width:180px;"
/>
<el-input
v-model=
"query.
driv
er"
clearable
size=
"small"
placeholder=
"请输入姓名"
style=
"width:180px;"
/>
<label
class=
"el-form-item-label"
style=
"font-weight: 500;"
>
报警类型
</label>
<label
class=
"el-form-item-label"
style=
"font-weight: 500;"
>
报警类型
</label>
<el-select
v-model=
"query.alarmType"
placeholder=
"请选择"
>
<el-select
v-model=
"query.alarmType"
placeholder=
"请选择"
>
<el-option
v-for=
"item in stuOpts"
:key=
"item.value"
:label=
"item.label"
:value=
"item.value"
></el-option>
<el-option
v-for=
"item in stuOpts"
:key=
"item.value"
:label=
"item.label"
:value=
"item.value"
></el-option>
...
...
src/views/IntelligentDispatchManagement/carVoiceSupplement/index.vue
View file @
cfa3425a
...
@@ -359,29 +359,25 @@ export default {
...
@@ -359,29 +359,25 @@ export default {
query1
.
flag
=
2
;
query1
.
flag
=
2
;
HttpReq
.
truckDispatching
.
personRecordingAdd
(
query1
).
then
((
res
)
=>
{
HttpReq
.
truckDispatching
.
personRecordingAdd
(
query1
).
then
((
res
)
=>
{
if
(
res
.
code
==
200
){
if
(
res
.
code
==
200
){
}
else
{
this
.
$notify
({
title
:
res
.
msg
,
type
:
'
error
'
,
duration
:
2500
})
}
}).
catch
(
function
(
error
)
{
});
})
this
.
$notify
({
this
.
$notify
({
title
:
'
添加成功!
'
,
title
:
'
添加成功!
'
,
type
:
'
success
'
,
type
:
'
success
'
,
duration
:
2500
duration
:
2500
});
});
this
.
loadDataAdd
();
this
.
loadData
();
this
.
form
.
toAddVisible
=
false
;
this
.
form
.
toAddVisible
=
false
;
this
.
queryAdd
=
{};
this
.
queryAdd
=
{};
this
.
formAdd
=
{};
this
.
formAdd
=
{};
this
.
checkDataListAdd
=
[];
this
.
checkDataListAdd
=
[];
this
.
loadData
();
}
else
{
this
.
$notify
({
title
:
res
.
msg
,
type
:
'
error
'
,
duration
:
2500
})
}
}).
catch
(
function
(
error
)
{
});
})
},
},
//调度状态更改
//调度状态更改
flagChange
(
row
){
flagChange
(
row
){
...
...
src/views/personnelPositioning/peopleAlarm/index.vue
View file @
cfa3425a
...
@@ -49,7 +49,7 @@
...
@@ -49,7 +49,7 @@
<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
>
...
@@ -113,7 +113,7 @@ export default {
...
@@ -113,7 +113,7 @@ 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
},
],
],
...
...
src/views/personnelPositioning/peopleLogData/index.vue
View file @
cfa3425a
...
@@ -443,6 +443,7 @@ export default {
...
@@ -443,6 +443,7 @@ export default {
}).
then
((
res
)
=>
{
}).
then
((
res
)
=>
{
if
(
res
.
code
==
200
)
{
if
(
res
.
code
==
200
)
{
if
(
res
.
body
&&
res
.
body
.
api_url
&&
res
.
body
.
play_url
){
if
(
res
.
body
&&
res
.
body
.
api_url
&&
res
.
body
.
play_url
){
setTimeout
(()
=>
{
this
.
videoRtcPlayer
=
new
JSWebrtc
.
Player
(
res
.
body
.
api_url
,
res
.
body
.
play_url
,
{
this
.
videoRtcPlayer
=
new
JSWebrtc
.
Player
(
res
.
body
.
api_url
,
res
.
body
.
play_url
,
{
video
:
document
.
getElementById
(
"
remoteVideo
"
),
video
:
document
.
getElementById
(
"
remoteVideo
"
),
autoplay
:
true
,
autoplay
:
true
,
...
@@ -454,6 +455,7 @@ export default {
...
@@ -454,6 +455,7 @@ export default {
this
.
videoRtcPlayer
.
destroy
();
this
.
videoRtcPlayer
.
destroy
();
}
}
});
});
},
1000
);
}
else
{
}
else
{
this
.
$message
({
this
.
$message
({
message
:
'
链接失败!
'
+
res
.
body
.
msg
message
:
'
链接失败!
'
+
res
.
body
.
msg
...
@@ -467,6 +469,7 @@ export default {
...
@@ -467,6 +469,7 @@ export default {
this
.
videoDia
=
true
;
this
.
videoDia
=
true
;
this
.
$nextTick
(()
=>
{
this
.
$nextTick
(()
=>
{
if
(
!
this
.
videoPlayer
){
if
(
!
this
.
videoPlayer
){
setTimeout
(()
=>
{
this
.
videoPlayer
=
videojs
(
'
videoRealtime
'
,
{
this
.
videoPlayer
=
videojs
(
'
videoRealtime
'
,
{
fluid
:
true
,
fluid
:
true
,
bigPlayButton
:
false
,
bigPlayButton
:
false
,
...
@@ -479,6 +482,7 @@ export default {
...
@@ -479,6 +482,7 @@ export default {
console
.
log
(
'
video ready!
'
)
console
.
log
(
'
video ready!
'
)
this
.
videoPlayer
.
play
();
this
.
videoPlayer
.
play
();
})
})
},
1000
);
}
else
{
}
else
{
let
data
=
{
src
:
url
,
type
:
tp
||
"
video/mp4
"
}
let
data
=
{
src
:
url
,
type
:
tp
||
"
video/mp4
"
}
this
.
videoPlayer
.
pause
();
this
.
videoPlayer
.
pause
();
...
...
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