gfwleak/nezha-nezha-fronted
Archived
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

fix：修改从当前连线更换到其他连线 颜色选择器颜色不对的问题

Browse Source
This commit is contained in:
zhangyu
2021-03-29 10:42:54 +08:00
parent 39306477ee
commit fbeec0964e
5 changed files with 42 additions and 30 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
nezha-fronted/src/assets/stylus/main.scss
View File

@@ -2495,3 +2495,7 @@ li{
outline: none;
}
/deep/ .el-switch.is-checked .el-switch__core{
border-color: #ee9d3f;
background-color: #ee9d3f;
}

6
nezha-fronted/src/components/common/nezhaColor.vue
View File

@@ -63,14 +63,14 @@ export default {
}
},
watch: {
// valueArr:{
// valueArr: {
// immediate: true,
// handler(n) {
// handler (n) {
// console.log(n);
// if(n.length){
//
// }
// }
// }
// },
// keyName:{
// deep:true,

2
nezha-fronted/src/components/common/project/L5/CanvasProps.vue
View File

@@ -580,7 +580,7 @@
</el-tab-pane>
</el-tabs>
<!-- 选中为空 -->
<div v-if="!selection.pen && !selection.pens" style="height: 100%">
<div v-else style="height: 100%">
<div class="project-title">
Project
</div>

30
nezha-fronted/src/components/common/project/topologyL5.vue
View File

@@ -414,7 +414,7 @@ registerNode('myCube', myCubec, myCubeAnchors, null, null)
const canvasOptions = {
rotateCursor: '/img/rotate.cur',
translateKey: 'None',
disableEmptyLine: false,
disableEmptyLine: true,
autoExpandDistance: 0,
minScale: 0.01
}
@@ -830,15 +830,15 @@ export default {
clearInterval(timer)
const promiseArr = []
const self = this
// for(let i=0;i<data.pens.length;i++){
// let line=data.pens[i]
// if(line.type===1){
// if(!data.pens.find(item=>item.id===line.from.id) || !data.pens.find(item=>item.id===line.to.id)){
// data.pens.splice(i, 1);
// i--;
// }
// }
// }
for (let i = 0; i < data.pens.length; i++) {
const line = data.pens[i]
if (line.type === 1) {
if (!data.pens.find(item => item.id === line.from.id) || !data.pens.find(item => item.id === line.to.id)) {
data.pens.splice(i, 1)
i--
}
}
}
data.pens.forEach(item => {
if (item.type === 0 && item.data.imageId) {
item.image = this.iconArray.find(item1 => item1.id == item.data.imageId).image
@@ -1166,6 +1166,10 @@ export default {
// console.log('onMessage',event,data);
// console.log(getTopology(this.topologyIndex))
// this.notModuleIDArr=[];
this.toolShow.attr = false
this.$nextTick(()=>{
this.toolShow.attr = true
})
if (data) {
this.notModuleIDArr.forEach(item => {
if (item.id === data.id) {
@@ -1220,9 +1224,9 @@ export default {
animatePlay: false,
strokeStyle: data.strokeStyle,
animateColor: data.animateColor,
arrowColor: '#00000',
fromArrowColor: '#00000',
toArrowColor: '#00000',
arrowColor: '#000000',
fromArrowColor: '#000000',
toArrowColor: '#000000',
lineWidth: 1,
// chart 配置项
valueMapping: [{

30
nezha-fronted/src/components/common/project/topologyPrev.vue
View File

@@ -414,7 +414,7 @@
const canvasOptions = {
rotateCursor: '/img/rotate.cur',
translateKey: 'None',
disableEmptyLine: false,
disableEmptyLine: true,
autoExpandDistance: 0,
minScale: 0.01
}
@@ -830,15 +830,15 @@
clearInterval(timer)
const promiseArr = []
const self = this
// for(let i=0;i<data.pens.length;i++){
// let line=data.pens[i]
// if(line.type===1){
// if(!data.pens.find(item=>item.id===line.from.id) || !data.pens.find(item=>item.id===line.to.id)){
// data.pens.splice(i, 1);
// i--;
// }
// }
// }
for (let i = 0; i < data.pens.length; i++) {
const line = data.pens[i]
if (line.type === 1) {
if (!data.pens.find(item => item.id === line.from.id) || !data.pens.find(item => item.id === line.to.id)) {
data.pens.splice(i, 1)
i--
}
}
}
data.pens.forEach(item => {
if (item.type === 0 && item.data.imageId) {
item.image = this.iconArray.find(item1 => item1.id == item.data.imageId).image
@@ -1166,6 +1166,10 @@
// console.log('onMessage',event,data);
// console.log(getTopology(this.topologyIndex))
// this.notModuleIDArr=[];
this.toolShow.attr = false
this.$nextTick(()=>{
this.toolShow.attr = true
})
if (data) {
this.notModuleIDArr.forEach(item => {
if (item.id === data.id) {
@@ -1220,9 +1224,9 @@
animatePlay: false,
strokeStyle: data.strokeStyle,
animateColor: data.animateColor,
arrowColor: '#00000',
fromArrowColor: '#00000',
toArrowColor: '#00000',
arrowColor: '#000000',
fromArrowColor: '#000000',
toArrowColor: '#000000',
lineWidth: 1,
// chart 配置项
valueMapping: [{