diff --git a/data-room-ui/packages/BigScreenDesign/RightSetting/G2CustomSetting.vue b/data-room-ui/packages/BigScreenDesign/RightSetting/G2CustomSetting.vue index 23be8c1d..da13665c 100644 --- a/data-room-ui/packages/BigScreenDesign/RightSetting/G2CustomSetting.vue +++ b/data-room-ui/packages/BigScreenDesign/RightSetting/G2CustomSetting.vue @@ -71,9 +71,9 @@ style=" display: flex; align-items: center; - height: 42px; flex-wrap: wrap; " + class="color-picker-box" > diff --git a/data-room-ui/packages/BigScreenDesign/RightSetting/TextGradient/index.vue b/data-room-ui/packages/BigScreenDesign/RightSetting/TextGradient/index.vue index 4f967d54..f1f58217 100644 --- a/data-room-ui/packages/BigScreenDesign/RightSetting/TextGradient/index.vue +++ b/data-room-ui/packages/BigScreenDesign/RightSetting/TextGradient/index.vue @@ -26,7 +26,7 @@ label-width="100px" >
-
+
@@ -109,6 +109,7 @@ export default { .el-icon-right{ width: 40px; text-align: center; + /*color: #778390;*/ } } diff --git a/data-room-ui/packages/DataSetManagement/src/TypeTree.vue b/data-room-ui/packages/DataSetManagement/src/TypeTree.vue index d08ce3d8..59bd0c55 100644 --- a/data-room-ui/packages/DataSetManagement/src/TypeTree.vue +++ b/data-room-ui/packages/DataSetManagement/src/TypeTree.vue @@ -235,7 +235,7 @@ export default { this.$refs.editForm.dialogFormVisible = true this.$refs.editForm.init({ parentId: 0 }, true) this.$refs.editForm.radio = 0 - this.$refs.editForm.title = '节点新增' + this.$refs.editForm.title = '分组新增' }) }, addDiyDom (treeId, treeNode) { @@ -382,7 +382,7 @@ export default { this.$refs.editForm.type = 'dataset' this.$refs.editForm.dialogFormVisible = true this.$refs.editForm.init(this.rightClickForm.org, false) - this.$refs.editForm.title = '节点编辑' + this.$refs.editForm.title = '分组编辑' }) return } @@ -393,7 +393,7 @@ export default { this.$refs.editForm.dialogFormVisible = true this.$refs.editForm.init(this.rightClickForm.org, true) this.$refs.editForm.radio = 0 - this.$refs.editForm.title = '节点新增' + this.$refs.editForm.title = '分组新增' }) return } @@ -404,7 +404,7 @@ export default { this.$refs.editForm.dialogFormVisible = true this.$refs.editForm.init(this.rightClickForm.org, true) this.$refs.editForm.radio = 1 - this.$refs.editForm.title = '节点新增' + this.$refs.editForm.title = '分组新增' }) } },