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 14:36:39 +08:00
parent a022f84160 7a46d53c11
commit 515e87583f
14 changed files with 726 additions and 126 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,13 +24,14 @@
margin: 0 auto;
.el-dialog__header{
background-color: rgb(48, 77, 167);
color: #fff;
background-color: #fff;
color: #333;
border-bottom: 1px solid #eee;
.el-dialog__title{
color: #fff;
color: #333;
}
.el-dialog__headerbtn i {
color: #fff;
color: #333;
}
}
}

1
report-ui/src/assets/styles/index.scss
View File

@@ -270,6 +270,7 @@ a:hover {
color:#a8e3ff
}
.el-input-number.is-controls-right .el-input-number__increase{
height: 15px;
border-bottom: 1px solid #3f5673;
}
.el-input-number.is-controls-right .el-input-number__decrease{

133
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,.5)',
value: 'rgba(115,170,229,.1)',
},
{
type: 'el-select',
@@ -1171,6 +1171,23 @@ const widgetTools = [
required: false,
placeholder: '',
value: '#fff',
},
{
type: 'el-switch',
label: '分割线显示',
name: 'isShowSplitLineX',
require: false,
placeholder: '',
value: true,
},
{
type: 'vue-color',
label: '分割线颜色',
name: 'splitLineColorX',
required: false,
placeholder: '',
value: '#fff',
}
],
},
@@ -1240,6 +1257,21 @@ const widgetTools = [
required: false,
placeholder: '',
value: '#fff',
}, {
type: 'el-switch',
label: '分割线显示',
name: 'isShowSplitLineY',
require: false,
placeholder: '',
value: true,
}, {
type: 'vue-color',
label: '分割线颜色',
name: 'splitLineColorY',
required: false,
placeholder: '',
value: '#fff',
}
],
},
@@ -1723,6 +1755,23 @@ const widgetTools = [
required: false,
placeholder: '',
value: '#fff',
},
{
type: 'el-switch',
label: '分割线显示',
name: 'isShowSplitLineX',
require: false,
placeholder: '',
value: true,
},
{
type: 'vue-color',
label: '分割线颜色',
name: 'splitLineColorX',
required: false,
placeholder: '',
value: '#fff',
}
],
},
@@ -1792,6 +1841,22 @@ const widgetTools = [
required: false,
placeholder: '',
value: '#fff',
},
{
type: 'el-switch',
label: '分割线显示',
name: 'isShowSplitLineY',
require: false,
placeholder: '',
value: true,
}, {
type: 'vue-color',
label: '分割线颜色',
name: 'splitLineColorY',
required: false,
placeholder: '',
value: '#fff',
}
],
},
@@ -2195,6 +2260,23 @@ const widgetTools = [
required: false,
placeholder: '',
value: '#fff',
},
{
type: 'el-switch',
label: '分割线显示',
name: 'isShowSplitLineX',
require: false,
placeholder: '',
value: true,
},
{
type: 'vue-color',
label: '分割线颜色',
name: 'splitLineColorX',
required: false,
placeholder: '',
value: '#fff',
}
],
},
@@ -2264,6 +2346,22 @@ const widgetTools = [
required: false,
placeholder: '',
value: '#fff',
},
{
type: 'el-switch',
label: '分割线显示',
name: 'isShowSplitLineY',
require: false,
placeholder: '',
value: true,
}, {
type: 'vue-color',
label: '分割线颜色',
name: 'splitLineColorY',
required: false,
placeholder: '',
value: '#fff',
}
],
},
@@ -2823,6 +2921,23 @@ const widgetTools = [
required: false,
placeholder: '',
value: '#fff',
},
{
type: 'el-switch',
label: '分割线显示',
name: 'isShowSplitLineX',
require: false,
placeholder: '',
value: true,
},
{
type: 'vue-color',
label: '分割线颜色',
name: 'splitLineColorX',
required: false,
placeholder: '',
value: '#fff',
}
],
},
@@ -2892,6 +3007,22 @@ const widgetTools = [
required: false,
placeholder: '',
value: '#fff',
},
{
type: 'el-switch',
label: '分割线显示',
name: 'isShowSplitLineY',
require: false,
placeholder: '',
value: true,
}, {
type: 'vue-color',
label: '分割线颜色',
name: 'splitLineColorY',
required: false,
placeholder: '',
value: '#fff',
}
],
},

12
report-ui/src/views/report/bigscreen/designer/widget/bar/widgetGradientColorBarchart.vue
View File

@@ -235,6 +235,12 @@ export default {
color: optionsCollapse.lineColorX,
},
},
splitLine: {
show: optionsCollapse.isShowSplitLineX,
lineStyle: {
color: optionsCollapse.splitLineColorX
},
},
}
this.options.xAxis = xAxis
},
@@ -266,6 +272,12 @@ export default {
color: optionsCollapse.lineColorY,
},
},
splitLine: {
show: optionsCollapse.isShowSplitLineY,
lineStyle: {
color: optionsCollapse.splitLineColorY
},
},
}
this.options.yAxis = yAxis

16
report-ui/src/views/report/bigscreen/designer/widget/pie/widgetPieNightingaleRoseArea.vue
View File

@@ -147,7 +147,13 @@ export default {
lineStyle: {
color: optionsCollapse.lineColorX
}
}
},
splitLine: {
show: optionsCollapse.isShowSplitLineX,
lineStyle: {
color: optionsCollapse.splitLineColorX
},
},
};
this.options.xAxis = xAxis;
},
@@ -178,7 +184,13 @@ export default {
lineStyle: {
color: optionsCollapse.lineColorY
}
}
},
splitLine: {
show: optionsCollapse.isShowSplitLineY,
lineStyle: {
color: optionsCollapse.splitLineColorY
},
},
};
this.options.yAxis = yAxis;

409
report-ui/src/views/report/bigscreen/designer/widget/pie/widgetPieRoundChart.vue Normal file
View File

File diff suppressed because one or more lines are too long

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

@@ -150,7 +150,13 @@ export default {
lineStyle: {
color: optionsCollapse.lineColorX
}
}
},
splitLine: {
show: optionsCollapse.isShowSplitLineX,
lineStyle: {
color: optionsCollapse.splitLineColorX
},
},
};
this.options.xAxis = xAxis;
},
@@ -181,7 +187,13 @@ export default {
lineStyle: {
color: optionsCollapse.lineColorY
}
}
},
splitLine: {
show: optionsCollapse.isShowSplitLineY,
lineStyle: {
color: optionsCollapse.splitLineColorY
},
},
};
this.options.yAxis = yAxis;

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

@@ -192,6 +192,12 @@ export default {
color: optionsCollapse.lineColorX,
},
},
splitLine: {
show: optionsCollapse.isShowSplitLineX,
lineStyle: {
color: optionsCollapse.splitLineColorX
},
},
}
this.options.xAxis = xAxis
},
@@ -224,6 +230,12 @@ export default {
color: '#fff',
},
},
splitLine: {
show: optionsCollapse.isShowSplitLineY,
lineStyle: {
color: optionsCollapse.splitLineColorY
},
},
},
{
type: 'value',
@@ -250,6 +262,12 @@ export default {
color: optionsCollapse.lineColorY,
},
},
splitLine: {
show: true,
lineStyle: {
color: optionsCollapse.splitLineColorY
},
},
},
]

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

@@ -158,6 +158,12 @@ export default {
color: optionsCollapse.lineColorX,
},
},
splitLine: {
show: optionsCollapse.isShowSplitLineX,
lineStyle: {
color: optionsCollapse.splitLineColorX
},
},
}
this.options.xAxis = xAxis
},
@@ -189,6 +195,12 @@ export default {
color: optionsCollapse.lineColorY,
},
},
splitLine: {
show: optionsCollapse.isShowSplitLineY,
lineStyle: {
color: optionsCollapse.splitLineColorY
},
},
}
this.options.yAxis = yAxis

49
report-ui/src/views/report/resultset/index.vue
View File

@@ -121,13 +121,12 @@
size="small"
label-width="100px">
<el-row :gutter="10">
<el-col :xs="24"
:sm="20"
:md="4"
:lg="4"
:xl="4">
<el-form-item label-width="0"
:md="6"
:lg="6"
:xl="6">
<el-form-item label="数据源"
prop="sourceCode">
<el-select v-model.trim="formData.sourceCode"
class="organisation"
@@ -140,11 +139,45 @@
</el-select>
</el-form-item>
</el-col>
<el-col :xs="24"
:sm="20"
:md="8"
:lg="8"
:xl="8">
<el-form-item label="数据集名称"
prop="setName">
<el-input v-model.trim="formData.setName"
size="mini" />
</el-form-item>
</el-col>
<el-col :xs="24"
:sm="20"
:md="8"
:lg="8"
:xl="8">
<el-form-item label="数据集编码"
prop="setCode">
<el-input v-model.trim="formData.setCode"
size="mini" />
</el-form-item>
</el-col>
<el-col :xs="24"
:sm="20"
:md="22"
:lg="22"
:xl="22">
<el-form-item label="数据集描述">
<el-input v-model.trim="formData.setDesc"
size="mini" />
</el-form-item>
</el-col>
<el-col :xs="24"
:sm="20"
:md="22"
:lg="22"
:xl="22"
class="code-mirror-form">
<el-form-item label="查询SQL或请求体"
label-width="140px">
<div class="codemirror">
@@ -884,6 +917,12 @@ export default {
}
</script>
<style lang="scss" scoped>
.code-mirror-form {
/deep/.el-form-item__content {
height: 200px;
overflow: hidden;
}
}
.my-editor {
height: 400px;
div.jsoneditor {