lxm_front/AJ-Report
1
0
Fork 0
mirror of https://gitee.com/anji-plus/report.git synced 2026-03-20 09:38:35 +08:00
Code Issues Projects Releases Wiki Activity

Merge branch 'master' of https://gitee.com/anji-plus/report

Browse Source
This commit is contained in:
qianlishi
2021-06-29 15:47:51 +08:00
parent 169c28c69f 94208a58e2
commit 17517b162a
6 changed files with 89 additions and 20 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
report-ui/src/assets/styles/element-ui.scss
View File

@@ -24,14 +24,13 @@
margin: 0 auto;
.el-dialog__header{
background-color: #fff;
color: #333;
border-bottom: 1px solid #eee;
background-color: rgb(48, 77, 167);
color: #fff;
.el-dialog__title{
color: #333;
color: #fff;
}
.el-dialog__headerbtn i {
color: #333;
color: #fff;
}
}
}

6
report-ui/src/views/report/bigscreen/designer/index.vue
View File

@@ -641,8 +641,8 @@ export default {
<style scoped lang="scss">
.is-active {
background: #409eff !important;
color: #373d41 !important;
background: #31455d !important;
color: #bfcbd9 !important;
}
.layout {
display: -webkit-box;
@@ -777,7 +777,7 @@ export default {
.el-tabs__header {
.el-tabs__nav {
.el-tabs__item {
background-color: #304156;
background-color: #31455d;
border: 0px;
}
.el-tabs__item.is-active {

86
report-ui/src/views/report/bigscreen/designer/tools.js
View File

@@ -121,7 +121,7 @@ const widgetTools = [
name: 'background',
required: false,
placeholder: '',
value: 'rgba(115,170,229,.1)',
value: 'rgba(115,170,229,.0)',
},
{
type: 'el-select',
@@ -1178,7 +1178,7 @@ const widgetTools = [
name: 'isShowSplitLineX',
require: false,
placeholder: '',
value: true,
value: false,
},
{
type: 'vue-color',
@@ -1263,7 +1263,7 @@ const widgetTools = [
name: 'isShowSplitLineY',
require: false,
placeholder: '',
value: true,
value: false,
}, {
type: 'vue-color',
label: '分割线颜色',
@@ -1762,7 +1762,7 @@ const widgetTools = [
name: 'isShowSplitLineX',
require: false,
placeholder: '',
value: true,
value: false,
},
{
type: 'vue-color',
@@ -1848,7 +1848,7 @@ const widgetTools = [
name: 'isShowSplitLineY',
require: false,
placeholder: '',
value: true,
value: false,
}, {
type: 'vue-color',
label: '分割线颜色',
@@ -1939,6 +1939,14 @@ const widgetTools = [
],
value: 'staticData',
},
{
type: 'el-input-number',
label: '刷新时间(毫秒)',
name: 'refreshTime',
relactiveDom: 'dataType',
relactiveDomValue: 'dynamicData',
value: 5000
},
{
type: 'el-button',
label: '静态数据',
@@ -2267,7 +2275,7 @@ const widgetTools = [
name: 'isShowSplitLineX',
require: false,
placeholder: '',
value: true,
value: false,
},
{
type: 'vue-color',
@@ -2353,7 +2361,7 @@ const widgetTools = [
name: 'isShowSplitLineY',
require: false,
placeholder: '',
value: true,
value: false,
}, {
type: 'vue-color',
label: '分割线颜色',
@@ -2574,6 +2582,14 @@ const widgetTools = [
],
value: 'staticData',
},
{
type: 'el-input-number',
label: '刷新时间(毫秒)',
name: 'refreshTime',
relactiveDom: 'dataType',
relactiveDomValue: 'dynamicData',
value: 5000
},
{
type: 'el-button',
label: '静态数据',
@@ -2928,7 +2944,7 @@ const widgetTools = [
name: 'isShowSplitLineX',
require: false,
placeholder: '',
value: true,
value: false,
},
{
type: 'vue-color',
@@ -3014,7 +3030,7 @@ const widgetTools = [
name: 'isShowSplitLineY',
require: false,
placeholder: '',
value: true,
value: false,
}, {
type: 'vue-color',
label: '分割线颜色',
@@ -3186,6 +3202,14 @@ const widgetTools = [
],
value: 'staticData',
},
{
type: 'el-input-number',
label: '刷新时间(毫秒)',
name: 'refreshTime',
relactiveDom: 'dataType',
relactiveDomValue: 'dynamicData',
value: 5000
},
{
type: 'el-button',
label: '静态数据',
@@ -3532,7 +3556,7 @@ const widgetTools = [
label: '',
name: 'customColor',
required: false,
value: [{ color: '#ED0E0E' }, { color: '#6CCD17' }, { color: '#172CCD' }, { color: '#B817CD' }, { color: '#AFCD17' }],
value: [{ color: '#0CD2E6' }, { color: '#00BFA5' }, { color: '#FFC722' }, { color: '#886EFF' }, { color: '#008DEC' }],
},
],
},
@@ -3559,6 +3583,14 @@ const widgetTools = [
],
value: 'staticData',
},
{
type: 'el-input-number',
label: '刷新时间(毫秒)',
name: 'refreshTime',
relactiveDom: 'dataType',
relactiveDomValue: 'dynamicData',
value: 5000
},
{
type: 'el-button',
label: '静态数据',
@@ -3906,7 +3938,7 @@ const widgetTools = [
label: '',
name: 'customColor',
required: false,
value: [{ color: '#ED0E0E' }, { color: '#6CCD17' }, { color: '#172CCD' }, { color: '#B817CD' }, { color: '#AFCD17' }],
value: [{ color: '#0CD2E6' }, { color: '#00BFA5' }, { color: '#FFC722' }, { color: '#886EFF' }, { color: '#008DEC' }],
},
],
},
@@ -3933,6 +3965,14 @@ const widgetTools = [
],
value: 'staticData',
},
{
type: 'el-input-number',
label: '刷新时间(毫秒)',
name: 'refreshTime',
relactiveDom: 'dataType',
relactiveDomValue: 'dynamicData',
value: 5000
},
{
type: 'el-button',
label: '静态数据',
@@ -4299,6 +4339,14 @@ const widgetTools = [
],
value: 'staticData',
},
{
type: 'el-input-number',
label: '刷新时间(毫秒)',
name: 'refreshTime',
relactiveDom: 'dataType',
relactiveDomValue: 'dynamicData',
value: 5000
},
{
type: 'el-button',
label: '静态数据',
@@ -4444,6 +4492,14 @@ const widgetTools = [
],
value: 'staticData',
},
{
type: 'el-input-number',
label: '刷新时间(毫秒)',
name: 'refreshTime',
relactiveDom: 'dataType',
relactiveDomValue: 'dynamicData',
value: 5000
},
{
type: 'el-button',
label: '静态数据',
@@ -4824,6 +4880,14 @@ const widgetTools = [
],
value: 'staticData',
},
{
type: 'el-input-number',
label: '刷新时间(毫秒)',
name: 'refreshTime',
relactiveDom: 'dataType',
relactiveDomValue: 'dynamicData',
value: 5000
},
{
type: 'el-button',
label: '静态数据',

4
report-ui/src/views/report/bigscreen/designer/widget/temp.vue
View File

@@ -22,10 +22,12 @@ import WidgetIframe from './widgetIframe.vue'
import widgetBarchart from './widgetBarchart.vue'
import widgetLinechart from './widgetLinechart.vue'
import widgetBarlinechart from './widgetBarlinechart'
import widgetGradientColorBarchart from "./bar/widgetGradientColorBarchart.vue";
import WidgetPiechart from './widgetPiechart.vue'
import WidgetHollowPiechart from './widgetHollowPiechart.vue'
import WidgetFunnel from './widgetFunnel.vue'
import WidgetGauge from './widgetGauge.vue'
import WidgetPieNightingaleRoseArea from "./pie/widgetPieNightingaleRoseArea";
export default {
name: 'WidgetTemp',
components: {
@@ -38,12 +40,14 @@ export default {
widgetVideo,
WidgetIframe,
widgetBarchart,
widgetGradientColorBarchart,
widgetLinechart,
widgetBarlinechart,
WidgetPiechart,
WidgetHollowPiechart,
WidgetFunnel,
WidgetGauge,
WidgetPieNightingaleRoseArea
},
model: {
prop: 'value',

3
report-ui/src/views/report/bigscreen/designer/widget/widget.vue
View File

@@ -101,7 +101,8 @@ export default {
return this.value.position.zIndex || 1;
}
},
mounted() {},
mounted() {
},
methods: {
handleFocus({ index, left, top, width, height }) {},
handleBlur({ index, left, top, width, height }) {

1
report-ui/src/views/report/bigscreen/designer/widget/widgetUniversalComponentsChart.vue Normal file
View File

@@ -0,0 +1 @@