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 b8787dfc
authored
Jun 17, 2020
by
潘建波
Browse Files
Options
Browse Files
Tag
Download
Email Patches
Plain Diff
提交高亮显示当前任务
1 parent
60eb16b6
Hide whitespace changes
Inline
Side-by-side
Showing
12 changed files
with
105 additions
and
49 deletions
dist.zip
public/dynamicParameters.html
public/index.html
src/api/apiList.js
src/api/axios.js
src/api/baseUrl.js
src/views/sceneManage/eventDetail.vue
src/views/sceneManage/index.vue
src/views/sceneManage/setting/parameter.vue
src/views/taskManage/editVideo.vue
src/views/taskManage/index.vue
src/views/taskManage/subtask.vue
dist.zip
View file @
b8787df
No preview for this file type
public/dynamicParameters.html
View file @
b8787df
...
...
@@ -47,11 +47,11 @@
<body>
<div
class=
"easyui-layout"
data-options=
"fit:true"
>
<div
data-options=
"region:'west',split:true"
style=
"width:
300px;"
class=
'treE'
>
<div
data-options=
"region:'west',split:true"
style=
"width:
240px;"
>
<div
id=
"ptree"
class=
"easyui-tree"
data-options=
"fit:true,lines:true,onClick:clickTreeNode,filter:searchTree"
>
</div>
</div>
<div
data-options=
"region:'center'"
style=
"padding:5px"
>
<div
data-options=
"region:'center'"
style=
"padding:5px
;margin-left: 10px;
"
>
<div
id=
"pgrid"
class=
"easyui-propertygrid"
data-options=
"showGroup:false,fit:true,fitColumns:true,
columns:myColumns,onAfterEdit:onEndEditParameter,onClickRow:onClickPropertyRow"
>
</div>
...
...
public/index.html
View file @
b8787df
...
...
@@ -5,7 +5,7 @@
<meta
http-equiv=
"X-UA-Compatible"
content=
"IE=edge"
>
<meta
name=
"viewport"
content=
"width=device-width,initial-scale=1.0"
>
<link
rel=
"icon"
href=
"<%= BASE_URL %>favicon.png"
>
<title>
fanxing
</title>
<title>
视频分析平台
</title>
<script
src=
"<%= BASE_URL %>js/kinetic-v5.1.0.min.js"
></script>
<script
src=
"<%= BASE_URL %>js/ObjTree.js"
></script>
<script
src=
"<%= BASE_URL %>js/jquery.min.js"
></script>
...
...
src/api/apiList.js
View file @
b8787df
...
...
@@ -6,11 +6,11 @@ import search from "./search";
import
device
from
"./device"
;
import
resource
from
"./resource"
;
import
codes
from
"./codes"
;
import
ops
from
"./ops"
let
wsIP
=
"
vion-panda.51vip.biz:52510
"
;
import
ops
from
"./ops"
;
let
wsIP
=
""
;
switch
(
process
.
env
.
NODE_ENV
)
{
case
"development"
:
wsIP
=
"192.168.9.
233
:20080"
;
// 测试环境url
wsIP
=
"192.168.9.
149
:20080"
;
// 测试环境url
// baseUrl = "http://192.168.9.61:8086";
break
;
case
"pre"
:
...
...
src/api/axios.js
View file @
b8787df
...
...
@@ -80,13 +80,18 @@ service.interceptors.request.use(
);
// 添加响应拦截器
service
.
interceptors
.
response
.
use
(
response
=>
{
// endLoading();
service
.
interceptors
.
response
.
use
(
response
=>
{
// endLoading();
if
(
response
.
data
&&
response
.
data
.
ecode
&&
response
.
data
.
ecode
==
401
)
{
localStorage
.
removeItem
(
"atoken"
);
router
.
replace
({
path
:
"/"
});
// location.reload();
}
else
{
let
{
data
}
=
response
;
return
data
;
}
,
}
err
=>
{
// endLoading();
if
(
err
&&
err
.
response
)
{
...
...
@@ -95,8 +100,25 @@ service.interceptors.response.use(
Message
.
error
({
message
:
"连接服务器失败!"
});
}
return
Promise
.
reject
(
err
);
}
);
};
});
// service.interceptors.response.use(
// response => {
// // endLoading();
// let { data } = response;
// return data;
// },
// err => {
// // endLoading();
// if (err && err.response) {
// Message.error({ message: err.response.data.enote });
// } else {
// Message.error({ message: "连接服务器失败!" });
// }
// return Promise.reject(err);
// }
// );
/**
* 创建统一封装过的 axios 实例
...
...
src/api/baseUrl.js
View file @
b8787df
...
...
@@ -4,7 +4,7 @@ console.log(process.env.NODE_ENV);
switch
(
process
.
env
.
NODE_ENV
)
{
case
"development"
:
// baseUrl = "http://192.168.9.234:20080"; // 测试环境url
baseUrl
=
"http://192.168.9.
62
:20080"
;
// 测试环境url
baseUrl
=
"http://192.168.9.
149
: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/eventDetail.vue
View file @
b8787df
...
...
@@ -7,17 +7,23 @@
>
<el-row>
<el-col
:span=
"24"
>
<div
@
mousemove=
"picMove"
class=
"pic-wrap"
>
<img
v-if=
"curPicData.picsEmpty"
:src=
"carImg"
alt=
"暂无图片"
title=
"暂无图片"
slot=
"reference"
class=
"pictures small"
/>
<div
class=
"pic-wrap"
>
<el-image
style=
"width: 100%;"
:src=
"curPicData.bigpic"
:preview-src-list=
"srcList"
>
<div
slot=
"error"
class=
"image-slot"
>
<img
:src=
"curPicData.bigpic"
alt=
""
style=
"width: 30%;display: block;margin: 0 auto;"
/>
</div>
</el-image>
<!--
<img
v-if=
"curPicData.pics"
:src=
"carImg"
alt=
"暂无图片"
slot=
"reference"
class=
'pictures small'
/>
-->
<el-popover
<
!--
<
el-popover
placement=
"left-end"
width=
"305"
trigger=
"hover"
...
...
@@ -38,7 +44,7 @@
slot=
"reference"
class=
"pictures small"
/>
</el-popover>
</el-popover>
-->
</div>
</el-col>
<!-- 交通 -->
...
...
@@ -243,7 +249,10 @@
</el-col>
</el-row>
<span
slot=
"footer"
>
<button
class=
"el-button el-button--default el-button--small"
@
click=
"beforeHideModal"
>
<button
class=
"el-button el-button--default el-button--small"
@
click=
"beforeHideModal"
>
关闭
</button>
</span>
...
...
@@ -257,14 +266,20 @@ export default {
return
{
carImg
:
""
,
isShow
:
false
,
curPicData
:
{}
curPicData
:
{},
srcList
:
[]
};
},
methods
:
{
detailInfo
:
function
(
data
)
{
this
.
curPicData
=
{};
this
.
curPicData
=
data
;
console
.
log
(
"detail"
,
data
)
this
.
srcList
=
[];
setTimeout
(()
=>
{
if
(
data
.
bigpic
)
{
this
.
srcList
.
push
(
data
.
bigpic
);
}
},
0
);
this
.
isShow
=
true
;
this
.
$store
.
commit
(
"setocxstate"
,
0
);
},
...
...
src/views/sceneManage/index.vue
View file @
b8787df
...
...
@@ -321,9 +321,10 @@ export default {
margin-bottom
5px
width
15vw
height
30px
padding-left
30
px
margin-left
15
px
line-height
30px
font-size
13px
padding-left
8px
color
#666666
//
width
calc(100%
-
30px);
overflow
hidden
...
...
@@ -341,6 +342,18 @@ export default {
cursor
text
}
.subtaskActive
{
//
background
#0c3b87
position
relative
color
#333
}
.subtaskActive
::before
{
position
absolute
content
""
top
11px
left
0px
display
inline-block
height
8px
width
8px
background
rgba(42,
225,
47,
0.74)
border-radius
10px
}
</
style
>
src/views/sceneManage/setting/parameter.vue
View file @
b8787df
...
...
@@ -3,7 +3,7 @@
<el-dialog
title=
"参数设置"
:visible
.
sync=
"dialogVisible"
width=
"
5
0%"
width=
"
6
0%"
:before-close=
"handleClose"
>
<span>
...
...
src/views/taskManage/editVideo.vue
View file @
b8787df
...
...
@@ -245,7 +245,9 @@ export default {
message
:
"添加成功"
,
type
:
"success"
});
this
.
tableData
.
push
(
vchan
);
res
.
name
=
vchan
.
name
;
res
.
subtask_id
=
res
.
id
;
this
.
tableData
.
push
(
res
);
}
else
{
this
.
$message
.
error
(
res
.
enote
);
}
...
...
src/views/taskManage/index.vue
View file @
b8787df
...
...
@@ -94,6 +94,7 @@
:freeList=
"freeList"
>
</subTaskInfo>
<div
v-if=
"props.row.subTaskData.length
<
= 0" class="notaskinfo">暂无子任务
</div>
</
template
>
</el-table-column>
<el-table-column
...
...
@@ -314,6 +315,7 @@ export default {
?
data
[
i
].
running_status
:
""
;
data
[
i
].
vchan
.
enableStatus
=
data
[
i
].
enableStatus
?
data
[
i
].
enableStatus
:
""
;
data
[
i
].
vchan
.
info
=
data
[
i
].
info
?
data
[
i
].
info
:
""
;
}
ary
.
push
(
data
[
i
].
vchan
);
}
...
...
@@ -630,4 +632,8 @@ export default {
.statusbox
{
background
:
red
;
}
.notaskinfo
{
text-align
:
center
;
color
:
#c4c4c4
;
}
</
style
>
src/views/taskManage/subtask.vue
View file @
b8787df
...
...
@@ -6,13 +6,13 @@
<span
class=
"subtask-info"
>
{{
subTaskData
.
vchan_name
}}
</span>
<span
class=
"label"
>
任务ID
</span>
<span
class=
"subtask-info"
>
{{
subTaskData
.
subtask_id
}}
</span>
<span
class=
"label"
>
设备地址
</span>
<span
class=
"subtask-info"
>
{{
subTaskData
.
device_ip
}}
</span>
<span
class=
"label"
>
已用资源
</span>
<
!--
<
span
class=
"label"
>
设备地址
</span>
<span
class=
"subtask-info"
>
{{
subTaskData
.
device_ip
}}
</span>
-->
<
!--
<
span
class=
"label"
>
已用资源
</span>
<span
class=
"subtask-info"
>
{{
subTaskData
.
video_busy
}}
</span>
<span
class=
"label"
>
设备容量
</span>
<span
class=
"subtask-info"
>
{{
subTaskData
.
video_total
}}
</span>
<span
class=
"label"
>
指定设备下发
</span>
<span
class=
"subtask-info"
>
{{
subTaskData
.
video_total
}}
</span>
-->
<span
class=
"label"
>
分析设备
</span>
<span
class=
"subtask-info"
>
<el-select
v-model=
"assign_id"
>
<el-option
...
...
@@ -38,7 +38,7 @@
</el-option>
</el-select>
</span>
<span
class=
"label sub-btn"
@
click=
"subMove"
>
确定
</span>
<span
class=
"label sub-btn"
@
click=
"subMove"
hidden
>
确定
</span>
</div>
</
template
>
...
...
@@ -106,11 +106,7 @@ export default {
console
.
log
(
this
.
subTaskData
);
},
watch
:
{},
mounted
()
{
this
.
assign_id
=
this
.
subTaskData
.
assign_id
?
this
.
subTaskData
.
assign_id
:
""
;
}
mounted
()
{}
};
</
script
>
...
...
@@ -123,11 +119,13 @@ export default {
border-bottom
:
1px
solid
#ccc
;
overflow
:
hidden
;
}
span
:last-child
{
border-bottom
:
1px
solid
#333
;
}
.label
{
width
:
5vw
;
text-align
:
center
;
border-left
:
1px
solid
$
border-color
;
//
border-left
:
1px
solid
$
border-color
;
background
:
#f0f0f0
;
height
:
40px
;
line-height
:
40px
;
...
...
@@ -136,7 +134,7 @@ export default {
width
:
3vw
;
}
.taskstatus
{
width
:
5
vw
;
width
:
6
vw
;
}
.subtask-info
{
border-left
:
1px
solid
#f0f0f0
;
...
...
@@ -146,14 +144,14 @@ export default {
line-height
:
40px
;
}
.subtask-info
:nth-child
(
4
)
{
width
:
7
vw
;
width
:
8
vw
;
overflow
:
hidden
;
}
.subtask-info
:nth-child
(
6
)
{
width
:
8
vw
;
width
:
15
vw
;
}
.subtask-info
:nth-child
(
8
)
{
width
:
6
vw
;
width
:
12
vw
;
}
.subtask-info
:nth-child
(
10
)
{
width
:
3vw
;
...
...
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