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 a8da046a
authored
May 27, 2021
by
潘建波
Browse Files
Options
Browse Files
Tag
Download
Email Patches
Plain Diff
博关配置修改
1 parent
e9b878f7
Hide whitespace changes
Inline
Side-by-side
Showing
4 changed files
with
16 additions
and
15 deletions
public/js/version.json
src/api/baseUrl.js
src/views/sceneManage/setting/area.vue
src/views/sceneManage/setting/areaconfig/Behavior.vue
public/js/version.json
View file @
a8da046
{
"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
{
"commit"
:
"e9b878f7deaf4f5dad924a65071186ebc6f970d7"
,
"commitDate"
:
"2021-5-25 16:10"
,
"buildDate"
:
"2021-5-25 17:13"
,
"version"
:
"2.1.0"
,
"info"
:
"【BUG】修改密码验证方式 【new】增加用户显示,增加推出提示 【new】过车增加速度"
}
\ No newline at end of file
src/api/baseUrl.js
View file @
a8da046
...
...
@@ -4,7 +4,7 @@ import axios from "axios";
switch
(
process
.
env
.
NODE_ENV
)
{
case
"development"
:
// 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.61:8086";
// baseUrl = 'http://vion-panda.51vip.biz:52510';
...
...
src/views/sceneManage/setting/area.vue
View file @
a8da046
...
...
@@ -77,9 +77,7 @@ export default {
methods
:
{
showModal
:
function
(
data
,
mtaskdata
)
{
var
_this
=
this
;
this
.
$store
.
commit
(
"setocxstate"
,
0
);
this
.
taskData
=
mtaskdata
;
this
.
dialogVisible
=
true
;
this
.
type
=
data
.
algo_type
;
// this.type = 2;
this
.
bgUrl
=
""
;
...
...
@@ -114,8 +112,20 @@ export default {
.
catch
(
err
=>
{
console
.
log
(
"区域设置截图返回异常:"
,
err
.
message
);
});
}
else
{
var
picuri
=
this
.
uuid
();
try
{
document
.
getElementById
(
"VionVideo"
)
.
CapturePicture
(
"D:\\/"
+
picuri
+
".jpg"
);
setTimeout
(()
=>
{
document
.
getElementById
(
"pic"
).
style
.
backgroundImage
=
"url(D:\\/"
+
picuri
+
".jpg)"
;
},
500
);
}
catch
(
error
)
{}
}
this
.
$store
.
commit
(
"setocxstate"
,
0
);
this
.
dialogVisible
=
true
;
this
.
configxml
=
data
.
config
;
setTimeout
(()
=>
{
_this
.
$refs
.
canvas
.
stageInit
(
data
.
config
);
...
...
src/views/sceneManage/setting/areaconfig/Behavior.vue
View file @
a8da046
...
...
@@ -162,16 +162,7 @@ export default {
*/
configInit
(
roiXml
,
confxml
)
{
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
;
...
...
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