Skip to content
Projects
Groups
Snippets
Help
Loading...
Help
Support
Submit feedback
Contribute to GitLab
Sign in / Register
Toggle navigation
H
holo-web
Project
Project
Details
Activity
Releases
Cycle Analytics
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Charts
Issues
0
Issues
0
List
Boards
Labels
Milestones
Merge Requests
0
Merge Requests
0
CI / CD
CI / CD
Pipelines
Jobs
Schedules
Charts
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Charts
Create a new issue
Jobs
Commits
Issue Boards
Open sidebar
xinkong
holo-web
Commits
10056ee4
Commit
10056ee4
authored
Apr 10, 2023
by
刘扬琳
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
配饰组件ws更新
parent
e31e06f6
Changes
2
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
7 additions
and
13 deletions
+7
-13
crossControl.vue
wj-data-vision/src/components/CrossControl/crossControl.vue
+7
-11
wsMixins.js
wj-data-vision/src/components/CrossControl/wsMixins.js
+0
-2
No files found.
wj-data-vision/src/components/CrossControl/crossControl.vue
View file @
10056ee4
...
...
@@ -26,15 +26,13 @@
(allCyclelen / (ring.groupList.length * item.phaseList.length))
"
>
<div
class=
"phase_box"
style=
"width: 100%"
>
<div
class=
"phase_box"
style=
"width: 100%"
>
<template
v-for=
"(ld, li) in lampList"
>
<div
:key=
"li"
:style=
"getLampStyle(ld, pd)"
class=
"lampbox"
:class=
"
{ 'lampbox-active': activePhaseId === pd.phaseNo }"
v-if="pd[ld.key] > 0
&&
!ld.exclude"
>
{{
pd
[
ld
.
key
]
}}
...
...
@@ -78,7 +76,7 @@
<
script
>
import
{
api_planList
}
from
"
../../dao/situation
"
;
// import wsMixins from './wsMixins.js'
;
import
wsMixins
from
"
./wsMixins.js
"
;
export
default
{
data
()
{
return
{
...
...
@@ -171,7 +169,7 @@ export default {
timeConfigDialogShow
:
false
,
};
},
//
mixins: [wsMixins],
mixins
:
[
wsMixins
],
props
:
[
"
crossId
"
,
"
source
"
,
"
type
"
,
"
specialList
"
,
"
allData
"
],
// props: ["phaseChartData", "allCyclelen", "phaseImgMaps", "lampList"],
mounted
()
{
...
...
@@ -495,11 +493,9 @@ export default {
display: flex;
flex: 1;
position: relative;
&:nth-child(2) {
.lampbox:nth-child(1) {
border: 2.68px solid #00ffee;
transform: scaleY(1.5);
}
.lampbox-active {
border: 2.68px solid #00ffee;
transform: scaleY(1.5);
}
}
...
...
wj-data-vision/src/components/CrossControl/wsMixins.js
View file @
10056ee4
...
...
@@ -13,8 +13,6 @@ export default {
},
methods
:
{
getCrossWs
()
{
console
.
log
(
ws_config
.
CROSS_CONTROL
);
console
.
log
(
this
.
crossId
);
this
.
websocket
=
init
({
url
:
ws_config
.
CROSS_CONTROL
+
this
.
crossId
,
callBack
:
(
res
)
=>
{
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a file
Cancel
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 comment