Skip to content
Toggle navigation
Projects
Groups
Snippets
Help
Toggle navigation
This project
Loading...
Sign in
platform
/
fanxing_new
Go to a project
Project
Repository
Issues
0
Merge Requests
0
Pipelines
Wiki
Settings
Activity
Graph
Charts
Create a new issue
Jobs
Commits
Issue Boards
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Charts
Commit 3433573b
authored
Apr 10, 2020
by
潘建波
Browse Files
Options
Browse Files
Tag
Download
Email Patches
Plain Diff
提交首页折线图修改
1 parent
a0e307be
Show whitespace changes
Inline
Side-by-side
Showing
5 changed files
with
30 additions
and
7 deletions
src/api/baseUrl.js
src/views/resource/videoEquipment.vue
src/views/trafficShow/illegaltrend.vue
src/views/trafficShow/index.vue
src/views/trafficShow/map.vue
src/api/baseUrl.js
View file @
3433573
...
...
@@ -3,9 +3,9 @@ import axios from "axios";
console
.
log
(
process
.
env
.
NODE_ENV
);
switch
(
process
.
env
.
NODE_ENV
)
{
case
"development"
:
baseUrl
=
"http://192.168.9.133:20080"
;
// 测试环境url
//
baseUrl = "http://192.168.9.133:20080"; // 测试环境url
// baseUrl = "http://192.168.9.61:8086";
//
baseUrl = 'http://vion-panda.51vip.biz:52510';
baseUrl
=
'http://vion-panda.51vip.biz:52510'
;
break
;
case
"pre"
:
baseUrl
=
"https://pre-server.feleti.cn"
;
// 预上线环境url
...
...
src/views/resource/videoEquipment.vue
View file @
3433573
...
...
@@ -60,6 +60,12 @@
<el-form-item
label=
"取流地址"
>
<el-input
v-model=
"videoEditParam.video_url"
disabled
></el-input>
</el-form-item>
<el-form-item
label=
"经度"
>
<el-input
v-model=
"videoEditParam.longitude"
></el-input>
</el-form-item>
<el-form-item
label=
"纬度"
>
<el-input
v-model=
"videoEditParam.latitude"
></el-input>
</el-form-item>
</el-form>
</div>
<span
slot=
"footer"
class=
"dialog-footer"
>
...
...
@@ -94,7 +100,9 @@
videoTree
:[],
videoEditParam
:{
vchan_name
:
''
,
video_url
:
''
video_url
:
''
,
longitude
:
''
,
latitude
:
''
},
videoEditVisible
:
false
,
vchan_duid
:
''
,
...
...
@@ -286,11 +294,15 @@
this
.
vchan_duid
=
row
.
vchan_duid
;
this
.
videoEditParam
.
vchan_name
=
row
.
vchan_name
;
this
.
videoEditParam
.
video_url
=
row
.
video_url
;
this
.
videoEditParam
.
longitude
=
row
.
longitude
;
this
.
videoEditParam
.
latitude
=
row
.
latitude
;
this
.
videoEditVisible
=
true
;
},
editSave
(){
this
.
$api
.
resource
.
editVideo
({
name
:
this
.
videoEditParam
.
vchan_name
name
:
this
.
videoEditParam
.
vchan_name
,
longitude
:
this
.
videoEditParam
.
longitude
,
latitude
:
this
.
videoEditParam
.
latitude
},
this
.
dev_unid
,
this
.
vchan_duid
).
then
(
res
=>
{
if
(
res
.
ecode
==
200
){
this
.
$message
({
...
...
src/views/trafficShow/illegaltrend.vue
View file @
3433573
...
...
@@ -289,10 +289,22 @@ export default {
this
.
illageList
=
JSON
.
parse
(
localStorage
.
getItem
(
"违法类型"
));
},
getTrafficHour
()
{
let
date
=
new
Date
();
let
Y
=
date
.
getFullYear
();
let
M
=
date
.
getMonth
()
>
10
?
date
.
getMonth
()
:
`0
${
date
.
getMonth
()
+
1
}
`
;
let
D
=
date
.
getDate
()
>
10
?
date
.
getDate
()
:
`0
${
date
.
getDate
()}
`
;
let
h
=
date
.
getHours
()
>
10
?
date
.
getHours
()
:
`0
${
date
.
getHours
()}
`
;
let
m
=
date
.
getMinutes
()
>
10
?
date
.
getMinutes
()
:
`0
${
date
.
getMinutes
()}
`
;
let
s
=
date
.
getSeconds
();
let
startDate
=
`
${
Y
}
-
${
M
}
-
${
D
}
00:00:00`
;
let
curDate
=
`
${
Y
}
-
${
M
}
-
${
D
}
${
h
}
:
${
m
}
:
${
s
}
`
;
let
data
=
{
illegal_type
:
this
.
illtype
,
event_type
:
this
.
eventtype
,
key_vehicle_type
:
this
.
special_type
key_vehicle_type
:
this
.
special_type
,
start_dt
:
startDate
,
end_dt
:
curDate
,
};
this
.
$api
.
show
.
getTrafficHour
(
data
).
then
(
res
=>
{
console
.
log
(
'违法事件趋势'
,
res
);
...
...
src/views/trafficShow/index.vue
View file @
3433573
...
...
@@ -195,6 +195,7 @@ export default {
},
methods
:
{
alarmevent
(
data
)
{
console
.
log
(
'alarmdata'
,
data
);
//移动地图
this
.
$refs
.
map
.
movemap
(
data
,
null
,
2
);
},
...
...
src/views/trafficShow/map.vue
View file @
3433573
...
...
@@ -444,9 +444,7 @@ export default {
},
watch
:{
mapopen
(){
debugger
map
.
updateSize
();
// this.InitMap();
}
},
mounted
()
{
...
...
Write
Preview
Markdown
is supported
Attach a file
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 post a comment