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 a0e307be
authored
Apr 09, 2020
by
潘建波
Browse Files
Options
Browse Files
Tag
Download
Email Patches
Plain Diff
提交文本修改
1 parent
b33ad851
Show whitespace changes
Inline
Side-by-side
Showing
11 changed files
with
37 additions
and
17 deletions
dist.zip
src/api/baseUrl.js
src/store/mutaition.js
src/store/state.js
src/views/Layout/index.vue
src/views/Layout/menu.vue
src/views/public/videoPlay.vue
src/views/sceneManage/setting/demarcate.vue
src/views/sceneManage/setting/index.vue
src/views/trafficShow/alarmEvent.vue
src/views/trafficShow/map.vue
dist.zip
View file @
a0e307b
No preview for this file type
src/api/baseUrl.js
View file @
a0e307b
...
...
@@ -11,7 +11,7 @@ switch (process.env.NODE_ENV) {
baseUrl
=
"https://pre-server.feleti.cn"
;
// 预上线环境url
break
;
case
"production"
:
baseUrl
=
"http://192.168.9.
2
33:20080"
;
// 生产环境url
baseUrl
=
"http://192.168.9.
1
33:20080"
;
// 生产环境url
break
;
}
...
...
src/store/mutaition.js
View file @
a0e307b
...
...
@@ -19,5 +19,8 @@ export default {
},
setillegaltype
(
state
,
data
)
{
state
.
illegaltype
=
data
;
},
setmapopen
(
state
,
data
)
{
state
.
mapopen
=
data
;
}
};
src/store/state.js
View file @
a0e307b
export
default
{
ocxstate
:
0
,
mapopen
:
false
,
addRouter
:[]
}
src/views/Layout/index.vue
View file @
a0e307b
...
...
@@ -77,6 +77,8 @@ export default {
openmenu
()
{
this
.
isopen
=
!
this
.
isopen
;
this
.
$refs
.
leftmenu
.
collapsemenu
();
let
date
=
new
Date
().
getTime
();
this
.
$store
.
commit
(
"setmapopen"
,
date
);
},
toPath
(
data
)
{
this
.
$refs
.
leftmenu
.
handleSelect
(
data
.
path
);
...
...
src/views/Layout/menu.vue
View file @
a0e307b
...
...
@@ -11,7 +11,7 @@
<el-submenu
index=
"1"
class=
"menu-icon"
>
<template
slot=
"title"
>
<i
class=
"icon-fanxing-iconxuanzhongshouye1"
></i>
<span
slot=
"title"
>
首页
</span>
<span
slot=
"title"
>
态势总览
</span>
</
template
>
<el-menu-item
index=
"/trficcshow"
>
<i
class=
"submenuicon"
></i>
交通展示
...
...
src/views/public/videoPlay.vue
View file @
a0e307b
...
...
@@ -34,7 +34,7 @@ export default {
let
isLoadingOcx
=
typeof
myVideo
.
GetVersion
()
===
"string"
?
true
:
false
;
if
(
isLoadingOcx
)
{
let
ocxPlayRes
=
document
.
getElementById
(
"VionVideo"
).
StartPlay
(
url
,
0
);
console
.
log
(
"
video Ocx播放rtsp流返回值:"
,
ocxPlayRes
);
console
.
log
(
"
视频流:"
,
url
);
}
else
{
this
.
installOcxInfo
();
}
...
...
src/views/sceneManage/setting/demarcate.vue
View file @
a0e307b
...
...
@@ -134,18 +134,21 @@ export default {
// props: ['bgUrl'],
methods
:
{
checkBrower
:
function
()
{},
showModal
:
function
(
data
)
{
showModal
:
function
(
data
,
mtaskdata
)
{
var
_this
=
this
;
this
.
$store
.
commit
(
"setocxstate"
,
0
);
this
.
taskData
=
data
;
this
.
taskData
=
mtask
data
;
this
.
dialogVisible
=
true
;
this
.
curType
=
0
;
// let filePath = 'C:/Program Files (x86)/screen.jpg';
let
cur_duid
=
data
.
task_id
;
let
subtask_id
=
data
.
task_id
;
this
.
src
=
""
;
this
.
type
=
data
.
algo_type
;
// this.type = 2;
this
.
bgUrl
=
""
;
//获取视频截图
this
.
$api
.
task
.
cutpic
(
data
.
vchan
.
vdev_unid
,
data
.
vchan
.
vchan_refid
,
data
.
subtask_id
)
.
then
(
res
=>
{
.
cutpic
(
mtaskdata
.
vchan
.
vdev_unid
,
mtaskdata
.
vchan
.
vchan_refid
,
mtaskdata
.
subtask_id
).
then
(
res
=>
{
if
(
!
res
.
ecode
)
{
this
.
src
=
"data:image/png;base64,"
+
res
.
pic_base64
;
}
else
{
...
...
src/views/sceneManage/setting/index.vue
View file @
a0e307b
...
...
@@ -121,7 +121,7 @@ export default {
}
]
},
switchstate
:
tru
e
switchstate
:
fals
e
};
},
props
:
[
"taskid"
,
"subtaskid"
,
"playurl"
],
...
...
@@ -149,7 +149,7 @@ export default {
setDemarcate
(
scenesdata
,
index
)
{
if
(
this
.
checkpollstate
())
{
this
.
curindex
=
index
;
this
.
$refs
.
demarcate
.
showModal
(
scenesdata
);
this
.
$refs
.
demarcate
.
showModal
(
scenesdata
,
this
.
taskInfo
);
}
},
handleparam
(
type
)
{
...
...
src/views/trafficShow/alarmEvent.vue
View file @
a0e307b
...
...
@@ -5,7 +5,7 @@
<el-table-column
align=
"center"
prop=
"camername"
label=
"
事件
地点"
label=
"
发生
地点"
></el-table-column>
<el-table-column
align=
"center"
...
...
@@ -120,12 +120,13 @@ export default {
pics
:
pics
,
pos
:
pos
};
if
(
that
.
tableData
.
length
>
40
)
{
if
(
that
.
tableData
.
length
>
6
)
{
that
.
tableData
.
pop
(
obj
);
}
else
{
that
.
tableData
.
unshift
(
obj
);
}
that
.
tableData
.
unshift
(
obj
);
this
.
$forceUpdate
();
}
}
catch
(
error
)
{
console
.
log
(
error
);
...
...
src/views/trafficShow/map.vue
View file @
a0e307b
...
...
@@ -31,6 +31,7 @@
</
template
>
<
script
>
import
{
mapState
}
from
"vuex"
;
import
videoPlay
from
"../public/videoPlay"
;
import
{
inherits
}
from
"ol/util.js"
;
import
Map
from
"ol/Map"
;
...
...
@@ -163,7 +164,6 @@ export default {
};
heatData
.
features
.
push
(
a
);
}
var
vectorSources
=
new
VectorSource
({
features
:
new
GeoJSON
().
readFeatures
(
heatData
,
{
dataProjection
:
"EPSG:4326"
...
...
@@ -439,6 +439,16 @@ export default {
});
}
},
computed
:{
...
mapState
([
'mapopen'
])
},
watch
:{
mapopen
(){
debugger
map
.
updateSize
();
// this.InitMap();
}
},
mounted
()
{
setTimeout
(()
=>
{
this
.
getDevList
();
...
...
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