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 c06b62d1
authored
3 years ago
by
潘建波
Browse Files
Options
Browse Files
Tag
Download
Email Patches
Plain Diff
【NEW】添加nvs3000拉取功能
1 parent
da9fcf8f
Hide whitespace changes
Inline
Side-by-side
Showing
3 changed files
with
30 additions
and
2 deletions
public/js/config.js
src/api/device/index.js
src/views/resource/treeComponents/cameraTree.vue
public/js/config.js
View file @
c06b62d
...
@@ -13,4 +13,7 @@ window.config = {
...
@@ -13,4 +13,7 @@ window.config = {
"isdd"
:
false
,
//是否开启钉钉登录
"isdd"
:
false
,
//是否开启钉钉登录
"version"
:
"2.1.0"
,
"version"
:
"2.1.0"
,
"encrypt"
:
false
,
//是否加密true采用sha1加密,false不加密
"encrypt"
:
false
,
//是否加密true采用sha1加密,false不加密
"nvsUrl"
:
''
,
"nvsRegex"
:
''
,
"isNvs3000"
:
true
,
//是否开启nvs3000拉取功能
}
}
This diff is collapsed.
Click to expand it.
src/api/device/index.js
View file @
c06b62d
...
@@ -88,5 +88,8 @@ export default {
...
@@ -88,5 +88,8 @@ export default {
},
},
postcatadev
:(
params
)
=>
{
postcatadev
:(
params
)
=>
{
return
api
.
post
(
`
${
baseUrl
}
/api/v1/devconf_fx/device_catalogs`
,
params
)
return
api
.
post
(
`
${
baseUrl
}
/api/v1/devconf_fx/device_catalogs`
,
params
)
}
},
getNvs3000
:(
params
)
=>
{
return
api
.
get
(
`
${
baseUrl
}
/api/v1/devconf_fx/devs/nvs3000`
,
params
)
},
};
};
This diff is collapsed.
Click to expand it.
src/views/resource/treeComponents/cameraTree.vue
View file @
c06b62d
...
@@ -23,6 +23,11 @@
...
@@ -23,6 +23,11 @@
}}
</span>
}}
</span>
</span>
</span>
<span
class=
"tree-btn"
v-if=
"(data.label || data.label == '') && data.vtype ? false:true"
>
<span
class=
"tree-btn"
v-if=
"(data.label || data.label == '') && data.vtype ? false:true"
>
<i
class=
"el-icon-link"
@
click
.
stop=
"getNvs(node, data)"
v-if=
"data.org_type == 'address' && isNvs"
></i>
<i
class=
"el-icon-plus"
@
click
.
stop=
"nodeAddClick(node, data)"
></i>
<i
class=
"el-icon-plus"
@
click
.
stop=
"nodeAddClick(node, data)"
></i>
<i
<i
class=
"el-icon-edit"
class=
"el-icon-edit"
...
@@ -137,6 +142,7 @@ export default {
...
@@ -137,6 +142,7 @@ export default {
code
:
""
code
:
""
},
},
addVideoParam
:
{},
addVideoParam
:
{},
isNvs
:
window
.
config
.
isNvs3000
,
treeData
:
[
treeData
:
[
{
{
unid
:
"0"
,
unid
:
"0"
,
...
@@ -307,7 +313,23 @@ export default {
...
@@ -307,7 +313,23 @@ export default {
delTreenode
(
data
){
delTreenode
(
data
){
this
.
$refs
.
catree
.
remove
(
data
.
vchan_refid
)
this
.
$refs
.
catree
.
remove
(
data
.
vchan_refid
)
},
},
getNvs
(
node
,
data
){
this
.
$confirm
(
"拉取NVS300到该地点?"
,
"提示"
,
{
confirmButtonText
:
"确定"
,
cancelButtonText
:
"取消"
,
type
:
"warning"
}).
then
(()
=>
{
let
params
=
{
"devUnid"
:
this
.
dev_unid
,
"addressUnid"
:
data
.
event_code
,
"nvsUrl"
:
window
.
config
.
nvsUrl
,
"nvsRegex"
:
window
.
config
.
nvsRegex
}
this
.
$api
.
device
.
getNvs3000
(
params
).
then
(
res
=>
{
this
.
orgServ
();
})
})
},
nodeAddClick
(
node
,
data
)
{
nodeAddClick
(
node
,
data
)
{
if
(
data
.
org_type
==
"address"
)
{
if
(
data
.
org_type
==
"address"
)
{
//添加视频
//添加视频
...
...
This diff is collapsed.
Click to expand it.
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