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 f2aebd67
authored
Jun 30, 2020
by
潘建波
Browse Files
Options
Browse Files
Tag
Download
Email Patches
Plain Diff
fix
🐛
修改长时间运行网页崩溃问题
1 parent
9d7c3ec9
Hide whitespace changes
Inline
Side-by-side
Showing
5 changed files
with
12 additions
and
5 deletions
dist.zip
package.json
src/views/Layout/index.vue
src/views/ops/equipment_manage.vue
src/views/sceneManage/eventTab.vue
dist.zip
View file @
f2aebd6
No preview for this file type
package.json
View file @
f2aebd6
...
@@ -20,6 +20,7 @@
...
@@ -20,6 +20,7 @@
"ol"
:
"^6.1.1"
,
"ol"
:
"^6.1.1"
,
"particles.js"
:
"^2.0.0"
,
"particles.js"
:
"^2.0.0"
,
"rimraf"
:
"^3.0.2"
,
"rimraf"
:
"^3.0.2"
,
"svg.js"
:
"^2.7.1"
,
"vue"
:
"^2.6.10"
,
"vue"
:
"^2.6.10"
,
"vue-router"
:
"^3.1.3"
,
"vue-router"
:
"^3.1.3"
,
"vuex"
:
"^3.0.1"
"vuex"
:
"^3.0.1"
...
...
src/views/Layout/index.vue
View file @
f2aebd6
...
@@ -245,6 +245,9 @@ export default {
...
@@ -245,6 +245,9 @@ export default {
margin-left
25px;
margin-left
25px;
margin-top
:
20px
;
margin-top
:
20px
;
}
}
.headRight
img
{
cursor
pointer
}
.logotitle
{
.logotitle
{
overflow
:
hidden
;
overflow
:
hidden
;
font-size
:
20px
;
font-size
:
20px
;
...
...
src/views/ops/equipment_manage.vue
View file @
f2aebd6
...
@@ -159,7 +159,7 @@
...
@@ -159,7 +159,7 @@
</
template
>
</
template
>
<
script
>
<
script
>
import
{
SVG
}
from
"@svgdotjs/svg.js"
;
var
SVG
=
require
(
"svg.js"
)
;
var
draw
=
null
;
var
draw
=
null
;
var
childgroup
=
null
;
var
childgroup
=
null
;
var
levalgroup
=
null
;
var
levalgroup
=
null
;
...
@@ -209,8 +209,7 @@ export default {
...
@@ -209,8 +209,7 @@ export default {
mounted
()
{
mounted
()
{
this
.
styleheight
=
55
*
6
;
this
.
styleheight
=
55
*
6
;
this
.
subDevData
=
0
;
this
.
subDevData
=
0
;
draw
=
SVG
()
draw
=
SVG
(
"drawing"
)
.
addTo
(
"#drawing"
)
.
size
(
10000
,
10000
);
.
size
(
10000
,
10000
);
},
},
created
()
{
created
()
{
...
@@ -282,6 +281,7 @@ export default {
...
@@ -282,6 +281,7 @@ export default {
.
fill
({
color
:
"#fff"
}),
.
fill
({
color
:
"#fff"
}),
add
.
tspan
(
`
${
data
.
in_ip
}
`
).
newLine
();
add
.
tspan
(
`
${
data
.
in_ip
}
`
).
newLine
();
});
});
text
.
dy
(
-
6
);
nested
.
click
(
function
()
{
nested
.
click
(
function
()
{
let
data
=
this
.
data
(
"sdv"
);
let
data
=
this
.
data
(
"sdv"
);
_this
.
getSubDev
(
data
);
_this
.
getSubDev
(
data
);
...
@@ -323,10 +323,11 @@ export default {
...
@@ -323,10 +323,11 @@ export default {
var
text
=
nested
.
text
(
function
(
add
)
{
var
text
=
nested
.
text
(
function
(
add
)
{
add
add
.
tspan
(
`
${
ele
.
device_name
}
`
)
.
tspan
(
`
${
ele
.
device_name
}
`
)
.
newLine
()
.
newLine
()
.
dy
(
120
)
.
fill
({
color
:
"#fff"
}),
.
fill
({
color
:
"#fff"
}),
add
.
tspan
(
`
${
ele
.
in_ip
}
`
).
newLine
();
add
.
tspan
(
`
${
ele
.
in_ip
}
`
).
newLine
();
});
});
text
.
dy
(
-
6
)
childgroup
.
add
(
nested
);
childgroup
.
add
(
nested
);
nested
.
click
(
function
()
{
nested
.
click
(
function
()
{
let
data
=
this
.
data
(
"childsdv"
);
let
data
=
this
.
data
(
"childsdv"
);
...
@@ -417,6 +418,7 @@ export default {
...
@@ -417,6 +418,7 @@ export default {
.
fill
({
color
:
"#fff"
}),
.
fill
({
color
:
"#fff"
}),
add
.
tspan
(
`
${
ele
.
in_ip
}
`
).
newLine
();
add
.
tspan
(
`
${
ele
.
in_ip
}
`
).
newLine
();
});
});
text
.
dy
(
-
6
);
levalgroup
.
add
(
nested
);
levalgroup
.
add
(
nested
);
//事件点击
//事件点击
nested
.
click
(
function
()
{
nested
.
click
(
function
()
{
...
...
src/views/sceneManage/eventTab.vue
View file @
f2aebd6
...
@@ -20,6 +20,7 @@
...
@@ -20,6 +20,7 @@
</div>
</div>
</
template
>
</
template
>
<
script
>
<
script
>
var
canvas
=
document
.
createElement
(
"canvas"
);
// 分类报警
// 分类报警
import
Allalarm
from
"./eventData/allEvent.vue"
;
import
Allalarm
from
"./eventData/allEvent.vue"
;
import
CarAlarm
from
"./eventData/carEvent.vue"
;
import
CarAlarm
from
"./eventData/carEvent.vue"
;
...
@@ -118,7 +119,7 @@ export default {
...
@@ -118,7 +119,7 @@ export default {
"data:image/jpeg;base64,"
+
data
.
pics
[
0
].
pic_base64
;
"data:image/jpeg;base64,"
+
data
.
pics
[
0
].
pic_base64
;
let
img
=
new
Image
();
let
img
=
new
Image
();
let
picOffset
=
data
.
pics
[
0
].
object_rect
;
let
picOffset
=
data
.
pics
[
0
].
object_rect
;
let
canvas
=
document
.
createElement
(
"canvas"
);
canvas
.
width
=
canvas
.
width
=
data
.
pics
[
0
].
width
*
(
picOffset
.
right
-
picOffset
.
left
)
||
data
.
pics
[
0
].
width
*
(
picOffset
.
right
-
picOffset
.
left
)
||
189
;
189
;
...
...
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