From 1ac154126e731dcc22c86d1b3a51259d65791fad Mon Sep 17 00:00:00 2001 From: 陈鑫涛 <10125295+chen-xintao97@user.noreply.gitee.com> Date: Wed, 24 Sep 2025 09:27:07 +0800 Subject: [PATCH] 样式 --- src/assets/styles/screen.scss | 6 +++--- src/components/AnjiPlus/anji-autocomplete.vue | 2 +- src/components/AnjiPlus/anji-crud/anji-crud.vue | 18 +++++++++--------- src/components/AnjiPlus/anji-crud/edit.vue | 4 ++-- src/components/AnjiPlus/anji-dialog.vue | 6 +++--- src/components/AnjiPlus/anji-input.vue | 4 ++-- src/components/AnjiPlus/anji-upload.vue | 2 +- src/views/accessRole/components/RoleAuthority.vue | 2 +- src/views/bigscreenDesigner/designer/components/colorPicker.vue | 4 ++-- src/views/bigscreenDesigner/designer/components/customColorComponents.vue | 22 +++++++++++----------- src/views/bigscreenDesigner/designer/components/customUpload.vue | 4 ++-- src/views/bigscreenDesigner/designer/components/customUploadMulti.vue | 6 +++--- src/views/bigscreenDesigner/designer/components/customUploadNew.vue | 4 ++-- src/views/bigscreenDesigner/designer/components/dynamicAddPicAdress.vue | 18 +++++++++--------- src/views/bigscreenDesigner/designer/components/dynamicAddRadar.vue | 18 +++++++++--------- src/views/bigscreenDesigner/designer/components/dynamicAddSvg.vue | 18 +++++++++--------- src/views/bigscreenDesigner/designer/components/dynamicAddTable.vue | 18 +++++++++--------- src/views/bigscreenDesigner/designer/components/dynamicForm.vue | 6 +++--- src/views/bigscreenDesigner/designer/components/dynamicHtmlSlider.vue | 18 +++++++++--------- src/views/bigscreenDesigner/designer/index.vue | 24 +++++++++++++----------- src/views/bigscreenDesigner/designer/index.vue.bak | 6 +++--- src/views/bigscreenDesigner/designer/tools/configure/texts/widget-text.js | 8 ++++++++ src/views/bigscreenDesigner/designer/widget/pie/widgetActiveRingChart.vue | 3 ++- src/views/bigscreenDesigner/designer/widget/pie/widgetPiechart.vue | 2 ++ src/views/bigscreenDesigner/designer/widget/pie/widgetRadioPiechart.vue | 1 + src/views/bigscreenDesigner/designer/widget/text/widgetText.vue | 1 + src/views/excelreport/components/colorPicker.vue | 4 ++-- src/views/resultset/index.vue | 2 +- src/views/screenDesigner/components/colorPicker.vue | 4 ++-- src/views/screenDesigner/components/customColorComponents.vue | 22 +++++++++++----------- src/views/screenDesigner/components/customUpload.vue | 4 ++-- src/views/screenDesigner/components/dynamicAddTable.vue | 18 +++++++++--------- src/views/screenDesigner/components/dynamicForm.vue | 6 +++--- src/views/screenDesigner/layout/leftMenu.vue | 8 ++++---- 34 files changed, 154 insertions(+), 139 deletions(-) diff --git a/src/assets/styles/screen.scss b/src/assets/styles/screen.scss index 1a40ed6..54a6ab5 100644 --- a/src/assets/styles/screen.scss +++ b/src/assets/styles/screen.scss @@ -440,7 +440,7 @@ li { height: calc(100vh - 80px); text-align: center; - ::v-deep.el-tabs__header { + ::v-deep .el-tabs__header { width: 30%; margin-right: 0; @@ -459,7 +459,7 @@ li { } } - ::v-deep.el-tabs__content { + ::v-deep .el-tabs__content { width: 70%; } } @@ -495,7 +495,7 @@ li { } } - ::v-deep.el-tabs__content { + ::v-deep .el-tabs__content { padding: 0; } } diff --git a/src/components/AnjiPlus/anji-autocomplete.vue b/src/components/AnjiPlus/anji-autocomplete.vue index c2d9a70..5f0f0b5 100644 --- a/src/components/AnjiPlus/anji-autocomplete.vue +++ b/src/components/AnjiPlus/anji-autocomplete.vue @@ -132,7 +132,7 @@ export default { } }; - diff --git a/src/components/AnjiPlus/anji-input.vue b/src/components/AnjiPlus/anji-input.vue index bff3550..5a38ecd 100644 --- a/src/components/AnjiPlus/anji-input.vue +++ b/src/components/AnjiPlus/anji-input.vue @@ -167,8 +167,8 @@ export default { }, } - diff --git a/src/views/bigscreenDesigner/designer/components/dynamicHtmlSlider.vue b/src/views/bigscreenDesigner/designer/components/dynamicHtmlSlider.vue index 456f993..feb2e28 100644 --- a/src/views/bigscreenDesigner/designer/components/dynamicHtmlSlider.vue +++ b/src/views/bigscreenDesigner/designer/components/dynamicHtmlSlider.vue @@ -162,26 +162,26 @@ export default { border-radius: 5px; background-color: rgba(144, 146, 152, 0.3); } -::v-deep.el-table, -::v-deep.el-table__expanded-cell, -::v-deep.el-table th, -::v-deep.el-table tr { +::v-deep .el-table, +::v-deep .el-table__expanded-cell, +::v-deep .el-table th, +::v-deep .el-table tr { background-color: transparent !important; color: #859094 !important; font-size: 12px !important; } -::v-deep.el-table td, -::v-deep.el-table th.is-leaf { +::v-deep .el-table td, +::v-deep .el-table th.is-leaf { border-bottom: none; line-height: 26px; } -::v-deep.el-table tbody tr:hover { +::v-deep .el-table tbody tr:hover { background-color: #263445 !important; } -::v-deep.el-table tbody tr:hover > td { +::v-deep .el-table tbody tr:hover > td { background-color: #263445 !important; } -::v-deep.el-table::before { +::v-deep .el-table::before { height: 0; } .button-group .el-button { diff --git a/src/views/bigscreenDesigner/designer/index.vue b/src/views/bigscreenDesigner/designer/index.vue index ecae304..0bb41ff 100644 --- a/src/views/bigscreenDesigner/designer/index.vue +++ b/src/views/bigscreenDesigner/designer/index.vue @@ -1026,18 +1026,20 @@ export default { return widgetJson; }, setWidgetConfigValue(config, configValue) { - config.forEach((item) => { - if (this.isObjectFn(item)) { - configValue[item.name] = item.value; - } - if (this.isArrayFn(item)) { - item.forEach((itemChild) => { - itemChild.list.forEach((ev) => { - configValue[ev.name] = ev.value; + if (config && config.length) { + config.forEach((item) => { + if (this.isObjectFn(item)) { + configValue[item.name] = item.value; + } + if (this.isArrayFn(item)) { + item.forEach((itemChild) => { + itemChild.list.forEach((ev) => { + configValue[ev.name] = ev.value; + }); }); - }); - } - }); + } + }); + } }, // 对组件默认值处理 handleDefaultValue(widgetJson) { diff --git a/src/views/bigscreenDesigner/designer/index.vue.bak b/src/views/bigscreenDesigner/designer/index.vue.bak index b88e6d1..fcb9df4 100644 --- a/src/views/bigscreenDesigner/designer/index.vue.bak +++ b/src/views/bigscreenDesigner/designer/index.vue.bak @@ -1638,7 +1638,7 @@ li { width: 100%; height: calc(100vh - 80px); text-align: center; - ::v-deep.el-tabs__header { + ::v-deep .el-tabs__header { width: 30%; margin-right: 0; .el-tabs__nav-wrap { @@ -1654,7 +1654,7 @@ li { } } } - ::v-deep.el-tabs__content { + ::v-deep .el-tabs__content { width: 70%; } } @@ -1687,7 +1687,7 @@ li { font-size: 12px !important; } } - ::v-deep.el-tabs__content { + ::v-deep .el-tabs__content { padding: 0; } } diff --git a/src/views/bigscreenDesigner/designer/tools/configure/texts/widget-text.js b/src/views/bigscreenDesigner/designer/tools/configure/texts/widget-text.js index 27d99fb..887269c 100644 --- a/src/views/bigscreenDesigner/designer/tools/configure/texts/widget-text.js +++ b/src/views/bigscreenDesigner/designer/tools/configure/texts/widget-text.js @@ -73,6 +73,14 @@ export const widgetText = { value: '0', }, { + type: 'el-input-number', + label: '边框倒角', + name: 'borderRadius', + required: false, + placeholder: '', + value: '0', + }, + { type: 'vue-color', label: '字体背景', name: 'background', diff --git a/src/views/bigscreenDesigner/designer/widget/pie/widgetActiveRingChart.vue b/src/views/bigscreenDesigner/designer/widget/pie/widgetActiveRingChart.vue index b83785e..c717a30 100644 --- a/src/views/bigscreenDesigner/designer/widget/pie/widgetActiveRingChart.vue +++ b/src/views/bigscreenDesigner/designer/widget/pie/widgetActiveRingChart.vue @@ -93,7 +93,7 @@ export default { width: this.optionsStyle.width + "px", height: this.optionsStyle.height+ "px", left: this.optionsStyle.left + "px", - top: this.optionsStyle.top-20 + "px", + top: this.optionsStyle.top - 20 + "px", position: "static", display: 'flex' }; @@ -114,6 +114,7 @@ export default { }, created() { this.optionsStyle = this.value.position; + console.log("🚀 ~ created ~ this.optionsStyle:", this.optionsStyle) this.optionsData = this.value.data; this.optionsSetup = this.value.setup; this.editorOptions(); diff --git a/src/views/bigscreenDesigner/designer/widget/pie/widgetPiechart.vue b/src/views/bigscreenDesigner/designer/widget/pie/widgetPiechart.vue index fd251e6..afc505b 100644 --- a/src/views/bigscreenDesigner/designer/widget/pie/widgetPiechart.vue +++ b/src/views/bigscreenDesigner/designer/widget/pie/widgetPiechart.vue @@ -81,6 +81,8 @@ export default { this.optionsCollapse = this.value.collapse; this.optionsSetup = this.value.setup; this.editorOptions(); + console.log(11111); + }, methods: { // 修改图标options属性 diff --git a/src/views/bigscreenDesigner/designer/widget/pie/widgetRadioPiechart.vue b/src/views/bigscreenDesigner/designer/widget/pie/widgetRadioPiechart.vue index 305df3c..696d6dd 100644 --- a/src/views/bigscreenDesigner/designer/widget/pie/widgetRadioPiechart.vue +++ b/src/views/bigscreenDesigner/designer/widget/pie/widgetRadioPiechart.vue @@ -90,6 +90,7 @@ export default { this.optionsCollapse = this.value.collapse; this.optionsSetup = this.value.setup; this.editorOptions(); + }, methods: { // 修改图标options属性 diff --git a/src/views/bigscreenDesigner/designer/widget/text/widgetText.vue b/src/views/bigscreenDesigner/designer/widget/text/widgetText.vue index 7157fde..924db03 100644 --- a/src/views/bigscreenDesigner/designer/widget/text/widgetText.vue +++ b/src/views/bigscreenDesigner/designer/widget/text/widgetText.vue @@ -46,6 +46,7 @@ export default { "font-size": this.transStyle.fontSize + "px", "letter-spacing": this.transStyle.letterSpacing + "em", background: this.transStyle.background, + 'border-radius': this.transStyle.borderRadius + 'px', "text-align": this.transStyle.textAlign, width: this.transStyle.width + "px", height: this.transStyle.height + "px", diff --git a/src/views/excelreport/components/colorPicker.vue b/src/views/excelreport/components/colorPicker.vue index 0de91f0..9dd82d2 100644 --- a/src/views/excelreport/components/colorPicker.vue +++ b/src/views/excelreport/components/colorPicker.vue @@ -63,8 +63,8 @@ export default { }; diff --git a/src/views/screenDesigner/components/colorPicker.vue b/src/views/screenDesigner/components/colorPicker.vue index 0de91f0..9dd82d2 100644 --- a/src/views/screenDesigner/components/colorPicker.vue +++ b/src/views/screenDesigner/components/colorPicker.vue @@ -63,8 +63,8 @@ export default { }; diff --git a/src/views/screenDesigner/layout/leftMenu.vue b/src/views/screenDesigner/layout/leftMenu.vue index c275bb8..48098eb 100644 --- a/src/views/screenDesigner/layout/leftMenu.vue +++ b/src/views/screenDesigner/layout/leftMenu.vue @@ -74,7 +74,7 @@ export default { };