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 490b3faa
authored
May 31, 2021
by
潘建波
Browse Files
Options
Browse Files
Tag
Download
Email Patches
Plain Diff
修改标定设置
1 parent
e9b878f7
Hide whitespace changes
Inline
Side-by-side
Showing
6 changed files
with
34 additions
and
15 deletions
public/js/version.json
src/api/baseUrl.js
src/api/search/index.js
src/api/search/urls.js
src/views/sceneManage/setting/areaconfig/Behavior.vue
src/views/search/illegal.vue
public/js/version.json
View file @
490b3fa
{
"commit"
:
"af680df9280d84c026e7ce21c2b21559ea924789"
,
"commitDate"
:
"2021-5-20 16:58"
,
"buildDate"
:
"2021-5-21 17:24"
,
"version"
:
"2.1.0"
,
"info"
:
"提交博关算法配置"
}
\ No newline at end of file
\ No newline at end of file
{
"commit"
:
"e9b878f7deaf4f5dad924a65071186ebc6f970d7"
,
"commitDate"
:
"2021-5-25 16:10"
,
"buildDate"
:
"2021-5-27 19:23"
,
"version"
:
"2.0.9"
,
"info"
:
"【BUG】修改密码验证方式 【new】增加用户显示,增加推出提示 【new】过车增加速度"
}
\ No newline at end of file
\ No newline at end of file
src/api/baseUrl.js
View file @
490b3fa
...
@@ -4,7 +4,7 @@ import axios from "axios";
...
@@ -4,7 +4,7 @@ import axios from "axios";
switch
(
process
.
env
.
NODE_ENV
)
{
switch
(
process
.
env
.
NODE_ENV
)
{
case
"development"
:
case
"development"
:
// baseUrl = "http://192.168.9.234:20080"; // 测试环境url
// baseUrl = "http://192.168.9.234:20080"; // 测试环境url
baseUrl
=
window
.
config
.
https
?
"https://192.168.9.233:20070"
:
"http://192.168.9.
23
3:20080"
;
// 测试环境url
baseUrl
=
window
.
config
.
https
?
"https://192.168.9.233:20070"
:
"http://192.168.9.
17
3:20080"
;
// 测试环境url
// baseUrl = "http://192.168.9.82:8080"; // 测试环境url
// baseUrl = "http://192.168.9.82:8080"; // 测试环境url
// baseUrl = "http://192.168.9.61:8086";
// baseUrl = "http://192.168.9.61:8086";
// baseUrl = 'http://vion-panda.51vip.biz:52510';
// baseUrl = 'http://vion-panda.51vip.biz:52510';
...
...
src/api/search/index.js
View file @
490b3fa
...
@@ -8,6 +8,9 @@ export default {
...
@@ -8,6 +8,9 @@ export default {
detailImg
(
params
,
id
)
{
detailImg
(
params
,
id
)
{
return
api
.
get
(
urls
.
detailImg
+
id
,
params
);
return
api
.
get
(
urls
.
detailImg
+
id
,
params
);
},
},
detailVideo
(
params
,
id
)
{
return
api
.
get
(
urls
.
detailvideo
+
id
,
params
);
},
delVehicle
(
params
,
id
)
{
delVehicle
(
params
,
id
)
{
// return出去了一个promise
// return出去了一个promise
return
api
.
delete
(
urls
.
delVehicle
+
id
,
params
);
return
api
.
delete
(
urls
.
delVehicle
+
id
,
params
);
...
...
src/api/search/urls.js
View file @
490b3fa
...
@@ -14,4 +14,6 @@ export default {
...
@@ -14,4 +14,6 @@ export default {
eventTypes
:
baseUrl
+
'/api/v1/codes/event_types'
,
eventTypes
:
baseUrl
+
'/api/v1/codes/event_types'
,
//交通流量表格
//交通流量表格
traficflow
:
baseUrl
+
'/api/v1/traffic/flow/statistics'
,
traficflow
:
baseUrl
+
'/api/v1/traffic/flow/statistics'
,
//获取视频
detailvideo
:
baseUrl
+
'/api/v1/web/videos/'
}
}
\ No newline at end of file
\ No newline at end of file
src/views/sceneManage/setting/areaconfig/Behavior.vue
View file @
490b3fa
...
@@ -162,16 +162,7 @@ export default {
...
@@ -162,16 +162,7 @@ export default {
*/
*/
configInit
(
roiXml
,
confxml
)
{
configInit
(
roiXml
,
confxml
)
{
this
.
curtool
=
""
;
this
.
curtool
=
""
;
var
picuri
=
new
Date
().
getTime
();
try
{
document
.
getElementById
(
"VionVideo"
)
.
CapturePicture
(
"D:\\/"
+
picuri
+
".jpg"
);
setTimeout
(()
=>
{
document
.
getElementById
(
"pic"
).
style
.
backgroundImage
=
"url(D:\\/"
+
picuri
+
".jpg)"
;
},
1500
);
}
catch
(
error
)
{}
let
roiobj
=
this
.
oParse
.
parseXML
(
roiXml
).
roi
;
let
roiobj
=
this
.
oParse
.
parseXML
(
roiXml
).
roi
;
...
@@ -273,6 +264,17 @@ export default {
...
@@ -273,6 +264,17 @@ export default {
this
.
basconfig
=
this
.
oParse
.
parseXML
(
xml
);
this
.
basconfig
=
this
.
oParse
.
parseXML
(
xml
);
}
}
this
.
initConfig
(
this
.
basconfig
);
this
.
initConfig
(
this
.
basconfig
);
var
picuri
=
new
Date
().
getTime
();
try
{
document
.
getElementById
(
"VionVideo"
)
.
CapturePicture
(
"D:\\/"
+
picuri
+
".jpg"
);
setTimeout
(()
=>
{
document
.
getElementById
(
"pic"
).
style
.
backgroundImage
=
"url(D:\\/"
+
picuri
+
".jpg)"
;
},
1500
);
}
catch
(
error
)
{}
},
},
getObjects
(
klass
)
{
getObjects
(
klass
)
{
//获取所有的列表对象
//获取所有的列表对象
...
...
src/views/search/illegal.vue
View file @
490b3fa
...
@@ -531,9 +531,8 @@ export default {
...
@@ -531,9 +531,8 @@ export default {
}
}
var
play_url
=
""
;
var
play_url
=
""
;
if
(
row
.
video
)
{
if
(
row
.
video
)
{
play_url
=
row
.
video
[
0
].
src_url
;
this
.
getVideo
(
row
.
video
[
0
].
unid
)
}
}
this
.
$refs
.
visableDialog
.
playvideos
(
play_url
);
},
},
exportFun
()
{
exportFun
()
{
this
.
$logs
.
oplogs
({},
'serv_serarch'
,
`违法事件导出`
);
this
.
$logs
.
oplogs
({},
'serv_serarch'
,
`违法事件导出`
);
...
@@ -697,6 +696,19 @@ export default {
...
@@ -697,6 +696,19 @@ export default {
})
})
.
catch
(
e
=>
{});
.
catch
(
e
=>
{});
},
},
getVideo
(
unid
)
{
this
.
$api
.
search
.
detailVideo
({},
unid
)
.
then
(
res
=>
{
let
play_url
=
res
.
mp4_url
console
.
log
(
"录像路径"
,
play_url
);
setTimeout
(()
=>
{
this
.
$refs
.
visableDialog
.
playvideos
(
play_url
);
},
0
);
})
.
catch
(
e
=>
{});
},
detailFun
(
index
,
row
)
{
detailFun
(
index
,
row
)
{
this
.
currentIndex
=
index
;
this
.
currentIndex
=
index
;
if
(
row
.
pics
.
length
>
0
)
{
if
(
row
.
pics
.
length
>
0
)
{
...
@@ -740,7 +752,7 @@ export default {
...
@@ -740,7 +752,7 @@ export default {
this
.
$api
.
search
this
.
$api
.
search
.
delVehicle
({},
this
.
detailObj
.
id
)
.
delVehicle
({},
this
.
detailObj
.
id
)
.
then
(
res
=>
{
.
then
(
res
=>
{
if
(
res
.
ecode
==
200
)
{
if
(
res
.
ecode
==
200
)
{
19
this
.
formatterData
.
splice
(
this
.
currentIndex
,
1
);
this
.
formatterData
.
splice
(
this
.
currentIndex
,
1
);
this
.
detailObj
=
Object
.
assign
(
this
.
detailObj
=
Object
.
assign
(
{},
{},
...
...
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