-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
+
+
+
+
+
+
+
+
+
+
+ {{ parseInt(scaleNum) }}%
+
+
+
+
+
@@ -137,7 +183,6 @@
:headers="headers"
accept=".zip"
:on-success="handleUpload"
- :on-error="handleError"
:show-file-list="false"
:limit="1"
>
@@ -176,60 +221,72 @@
-
@@ -245,6 +302,9 @@
@@ -277,6 +337,8 @@
:visible.sync="visibleContentMenu"
:style-obj="styleObj"
@deletelayer="deletelayer"
+ @lockLayer="lockLayer"
+ @noLockLayer="noLockLayer"
@copylayer="copylayer"
@istopLayer="istopLayer"
@setlowLayer="setlowLayer"
@@ -287,20 +349,13 @@
diff --git a/report-ui/src/views/bigscreenDesigner/designer/linkageLogic.js b/report-ui/src/views/bigscreenDesigner/designer/linkageLogic.js
new file mode 100644
index 00000000..7dea1d9d
--- /dev/null
+++ b/report-ui/src/views/bigscreenDesigner/designer/linkageLogic.js
@@ -0,0 +1,156 @@
+/*
+ * @Author: chengsl
+ * @Date: 2023-02-24 09:40:13
+ * @LastEditors: qianlishi qianlishi@anji-plus.com
+ * @LastEditTime: 2023-03-24 14:01:08
+ * @Description: 各联动组件的参数配置 参数paramsKey的值具体封装时再改
+ */
+import { eventBus as bus } from "@/utils/eventBus";
+export const lickageParamsConfig = [
+ // {
+ // name: '按钮组',
+ // code: 'widgetButtonGroup',
+ // paramsKey: [] // 40@remarks 动态：[...row, index]
+ // },
+ {
+ name: '下拉框',
+ code: 'widget-select',
+ paramsKey: ['label','value']
+ },
+ {
+ name: '时间筛选器',
+ code: 'widget-form-time',
+ paramsKey: ['startTime','endTime']
+ },
+ {
+ name: '柱图',
+ code: 'widget-barchart',
+ paramsKey: ['name', 'value']
+ },
+ {
+ name: '柱图-渐变色',
+ code: 'widget-gradient-color-barchart',
+ paramsKey: ['name', 'value']
+ },
+ // ……
+ {
+ name: '折线图',
+ code: 'widget-linechart',
+ paramsKey: ['name', 'value']
+ },
+ {
+ name: '百分比图',
+ code: 'widgetPiePercentageChart',
+ paramsKey: ['value']
+ },
+ {
+ name: '饼图',
+ code: 'widget-piechart',
+ paramsKey: ['name', 'value']
+ },
+ {
+ name: '南丁格尔玫瑰图',
+ code: 'WidgetPieNightingaleRoseArea',
+ paramsKey: ['name', 'value']
+ },
+]
+
+export const getOneConfigByCode = function (code) {
+ return lickageParamsConfig.find(item => { return item.code === code })
+}
+
+export const getOneConfigByName = function (name) {
+ return lickageParamsConfig.find(item => { return item.name === name })
+}
+
+/**
+ * 源组件 - 初始化联动逻辑
+ * @param self 组件实例对象 this
+ * @param isActiveClick 主动触发(非echart类click事件触发)
+ * @param buttonConfig 按钮组组件的配置
+ * 40@remarks
+ * 1、v-chart 需添加 ref="myVChart" 以获取实例
+ * 2、 发消息发过去的对象 待封装配置动态兼容
+ */
+export const originWidgetLinkageLogic = function (self, isActiveClick = false, buttonConfig = {}) {
+ // if (self.allComponentLinkage && self.allComponentLinkage.length && self.allComponentLinkage[self.widgetIndex].index !== -1 && self.allComponentLinkage[self.widgetIndex].linkageArr.length) {
+ if (self.optionsSetup.componentLinkage && self.optionsSetup.componentLinkage.length) {
+ if (isActiveClick) { // 主动触发
+ self.allComponentLinkage[self.widgetIndex].linkageArr.forEach(item => {
+ console.log(item)
+ console.log(`bus_${item.originId}_${item.targetId}`, ' -联动逻辑点击-发送消息', buttonConfig)
+ bus.$emit(`bus_${item.originId}_${item.targetId}`, buttonConfig.currentData)
+ })
+ } else { // chart 组件
+ self.$refs.myVChart.chart.on('click', function (params) {
+ self.allComponentLinkage[self.widgetIndex].linkageArr.forEach(item => {
+ console.log(`bus_${item.originId}_${item.targetId}`, ' -联动逻辑点击-发送消息', params)
+ console.log(self.value)
+ let message = {}
+ const widgetConfigTemp = getOneConfigByCode(self.value.widgetCode)
+ console.log('widgetConfigTemp', widgetConfigTemp)
+ if (widgetConfigTemp && widgetConfigTemp.paramsKey.length) { // 动态加载各组件的参数来封装
+ widgetConfigTemp.paramsKey.forEach(key => {
+ message[key] = params[key]
+ })
+ // 40@remarks 部分组件 传参需要特殊处理下
+ // ……
+ // 40@remarks 专用于测试联动发消息 手动改造消息内容
+ // if (self.value.widgetCode === 'widgetMap2d') {
+ // const nameTemp = ['苹果', '三星', '小米', '华为', 'OPPO', 'VIVO']
+ // // message = {
+ // // name: nameTemp[(params.dataIndex % 6)],
+ // // value: params.value,
+ // // dataIndex: params.dataIndex
+ // // }
+ // // message.name = nameTemp[(+params.value % 6)]
+ // message.name = nameTemp[(parseInt(Math.random() * 6) % 6)]
+ // }
+ // if (self.value.widgetCode === 'widget-piechart') {
+ // message.name = (parseInt(Math.random() * 2) % 2) === 0 ? '深圳市' : '盐田区'
+ // }
+ } else {
+ message = {
+ name: params.name,
+ value: params.value
+ }
+ }
+ bus.$emit(`bus_${item.originId}_${item.targetId}`, message)
+ })
+ })
+ }
+ }
+}
+
+/**
+ * 目标组件 - 初始化联动逻辑
+ * @param self 组件实例对象 this
+ * @returns
+ */
+export const targetWidgetLinkageLogic = function (self) {
+ const busEvents = []
+ // 有无有关联的组件
+ if (!self.allComponentLinkage || !self.allComponentLinkage.length) return
+ self.allComponentLinkage.some(item => {
+ if (item.index !== -1 && item.linkageArr.length) {
+ item.linkageArr.some(obj => {
+ if (obj.targetId === self.value.setup.widgetId) {
+ self.hasLinkage = true
+ busEvents.push({
+ eventName: `bus_${obj.originId}_${obj.targetId}`,
+ paramsConfig: obj.paramsConfig
+ })
+ return true
+ }
+ })
+ }
+ })
+ if (self.hasLinkage) {
+ busEvents.forEach(item => {
+ bus.$on(item.eventName, e => {
+ console.log(item.eventName, ' 接收消息e', e)
+ self.setOptionsData(e, item.paramsConfig)
+ })
+ })
+ }
+}
diff --git a/report-ui/src/views/bigscreenDesigner/designer/tools/configure/barCharts/widget-bar-compare.js b/report-ui/src/views/bigscreenDesigner/designer/tools/configure/barCharts/widget-bar-compare.js
index 97762379..6d1d0500 100644
--- a/report-ui/src/views/bigscreenDesigner/designer/tools/configure/barCharts/widget-bar-compare.js
+++ b/report-ui/src/views/bigscreenDesigner/designer/tools/configure/barCharts/widget-bar-compare.js
@@ -3,8 +3,8 @@
* @version:
* @Author: qianlishi
* @Date: 2021-08-29 07:39:35
- * @LastEditors: qianlishi
- * @LastEditTime: 2021-09-28 14:09:58
+ * @LastEditors: qianlishi qianlishi@anji-plus.com
+ * @LastEditTime: 2023-01-10 14:08:40
*/
export const widgetBarCompare = {
code: 'widgetBarCompareChart',
@@ -194,7 +194,7 @@ export const widgetBarCompare = {
},
{
type: 'el-input-text',
- label: '图例名称',
+ label: '名称( | 分隔)',
name: 'legendName',
required: false,
placeholder: '多值以' | '隔开',
@@ -705,7 +705,7 @@ export const widgetBarCompare = {
name: 'refreshTime',
relactiveDom: 'dataType',
relactiveDomValue: 'dynamicData',
- value: 5000
+ value: 600000
},
{
type: 'el-button',
diff --git a/report-ui/src/views/bigscreenDesigner/designer/tools/configure/barCharts/widget-bar-double-yaxis-chart.js b/report-ui/src/views/bigscreenDesigner/designer/tools/configure/barCharts/widget-bar-double-yaxis-chart.js
new file mode 100644
index 00000000..51e05d5c
--- /dev/null
+++ b/report-ui/src/views/bigscreenDesigner/designer/tools/configure/barCharts/widget-bar-double-yaxis-chart.js
@@ -0,0 +1,904 @@
+
+export const widgetBarDoubleYaxis = {
+ code: 'widgetBarDoubleYaxisChart',
+ type: 'barChart',
+ tabName: '柱状图',
+ label: '双Y柱图',
+ icon: 'iconbianzu23',
+ options: {
+ // 配置
+ setup: [
+ {
+ type: 'el-input-text',
+ label: '图层名称',
+ name: 'layerName',
+ required: false,
+ placeholder: '',
+ value: '双Y柱图',
+ },
+ {
+ type: 'vue-color',
+ label: '背景颜色',
+ name: 'background',
+ required: false,
+ placeholder: '',
+ value: ''
+ },
+ [
+ {
+ name: '柱体设置',
+ list: [
+ {
+ type: 'el-slider',
+ label: '最大宽度',
+ name: 'maxWidth',
+ required: false,
+ placeholder: '',
+ value: 10,
+ },
+ {
+ type: 'el-slider',
+ label: '圆角',
+ name: 'radius',
+ require: false,
+ placeholder: '',
+ value: 5,
+ },
+ {
+ type: 'el-slider',
+ label: '最小高度',
+ name: 'minHeight',
+ require: false,
+ placeholder: '',
+ value: 0,
+ },
+ ],
+ },
+ {
+ name: '标题设置',
+ list: [
+ {
+ type: 'el-switch',
+ label: '标题显示',
+ name: 'isNoTitle',
+ required: false,
+ placeholder: '',
+ value: true,
+ },
+ {
+ type: 'el-input-text',
+ label: '标题名',
+ name: 'titleText',
+ required: false,
+ placeholder: '',
+ value: '',
+ },
+ {
+ type: 'vue-color',
+ label: '字体颜色',
+ name: 'textColor',
+ required: false,
+ placeholder: '',
+ value: '#FFD700'
+ },
+ {
+ type: 'el-input-number',
+ label: '字体字号',
+ name: 'textFontSize',
+ required: false,
+ placeholder: '',
+ value: 20
+ },
+ {
+ type: 'el-select',
+ label: '字体粗细',
+ name: 'textFontWeight',
+ required: false,
+ placeholder: '',
+ selectOptions: [
+ { code: 'normal', name: '正常' },
+ { code: 'bold', name: '粗体' },
+ { code: 'bolder', name: '特粗体' },
+ { code: 'lighter', name: '细体' }
+ ],
+ value: 'normal'
+ },
+ {
+ type: 'el-select',
+ label: '字体风格',
+ name: 'textFontStyle',
+ required: false,
+ placeholder: '',
+ selectOptions: [
+ { code: 'normal', name: '正常' },
+ { code: 'italic', name: 'italic斜体' },
+ { code: 'oblique', name: 'oblique斜体' },
+ ],
+ value: 'normal'
+ },
+ {
+ type: 'el-select',
+ label: '字体位置',
+ name: 'textAlign',
+ required: false,
+ placeholder: '',
+ selectOptions: [
+ { code: 'center', name: '居中' },
+ { code: 'left', name: '左对齐' },
+ { code: 'right', name: '右对齐' },
+ ],
+ value: 'center'
+ },
+ {
+ type: 'el-input-text',
+ label: '副标题名',
+ name: 'subText',
+ required: false,
+ placeholder: '',
+ value: ''
+ },
+ {
+ type: 'vue-color',
+ label: '字体颜色',
+ name: 'subTextColor',
+ required: false,
+ placeholder: '',
+ value: 'rgba(30, 144, 255, 1)'
+ },
+ {
+ type: 'el-input-number',
+ label: '字体字号',
+ name: 'subTextFontSize',
+ required: false,
+ placeholder: '',
+ value: 20
+ },
+ {
+ type: 'el-select',
+ label: '字体粗细',
+ name: 'subTextFontWeight',
+ required: false,
+ placeholder: '',
+ selectOptions: [
+ { code: 'normal', name: '正常' },
+ { code: 'bold', name: '粗体' },
+ { code: 'bolder', name: '特粗体' },
+ { code: 'lighter', name: '细体' }
+ ],
+ value: 'normal'
+ },
+ {
+ type: 'el-select',
+ label: '字体风格',
+ name: 'subTextFontStyle',
+ required: false,
+ placeholder: '',
+ selectOptions: [
+ { code: 'normal', name: '正常' },
+ { code: 'italic', name: 'italic斜体' },
+ { code: 'oblique', name: 'oblique斜体' },
+ ],
+ value: 'normal'
+ },
+ ],
+ },
+ {
+ name: '图例操作',
+ list: [
+ {
+ type: 'el-switch',
+ label: '图例显示',
+ name: 'isShowLegend',
+ required: false,
+ placeholder: '',
+ value: true,
+ },
+ {
+ type: 'el-input-text',
+ label: '名称( | 分隔)',
+ name: 'legendName',
+ required: false,
+ placeholder: '',
+ value: ''
+ },
+ {
+ type: 'vue-color',
+ label: '字体颜色',
+ name: 'legendColor',
+ required: false,
+ placeholder: '',
+ value: '#fff',
+ },
+ {
+ type: 'el-input-number',
+ label: '字体字号',
+ name: 'legendFontSize',
+ required: false,
+ placeholder: '',
+ value: 12,
+ },
+ {
+ type: 'el-input-number',
+ label: '图例宽度',
+ name: 'legendWidth',
+ required: false,
+ placeholder: '',
+ value: 12,
+ },
+ {
+ type: 'el-select',
+ label: '横向位置',
+ name: 'lateralPosition',
+ required: false,
+ placeholder: '',
+ selectOptions: [
+ { code: 'center', name: '居中' },
+ { code: 'left', name: '左对齐' },
+ { code: 'right', name: '右对齐' },
+ ],
+ value: 'center'
+ },
+ {
+ type: 'el-select',
+ label: '纵向位置',
+ name: 'longitudinalPosition',
+ required: false,
+ placeholder: '',
+ selectOptions: [
+ { code: 'top', name: '顶部' },
+ { code: 'bottom', name: '底部' },
+ ],
+ value: 'top'
+ },
+ {
+ type: 'el-select',
+ label: '布局前置',
+ name: 'layoutFront',
+ required: false,
+ placeholder: '',
+ selectOptions: [
+ { code: 'vertical', name: '竖排' },
+ { code: 'horizontal', name: '横排' },
+ ],
+ value: 'horizontal'
+ },
+ ],
+ },
+ {
+ name: 'X轴设置',
+ list: [
+ {
+ type: 'el-switch',
+ label: '显示',
+ name: 'hideX',
+ required: false,
+ placeholder: '',
+ value: true,
+ },
+ {
+ type: 'el-input-text',
+ label: '坐标名',
+ name: 'nameX',
+ required: false,
+ placeholder: '',
+ value: ''
+ },
+ {
+ type: 'vue-color',
+ label: '坐标名颜色',
+ name: 'nameColorX',
+ required: false,
+ placeholder: '',
+ value: '#fff'
+ },
+ {
+ type: 'el-input-number',
+ label: '坐标名字号',
+ name: 'nameFontSizeX',
+ required: false,
+ placeholder: '',
+ value: 14
+ },
+ {
+ type: 'vue-color',
+ label: '数值颜色',
+ name: 'colorX',
+ required: false,
+ placeholder: '',
+ value: '#fff',
+ },
+ {
+ type: 'el-input-number',
+ label: '数值字号',
+ name: 'fontSizeX',
+ required: false,
+ placeholder: '',
+ value: 14,
+ },
+ {
+ type: 'el-input-number',
+ label: '数值间隔',
+ name: 'textInterval',
+ required: false,
+ placeholder: '',
+ value: ''
+ },
+ {
+ type: 'el-slider',
+ label: '数值角度',
+ name: 'textAngleX',
+ required: false,
+ placeholder: '',
+ value: 0
+ },
+ {
+ type: 'el-switch',
+ label: '坐标轴反转',
+ name: 'reversalX',
+ required: false,
+ placeholder: '',
+ value: false
+ },
+ {
+ type: 'vue-color',
+ label: '坐标轴颜色',
+ name: 'lineColorX',
+ required: false,
+ placeholder: '',
+ value: '#fff',
+ },
+ {
+ type: 'el-input-number',
+ label: '坐标轴宽度',
+ name: 'lineWidthX',
+ required: false,
+ placeholder: '',
+ value: 1,
+ },
+ {
+ type: 'el-switch',
+ label: '分割线显示',
+ name: 'isShowSplitLineX',
+ require: false,
+ placeholder: '',
+ value: false,
+ },
+ {
+ type: 'vue-color',
+ label: '分割线颜色',
+ name: 'splitLineColorX',
+ required: false,
+ placeholder: '',
+ value: '#fff',
+ },
+ {
+ type: 'el-input-number',
+ label: '分割线宽度',
+ name: 'splitLineWidthX',
+ required: false,
+ placeholder: '',
+ value: 1,
+ },
+ ],
+ },
+ {
+ name: '左Y轴设置',
+ list: [
+ {
+ type: 'el-switch',
+ label: '显示',
+ name: 'isShowYLeft',
+ require: false,
+ placeholder: '',
+ value: true,
+ },
+ {
+ type: 'el-input-text',
+ label: '坐标名',
+ name: 'textNameYLeft',
+ require: false,
+ placeholder: '',
+ value: ''
+ },
+ {
+ type: 'vue-color',
+ label: '坐标名颜色',
+ name: 'nameColorYLeft',
+ required: false,
+ placeholder: '',
+ value: '#fff',
+ },
+ {
+ type: 'el-input-number',
+ label: '坐标名字号',
+ name: 'nameFontSizeYLeft',
+ required: false,
+ placeholder: '',
+ value: 14,
+ },
+ {
+ type: 'vue-color',
+ label: '数值颜色',
+ name: 'colorYLeft',
+ required: false,
+ placeholder: '',
+ value: '#fff',
+ },
+ {
+ type: 'el-input-number',
+ label: '数值字号',
+ name: 'fontSizeYLeft',
+ required: false,
+ placeholder: '',
+ value: 14,
+ },
+ {
+ type: 'el-input-number',
+ label: '均分',
+ name: 'splitNumberLeft',
+ required: false,
+ placeholder: '',
+ value: ''
+ },
+ {
+ type: 'el-slider',
+ label: '数值角度',
+ name: 'textAngleYLeft',
+ required: false,
+ placeholder: '',
+ value: 0
+ },
+ {
+ type: 'el-switch',
+ label: '刻度线显示',
+ name: 'tickLineYLeft',
+ require: false,
+ placeholder: '',
+ value: true,
+ },
+ {
+ type: 'el-switch',
+ label: '坐标轴显示',
+ name: 'lineYLeft',
+ require: false,
+ placeholder: '',
+ value: true,
+ },
+ {
+ type: 'vue-color',
+ label: '坐标轴颜色',
+ name: 'lineColorYLeft',
+ required: false,
+ placeholder: '',
+ value: '#fff',
+ },
+ {
+ type: 'el-input-number',
+ label: '坐标轴宽度',
+ name: 'lineWidthYLeft',
+ required: false,
+ placeholder: '',
+ value: 1,
+ },
+ {
+ type: 'el-switch',
+ label: '分割线显示',
+ name: 'isShowSplitLineYLeft',
+ require: false,
+ placeholder: '',
+ value: false,
+ },
+ {
+ type: 'vue-color',
+ label: '分割线颜色',
+ name: 'splitLineColorYLeft',
+ required: false,
+ placeholder: '',
+ value: '#fff',
+ },
+ {
+ type: 'el-input-number',
+ label: '分割线宽度',
+ name: 'splitLineFontWidthYLeft',
+ required: false,
+ placeholder: '',
+ value: 1,
+ },
+ ],
+ },
+ {
+ name: '右Y轴设置',
+ list: [
+ {
+ type: 'el-switch',
+ label: '显示',
+ name: 'isShowYRight',
+ require: false,
+ placeholder: '',
+ value: true,
+ },
+ {
+ type: 'el-input-text',
+ label: '坐标名',
+ name: 'textNameYRight',
+ require: false,
+ placeholder: '',
+ value: ''
+ },
+ {
+ type: 'vue-color',
+ label: '坐标名颜色',
+ name: 'nameColorYRight',
+ required: false,
+ placeholder: '',
+ value: '#fff',
+ },
+ {
+ type: 'el-input-number',
+ label: '坐标名字号',
+ name: 'nameFontSizeYRight',
+ required: false,
+ placeholder: '',
+ value: 14,
+ }, {
+ type: 'vue-color',
+ label: '数值颜色',
+ name: 'colorYRight',
+ required: false,
+ placeholder: '',
+ value: '#fff',
+ },
+ {
+ type: 'el-input-number',
+ label: '数值字号',
+ name: 'fontSizeYRight',
+ required: false,
+ placeholder: '',
+ value: 14,
+ },
+ {
+ type: 'el-input-number',
+ label: '均分',
+ name: 'splitNumberRight',
+ required: false,
+ placeholder: '',
+ value: ''
+ },
+ {
+ type: 'el-slider',
+ label: '数值角度',
+ name: 'textAngleYRight',
+ required: false,
+ placeholder: '',
+ value: 0
+ },
+ {
+ type: 'el-switch',
+ label: '刻度线显示',
+ name: 'tickLineYRight',
+ require: false,
+ placeholder: '',
+ value: true,
+ },
+ {
+ type: 'el-switch',
+ label: '坐标轴显示',
+ name: 'lineYRight',
+ require: false,
+ placeholder: '',
+ value: true,
+ },
+ {
+ type: 'vue-color',
+ label: '坐标轴颜色',
+ name: 'lineColorYRight',
+ required: false,
+ placeholder: '',
+ value: '#fff',
+ },
+ {
+ type: 'el-input-number',
+ label: '坐标轴宽度',
+ name: 'lineWidthYRight',
+ required: false,
+ placeholder: '',
+ value: 1,
+ },
+ {
+ type: 'el-switch',
+ label: '分割线显示',
+ name: 'isShowSplitLineYRight',
+ require: false,
+ placeholder: '',
+ value: false,
+ },
+ {
+ type: 'vue-color',
+ label: '分割线颜色',
+ name: 'splitLineColorYRight',
+ required: false,
+ placeholder: '',
+ value: '#fff',
+ },
+ {
+ type: 'el-input-number',
+ label: '分割线宽度',
+ name: 'splitLineFontWidthYRight',
+ required: false,
+ placeholder: '',
+ value: 1,
+ },
+ ],
+ },
+ {
+ name: '折线数值设定',
+ list: [
+ {
+ type: 'el-switch',
+ label: '显示',
+ name: 'isShowLine',
+ required: false,
+ placeholder: '',
+ value: false
+ },
+ {
+ type: 'el-input-number',
+ label: '距离',
+ name: 'distanceLine',
+ required: false,
+ placeholder: '',
+ value: 5
+ },
+ {
+ type: 'el-input-number',
+ label: '字体字号',
+ name: 'fontSizeLine',
+ required: false,
+ placeholder: '',
+ value: 14
+ },
+ {
+ type: 'vue-color',
+ label: '字体颜色',
+ name: 'subTextColorLine',
+ required: false,
+ placeholder: '',
+ value: '#fff'
+ },
+ {
+ type: 'el-select',
+ label: '字体粗细',
+ name: 'fontWeightLine',
+ required: false,
+ placeholder: '',
+ selectOptions: [
+ { code: 'normal', name: '正常' },
+ { code: 'bold', name: '粗体' },
+ { code: 'bolder', name: '特粗体' },
+ { code: 'lighter', name: '细体' }
+ ],
+ value: 'normal'
+ },
+ ],
+ },
+ {
+ name: '柱体数值设定',
+ list: [
+ {
+ type: 'el-switch',
+ label: '显示',
+ name: 'isShowBar',
+ required: false,
+ placeholder: '',
+ value: false
+ },
+ {
+ type: 'el-input-number',
+ label: '距离',
+ name: 'distanceBar',
+ required: false,
+ placeholder: '',
+ value: 5
+ },
+ {
+ type: 'el-input-number',
+ label: '字体字号',
+ name: 'fontSizeBar',
+ required: false,
+ placeholder: '',
+ value: 14
+ },
+ {
+ type: 'vue-color',
+ label: '字体颜色',
+ name: 'subTextColorBar',
+ required: false,
+ placeholder: '',
+ value: '#fff'
+ },
+ {
+ type: 'el-select',
+ label: '字体粗细',
+ name: 'fontWeightBar',
+ required: false,
+ placeholder: '',
+ selectOptions: [
+ { code: 'normal', name: '正常' },
+ { code: 'bold', name: '粗体' },
+ { code: 'bolder', name: '特粗体' },
+ { code: 'lighter', name: '细体' }
+ ],
+ value: 'normal'
+ },
+ ],
+ },
+ {
+ name: '提示语设置',
+ list: [
+ {
+ type: 'el-input-number',
+ label: '字体字号',
+ name: 'tipsFontSize',
+ required: false,
+ placeholder: '',
+ value: 16
+ },
+ {
+ type: 'vue-color',
+ label: '字体颜色',
+ name: 'tipsColor',
+ required: false,
+ placeholder: '',
+ value: '#00FEFF'
+ },
+ ],
+ },
+ {
+ name: '坐标轴边距设置',
+ list: [
+ {
+ type: 'el-slider',
+ label: '左边距(像素)',
+ name: 'marginLeft',
+ required: false,
+ placeholder: '',
+ value: 10,
+ }, {
+ type: 'el-slider',
+ label: '顶边距(像素)',
+ name: 'marginTop',
+ required: false,
+ placeholder: '',
+ value: 50,
+ }, {
+ type: 'el-slider',
+ label: '右边距(像素)',
+ name: 'marginRight',
+ required: false,
+ placeholder: '',
+ value: 40,
+ }, {
+ type: 'el-slider',
+ label: '底边距(像素)',
+ name: 'marginBottom',
+ required: false,
+ placeholder: '',
+ value: 10,
+ },
+ ],
+ },
+ {
+ name: '自定义配色',
+ list: [
+ {
+ type: 'customColor',
+ label: '',
+ name: 'customColor',
+ required: false,
+ value: [{ color: '#ff7f50' }, { color: '#87cefa' }, { color: '#da70d6' }, { color: '#32cd32' }, { color: '#6495ed' }],
+ },
+ ],
+ },
+ ],
+ ],
+ // 数据
+ data: [
+ {
+ type: 'el-radio-group',
+ label: '数据类型',
+ name: 'dataType',
+ require: false,
+ placeholder: '',
+ selectValue: true,
+ selectOptions: [
+ {
+ code: 'staticData',
+ name: '静态数据',
+ },
+ {
+ code: 'dynamicData',
+ name: '动态数据',
+ },
+ ],
+ value: 'staticData',
+ },
+ {
+ type: 'el-input-number',
+ label: '刷新时间(毫秒)',
+ name: 'refreshTime',
+ relactiveDom: 'dataType',
+ relactiveDomValue: 'dynamicData',
+ value: 600000
+ },
+ {
+ type: 'el-button',
+ label: '静态数据',
+ name: 'staticData',
+ required: false,
+ placeholder: '',
+ relactiveDom: 'dataType',
+ relactiveDomValue: 'staticData',
+ value: [
+ { "axis": "1月", "bar1": 2.6, "bar2": 2 },
+ { "axis": "2月", "bar1": 5.9, "bar2": 2.2 },
+ { "axis": "3月", "bar1": 9, "bar2": 3.3 },
+ { "axis": "4月", "bar1": 26.4, "bar2": 4.5 },
+ { "axis": "5月", "bar1": 28.7, "bar2": 6.3 },
+ { "axis": "6月", "bar1": 70.7, "bar2": 10.2 },
+ { "axis": "7月", "bar1": 175.6, "bar2": 20.3 },
+ { "axis": "8月", "bar1": 182.2, "bar2": 23.4 },
+ { "axis": "9月", "bar1": 48.7, "bar2": 23 },
+ { "axis": "10月", "bar1": 18.8, "bar2": 16.5 },
+ { "axis": "11月", "bar1": 6, "bar2": 12 },
+ { "axis": "12月", "bar1": 2.3, "bar2": 6.2 },
+ ]
+ },
+ {
+ type: 'dycustComponents',
+ label: '',
+ name: 'dynamicData',
+ required: false,
+ placeholder: '',
+ relactiveDom: 'dataType',
+ chartType: 'widget-barlinechart',
+ dictKey: 'BAR_PROPERTIES',
+ relactiveDomValue: 'dynamicData',
+ },
+ ],
+ // 坐标
+ position: [
+ {
+ type: 'el-input-number',
+ label: '左边距',
+ name: 'left',
+ required: false,
+ placeholder: '',
+ value: 0,
+ },
+ {
+ type: 'el-input-number',
+ label: '上边距',
+ name: 'top',
+ required: false,
+ placeholder: '',
+ value: 0,
+ },
+ {
+ type: 'el-input-number',
+ label: '宽度',
+ name: 'width',
+ required: false,
+ placeholder: '该容器在1920px大屏中的宽度',
+ value: 500,
+ },
+ {
+ type: 'el-input-number',
+ label: '高度',
+ name: 'height',
+ required: false,
+ placeholder: '该容器在1080px大屏中的高度',
+ value: 250,
+ },
+ ],
+ }
+}
diff --git a/report-ui/src/views/bigscreenDesigner/designer/tools/configure/barCharts/widget-bar-stack.js b/report-ui/src/views/bigscreenDesigner/designer/tools/configure/barCharts/widget-bar-stack.js
index a0c74d92..b788ada1 100644
--- a/report-ui/src/views/bigscreenDesigner/designer/tools/configure/barCharts/widget-bar-stack.js
+++ b/report-ui/src/views/bigscreenDesigner/designer/tools/configure/barCharts/widget-bar-stack.js
@@ -3,8 +3,8 @@
* @version:
* @Author: qianlishi
* @Date: 2021-08-29 07:37:09
- * @LastEditors: qianlishi
- * @LastEditTime: 2021-09-28 14:11:09
+ * @LastEditors: qianlishi qianlishi@anji-plus.com
+ * @LastEditTime: 2023-01-10 14:09:07
*/
export const widgetBarStack = {
code: 'widgetBarStackChart',
@@ -46,8 +46,8 @@ export const widgetBarStack = {
required: false,
placeholder: '',
selectOptions: [
- {code: 'leftRight', name: '左右堆叠'},
- {code: 'upDown', name: '上下堆叠'},
+ { code: 'leftRight', name: '左右堆叠' },
+ { code: 'upDown', name: '上下堆叠' },
],
value: 'leftRight'
},
@@ -115,10 +115,10 @@ export const widgetBarStack = {
required: false,
placeholder: '',
selectOptions: [
- {code: 'normal', name: '正常'},
- {code: 'bold', name: '粗体'},
- {code: 'bolder', name: '特粗体'},
- {code: 'lighter', name: '细体'}
+ { code: 'normal', name: '正常' },
+ { code: 'bold', name: '粗体' },
+ { code: 'bolder', name: '特粗体' },
+ { code: 'lighter', name: '细体' }
],
value: 'normal'
},
@@ -129,9 +129,9 @@ export const widgetBarStack = {
required: false,
placeholder: '',
selectOptions: [
- {code: 'normal', name: '正常'},
- {code: 'italic', name: 'italic斜体'},
- {code: 'oblique', name: 'oblique斜体'},
+ { code: 'normal', name: '正常' },
+ { code: 'italic', name: 'italic斜体' },
+ { code: 'oblique', name: 'oblique斜体' },
],
value: 'normal'
},
@@ -142,9 +142,9 @@ export const widgetBarStack = {
required: false,
placeholder: '',
selectOptions: [
- {code: 'center', name: '居中'},
- {code: 'left', name: '左对齐'},
- {code: 'right', name: '右对齐'},
+ { code: 'center', name: '居中' },
+ { code: 'left', name: '左对齐' },
+ { code: 'right', name: '右对齐' },
],
value: 'center'
},
@@ -179,10 +179,10 @@ export const widgetBarStack = {
required: false,
placeholder: '',
selectOptions: [
- {code: 'normal', name: '正常'},
- {code: 'bold', name: '粗体'},
- {code: 'bolder', name: '特粗体'},
- {code: 'lighter', name: '细体'}
+ { code: 'normal', name: '正常' },
+ { code: 'bold', name: '粗体' },
+ { code: 'bolder', name: '特粗体' },
+ { code: 'lighter', name: '细体' }
],
value: 'normal'
},
@@ -193,9 +193,9 @@ export const widgetBarStack = {
required: false,
placeholder: '',
selectOptions: [
- {code: 'normal', name: '正常'},
- {code: 'italic', name: 'italic斜体'},
- {code: 'oblique', name: 'oblique斜体'},
+ { code: 'normal', name: '正常' },
+ { code: 'italic', name: 'italic斜体' },
+ { code: 'oblique', name: 'oblique斜体' },
],
value: 'normal'
},
@@ -214,7 +214,7 @@ export const widgetBarStack = {
},
{
type: 'el-input-text',
- label: '图例名称',
+ label: '名称( | 分隔)',
name: 'legendName',
required: false,
placeholder: '多值以' | '隔开',
@@ -251,9 +251,9 @@ export const widgetBarStack = {
required: false,
placeholder: '',
selectOptions: [
- {code: 'center', name: '居中'},
- {code: 'left', name: '左对齐'},
- {code: 'right', name: '右对齐'},
+ { code: 'center', name: '居中' },
+ { code: 'left', name: '左对齐' },
+ { code: 'right', name: '右对齐' },
],
value: 'center'
},
@@ -264,8 +264,8 @@ export const widgetBarStack = {
required: false,
placeholder: '',
selectOptions: [
- {code: 'top', name: '顶部'},
- {code: 'bottom', name: '底部'},
+ { code: 'top', name: '顶部' },
+ { code: 'bottom', name: '底部' },
],
value: 'top'
},
@@ -276,8 +276,8 @@ export const widgetBarStack = {
required: false,
placeholder: '',
selectOptions: [
- {code: 'vertical', name: '竖排'},
- {code: 'horizontal', name: '横排'},
+ { code: 'vertical', name: '竖排' },
+ { code: 'horizontal', name: '横排' },
],
value: 'horizontal'
},
@@ -559,10 +559,10 @@ export const widgetBarStack = {
required: false,
placeholder: '',
selectOptions: [
- {code: 'normal', name: '正常'},
- {code: 'bold', name: '粗体'},
- {code: 'bolder', name: '特粗体'},
- {code: 'lighter', name: '细体'}
+ { code: 'normal', name: '正常' },
+ { code: 'bold', name: '粗体' },
+ { code: 'bolder', name: '特粗体' },
+ { code: 'lighter', name: '细体' }
],
value: 'normal'
},
@@ -631,7 +631,7 @@ export const widgetBarStack = {
label: '',
name: 'customColor',
required: false,
- value: [{color: '#ff7f50'}, {color: '#87cefa'}, {color: '#da70d6'}, {color: '#32cd32'}, {color: '#6495ed'}],
+ value: [{ color: '#ff7f50' }, { color: '#87cefa' }, { color: '#da70d6' }, { color: '#32cd32' }, { color: '#6495ed' }],
},
],
},
@@ -664,7 +664,7 @@ export const widgetBarStack = {
name: 'refreshTime',
relactiveDom: 'dataType',
relactiveDomValue: 'dynamicData',
- value: 5000
+ value: 600000
},
{
type: 'el-button',
@@ -675,11 +675,11 @@ export const widgetBarStack = {
relactiveDom: 'dataType',
relactiveDomValue: 'staticData',
value: [
- {"axis": "2021-07-25", "name": "A", "data": "12"},
- {"axis": "2021-07-25", "name": "B", "data": "20"},
- {"axis": "2021-07-26", "name": "B", "data": "5"},
- {"axis": "2021-07-27", "name": "A", "data": "15"},
- {"axis": "2021-07-27", "name": "B", "data": "30"},
+ { "axis": "2021-07-25", "name": "A", "data": "12" },
+ { "axis": "2021-07-25", "name": "B", "data": "20" },
+ { "axis": "2021-07-26", "name": "B", "data": "5" },
+ { "axis": "2021-07-27", "name": "A", "data": "15" },
+ { "axis": "2021-07-27", "name": "B", "data": "30" },
],
},
{
diff --git a/report-ui/src/views/bigscreenDesigner/designer/tools/configure/barCharts/widget-barchart.js b/report-ui/src/views/bigscreenDesigner/designer/tools/configure/barCharts/widget-barchart.js
index 673d26f6..1847bc3f 100644
--- a/report-ui/src/views/bigscreenDesigner/designer/tools/configure/barCharts/widget-barchart.js
+++ b/report-ui/src/views/bigscreenDesigner/designer/tools/configure/barCharts/widget-barchart.js
@@ -3,8 +3,8 @@
* @version:
* @Author: qianlishi
* @Date: 2021-08-29 07:21:45
- * @LastEditors: qianlishi
- * @LastEditTime: 2021-09-28 14:08:29
+ * @LastEditors: qianlishi qianlishi@anji-plus.com
+ * @LastEditTime: 2023-01-10 14:09:03
*/
export const widgetBarchart = {
code: 'widget-barchart',
@@ -111,10 +111,10 @@ export const widgetBarchart = {
required: false,
placeholder: '',
selectOptions: [
- {code: 'normal', name: '正常'},
- {code: 'bold', name: '粗体'},
- {code: 'bolder', name: '特粗体'},
- {code: 'lighter', name: '细体'}
+ { code: 'normal', name: '正常' },
+ { code: 'bold', name: '粗体' },
+ { code: 'bolder', name: '特粗体' },
+ { code: 'lighter', name: '细体' }
],
value: 'normal'
},
@@ -125,9 +125,9 @@ export const widgetBarchart = {
required: false,
placeholder: '',
selectOptions: [
- {code: 'normal', name: '正常'},
- {code: 'italic', name: 'italic斜体'},
- {code: 'oblique', name: 'oblique斜体'},
+ { code: 'normal', name: '正常' },
+ { code: 'italic', name: 'italic斜体' },
+ { code: 'oblique', name: 'oblique斜体' },
],
value: 'normal'
},
@@ -138,9 +138,9 @@ export const widgetBarchart = {
required: false,
placeholder: '',
selectOptions: [
- {code: 'center', name: '居中'},
- {code: 'left', name: '左对齐'},
- {code: 'right', name: '右对齐'},
+ { code: 'center', name: '居中' },
+ { code: 'left', name: '左对齐' },
+ { code: 'right', name: '右对齐' },
],
value: 'center'
},
@@ -175,10 +175,10 @@ export const widgetBarchart = {
required: false,
placeholder: '',
selectOptions: [
- {code: 'normal', name: '正常'},
- {code: 'bold', name: '粗体'},
- {code: 'bolder', name: '特粗体'},
- {code: 'lighter', name: '细体'}
+ { code: 'normal', name: '正常' },
+ { code: 'bold', name: '粗体' },
+ { code: 'bolder', name: '特粗体' },
+ { code: 'lighter', name: '细体' }
],
value: 'normal'
},
@@ -189,9 +189,9 @@ export const widgetBarchart = {
required: false,
placeholder: '',
selectOptions: [
- {code: 'normal', name: '正常'},
- {code: 'italic', name: 'italic斜体'},
- {code: 'oblique', name: 'oblique斜体'},
+ { code: 'normal', name: '正常' },
+ { code: 'italic', name: 'italic斜体' },
+ { code: 'oblique', name: 'oblique斜体' },
],
value: 'normal'
},
@@ -481,10 +481,10 @@ export const widgetBarchart = {
required: false,
placeholder: '',
selectOptions: [
- {code: 'normal', name: '正常'},
- {code: 'bold', name: '粗体'},
- {code: 'bolder', name: '特粗体'},
- {code: 'lighter', name: '细体'}
+ { code: 'normal', name: '正常' },
+ { code: 'bold', name: '粗体' },
+ { code: 'bolder', name: '特粗体' },
+ { code: 'lighter', name: '细体' }
],
value: 'normal'
},
@@ -553,10 +553,22 @@ export const widgetBarchart = {
label: '',
name: 'customColor',
required: false,
- value: [{color: '#ff7f50'}, {color: '#87cefa'}, {color: '#da70d6'}, {color: '#32cd32'}, {color: '#6495ed'}],
+ value: [{ color: '#ff7f50' }, { color: '#87cefa' }, { color: '#da70d6' }, { color: '#32cd32' }, { color: '#6495ed' }],
},
],
},
+ {
+ name: '组件联动',
+ list: [
+ {
+ type: 'componentLinkage',
+ label: '',
+ name: 'componentLinkage',
+ required: false,
+ value: []
+ }
+ ]
+ }
],
],
// 数据
@@ -586,7 +598,7 @@ export const widgetBarchart = {
name: 'refreshTime',
relactiveDom: 'dataType',
relactiveDomValue: 'dynamicData',
- value: 5000
+ value: 600000
},
{
type: 'el-button',
@@ -597,11 +609,11 @@ export const widgetBarchart = {
relactiveDom: 'dataType',
relactiveDomValue: 'staticData',
value: [
- {"axis": "苹果", "data": 1000},
- {"axis": "三星", "data": 2229},
- {"axis": "小米", "data": 3879},
- {"axis": "oppo", "data": 2379},
- {"axis": "vivo", "data": 4079},
+ { "axis": "苹果", "data": 1000 },
+ { "axis": "三星", "data": 2229 },
+ { "axis": "小米", "data": 3879 },
+ { "axis": "oppo", "data": 2379 },
+ { "axis": "vivo", "data": 4079 },
],
},
{
@@ -652,5 +664,20 @@ export const widgetBarchart = {
value: 200,
},
],
+ // 事件
+ methods: [
+ // {
+ // type: 'methods',
+ // label: '前置钩子',
+ // name: 'beforeMethods',
+ // value: 'function beforeMethods(data){\n\t//自定义脚本内容1\n\treturn data;\n}',
+ // },
+ // {
+ // type: 'methods',
+ // label: '后置钩子',
+ // name: 'afterMethods',
+ // value: 'function afterMethods(data){\n\t//自定义脚本内容2\n\treturn data;\n}',
+ // },
+ ]
}
}
diff --git a/report-ui/src/views/bigscreenDesigner/designer/tools/configure/barCharts/widget-gradient-barchart.js b/report-ui/src/views/bigscreenDesigner/designer/tools/configure/barCharts/widget-gradient-barchart.js
index 17646d3a..97173a84 100644
--- a/report-ui/src/views/bigscreenDesigner/designer/tools/configure/barCharts/widget-gradient-barchart.js
+++ b/report-ui/src/views/bigscreenDesigner/designer/tools/configure/barCharts/widget-gradient-barchart.js
@@ -3,8 +3,8 @@
* @version:
* @Author: qianlishi
* @Date: 2021-08-29 07:23:41
- * @LastEditors: qianlishi
- * @LastEditTime: 2021-09-28 14:14:08
+ * @LastEditors: qianlishi qianlishi@anji-plus.com
+ * @LastEditTime: 2023-01-10 14:09:49
*/
export const widgetGradientBarchart = {
code: 'widget-gradient-color-barchart',
@@ -457,10 +457,10 @@ export const widgetGradientBarchart = {
required: false,
placeholder: '',
selectOptions: [
- {code: 'normal', name: '正常'},
- {code: 'bold', name: '粗体'},
- {code: 'bolder', name: '特粗体'},
- {code: 'lighter', name: '细体'}
+ { code: 'normal', name: '正常' },
+ { code: 'bold', name: '粗体' },
+ { code: 'bolder', name: '特粗体' },
+ { code: 'lighter', name: '细体' }
],
value: 'normal'
},
@@ -558,6 +558,18 @@ export const widgetGradientBarchart = {
},
],
},
+ {
+ name: '组件联动',
+ list: [
+ {
+ type: 'componentLinkage',
+ label: '',
+ name: 'componentLinkage',
+ required: false,
+ value: []
+ }
+ ]
+ }
],
],
// 数据
@@ -587,7 +599,7 @@ export const widgetGradientBarchart = {
name: 'refreshTime',
relactiveDom: 'dataType',
relactiveDomValue: 'dynamicData',
- value: 5000
+ value: 600000
},
{
type: 'el-button',
@@ -598,11 +610,11 @@ export const widgetGradientBarchart = {
relactiveDom: 'dataType',
relactiveDomValue: 'staticData',
value: [
- {"axis": "苹果", "data": 1000},
- {"axis": "三星", "data": 2229},
- {"axis": "小米", "data": 3879},
- {"axis": "oppo", "data": 2379},
- {"axis": "vivo", "data": 4079},
+ { "axis": "苹果", "data": 1000 },
+ { "axis": "三星", "data": 2229 },
+ { "axis": "小米", "data": 3879 },
+ { "axis": "oppo", "data": 2379 },
+ { "axis": "vivo", "data": 4079 },
],
},
{
diff --git a/report-ui/src/views/bigscreenDesigner/designer/tools/configure/barlineCharts/widget-bar-line-stack.js b/report-ui/src/views/bigscreenDesigner/designer/tools/configure/barlineCharts/widget-bar-line-stack.js
index bea0082e..a3a1e064 100644
--- a/report-ui/src/views/bigscreenDesigner/designer/tools/configure/barlineCharts/widget-bar-line-stack.js
+++ b/report-ui/src/views/bigscreenDesigner/designer/tools/configure/barlineCharts/widget-bar-line-stack.js
@@ -75,8 +75,8 @@ export const widgetBarLineStack = {
required: false,
placeholder: '',
selectOptions: [
- {code: 'circle', name: '实心点'},
- {code: 'emptyCircle', name: '空心点'},
+ { code: 'circle', name: '实心点' },
+ { code: 'emptyCircle', name: '空心点' },
],
value: 'circle'
},
@@ -140,10 +140,10 @@ export const widgetBarLineStack = {
required: false,
placeholder: '',
selectOptions: [
- {code: 'normal', name: '正常'},
- {code: 'bold', name: '粗体'},
- {code: 'bolder', name: '特粗体'},
- {code: 'lighter', name: '细体'}
+ { code: 'normal', name: '正常' },
+ { code: 'bold', name: '粗体' },
+ { code: 'bolder', name: '特粗体' },
+ { code: 'lighter', name: '细体' }
],
value: 'normal'
},
@@ -154,9 +154,9 @@ export const widgetBarLineStack = {
required: false,
placeholder: '',
selectOptions: [
- {code: 'normal', name: '正常'},
- {code: 'italic', name: 'italic斜体'},
- {code: 'oblique', name: 'oblique斜体'},
+ { code: 'normal', name: '正常' },
+ { code: 'italic', name: 'italic斜体' },
+ { code: 'oblique', name: 'oblique斜体' },
],
value: 'normal'
},
@@ -167,9 +167,9 @@ export const widgetBarLineStack = {
required: false,
placeholder: '',
selectOptions: [
- {code: 'center', name: '居中'},
- {code: 'left', name: '左对齐'},
- {code: 'right', name: '右对齐'},
+ { code: 'center', name: '居中' },
+ { code: 'left', name: '左对齐' },
+ { code: 'right', name: '右对齐' },
],
value: 'center'
},
@@ -204,10 +204,10 @@ export const widgetBarLineStack = {
required: false,
placeholder: '',
selectOptions: [
- {code: 'normal', name: '正常'},
- {code: 'bold', name: '粗体'},
- {code: 'bolder', name: '特粗体'},
- {code: 'lighter', name: '细体'}
+ { code: 'normal', name: '正常' },
+ { code: 'bold', name: '粗体' },
+ { code: 'bolder', name: '特粗体' },
+ { code: 'lighter', name: '细体' }
],
value: 'normal'
},
@@ -218,9 +218,9 @@ export const widgetBarLineStack = {
required: false,
placeholder: '',
selectOptions: [
- {code: 'normal', name: '正常'},
- {code: 'italic', name: 'italic斜体'},
- {code: 'oblique', name: 'oblique斜体'},
+ { code: 'normal', name: '正常' },
+ { code: 'italic', name: 'italic斜体' },
+ { code: 'oblique', name: 'oblique斜体' },
],
value: 'normal'
},
@@ -239,7 +239,7 @@ export const widgetBarLineStack = {
},
{
type: 'el-input-text',
- label: '图例名称',
+ label: '名称( | 分隔)',
name: 'legendName',
required: false,
placeholder: '多值以' | '隔开',
@@ -276,9 +276,9 @@ export const widgetBarLineStack = {
required: false,
placeholder: '',
selectOptions: [
- {code: 'center', name: '居中'},
- {code: 'left', name: '左对齐'},
- {code: 'right', name: '右对齐'},
+ { code: 'center', name: '居中' },
+ { code: 'left', name: '左对齐' },
+ { code: 'right', name: '右对齐' },
],
value: 'center'
},
@@ -289,8 +289,8 @@ export const widgetBarLineStack = {
required: false,
placeholder: '',
selectOptions: [
- {code: 'top', name: '顶部'},
- {code: 'bottom', name: '底部'},
+ { code: 'top', name: '顶部' },
+ { code: 'bottom', name: '底部' },
],
value: 'top'
},
@@ -301,8 +301,8 @@ export const widgetBarLineStack = {
required: false,
placeholder: '',
selectOptions: [
- {code: 'vertical', name: '竖排'},
- {code: 'horizontal', name: '横排'},
+ { code: 'vertical', name: '竖排' },
+ { code: 'horizontal', name: '横排' },
],
value: 'horizontal'
},
@@ -716,10 +716,10 @@ export const widgetBarLineStack = {
required: false,
placeholder: '',
selectOptions: [
- {code: 'normal', name: '正常'},
- {code: 'bold', name: '粗体'},
- {code: 'bolder', name: '特粗体'},
- {code: 'lighter', name: '细体'}
+ { code: 'normal', name: '正常' },
+ { code: 'bold', name: '粗体' },
+ { code: 'bolder', name: '特粗体' },
+ { code: 'lighter', name: '细体' }
],
value: 'normal'
},
@@ -767,10 +767,10 @@ export const widgetBarLineStack = {
required: false,
placeholder: '',
selectOptions: [
- {code: 'normal', name: '正常'},
- {code: 'bold', name: '粗体'},
- {code: 'bolder', name: '特粗体'},
- {code: 'lighter', name: '细体'}
+ { code: 'normal', name: '正常' },
+ { code: 'bold', name: '粗体' },
+ { code: 'bolder', name: '特粗体' },
+ { code: 'lighter', name: '细体' }
],
value: 'normal'
},
@@ -839,7 +839,7 @@ export const widgetBarLineStack = {
label: '',
name: 'customColor',
required: false,
- value: [{color: '#ff7f50'}, {color: '#87cefa'}, {color: '#da70d6'}, {color: '#32cd32'}, {color: '#6495ed'}],
+ value: [{ color: '#ff7f50' }, { color: '#87cefa' }, { color: '#da70d6' }, { color: '#32cd32' }, { color: '#6495ed' }],
},
],
},
@@ -872,7 +872,7 @@ export const widgetBarLineStack = {
name: 'refreshTime',
relactiveDom: 'dataType',
relactiveDomValue: 'dynamicData',
- value: 5000
+ value: 600000
},
{
type: 'el-button',
@@ -883,16 +883,16 @@ export const widgetBarLineStack = {
relactiveDom: 'dataType',
relactiveDomValue: 'staticData',
value: [
- {"axis": "2021-07", "name": "A", "bar": "12", "line": "20"},
- {"axis": "2021-07", "name": "B", "bar": "20", "line": "12"},
- {"axis": "2021-08", "name": "A", "bar": "0", "line": "8"},
- {"axis": "2021-08", "name": "B", "bar": "5", "line": "3"},
- {"axis": "2021-09", "name": "A", "bar": "15", "line": "9"},
- {"axis": "2021-09", "name": "B", "bar": "30", "line": "19"},
- {"axis": "2021-10", "name": "A", "bar": "10", "line": "27"},
- {"axis": "2021-10", "name": "B", "bar": "24", "line": "6"},
- {"axis": "2021-11", "name": "A", "bar": "23", "line": "29"},
- {"axis": "2021-11", "name": "B", "bar": "8", "line": "9"},
+ { "axis": "2021-07", "name": "A", "bar": "12", "line": "20" },
+ { "axis": "2021-07", "name": "B", "bar": "20", "line": "12" },
+ { "axis": "2021-08", "name": "A", "bar": "0", "line": "8" },
+ { "axis": "2021-08", "name": "B", "bar": "5", "line": "3" },
+ { "axis": "2021-09", "name": "A", "bar": "15", "line": "9" },
+ { "axis": "2021-09", "name": "B", "bar": "30", "line": "19" },
+ { "axis": "2021-10", "name": "A", "bar": "10", "line": "27" },
+ { "axis": "2021-10", "name": "B", "bar": "24", "line": "6" },
+ { "axis": "2021-11", "name": "A", "bar": "23", "line": "29" },
+ { "axis": "2021-11", "name": "B", "bar": "8", "line": "9" },
],
},
{
diff --git a/report-ui/src/views/bigscreenDesigner/designer/tools/configure/barlineCharts/widget-barlinechart.js b/report-ui/src/views/bigscreenDesigner/designer/tools/configure/barlineCharts/widget-barlinechart.js
index eb43fa25..8bef3bbe 100644
--- a/report-ui/src/views/bigscreenDesigner/designer/tools/configure/barlineCharts/widget-barlinechart.js
+++ b/report-ui/src/views/bigscreenDesigner/designer/tools/configure/barlineCharts/widget-barlinechart.js
@@ -4,7 +4,7 @@
* @Author: qianlishi
* @Date: 2021-08-29 07:26:48
* @LastEditors: qianlishi qianlishi@anji-plus.com
- * @LastEditTime: 2022-11-07 15:39:29
+ * @LastEditTime: 2023-01-10 14:04:14
*/
export const widgetBarlinechart = {
code: 'widget-barlinechart',
@@ -87,8 +87,8 @@ export const widgetBarlinechart = {
required: false,
placeholder: '',
selectOptions: [
- {code: 'circle', name: '实心点'},
- {code: 'emptyCircle', name: '空心点'},
+ { code: 'circle', name: '实心点' },
+ { code: 'emptyCircle', name: '空心点' },
],
value: 'circle'
},
@@ -168,10 +168,10 @@ export const widgetBarlinechart = {
required: false,
placeholder: '',
selectOptions: [
- {code: 'normal', name: '正常'},
- {code: 'bold', name: '粗体'},
- {code: 'bolder', name: '特粗体'},
- {code: 'lighter', name: '细体'}
+ { code: 'normal', name: '正常' },
+ { code: 'bold', name: '粗体' },
+ { code: 'bolder', name: '特粗体' },
+ { code: 'lighter', name: '细体' }
],
value: 'normal'
},
@@ -182,9 +182,9 @@ export const widgetBarlinechart = {
required: false,
placeholder: '',
selectOptions: [
- {code: 'normal', name: '正常'},
- {code: 'italic', name: 'italic斜体'},
- {code: 'oblique', name: 'oblique斜体'},
+ { code: 'normal', name: '正常' },
+ { code: 'italic', name: 'italic斜体' },
+ { code: 'oblique', name: 'oblique斜体' },
],
value: 'normal'
},
@@ -195,9 +195,9 @@ export const widgetBarlinechart = {
required: false,
placeholder: '',
selectOptions: [
- {code: 'center', name: '居中'},
- {code: 'left', name: '左对齐'},
- {code: 'right', name: '右对齐'},
+ { code: 'center', name: '居中' },
+ { code: 'left', name: '左对齐' },
+ { code: 'right', name: '右对齐' },
],
value: 'center'
},
@@ -232,10 +232,10 @@ export const widgetBarlinechart = {
required: false,
placeholder: '',
selectOptions: [
- {code: 'normal', name: '正常'},
- {code: 'bold', name: '粗体'},
- {code: 'bolder', name: '特粗体'},
- {code: 'lighter', name: '细体'}
+ { code: 'normal', name: '正常' },
+ { code: 'bold', name: '粗体' },
+ { code: 'bolder', name: '特粗体' },
+ { code: 'lighter', name: '细体' }
],
value: 'normal'
},
@@ -246,9 +246,9 @@ export const widgetBarlinechart = {
required: false,
placeholder: '',
selectOptions: [
- {code: 'normal', name: '正常'},
- {code: 'italic', name: 'italic斜体'},
- {code: 'oblique', name: 'oblique斜体'},
+ { code: 'normal', name: '正常' },
+ { code: 'italic', name: 'italic斜体' },
+ { code: 'oblique', name: 'oblique斜体' },
],
value: 'normal'
},
@@ -267,7 +267,7 @@ export const widgetBarlinechart = {
},
{
type: 'el-input-text',
- label: '图例名称',
+ label: '名称( | 分隔)',
name: 'legendName',
required: false,
placeholder: '',
@@ -304,9 +304,9 @@ export const widgetBarlinechart = {
required: false,
placeholder: '',
selectOptions: [
- {code: 'center', name: '居中'},
- {code: 'left', name: '左对齐'},
- {code: 'right', name: '右对齐'},
+ { code: 'center', name: '居中' },
+ { code: 'left', name: '左对齐' },
+ { code: 'right', name: '右对齐' },
],
value: 'center'
},
@@ -317,8 +317,8 @@ export const widgetBarlinechart = {
required: false,
placeholder: '',
selectOptions: [
- {code: 'top', name: '顶部'},
- {code: 'bottom', name: '底部'},
+ { code: 'top', name: '顶部' },
+ { code: 'bottom', name: '底部' },
],
value: 'top'
},
@@ -329,8 +329,8 @@ export const widgetBarlinechart = {
required: false,
placeholder: '',
selectOptions: [
- {code: 'vertical', name: '竖排'},
- {code: 'horizontal', name: '横排'},
+ { code: 'vertical', name: '竖排' },
+ { code: 'horizontal', name: '横排' },
],
value: 'horizontal'
},
@@ -744,10 +744,10 @@ export const widgetBarlinechart = {
required: false,
placeholder: '',
selectOptions: [
- {code: 'normal', name: '正常'},
- {code: 'bold', name: '粗体'},
- {code: 'bolder', name: '特粗体'},
- {code: 'lighter', name: '细体'}
+ { code: 'normal', name: '正常' },
+ { code: 'bold', name: '粗体' },
+ { code: 'bolder', name: '特粗体' },
+ { code: 'lighter', name: '细体' }
],
value: 'normal'
},
@@ -795,10 +795,10 @@ export const widgetBarlinechart = {
required: false,
placeholder: '',
selectOptions: [
- {code: 'normal', name: '正常'},
- {code: 'bold', name: '粗体'},
- {code: 'bolder', name: '特粗体'},
- {code: 'lighter', name: '细体'}
+ { code: 'normal', name: '正常' },
+ { code: 'bold', name: '粗体' },
+ { code: 'bolder', name: '特粗体' },
+ { code: 'lighter', name: '细体' }
],
value: 'normal'
},
@@ -867,7 +867,7 @@ export const widgetBarlinechart = {
label: '',
name: 'customColor',
required: false,
- value: [{color: '#ff7f50'}, {color: '#87cefa'}, {color: '#da70d6'}, {color: '#32cd32'}, {color: '#6495ed'}],
+ value: [{ color: '#ff7f50' }, { color: '#87cefa' }, { color: '#da70d6' }, { color: '#32cd32' }, { color: '#6495ed' }],
},
],
},
@@ -900,7 +900,7 @@ export const widgetBarlinechart = {
name: 'refreshTime',
relactiveDom: 'dataType',
relactiveDomValue: 'dynamicData',
- value: 5000
+ value: 600000
},
{
type: 'el-button',
@@ -911,18 +911,18 @@ export const widgetBarlinechart = {
relactiveDom: 'dataType',
relactiveDomValue: 'staticData',
value: [
- {"axis": "1月", "bar": 2.6, "line": 2},
- {"axis": "2月", "bar": 5.9, "line": 2.2},
- {"axis": "3月", "bar": 9, "line": 3.3},
- {"axis": "4月", "bar": 26.4, "line": 4.5},
- {"axis": "5月", "bar": 28.7, "line": 6.3},
- {"axis": "6月", "bar": 70.7, "line": 10.2},
- {"axis": "7月", "bar": 175.6, "line": 20.3},
- {"axis": "8月", "bar": 182.2, "line": 23.4},
- {"axis": "9月", "bar": 48.7, "line": 23},
- {"axis": "10月", "bar": 18.8, "line": 16.5},
- {"axis": "11月", "bar": 6, "line": 12},
- {"axis": "12月", "bar": 2.3, "line": 6.2},
+ { "axis": "1月", "bar": 2.6, "line": 2 },
+ { "axis": "2月", "bar": 5.9, "line": 2.2 },
+ { "axis": "3月", "bar": 9, "line": 3.3 },
+ { "axis": "4月", "bar": 26.4, "line": 4.5 },
+ { "axis": "5月", "bar": 28.7, "line": 6.3 },
+ { "axis": "6月", "bar": 70.7, "line": 10.2 },
+ { "axis": "7月", "bar": 175.6, "line": 20.3 },
+ { "axis": "8月", "bar": 182.2, "line": 23.4 },
+ { "axis": "9月", "bar": 48.7, "line": 23 },
+ { "axis": "10月", "bar": 18.8, "line": 16.5 },
+ { "axis": "11月", "bar": 6, "line": 12 },
+ { "axis": "12月", "bar": 2.3, "line": 6.2 },
]
},
{
diff --git a/report-ui/src/views/bigscreenDesigner/designer/tools/configure/barlineCharts/widget-more-bar-line.js b/report-ui/src/views/bigscreenDesigner/designer/tools/configure/barlineCharts/widget-more-bar-line.js
index e291ece6..5362ba3a 100644
--- a/report-ui/src/views/bigscreenDesigner/designer/tools/configure/barlineCharts/widget-more-bar-line.js
+++ b/report-ui/src/views/bigscreenDesigner/designer/tools/configure/barlineCharts/widget-more-bar-line.js
@@ -4,7 +4,7 @@
* @Author: foming
* @Date:
* @LastEditors: qianlishi qianlishi@anji-plus.com
- * @LastEditTime: 2022-11-07 15:39:52
+ * @LastEditTime: 2023-01-10 14:10:08
*/
export const widgetMoreBarLine = {
code: 'widgetMoreBarLineChart',
@@ -79,8 +79,8 @@ export const widgetMoreBarLine = {
required: false,
placeholder: '',
selectOptions: [
- {code: 'circle', name: '实心点'},
- {code: 'emptyCircle', name: '空心点'},
+ { code: 'circle', name: '实心点' },
+ { code: 'emptyCircle', name: '空心点' },
],
value: 'circle'
},
@@ -160,10 +160,10 @@ export const widgetMoreBarLine = {
required: false,
placeholder: '',
selectOptions: [
- {code: 'normal', name: '正常'},
- {code: 'bold', name: '粗体'},
- {code: 'bolder', name: '特粗体'},
- {code: 'lighter', name: '细体'}
+ { code: 'normal', name: '正常' },
+ { code: 'bold', name: '粗体' },
+ { code: 'bolder', name: '特粗体' },
+ { code: 'lighter', name: '细体' }
],
value: 'normal'
},
@@ -174,9 +174,9 @@ export const widgetMoreBarLine = {
required: false,
placeholder: '',
selectOptions: [
- {code: 'normal', name: '正常'},
- {code: 'italic', name: 'italic斜体'},
- {code: 'oblique', name: 'oblique斜体'},
+ { code: 'normal', name: '正常' },
+ { code: 'italic', name: 'italic斜体' },
+ { code: 'oblique', name: 'oblique斜体' },
],
value: 'normal'
},
@@ -187,9 +187,9 @@ export const widgetMoreBarLine = {
required: false,
placeholder: '',
selectOptions: [
- {code: 'center', name: '居中'},
- {code: 'left', name: '左对齐'},
- {code: 'right', name: '右对齐'},
+ { code: 'center', name: '居中' },
+ { code: 'left', name: '左对齐' },
+ { code: 'right', name: '右对齐' },
],
value: 'center'
},
@@ -224,10 +224,10 @@ export const widgetMoreBarLine = {
required: false,
placeholder: '',
selectOptions: [
- {code: 'normal', name: '正常'},
- {code: 'bold', name: '粗体'},
- {code: 'bolder', name: '特粗体'},
- {code: 'lighter', name: '细体'}
+ { code: 'normal', name: '正常' },
+ { code: 'bold', name: '粗体' },
+ { code: 'bolder', name: '特粗体' },
+ { code: 'lighter', name: '细体' }
],
value: 'normal'
},
@@ -238,9 +238,9 @@ export const widgetMoreBarLine = {
required: false,
placeholder: '',
selectOptions: [
- {code: 'normal', name: '正常'},
- {code: 'italic', name: 'italic斜体'},
- {code: 'oblique', name: 'oblique斜体'},
+ { code: 'normal', name: '正常' },
+ { code: 'italic', name: 'italic斜体' },
+ { code: 'oblique', name: 'oblique斜体' },
],
value: 'normal'
},
@@ -259,7 +259,7 @@ export const widgetMoreBarLine = {
},
{
type: 'el-input-text',
- label: '图例名称',
+ label: '名称( | 分隔)',
name: 'legendName',
required: false,
placeholder: '多值以' | '隔开',
@@ -296,9 +296,9 @@ export const widgetMoreBarLine = {
required: false,
placeholder: '',
selectOptions: [
- {code: 'center', name: '居中'},
- {code: 'left', name: '左对齐'},
- {code: 'right', name: '右对齐'},
+ { code: 'center', name: '居中' },
+ { code: 'left', name: '左对齐' },
+ { code: 'right', name: '右对齐' },
],
value: 'center'
},
@@ -309,8 +309,8 @@ export const widgetMoreBarLine = {
required: false,
placeholder: '',
selectOptions: [
- {code: 'top', name: '顶部'},
- {code: 'bottom', name: '底部'},
+ { code: 'top', name: '顶部' },
+ { code: 'bottom', name: '底部' },
],
value: 'top'
},
@@ -321,8 +321,8 @@ export const widgetMoreBarLine = {
required: false,
placeholder: '',
selectOptions: [
- {code: 'vertical', name: '竖排'},
- {code: 'horizontal', name: '横排'},
+ { code: 'vertical', name: '竖排' },
+ { code: 'horizontal', name: '横排' },
],
value: 'horizontal'
},
@@ -736,10 +736,10 @@ export const widgetMoreBarLine = {
required: false,
placeholder: '',
selectOptions: [
- {code: 'normal', name: '正常'},
- {code: 'bold', name: '粗体'},
- {code: 'bolder', name: '特粗体'},
- {code: 'lighter', name: '细体'}
+ { code: 'normal', name: '正常' },
+ { code: 'bold', name: '粗体' },
+ { code: 'bolder', name: '特粗体' },
+ { code: 'lighter', name: '细体' }
],
value: 'normal'
},
@@ -787,10 +787,10 @@ export const widgetMoreBarLine = {
required: false,
placeholder: '',
selectOptions: [
- {code: 'normal', name: '正常'},
- {code: 'bold', name: '粗体'},
- {code: 'bolder', name: '特粗体'},
- {code: 'lighter', name: '细体'}
+ { code: 'normal', name: '正常' },
+ { code: 'bold', name: '粗体' },
+ { code: 'bolder', name: '特粗体' },
+ { code: 'lighter', name: '细体' }
],
value: 'normal'
},
@@ -859,7 +859,7 @@ export const widgetMoreBarLine = {
label: '',
name: 'customColor',
required: false,
- value: [{color: '#ff7f50'}, {color: '#87cefa'}, {color: '#da70d6'}, {color: '#32cd32'}, {color: '#6495ed'}],
+ value: [{ color: '#ff7f50' }, { color: '#87cefa' }, { color: '#da70d6' }, { color: '#32cd32' }, { color: '#6495ed' }],
},
],
},
@@ -892,7 +892,7 @@ export const widgetMoreBarLine = {
name: 'refreshTime',
relactiveDom: 'dataType',
relactiveDomValue: 'dynamicData',
- value: 5000
+ value: 600000
},
{
type: 'el-button',
@@ -903,14 +903,14 @@ export const widgetMoreBarLine = {
relactiveDom: 'dataType',
relactiveDomValue: 'staticData',
value: [
- {"date": "2014", "unsales": 400, "manus": 300, "sales": 4.2,},
- {"date": "2015", "unsales": 400, "manus": 500, "sales": 3.6,},
- {"date": "2016", "unsales": 300, "manus": 500, "sales": 5.8,},
- {"date": "2017", "unsales": 300, "manus": 500, "sales": 3.4,},
- {"date": "2018", "unsales": 400, "manus": 400, "sales": 2.5,},
- {"date": "2019", "unsales": 400, "manus": 500, "sales": 5.8,},
- {"date": "2020", "unsales": 300, "manus": 400, "sales": 7.6,},
- {"date": "2021", "unsales": 300, "manus": 600, "sales": 3.4,},
+ { "date": "2014", "unsales": 400, "manus": 300, "sales": 4.2, },
+ { "date": "2015", "unsales": 400, "manus": 500, "sales": 3.6, },
+ { "date": "2016", "unsales": 300, "manus": 500, "sales": 5.8, },
+ { "date": "2017", "unsales": 300, "manus": 500, "sales": 3.4, },
+ { "date": "2018", "unsales": 400, "manus": 400, "sales": 2.5, },
+ { "date": "2019", "unsales": 400, "manus": 500, "sales": 5.8, },
+ { "date": "2020", "unsales": 300, "manus": 400, "sales": 7.6, },
+ { "date": "2021", "unsales": 300, "manus": 600, "sales": 3.4, },
]
},
{
diff --git a/report-ui/src/views/bigscreenDesigner/designer/tools/configure/decorateCharts/widget-decorate-pie.js b/report-ui/src/views/bigscreenDesigner/designer/tools/configure/decorateCharts/widget-decorate-pie.js
index ad94e2fc..d28ccbbe 100644
--- a/report-ui/src/views/bigscreenDesigner/designer/tools/configure/decorateCharts/widget-decorate-pie.js
+++ b/report-ui/src/views/bigscreenDesigner/designer/tools/configure/decorateCharts/widget-decorate-pie.js
@@ -4,7 +4,7 @@
* @Author: foming
* @Date:
* @LastEditors: qianlishi qianlishi@anji-plus.com
- * @LastEditTime: 2022-11-07 15:40:07
+ * @LastEditTime: 2023-01-10 14:04:50
*/
export const widgetDecoratePie = {
code: 'widgetDecoratePieChart',
diff --git a/report-ui/src/views/bigscreenDesigner/designer/tools/configure/form/widget-form-time.js b/report-ui/src/views/bigscreenDesigner/designer/tools/configure/form/widget-form-time.js
new file mode 100644
index 00000000..c3679ecc
--- /dev/null
+++ b/report-ui/src/views/bigscreenDesigner/designer/tools/configure/form/widget-form-time.js
@@ -0,0 +1,91 @@
+/*
+ * @Descripttion: 时间筛选器
+ * @Author: qianlishi qianlishi@anji-plus.com
+ */
+export const widgetFormTime = {
+ code: 'widget-form-time',
+ type: 'form',
+ tabName: '表单',
+ label: '时间筛选器',
+ icon: 'iconshijianshaixuan',
+ options: {
+ setup: [
+ {
+ type: 'el-input-text',
+ label: '图层名称',
+ name: 'layerName',
+ required: false,
+ placeholder: '',
+ value: '时间筛选器',
+ },
+ {
+ type: 'vue-color',
+ label: '背景',
+ name: 'select_background',
+ required: false,
+ placeholder: '',
+ value: 'rgba(115,170,229,.5)',
+ },
+/* {
+ type: 'el-select',
+ label: '触发事件',
+ name: 'event',
+ required: false,
+ placeholder: '',
+ selectOptions: [
+ { code: 'change', name: 'change' },
+ { code: 'blur', name: 'blur' },
+ { code: 'focus', name: 'focus' },
+ ],
+ value: 'change',
+ },*/
+ [{
+ name: '组件联动',
+ list: [
+ {
+ type: 'componentLinkage',
+ label: '',
+ name: 'componentLinkage',
+ required: false,
+ value: []
+ }
+ ]
+ }]
+ ],
+ data: [],
+ position: [
+ {
+ type: 'el-input-number',
+ label: '左边距',
+ name: 'left',
+ required: false,
+ placeholder: '',
+ value: 0,
+ },
+ {
+ type: 'el-input-number',
+ label: '上边距',
+ name: 'top',
+ required: false,
+ placeholder: '',
+ value: 0,
+ },
+ {
+ type: 'el-input-number',
+ label: '宽度',
+ name: 'width',
+ required: false,
+ placeholder: '该容器在1920px大屏中的宽度',
+ value: 400,
+ },
+ {
+ type: 'el-input-number',
+ label: '高度',
+ name: 'height',
+ required: false,
+ placeholder: '该容器在1080px大屏中的高度',
+ value: 40,
+ },
+ ],
+ }
+}
diff --git a/report-ui/src/views/bigscreenDesigner/designer/tools/configure/form/widget-input.js b/report-ui/src/views/bigscreenDesigner/designer/tools/configure/form/widget-input.js
new file mode 100644
index 00000000..db9854bd
--- /dev/null
+++ b/report-ui/src/views/bigscreenDesigner/designer/tools/configure/form/widget-input.js
@@ -0,0 +1,82 @@
+export const widgetInput = {
+ code: 'widget-input',
+ type: 'form',
+ tabName: '表单',
+ label: '输入框',
+ icon: 'icondanhangshurukuang',
+ options: {
+ setup: [
+ {
+ type: 'el-input-text',
+ label: '图层名称',
+ name: 'layerName',
+ required: false,
+ placeholder: '',
+ value: '输入框',
+ },
+ {
+ type: 'vue-color',
+ label: '字体颜色',
+ name: 'select_color',
+ required: false,
+ placeholder: '',
+ value: '#FAD400',
+ },
+ {
+ type: 'vue-color',
+ label: '字体背景',
+ name: 'select_background',
+ required: false,
+ placeholder: '',
+ value: 'rgba(115,170,229,.5)',
+ },
+/* {
+ type: 'el-select',
+ label: '触发事件',
+ name: 'event',
+ required: false,
+ placeholder: '',
+ selectOptions: [
+ { code: 'change', name: 'change' },
+ { code: 'blur', name: 'blur' },
+ { code: 'focus', name: 'focus' },
+ ],
+ value: 'change',
+ }*/
+ ],
+ position: [
+ {
+ type: 'el-input-number',
+ label: '左边距',
+ name: 'left',
+ required: false,
+ placeholder: '',
+ value: 0,
+ },
+ {
+ type: 'el-input-number',
+ label: '上边距',
+ name: 'top',
+ required: false,
+ placeholder: '',
+ value: 0,
+ },
+ {
+ type: 'el-input-number',
+ label: '宽度',
+ name: 'width',
+ required: false,
+ placeholder: '该容器在1920px大屏中的宽度',
+ value: 100,
+ },
+ {
+ type: 'el-input-number',
+ label: '高度',
+ name: 'height',
+ required: false,
+ placeholder: '该容器在1080px大屏中的高度',
+ value: 40,
+ },
+ ],
+ }
+}
diff --git a/report-ui/src/views/bigscreenDesigner/designer/tools/configure/form/widget-select.js b/report-ui/src/views/bigscreenDesigner/designer/tools/configure/form/widget-select.js
new file mode 100644
index 00000000..4e8d5d0f
--- /dev/null
+++ b/report-ui/src/views/bigscreenDesigner/designer/tools/configure/form/widget-select.js
@@ -0,0 +1,159 @@
+/*
+ * @Descripttion: 下拉框
+ * @Author: qianlishi qianlishi@anji-plus.com
+ * @Date: 2023-01-09 13:02:59
+ * @LastEditors: qianlishi qianlishi@anji-plus.com
+ * @LastEditTime: 2023-03-24 10:27:23
+ */
+
+export const widgetSelect = {
+ code: 'widget-select',
+ type: 'form',
+ tabName: '表单',
+ label: '下拉框',
+ icon: 'iconxialakuang1',
+ options: {
+ setup: [
+ {
+ type: 'el-input-text',
+ label: '图层名称',
+ name: 'layerName',
+ required: false,
+ placeholder: '',
+ value: '下拉框',
+ },
+ {
+ type: 'vue-color',
+ label: '字体颜色',
+ name: 'select_color',
+ required: false,
+ placeholder: '',
+ value: '#FAD400',
+ },
+ {
+ type: 'vue-color',
+ label: '字体背景',
+ name: 'select_background',
+ required: false,
+ placeholder: '',
+ value: 'rgba(115,170,229,.5)',
+ },
+/* {
+ type: 'el-select',
+ label: '触发事件',
+ name: 'event',
+ required: false,
+ placeholder: '',
+ selectOptions: [
+ { code: 'change', name: 'change' },
+ { code: 'blur', name: 'blur' },
+ { code: 'focus', name: 'focus' },
+ ],
+ value: 'change',
+ },*/
+ [{
+ name: '组件联动',
+ list: [
+ {
+ type: 'componentLinkage',
+ label: '',
+ name: 'componentLinkage',
+ required: false,
+ value: []
+ }
+ ]
+ }]
+ ],
+ data: [
+ {
+ type: 'el-radio-group',
+ label: '数据类型',
+ name: 'dataType',
+ require: false,
+ placeholder: '',
+ selectValue: true,
+ selectOptions: [
+ {
+ code: 'staticData',
+ name: '静态数据',
+ },
+ {
+ code: 'dynamicData',
+ name: '动态数据',
+ },
+ ],
+ value: 'staticData',
+ },
+ {
+ type: 'el-input-number',
+ label: '刷新时间(毫秒)',
+ name: 'refreshTime',
+ relactiveDom: 'dataType',
+ relactiveDomValue: 'dynamicData',
+ value: 600000
+ },
+ {
+ type: 'el-button',
+ label: '静态数据',
+ name: 'staticData',
+ required: false,
+ placeholder: '',
+ relactiveDom: 'dataType',
+ relactiveDomValue: 'staticData',
+ value: [
+ { "label": "苹果", "value": 1000 },
+ { "label": "三星", "value": 2229 },
+ { "label": "小米", "value": 3879 },
+ { "label": "oppo", "value": 2379 },
+ { "label": "vivo", "value": 4079 },
+ ],
+ },
+ {
+ type: 'dycustComponents',
+ label: '',
+ name: 'dynamicData',
+ required: false,
+ placeholder: '',
+ relactiveDom: 'dataType',
+ relactiveDomValue: 'dynamicData',
+ chartType: 'widget-select',
+ dictKey: 'SELECT_PROPERTIES',
+ value: '',
+ },
+ ],
+ position: [
+ {
+ type: 'el-input-number',
+ label: '左边距',
+ name: 'left',
+ required: false,
+ placeholder: '',
+ value: 0,
+ },
+ {
+ type: 'el-input-number',
+ label: '上边距',
+ name: 'top',
+ required: false,
+ placeholder: '',
+ value: 0,
+ },
+ {
+ type: 'el-input-number',
+ label: '宽度',
+ name: 'width',
+ required: false,
+ placeholder: '该容器在1920px大屏中的宽度',
+ value: 200,
+ },
+ {
+ type: 'el-input-number',
+ label: '高度',
+ name: 'height',
+ required: false,
+ placeholder: '该容器在1080px大屏中的高度',
+ value: 40,
+ },
+ ],
+ }
+}
diff --git a/report-ui/src/views/bigscreenDesigner/designer/tools/configure/funnelCharts/widget-funnel.js b/report-ui/src/views/bigscreenDesigner/designer/tools/configure/funnelCharts/widget-funnel.js
index 7b8a4490..91a1d754 100644
--- a/report-ui/src/views/bigscreenDesigner/designer/tools/configure/funnelCharts/widget-funnel.js
+++ b/report-ui/src/views/bigscreenDesigner/designer/tools/configure/funnelCharts/widget-funnel.js
@@ -4,7 +4,7 @@
* @Author: qianlishi
* @Date: 2021-08-29 07:29:23
* @LastEditors: qianlishi qianlishi@anji-plus.com
- * @LastEditTime: 2022-11-07 15:40:21
+ * @LastEditTime: 2023-01-10 14:05:07
*/
export const widgetFunnel = {
code: 'widget-funnel',
@@ -347,7 +347,7 @@ export const widgetFunnel = {
name: 'refreshTime',
relactiveDom: 'dataType',
relactiveDomValue: 'dynamicData',
- value: 5000
+ value: 600000
},
{
type: 'el-button',
diff --git a/report-ui/src/views/bigscreenDesigner/designer/tools/configure/heatmap/widget-heatmap.js b/report-ui/src/views/bigscreenDesigner/designer/tools/configure/heatmap/widget-heatmap.js
index 77cbb184..3e041851 100644
--- a/report-ui/src/views/bigscreenDesigner/designer/tools/configure/heatmap/widget-heatmap.js
+++ b/report-ui/src/views/bigscreenDesigner/designer/tools/configure/heatmap/widget-heatmap.js
@@ -4,7 +4,7 @@
* @Author: whw
* @Date: 2021-11-3
* @LastEditors: qianlishi qianlishi@anji-plus.com
- * @LastEditTime: 2022-11-07 15:40:35
+ * @LastEditTime: 2023-01-11 13:14:37
*/
export const widgetHeatmap = {
code: 'widget-heatmap',
@@ -583,7 +583,7 @@ export const widgetHeatmap = {
name: 'refreshTime',
relactiveDom: 'dataType',
relactiveDomValue: 'dynamicData',
- value: 5000
+ value: 600000
},
{
type: 'el-button',
diff --git a/report-ui/src/views/bigscreenDesigner/designer/tools/configure/lineCharts/widget-line-compare.js b/report-ui/src/views/bigscreenDesigner/designer/tools/configure/lineCharts/widget-line-compare.js
index ef093368..a9f9577b 100644
--- a/report-ui/src/views/bigscreenDesigner/designer/tools/configure/lineCharts/widget-line-compare.js
+++ b/report-ui/src/views/bigscreenDesigner/designer/tools/configure/lineCharts/widget-line-compare.js
@@ -4,7 +4,7 @@
* @Author: foming
* @Date: 2021-08-29 07:39:35
* @LastEditors: qianlishi qianlishi@anji-plus.com
- * @LastEditTime: 2022-11-07 15:40:44
+ * @LastEditTime: 2023-01-10 14:05:37
*/
export const widgetLineCompare = {
code: 'widgetLineCompareChart',
@@ -58,8 +58,8 @@ export const widgetLineCompare = {
required: false,
placeholder: '',
selectOptions: [
- {code: 'circle', name: '实心点'},
- {code: 'emptyCircle', name: '空心点'},
+ { code: 'circle', name: '实心点' },
+ { code: 'emptyCircle', name: '空心点' },
],
value: 'circle'
},
@@ -238,7 +238,7 @@ export const widgetLineCompare = {
},
{
type: 'el-input-text',
- label: '图例名称',
+ label: '名称( | 分隔)',
name: 'legendName',
required: false,
placeholder: '多值以' | '隔开',
@@ -321,7 +321,7 @@ export const widgetLineCompare = {
{
type: 'el-input-text',
label: '坐标名',
- name: 'xName',
+ name: 'nameX',
required: false,
placeholder: '',
value: ''
@@ -414,14 +414,15 @@ export const widgetLineCompare = {
{
type: 'el-input-text',
label: '坐标名',
- name: 'textNameYTop',
+ name: 'textNameY',
require: false,
placeholder: '',
value: ''
- }, {
+ },
+ {
type: 'vue-color',
label: '坐标名颜色',
- name: 'nameColorYTop',
+ name: 'nameColorY',
required: false,
placeholder: '',
value: '#fff',
@@ -429,7 +430,7 @@ export const widgetLineCompare = {
{
type: 'el-input-number',
label: '坐标名字号',
- name: 'nameFontSizeYTop',
+ name: 'nameFontSizeY',
required: false,
placeholder: '',
value: 14,
@@ -530,14 +531,15 @@ export const widgetLineCompare = {
{
type: 'el-input-text',
label: '坐标名',
- name: 'textNameYBottom',
+ name: 'textNameY',
require: false,
placeholder: '',
value: ''
- }, {
+ },
+ {
type: 'vue-color',
label: '坐标名颜色',
- name: 'nameColorYBottom',
+ name: 'nameColorY',
required: false,
placeholder: '',
value: '#fff',
@@ -545,7 +547,7 @@ export const widgetLineCompare = {
{
type: 'el-input-number',
label: '坐标名字号',
- name: 'nameFontSizeYBottom',
+ name: 'nameFontSizeY',
required: false,
placeholder: '',
value: 14,
@@ -786,7 +788,7 @@ export const widgetLineCompare = {
name: 'refreshTime',
relactiveDom: 'dataType',
relactiveDomValue: 'dynamicData',
- value: 5000
+ value: 600000
},
{
type: 'el-button',
diff --git a/report-ui/src/views/bigscreenDesigner/designer/tools/configure/lineCharts/widget-line-stack.js b/report-ui/src/views/bigscreenDesigner/designer/tools/configure/lineCharts/widget-line-stack.js
index 83272a78..6383c314 100644
--- a/report-ui/src/views/bigscreenDesigner/designer/tools/configure/lineCharts/widget-line-stack.js
+++ b/report-ui/src/views/bigscreenDesigner/designer/tools/configure/lineCharts/widget-line-stack.js
@@ -3,8 +3,8 @@
* @version:
* @Author: qianlishi
* @Date: 2021-08-29 07:38:17
- * @LastEditors: qianlishi
- * @LastEditTime: 2021-09-28 14:16:28
+ * @LastEditors: qianlishi qianlishi@anji-plus.com
+ * @LastEditTime: 2023-01-10 14:05:48
*/
export const widgetLineStack = {
code: 'widgetLineStackChart',
@@ -66,8 +66,8 @@ export const widgetLineStack = {
required: false,
placeholder: '',
selectOptions: [
- {code: 'circle', name: '实心点'},
- {code: 'emptyCircle', name: '空心点'},
+ { code: 'circle', name: '实心点' },
+ { code: 'emptyCircle', name: '空心点' },
],
value: 'circle'
},
@@ -246,7 +246,7 @@ export const widgetLineStack = {
},
{
type: 'el-input-text',
- label: '图例名称',
+ label: '名称( | 分隔)',
name: 'legendName',
required: false,
placeholder: '多值以' | '隔开',
@@ -696,7 +696,7 @@ export const widgetLineStack = {
name: 'refreshTime',
relactiveDom: 'dataType',
relactiveDomValue: 'dynamicData',
- value: 5000
+ value: 600000
},
{
type: 'el-button',
diff --git a/report-ui/src/views/bigscreenDesigner/designer/tools/configure/lineCharts/widget-linechart.js b/report-ui/src/views/bigscreenDesigner/designer/tools/configure/lineCharts/widget-linechart.js
index 24999b32..50f91cb9 100644
--- a/report-ui/src/views/bigscreenDesigner/designer/tools/configure/lineCharts/widget-linechart.js
+++ b/report-ui/src/views/bigscreenDesigner/designer/tools/configure/lineCharts/widget-linechart.js
@@ -58,8 +58,8 @@ export const widgetLinechart = {
required: false,
placeholder: '',
selectOptions: [
- {code: 'circle', name: '实心点'},
- {code: 'emptyCircle', name: '空心点'},
+ { code: 'circle', name: '实心点' },
+ { code: 'emptyCircle', name: '空心点' },
],
value: 'circle'
},
@@ -139,10 +139,10 @@ export const widgetLinechart = {
required: false,
placeholder: '',
selectOptions: [
- {code: 'normal', name: '正常'},
- {code: 'bold', name: '粗体'},
- {code: 'bolder', name: '特粗体'},
- {code: 'lighter', name: '细体'}
+ { code: 'normal', name: '正常' },
+ { code: 'bold', name: '粗体' },
+ { code: 'bolder', name: '特粗体' },
+ { code: 'lighter', name: '细体' }
],
value: 'normal'
},
@@ -153,9 +153,9 @@ export const widgetLinechart = {
required: false,
placeholder: '',
selectOptions: [
- {code: 'normal', name: '正常'},
- {code: 'italic', name: 'italic斜体'},
- {code: 'oblique', name: 'oblique斜体'},
+ { code: 'normal', name: '正常' },
+ { code: 'italic', name: 'italic斜体' },
+ { code: 'oblique', name: 'oblique斜体' },
],
value: 'normal'
},
@@ -166,9 +166,9 @@ export const widgetLinechart = {
required: false,
placeholder: '',
selectOptions: [
- {code: 'center', name: '居中'},
- {code: 'left', name: '左对齐'},
- {code: 'right', name: '右对齐'},
+ { code: 'center', name: '居中' },
+ { code: 'left', name: '左对齐' },
+ { code: 'right', name: '右对齐' },
],
value: 'center'
},
@@ -203,10 +203,10 @@ export const widgetLinechart = {
required: false,
placeholder: '',
selectOptions: [
- {code: 'normal', name: '正常'},
- {code: 'bold', name: '粗体'},
- {code: 'bolder', name: '特粗体'},
- {code: 'lighter', name: '细体'}
+ { code: 'normal', name: '正常' },
+ { code: 'bold', name: '粗体' },
+ { code: 'bolder', name: '特粗体' },
+ { code: 'lighter', name: '细体' }
],
value: 'normal'
},
@@ -217,9 +217,9 @@ export const widgetLinechart = {
required: false,
placeholder: '',
selectOptions: [
- {code: 'normal', name: '正常'},
- {code: 'italic', name: 'italic斜体'},
- {code: 'oblique', name: 'oblique斜体'},
+ { code: 'normal', name: '正常' },
+ { code: 'italic', name: 'italic斜体' },
+ { code: 'oblique', name: 'oblique斜体' },
],
value: 'normal'
},
@@ -501,10 +501,10 @@ export const widgetLinechart = {
required: false,
placeholder: '',
selectOptions: [
- {code: 'normal', name: '正常'},
- {code: 'bold', name: '粗体'},
- {code: 'bolder', name: '特粗体'},
- {code: 'lighter', name: '细体'}
+ { code: 'normal', name: '正常' },
+ { code: 'bold', name: '粗体' },
+ { code: 'bolder', name: '特粗体' },
+ { code: 'lighter', name: '细体' }
],
value: 'normal'
},
@@ -576,10 +576,22 @@ export const widgetLinechart = {
label: '',
name: 'customColor',
required: false,
- value: [{color: '#1E90FF'}],
+ value: [{ color: '#1E90FF' }],
},
],
},
+ {
+ name: '组件联动',
+ list: [
+ {
+ type: 'componentLinkage',
+ label: '',
+ name: 'componentLinkage',
+ required: false,
+ value: []
+ }
+ ]
+ }
],
],
// 数据
@@ -609,7 +621,7 @@ export const widgetLinechart = {
name: 'refreshTime',
relactiveDom: 'dataType',
relactiveDomValue: 'dynamicData',
- value: 5000
+ value: 600000
},
{
type: 'el-button',
@@ -620,11 +632,11 @@ export const widgetLinechart = {
relactiveDom: 'dataType',
relactiveDomValue: 'staticData',
value: [
- {"axis": "苹果", "data": 1000},
- {"axis": "三星", "data": 2229},
- {"axis": "小米", "data": 3879},
- {"axis": "oppo", "data": 2379},
- {"axis": "vivo", "data": 4079},
+ { "axis": "苹果", "data": 1000 },
+ { "axis": "三星", "data": 2229 },
+ { "axis": "小米", "data": 3879 },
+ { "axis": "oppo", "data": 2379 },
+ { "axis": "vivo", "data": 4079 },
],
},
{
diff --git a/report-ui/src/views/bigscreenDesigner/designer/tools/configure/mapCharts/widget-airbubble-map.js b/report-ui/src/views/bigscreenDesigner/designer/tools/configure/mapCharts/widget-airbubble-map.js
index e7f99b7f..8de5eb0a 100644
--- a/report-ui/src/views/bigscreenDesigner/designer/tools/configure/mapCharts/widget-airbubble-map.js
+++ b/report-ui/src/views/bigscreenDesigner/designer/tools/configure/mapCharts/widget-airbubble-map.js
@@ -194,10 +194,10 @@ export const widgetAirbubbleMap = {
required: false,
placeholder: '',
selectOptions: [
- {code: 'normal', name: '正常'},
- {code: 'bold', name: '粗体'},
- {code: 'bolder', name: '特粗体'},
- {code: 'lighter', name: '细体'}
+ { code: 'normal', name: '正常' },
+ { code: 'bold', name: '粗体' },
+ { code: 'bolder', name: '特粗体' },
+ { code: 'lighter', name: '细体' }
],
value: 'normal'
},
@@ -224,10 +224,10 @@ export const widgetAirbubbleMap = {
required: false,
placeholder: '',
selectOptions: [
- {code: 'normal', name: '正常'},
- {code: 'bold', name: '粗体'},
- {code: 'bolder', name: '特粗体'},
- {code: 'lighter', name: '细体'}
+ { code: 'normal', name: '正常' },
+ { code: 'bold', name: '粗体' },
+ { code: 'bolder', name: '特粗体' },
+ { code: 'lighter', name: '细体' }
],
value: 'normal'
},
@@ -319,7 +319,7 @@ export const widgetAirbubbleMap = {
name: 'refreshTime',
relactiveDom: 'dataType',
relactiveDomValue: 'dynamicData',
- value: 5000
+ value: 600000
},
{
type: 'el-button',
@@ -330,41 +330,41 @@ export const widgetAirbubbleMap = {
relactiveDom: 'dataType',
relactiveDomValue: 'staticData',
value: [
- {"name": "南海诸岛", "value": 1},
- {"name": "北京市", "value": 524},
- {"name": "天津市", "value": 14},
- {"name": "上海市", "value": 150},
- {"name": "重庆市", "value": 75},
- {"name": "河北省", "value": 13},
- {"name": "河南省", "value": 83},
- {"name": "云南省", "value": 11},
- {"name": "辽宁省", "value": 19},
- {"name": "黑龙江省", "value": 15},
- {"name": "湖南省", "value": 69},
- {"name": "安徽省", "value": 260},
- {"name": "山东省", "value": 39},
- {"name": "新疆维吾尔自治区", "value": 4},
- {"name": "江苏省", "value": 31},
- {"name": "浙江省", "value": 104},
- {"name": "江西省", "value": 36},
- {"name": "湖北省", "value": 1052},
- {"name": "广西壮族自治区", "value": 33},
- {"name": "甘肃省", "value": 347},
- {"name": "山西省", "value": 8},
- {"name": "内蒙古自治区", "value": 157},
- {"name": "陕西省", "value": 22},
- {"name": "吉林省", "value": 4},
- {"name": "福建省", "value": 36},
- {"name": "贵州省", "value": 39},
- {"name": "广东省", "value": 996},
- {"name": "青海省", "value": 27},
- {"name": "西藏自治区", "value": 31},
- {"name": "四川省", "value": 46},
- {"name": "宁夏回族自治区", "value": 16},
- {"name": "海南省", "value": 22},
- {"name": "台湾省", "value": 6},
- {"name": "香港", "value": 2},
- {"name": "澳门", "value": 9}],
+ { "name": "南海诸岛", "value": 1 },
+ { "name": "北京市", "value": 524 },
+ { "name": "天津市", "value": 14 },
+ { "name": "上海市", "value": 150 },
+ { "name": "重庆市", "value": 75 },
+ { "name": "河北省", "value": 13 },
+ { "name": "河南省", "value": 83 },
+ { "name": "云南省", "value": 11 },
+ { "name": "辽宁省", "value": 19 },
+ { "name": "黑龙江省", "value": 15 },
+ { "name": "湖南省", "value": 69 },
+ { "name": "安徽省", "value": 260 },
+ { "name": "山东省", "value": 39 },
+ { "name": "新疆维吾尔自治区", "value": 4 },
+ { "name": "江苏省", "value": 31 },
+ { "name": "浙江省", "value": 104 },
+ { "name": "江西省", "value": 36 },
+ { "name": "湖北省", "value": 1052 },
+ { "name": "广西壮族自治区", "value": 33 },
+ { "name": "甘肃省", "value": 347 },
+ { "name": "山西省", "value": 8 },
+ { "name": "内蒙古自治区", "value": 157 },
+ { "name": "陕西省", "value": 22 },
+ { "name": "吉林省", "value": 4 },
+ { "name": "福建省", "value": 36 },
+ { "name": "贵州省", "value": 39 },
+ { "name": "广东省", "value": 996 },
+ { "name": "青海省", "value": 27 },
+ { "name": "西藏自治区", "value": 31 },
+ { "name": "四川省", "value": 46 },
+ { "name": "宁夏回族自治区", "value": 16 },
+ { "name": "海南省", "value": 22 },
+ { "name": "台湾省", "value": 6 },
+ { "name": "香港", "value": 2 },
+ { "name": "澳门", "value": 9 }],
},
{
type: 'dycustComponents',
diff --git a/report-ui/src/views/bigscreenDesigner/designer/tools/configure/mapCharts/widget-line-map.js b/report-ui/src/views/bigscreenDesigner/designer/tools/configure/mapCharts/widget-line-map.js
index facf96cb..be43f6a5 100644
--- a/report-ui/src/views/bigscreenDesigner/designer/tools/configure/mapCharts/widget-line-map.js
+++ b/report-ui/src/views/bigscreenDesigner/designer/tools/configure/mapCharts/widget-line-map.js
@@ -3,8 +3,8 @@
* @version:
* @Author: qianlishi
* @Date: 2021-08-29 07:31:21
- * @LastEditors: qianlishi
- * @LastEditTime: 2021-09-28 14:17:20
+ * @LastEditors: qianlishi qianlishi@anji-plus.com
+ * @LastEditTime: 2023-01-10 14:06:32
*/
export const widgetLineMap = {
code: 'widgetLineMap',
@@ -396,7 +396,7 @@ export const widgetLineMap = {
name: 'refreshTime',
relactiveDom: 'dataType',
relactiveDomValue: 'dynamicData',
- value: 5000
+ value: 600000
},
{
type: 'el-button',
diff --git a/report-ui/src/views/bigscreenDesigner/designer/tools/configure/percentCharts/widget-gauge.js b/report-ui/src/views/bigscreenDesigner/designer/tools/configure/percentCharts/widget-gauge.js
index 6b75f6c5..69f00877 100644
--- a/report-ui/src/views/bigscreenDesigner/designer/tools/configure/percentCharts/widget-gauge.js
+++ b/report-ui/src/views/bigscreenDesigner/designer/tools/configure/percentCharts/widget-gauge.js
@@ -3,8 +3,8 @@
* @version:
* @Author: qianlishi
* @Date: 2021-08-29 07:30:25
- * @LastEditors: qianlishi
- * @LastEditTime: 2021-09-28 14:13:17
+ * @LastEditors: qianlishi qianlishi@anji-plus.com
+ * @LastEditTime: 2023-01-10 14:06:52
*/
export const widgetGauge = {
code: 'widget-gauge',
@@ -315,7 +315,7 @@ export const widgetGauge = {
name: 'refreshTime',
relactiveDom: 'dataType',
relactiveDomValue: 'dynamicData',
- value: 5000
+ value: 600000
},
{
type: 'el-button',
diff --git a/report-ui/src/views/bigscreenDesigner/designer/tools/configure/percentCharts/widget-pie-percentage.js b/report-ui/src/views/bigscreenDesigner/designer/tools/configure/percentCharts/widget-pie-percentage.js
index 856733ce..13ed55f5 100644
--- a/report-ui/src/views/bigscreenDesigner/designer/tools/configure/percentCharts/widget-pie-percentage.js
+++ b/report-ui/src/views/bigscreenDesigner/designer/tools/configure/percentCharts/widget-pie-percentage.js
@@ -3,256 +3,268 @@
* @version:
* @Author: qianlishi
* @Date: 2021-08-29 07:34:01
- * @LastEditors: qianlishi
- * @LastEditTime: 2021-09-28 14:18:45
+ * @LastEditors: qianlishi qianlishi@anji-plus.com
+ * @LastEditTime: 2023-01-11 13:15:26
*/
export const widgetPiePercentage = {
- code: 'widgetPiePercentageChart',
- type: 'percent',
- tabName: '百分比',
- label: '百分比图',
- icon: 'iconbaifenbi',
- options: {
- // 配置
- setup: [
+ code: 'widgetPiePercentageChart',
+ type: 'percent',
+ tabName: '百分比',
+ label: '百分比图',
+ icon: 'iconbaifenbi',
+ options: {
+ // 配置
+ setup: [
+ {
+ type: 'el-input-text',
+ label: '图层名称',
+ name: 'layerName',
+ required: false,
+ placeholder: '',
+ value: '百分比图',
+ },
+ {
+ type: 'vue-color',
+ label: '背景颜色',
+ name: 'background',
+ required: false,
+ placeholder: '',
+ value: ''
+ },
+ [
{
- type: 'el-input-text',
- label: '图层名称',
- name: 'layerName',
- required: false,
- placeholder: '',
- value: '百分比图',
- },
- {
- type: 'vue-color',
- label: '背景颜色',
- name: 'background',
- required: false,
- placeholder: '',
- value: ''
- },
- [
- {
- name: '数值设置',
- list: [
- {
- type: 'vue-color',
- label: '数值颜色',
- name: 'textNumColor',
- required: false,
- placeholder: '',
- value: '#fff'
- },
- {
- type: 'el-input-number',
- label: '数值字体',
- name: 'textNumFontSize',
- required: false,
- placeholder: '',
- value: 40
- },
- {
- type: 'el-select',
- label: '字体粗细',
- name: 'textNumFontWeight',
- required: false,
- placeholder: '',
- selectOptions: [
- {code: 'normal', name: '正常'},
- {code: 'bold', name: '粗体'},
- {code: 'bolder', name: '特粗体'},
- {code: 'lighter', name: '细体'}
- ],
- value: 'normal'
- },
- {
- type: 'vue-color',
- label: '%号颜色',
- name: 'textPerColor',
- required: false,
- placeholder: '',
- value: '#fff'
- },
- {
- type: 'el-input-number',
- label: '%号字体',
- name: 'textPerFontSize',
- required: false,
- placeholder: '',
- value: 20
- },
- {
- type: 'el-select',
- label: '字体粗细',
- name: 'textPerFontWeight',
- required: false,
- placeholder: '',
- selectOptions: [
- {code: 'normal', name: '正常'},
- {code: 'bold', name: '粗体'},
- {code: 'bolder', name: '特粗体'},
- {code: 'lighter', name: '细体'}
- ],
- value: 'normal'
- }
- ],
- },
- {
- name: '圆环设置',
- list: [
- {
- type: 'el-input-number',
- label: '刻度数量',
- name: 'lineNumber',
- required: false,
- placeholder: '',
- value: 8
- },
- {
- type: 'el-input-number',
- label: '刻度长度',
- name: 'lineLength',
- required: false,
- placeholder: '',
- value: 19
- },
- {
- type: 'el-input-number',
- label: '刻度宽度',
- name: 'lineWidth',
- required: false,
- placeholder: '',
- value: 2
- },
- {
- type: 'vue-color',
- label: '刻度颜色',
- name: 'lineColor',
- required: false,
- placeholder: '',
- value: '#061740'
- },
- ]
- },
- {
- name: '渐变色',
- list: [
- {
- type: 'vue-color',
- label: '0%处颜色',
- name: 'color0Start',
- required: false,
- placeholder: '',
- value: '#4FADFD'
- },
- {
- type: 'vue-color',
- label: '100%颜色',
- name: 'color100End',
- required: false,
- placeholder: '',
- value: '#28E8FA'
- },
- {
- type: 'vue-color',
- label: '余处颜色',
- name: 'colorsurplus',
- required: false,
- placeholder: '',
- value: '#173164'
- },
- ]
- }
- ],
- ],
- // 数据
- data: [
- {
- type: 'el-radio-group',
- label: '数据类型',
- name: 'dataType',
- require: false,
- placeholder: '',
- selectValue: true,
- selectOptions: [
+ name: '数值设置',
+ list: [
{
- code: 'staticData',
- name: '静态数据',
+ type: 'vue-color',
+ label: '数值颜色',
+ name: 'textNumColor',
+ required: false,
+ placeholder: '',
+ value: '#fff'
},
{
- code: 'dynamicData',
- name: '动态数据',
+ type: 'el-input-number',
+ label: '数值字体',
+ name: 'textNumFontSize',
+ required: false,
+ placeholder: '',
+ value: 40
},
+ {
+ type: 'el-select',
+ label: '字体粗细',
+ name: 'textNumFontWeight',
+ required: false,
+ placeholder: '',
+ selectOptions: [
+ { code: 'normal', name: '正常' },
+ { code: 'bold', name: '粗体' },
+ { code: 'bolder', name: '特粗体' },
+ { code: 'lighter', name: '细体' }
+ ],
+ value: 'normal'
+ },
+ {
+ type: 'vue-color',
+ label: '%号颜色',
+ name: 'textPerColor',
+ required: false,
+ placeholder: '',
+ value: '#fff'
+ },
+ {
+ type: 'el-input-number',
+ label: '%号字体',
+ name: 'textPerFontSize',
+ required: false,
+ placeholder: '',
+ value: 20
+ },
+ {
+ type: 'el-select',
+ label: '字体粗细',
+ name: 'textPerFontWeight',
+ required: false,
+ placeholder: '',
+ selectOptions: [
+ { code: 'normal', name: '正常' },
+ { code: 'bold', name: '粗体' },
+ { code: 'bolder', name: '特粗体' },
+ { code: 'lighter', name: '细体' }
+ ],
+ value: 'normal'
+ }
],
- value: 'staticData',
- },
- {
- type: 'el-input-number',
- label: '刷新时间(毫秒)',
- name: 'refreshTime',
- relactiveDom: 'dataType',
- relactiveDomValue: 'dynamicData',
- value: 5000
- },
- {
- type: 'el-button',
- label: '静态数据',
- name: 'staticData',
- required: false,
- placeholder: '',
- relactiveDom: 'dataType',
- relactiveDomValue: 'staticData',
- value: [
- {"num":60}
- ],
- },
- {
- type: 'dycustComponents',
- label: '',
- name: 'dynamicData',
- required: false,
- placeholder: '',
- relactiveDom: 'dataType',
- chartType: 'widget-piechart',
- dictKey: 'TEXT_PROPERTIES',
- relactiveDomValue: 'dynamicData',
- value: '',
- },
- ],
- // 坐标
- position: [
- {
- type: 'el-input-number',
- label: '左边距',
- name: 'left',
- required: false,
- placeholder: '',
- value: 0,
},
{
- type: 'el-input-number',
- label: '上边距',
- name: 'top',
- required: false,
- placeholder: '',
- value: 0,
+ name: '圆环设置',
+ list: [
+ {
+ type: 'el-input-number',
+ label: '刻度数量',
+ name: 'lineNumber',
+ required: false,
+ placeholder: '',
+ value: 8
+ },
+ {
+ type: 'el-input-number',
+ label: '刻度长度',
+ name: 'lineLength',
+ required: false,
+ placeholder: '',
+ value: 19
+ },
+ {
+ type: 'el-input-number',
+ label: '刻度宽度',
+ name: 'lineWidth',
+ required: false,
+ placeholder: '',
+ value: 2
+ },
+ {
+ type: 'vue-color',
+ label: '刻度颜色',
+ name: 'lineColor',
+ required: false,
+ placeholder: '',
+ value: '#061740'
+ },
+ ]
},
{
- type: 'el-input-number',
- label: '宽度',
- name: 'width',
- required: false,
- placeholder: '该容器在1920px大屏中的宽度',
- value: 400,
+ name: '渐变色',
+ list: [
+ {
+ type: 'vue-color',
+ label: '0%处颜色',
+ name: 'color0Start',
+ required: false,
+ placeholder: '',
+ value: '#4FADFD'
+ },
+ {
+ type: 'vue-color',
+ label: '100%颜色',
+ name: 'color100End',
+ required: false,
+ placeholder: '',
+ value: '#28E8FA'
+ },
+ {
+ type: 'vue-color',
+ label: '余处颜色',
+ name: 'colorsurplus',
+ required: false,
+ placeholder: '',
+ value: '#173164'
+ },
+ ]
},
{
- type: 'el-input-number',
- label: '高度',
- name: 'height',
- required: false,
- placeholder: '该容器在1080px大屏中的高度',
- value: 300,
- },
+ name: '组件联动',
+ list: [
+ {
+ type: 'componentLinkage',
+ label: '',
+ name: 'componentLinkage',
+ required: false,
+ value: []
+ }
+ ]
+ }
],
- }
+ ],
+ // 数据
+ data: [
+ {
+ type: 'el-radio-group',
+ label: '数据类型',
+ name: 'dataType',
+ require: false,
+ placeholder: '',
+ selectValue: true,
+ selectOptions: [
+ {
+ code: 'staticData',
+ name: '静态数据',
+ },
+ {
+ code: 'dynamicData',
+ name: '动态数据',
+ },
+ ],
+ value: 'staticData',
+ },
+ {
+ type: 'el-input-number',
+ label: '刷新时间(毫秒)',
+ name: 'refreshTime',
+ relactiveDom: 'dataType',
+ relactiveDomValue: 'dynamicData',
+ value: 600000
+ },
+ {
+ type: 'el-button',
+ label: '静态数据',
+ name: 'staticData',
+ required: false,
+ placeholder: '',
+ relactiveDom: 'dataType',
+ relactiveDomValue: 'staticData',
+ value: [
+ { "num": 60 }
+ ],
+ },
+ {
+ type: 'dycustComponents',
+ label: '',
+ name: 'dynamicData',
+ required: false,
+ placeholder: '',
+ relactiveDom: 'dataType',
+ chartType: 'widget-piechart',
+ dictKey: 'TEXT_PROPERTIES',
+ relactiveDomValue: 'dynamicData',
+ value: '',
+ },
+ ],
+ // 坐标
+ position: [
+ {
+ type: 'el-input-number',
+ label: '左边距',
+ name: 'left',
+ required: false,
+ placeholder: '',
+ value: 0,
+ },
+ {
+ type: 'el-input-number',
+ label: '上边距',
+ name: 'top',
+ required: false,
+ placeholder: '',
+ value: 0,
+ },
+ {
+ type: 'el-input-number',
+ label: '宽度',
+ name: 'width',
+ required: false,
+ placeholder: '该容器在1920px大屏中的宽度',
+ value: 400,
+ },
+ {
+ type: 'el-input-number',
+ label: '高度',
+ name: 'height',
+ required: false,
+ placeholder: '该容器在1080px大屏中的高度',
+ value: 300,
+ },
+ ],
}
+}
diff --git a/report-ui/src/views/bigscreenDesigner/designer/tools/configure/pieCharts/widget-pie-nightingale.js b/report-ui/src/views/bigscreenDesigner/designer/tools/configure/pieCharts/widget-pie-nightingale.js
index a025e8ac..5383b5b0 100644
--- a/report-ui/src/views/bigscreenDesigner/designer/tools/configure/pieCharts/widget-pie-nightingale.js
+++ b/report-ui/src/views/bigscreenDesigner/designer/tools/configure/pieCharts/widget-pie-nightingale.js
@@ -4,7 +4,7 @@
* @Author: qianlishi
* @Date: 2021-08-29 07:32:40
* @LastEditors: qianlishi qianlishi@anji-plus.com
- * @LastEditTime: 2022-11-07 15:41:37
+ * @LastEditTime: 2023-01-11 13:15:38
*/
export const widgetPieNightingale = {
code: 'WidgetPieNightingaleRoseArea',
@@ -277,7 +277,7 @@ export const widgetPieNightingale = {
name: 'legendFontSize',
required: false,
placeholder: '',
- value: 16,
+ value: 12,
},
{
type: 'el-input-number',
@@ -338,6 +338,18 @@ export const widgetPieNightingale = {
},
],
},
+ {
+ name: '组件联动',
+ list: [
+ {
+ type: 'componentLinkage',
+ label: '',
+ name: 'componentLinkage',
+ required: false,
+ value: []
+ }
+ ]
+ }
],
],
// 数据
@@ -367,7 +379,7 @@ export const widgetPieNightingale = {
name: 'refreshTime',
relactiveDom: 'dataType',
relactiveDomValue: 'dynamicData',
- value: 5000
+ value: 600000
},
{
type: 'el-button',
diff --git a/report-ui/src/views/bigscreenDesigner/designer/tools/configure/pieCharts/widget-piechart.js b/report-ui/src/views/bigscreenDesigner/designer/tools/configure/pieCharts/widget-piechart.js
index 348f8910..8126b042 100644
--- a/report-ui/src/views/bigscreenDesigner/designer/tools/configure/pieCharts/widget-piechart.js
+++ b/report-ui/src/views/bigscreenDesigner/designer/tools/configure/pieCharts/widget-piechart.js
@@ -3,8 +3,8 @@
* @version:
* @Author: qianlishi
* @Date: 2021-08-29 07:28:20
- * @LastEditors: qianlishi
- * @LastEditTime: 2021-09-28 14:19:19
+ * @LastEditors: qianlishi qianlishi@anji-plus.com
+ * @LastEditTime: 2023-01-11 13:15:48
*/
export const widgetPiechart = {
code: 'widget-piechart',
@@ -237,7 +237,7 @@ export const widgetPiechart = {
{
type: 'el-input-number',
label: '字体字号',
- name: 'tipFontSize',
+ name: 'tipsFontSize',
required: false,
placeholder: '',
value: 16
@@ -272,12 +272,12 @@ export const widgetPiechart = {
value: '#fff',
},
{
- type: 'el-input-text',
+ type: 'el-input-number',
label: '字体字号',
name: 'legendFontSize',
required: false,
placeholder: '',
- value: 16,
+ value: 12,
},
{
type: 'el-input-number',
@@ -338,6 +338,18 @@ export const widgetPiechart = {
},
],
},
+ {
+ name: '组件联动',
+ list: [
+ {
+ type: 'componentLinkage',
+ label: '',
+ name: 'componentLinkage',
+ required: false,
+ value: []
+ }
+ ]
+ }
],
],
// 数据
@@ -367,7 +379,7 @@ export const widgetPiechart = {
name: 'refreshTime',
relactiveDom: 'dataType',
relactiveDomValue: 'dynamicData',
- value: 5000
+ value: 600000
},
{
type: 'el-button',
diff --git a/report-ui/src/views/bigscreenDesigner/designer/tools/configure/radarCharts/widget-radar.js b/report-ui/src/views/bigscreenDesigner/designer/tools/configure/radarCharts/widget-radar.js
index 6bb72b29..214da6ce 100644
--- a/report-ui/src/views/bigscreenDesigner/designer/tools/configure/radarCharts/widget-radar.js
+++ b/report-ui/src/views/bigscreenDesigner/designer/tools/configure/radarCharts/widget-radar.js
@@ -164,8 +164,8 @@ export const widgetRadar = {
required: false,
placeholder: '',
selectOptions: [
- {code: 'line', name: '线型'},
- {code: 'circle', name: '圆型'},
+ { code: 'line', name: '线型' },
+ { code: 'circle', name: '圆型' },
],
value: 'line'
},
@@ -261,10 +261,10 @@ export const widgetRadar = {
required: false,
placeholder: '',
selectOptions: [
- {code: 'normal', name: '正常'},
- {code: 'bold', name: '粗体'},
- {code: 'bolder', name: '特粗体'},
- {code: 'lighter', name: '细体'}
+ { code: 'normal', name: '正常' },
+ { code: 'bold', name: '粗体' },
+ { code: 'bolder', name: '特粗体' },
+ { code: 'lighter', name: '细体' }
],
value: 'normal'
},
@@ -275,9 +275,9 @@ export const widgetRadar = {
required: false,
placeholder: '',
selectOptions: [
- {code: 'normal', name: '正常'},
- {code: 'italic', name: 'italic斜体'},
- {code: 'oblique', name: 'oblique斜体'},
+ { code: 'normal', name: '正常' },
+ { code: 'italic', name: 'italic斜体' },
+ { code: 'oblique', name: 'oblique斜体' },
],
value: 'normal'
},
@@ -296,7 +296,7 @@ export const widgetRadar = {
},
{
type: 'el-input-text',
- label: '图例名称',
+ label: '名称( | 分隔)',
name: 'legendName',
required: false,
placeholder: '多值以' | '隔开',
@@ -333,9 +333,9 @@ export const widgetRadar = {
required: false,
placeholder: '',
selectOptions: [
- {code: 'center', name: '居中'},
- {code: 'left', name: '左对齐'},
- {code: 'right', name: '右对齐'},
+ { code: 'center', name: '居中' },
+ { code: 'left', name: '左对齐' },
+ { code: 'right', name: '右对齐' },
],
value: 'center'
},
@@ -346,8 +346,8 @@ export const widgetRadar = {
required: false,
placeholder: '',
selectOptions: [
- {code: 'top', name: '顶部'},
- {code: 'bottom', name: '底部'},
+ { code: 'top', name: '顶部' },
+ { code: 'bottom', name: '底部' },
],
value: 'top'
},
@@ -358,8 +358,8 @@ export const widgetRadar = {
required: false,
placeholder: '',
selectOptions: [
- {code: 'vertical', name: '竖排'},
- {code: 'horizontal', name: '横排'},
+ { code: 'vertical', name: '竖排' },
+ { code: 'horizontal', name: '横排' },
],
value: 'horizontal'
},
@@ -399,10 +399,10 @@ export const widgetRadar = {
required: false,
placeholder: '',
selectOptions: [
- {code: 'normal', name: '正常'},
- {code: 'bold', name: '粗体'},
- {code: 'bolder', name: '特粗体'},
- {code: 'lighter', name: '细体'}
+ { code: 'normal', name: '正常' },
+ { code: 'bold', name: '粗体' },
+ { code: 'bolder', name: '特粗体' },
+ { code: 'lighter', name: '细体' }
],
value: 'normal'
},
@@ -421,9 +421,9 @@ export const widgetRadar = {
required: false,
placeholder: '',
selectOptions: [
- {code: 'solid', name: '实线'},
- {code: 'dashed', name: '线型虚线'},
- {code: 'dotted', name: '点型虚线'},
+ { code: 'solid', name: '实线' },
+ { code: 'dashed', name: '线型虚线' },
+ { code: 'dotted', name: '点型虚线' },
],
value: 'solid'
},
@@ -466,7 +466,7 @@ export const widgetRadar = {
label: '',
name: 'customColor',
required: false,
- value: [{color: '#ff7f50'}, {color: '#87cefa'}, {color: '#da70d6'}, {color: '#32cd32'}, {color: '#6495ed'}],
+ value: [{ color: '#ff7f50' }, { color: '#87cefa' }, { color: '#da70d6' }, { color: '#32cd32' }, { color: '#6495ed' }],
},
],
},
@@ -478,11 +478,11 @@ export const widgetRadar = {
required: false,
placeholder: '',
value: [
- {name: 'SA', key: 'Sales', max: 6500},
- {name: 'Admin', key: 'Admin', max: 16000},
- {name: 'Information', key: 'Information', max: 30000},
- {name: 'Customer', key: 'Customer', max: 38000},
- {name: 'Develop', key: 'Develop', max: 52000},
+ { name: 'SA', key: 'Sales', max: 6500 },
+ { name: 'Admin', key: 'Admin', max: 16000 },
+ { name: 'Information', key: 'Information', max: 30000 },
+ { name: 'Customer', key: 'Customer', max: 38000 },
+ { name: 'Develop', key: 'Develop', max: 52000 },
]
}
],
@@ -512,7 +512,7 @@ export const widgetRadar = {
name: 'refreshTime',
relactiveDom: 'dataType',
relactiveDomValue: 'dynamicData',
- value: 5000
+ value: 600000
},
{
type: 'el-button',
@@ -523,8 +523,8 @@ export const widgetRadar = {
relactiveDom: 'dataType',
relactiveDomValue: 'staticData',
value: [
- {name: '2016', Sales: 4200, Admin: 3000, Information: 20000, Customer: 35000, Develop: 50000},
- {name: '2017', Sales: 5000, Admin: 14000, Information: 28000, Customer: 26000, Develop: 42000},
+ { name: '2016', Sales: 4200, Admin: 3000, Information: 20000, Customer: 35000, Develop: 50000 },
+ { name: '2017', Sales: 5000, Admin: 14000, Information: 28000, Customer: 26000, Develop: 42000 },
],
},
{
diff --git a/report-ui/src/views/bigscreenDesigner/designer/tools/configure/scaleCharts/widget-scale-horizontal.js b/report-ui/src/views/bigscreenDesigner/designer/tools/configure/scaleCharts/widget-scale-horizontal.js
new file mode 100644
index 00000000..447e4a12
--- /dev/null
+++ b/report-ui/src/views/bigscreenDesigner/designer/tools/configure/scaleCharts/widget-scale-horizontal.js
@@ -0,0 +1,506 @@
+
+export const widgetScaleHorizontal = {
+ code: 'widget-scale-horizontal',
+ type: 'scaleCharts',
+ tabName: '刻度尺',
+ label: '横刻度尺',
+ icon: 'iconjindutiao',
+ options: {
+ // 配置
+ setup: [
+ {
+ type: 'el-input-text',
+ label: '图层名称',
+ name: 'layerName',
+ required: false,
+ placeholder: '',
+ value: '横刻度尺',
+ },
+ {
+ type: 'vue-color',
+ label: '背景颜色',
+ name: 'background',
+ required: false,
+ placeholder: '',
+ value: ''
+ },
+ [
+ {
+ name: '标题设置',
+ list: [
+ {
+ type: 'el-switch',
+ label: '标题显示',
+ name: 'isNoTitle',
+ required: false,
+ placeholder: '',
+ value: true,
+ },
+ {
+ type: 'el-input-text',
+ label: '标题名',
+ name: 'titleText',
+ required: false,
+ placeholder: '',
+ value: '',
+ },
+ {
+ type: 'vue-color',
+ label: '字体颜色',
+ name: 'textColor',
+ required: false,
+ placeholder: '',
+ value: '#FFD700'
+ },
+ {
+ type: 'el-input-number',
+ label: '字体字号',
+ name: 'textFontSize',
+ required: false,
+ placeholder: '',
+ value: 20
+ },
+ {
+ type: 'el-select',
+ label: '字体粗细',
+ name: 'textFontWeight',
+ required: false,
+ placeholder: '',
+ selectOptions: [
+ { code: 'normal', name: '正常' },
+ { code: 'bold', name: '粗体' },
+ { code: 'bolder', name: '特粗体' },
+ { code: 'lighter', name: '细体' }
+ ],
+ value: 'normal'
+ },
+ {
+ type: 'el-select',
+ label: '字体风格',
+ name: 'textFontStyle',
+ required: false,
+ placeholder: '',
+ selectOptions: [
+ { code: 'normal', name: '正常' },
+ { code: 'italic', name: 'italic斜体' },
+ { code: 'oblique', name: 'oblique斜体' },
+ ],
+ value: 'normal'
+ },
+ {
+ type: 'el-select',
+ label: '字体位置',
+ name: 'textAlign',
+ required: false,
+ placeholder: '',
+ selectOptions: [
+ { code: 'center', name: '居中' },
+ { code: 'left', name: '左对齐' },
+ { code: 'right', name: '右对齐' },
+ ],
+ value: 'center'
+ },
+ {
+ type: 'el-input-text',
+ label: '副标题名',
+ name: 'subText',
+ required: false,
+ placeholder: '',
+ value: ''
+ },
+ {
+ type: 'vue-color',
+ label: '字体颜色',
+ name: 'subTextColor',
+ required: false,
+ placeholder: '',
+ value: 'rgba(30, 144, 255, 1)'
+ },
+ {
+ type: 'el-input-number',
+ label: '字体字号',
+ name: 'subTextFontSize',
+ required: false,
+ placeholder: '',
+ value: 20
+ },
+ {
+ type: 'el-select',
+ label: '字体粗细',
+ name: 'subTextFontWeight',
+ required: false,
+ placeholder: '',
+ selectOptions: [
+ { code: 'normal', name: '正常' },
+ { code: 'bold', name: '粗体' },
+ { code: 'bolder', name: '特粗体' },
+ { code: 'lighter', name: '细体' }
+ ],
+ value: 'normal'
+ },
+ {
+ type: 'el-select',
+ label: '字体风格',
+ name: 'subTextFontStyle',
+ required: false,
+ placeholder: '',
+ selectOptions: [
+ { code: 'normal', name: '正常' },
+ { code: 'italic', name: 'italic斜体' },
+ { code: 'oblique', name: 'oblique斜体' },
+ ],
+ value: 'normal'
+ },
+ ],
+ },
+ {
+ name: '刻度设定',
+ list: [
+ {
+ type: 'el-switch',
+ label: '刻度显示',
+ name: 'isShowScale',
+ required: false,
+ placeholder: '',
+ value: true,
+ },
+ {
+ type: 'el-input-number',
+ label: '最大刻度',
+ name: 'maxScale',
+ require: false,
+ placeholder: '',
+ value: 100,
+ },
+ {
+ type: 'vue-color',
+ label: '刻度颜色',
+ name: 'scaleColor',
+ required: false,
+ placeholder: '',
+ value: 'rgba(56, 128, 138,1)'
+ },
+ {
+ type: 'el-input-number',
+ label: '刻度宽度',
+ name: 'scaleBarWidth',
+ required: false,
+ placeholder: '',
+ value: 2,
+ },
+ {
+ type: 'el-input-number',
+ label: '刻度值字号',
+ name: 'scaleFontSize',
+ required: false,
+ placeholder: '',
+ value: 16,
+ },
+ {
+ type: 'vue-color',
+ label: '刻度值颜色',
+ name: 'scaleDataColor',
+ required: false,
+ placeholder: '',
+ value: 'rgba(56, 128, 138,1)'
+ },
+ {
+ type: 'el-select',
+ label: '刻度值粗细',
+ name: 'scaleFontWeight',
+ required: false,
+ placeholder: '',
+ selectOptions: [
+ { code: 'normal', name: '正常' },
+ { code: 'bold', name: '粗体' },
+ { code: 'bolder', name: '特粗体' },
+ { code: 'lighter', name: '细体' }
+ ],
+ value: 'normal'
+ },
+ ],
+ },
+ {
+ name: '外框设置',
+ list: [
+ {
+ type: 'el-input-number',
+ label: '宽度',
+ name: 'outBarWidth',
+ required: false,
+ placeholder: '',
+ value: 45,
+ },
+ {
+ type: 'vue-color',
+ label: '颜色',
+ name: 'outBarColor',
+ require: false,
+ placeholder: '',
+ value: '#00FEFF',
+ },
+ {
+ type: 'el-slider',
+ label: '圆角',
+ name: 'outBarRadius',
+ require: false,
+ placeholder: '',
+ value: 50,
+ },
+ ],
+ },
+ {
+ name: '内框设置',
+ list: [
+ {
+ type: 'el-input-number',
+ label: '宽度',
+ name: 'inBarWidth',
+ required: false,
+ placeholder: '',
+ value: 35,
+ },
+ {
+ type: 'vue-color',
+ label: '空白区颜色',
+ name: 'inBarColor',
+ require: false,
+ placeholder: '',
+ value: 'rgba(56, 128, 138,1)',
+ },
+ {
+ type: 'el-slider',
+ label: '圆角',
+ name: 'inBarRadius',
+ require: false,
+ placeholder: '',
+ value: 50,
+ },
+ ],
+ },
+ {
+ name: '数值设定',
+ list: [
+ {
+ type: 'el-switch',
+ label: '显示',
+ name: 'isShow',
+ required: false,
+ placeholder: '',
+ value: true,
+ },
+ {
+ type: 'el-input-number',
+ label: '位置',
+ name: 'fontDistance',
+ required: false,
+ placeholder: '',
+ value: 20,
+ },
+ {
+ type: 'el-input-number',
+ label: '字体字号',
+ name: 'fontSize',
+ required: false,
+ placeholder: '',
+ value: 16,
+ },
+ {
+ type: 'el-select',
+ label: '字体粗细',
+ name: 'fontWeight',
+ required: false,
+ placeholder: '',
+ selectOptions: [
+ { code: 'normal', name: '正常' },
+ { code: 'bold', name: '粗体' },
+ { code: 'bolder', name: '特粗体' },
+ { code: 'lighter', name: '细体' }
+ ],
+ value: 'normal'
+ },
+ ],
+ },
+ {
+ name: '渐变色',
+ list: [
+ {
+ type: 'vue-color',
+ label: '0%',
+ name: 'bar0Color',
+ required: false,
+ placeholder: '',
+ value: '#00FEFF'
+ },
+ {
+ type: 'vue-color',
+ label: '30%',
+ name: 'bar30Color',
+ required: false,
+ placeholder: '',
+ value: '#93FE94'
+ },
+ {
+ type: 'vue-color',
+ label: '70%',
+ name: 'bar70Color',
+ required: false,
+ placeholder: '',
+ value: '#E4D225'
+ },
+ {
+ type: 'vue-color',
+ label: '100%',
+ name: 'bar100Color',
+ required: false,
+ placeholder: '',
+ value: '#E01F28'
+ },
+ ],
+ },
+ {
+ name: '提示语设置',
+ list: [
+ {
+ type: 'el-input-number',
+ label: '字体字号',
+ name: 'tipFontSize',
+ required: false,
+ placeholder: '',
+ value: 16
+ },
+ {
+ type: 'vue-color',
+ label: '字体颜色',
+ name: 'tipsColor',
+ required: false,
+ placeholder: '',
+ value: '#00FEFF'
+ },
+ ],
+ },
+ {
+ name: '坐标轴边距设置',
+ list: [
+ {
+ type: 'el-slider',
+ label: '左边距(像素)',
+ name: 'marginLeft',
+ required: false,
+ placeholder: '',
+ value: 10,
+ }, {
+ type: 'el-slider',
+ label: '顶边距(像素)',
+ name: 'marginTop',
+ required: false,
+ placeholder: '',
+ value: 0,
+ }, {
+ type: 'el-slider',
+ label: '右边距(像素)',
+ name: 'marginRight',
+ required: false,
+ placeholder: '',
+ value: 0,
+ }, {
+ type: 'el-slider',
+ label: '底边距(像素)',
+ name: 'marginBottom',
+ required: false,
+ placeholder: '',
+ value: 40,
+ },
+ ],
+ },
+ ],
+ ],
+ // 数据
+ data: [
+ {
+ type: 'el-radio-group',
+ label: '数据类型',
+ name: 'dataType',
+ require: false,
+ placeholder: '',
+ selectValue: true,
+ selectOptions: [
+ {
+ code: 'staticData',
+ name: '静态数据',
+ },
+ {
+ code: 'dynamicData',
+ name: '动态数据',
+ },
+ ],
+ value: 'staticData',
+ },
+ {
+ type: 'el-input-number',
+ label: '刷新时间(毫秒)',
+ name: 'refreshTime',
+ relactiveDom: 'dataType',
+ relactiveDomValue: 'dynamicData',
+ value: 600000
+ },
+ {
+ type: 'el-button',
+ label: '静态数据',
+ name: 'staticData',
+ required: false,
+ placeholder: '',
+ relactiveDom: 'dataType',
+ relactiveDomValue: 'staticData',
+ value: [{"num": 50 }]
+ },
+ {
+ type: 'dycustComponents',
+ label: '',
+ name: 'dynamicData',
+ required: false,
+ placeholder: '',
+ relactiveDom: 'dataType',
+ chartType: 'widget-scale',
+ relactiveDomValue: 'dynamicData',
+ dictKey: 'TEXT_PROPERTIES',
+ value: '',
+ },
+ ],
+ // 坐标
+ position: [
+ {
+ type: 'el-input-number',
+ label: '左边距',
+ name: 'left',
+ required: false,
+ placeholder: '',
+ value: 0,
+ },
+ {
+ type: 'el-input-number',
+ label: '上边距',
+ name: 'top',
+ required: false,
+ placeholder: '',
+ value: 0,
+ },
+ {
+ type: 'el-input-number',
+ label: '宽度',
+ name: 'width',
+ required: false,
+ placeholder: '该容器在1920px大屏中的宽度',
+ value: 400,
+ },
+ {
+ type: 'el-input-number',
+ label: '高度',
+ name: 'height',
+ required: false,
+ placeholder: '该容器在1080px大屏中的高度',
+ value: 250,
+ },
+ ],
+ }
+}
diff --git a/report-ui/src/views/bigscreenDesigner/designer/tools/configure/scaleCharts/widget-scale-vertical.js b/report-ui/src/views/bigscreenDesigner/designer/tools/configure/scaleCharts/widget-scale-vertical.js
new file mode 100644
index 00000000..6975ca69
--- /dev/null
+++ b/report-ui/src/views/bigscreenDesigner/designer/tools/configure/scaleCharts/widget-scale-vertical.js
@@ -0,0 +1,506 @@
+
+export const widgetScaleVertical = {
+ code: 'widget-scale-vertical',
+ type: 'scaleCharts',
+ tabName: '刻度尺',
+ label: '竖刻度尺',
+ icon: 'iconjindutiao',
+ options: {
+ // 配置
+ setup: [
+ {
+ type: 'el-input-text',
+ label: '图层名称',
+ name: 'layerName',
+ required: false,
+ placeholder: '',
+ value: '竖刻度尺',
+ },
+ {
+ type: 'vue-color',
+ label: '背景颜色',
+ name: 'background',
+ required: false,
+ placeholder: '',
+ value: ''
+ },
+ [
+ {
+ name: '标题设置',
+ list: [
+ {
+ type: 'el-switch',
+ label: '标题显示',
+ name: 'isNoTitle',
+ required: false,
+ placeholder: '',
+ value: true,
+ },
+ {
+ type: 'el-input-text',
+ label: '标题名',
+ name: 'titleText',
+ required: false,
+ placeholder: '',
+ value: '',
+ },
+ {
+ type: 'vue-color',
+ label: '字体颜色',
+ name: 'textColor',
+ required: false,
+ placeholder: '',
+ value: '#FFD700'
+ },
+ {
+ type: 'el-input-number',
+ label: '字体字号',
+ name: 'textFontSize',
+ required: false,
+ placeholder: '',
+ value: 20
+ },
+ {
+ type: 'el-select',
+ label: '字体粗细',
+ name: 'textFontWeight',
+ required: false,
+ placeholder: '',
+ selectOptions: [
+ { code: 'normal', name: '正常' },
+ { code: 'bold', name: '粗体' },
+ { code: 'bolder', name: '特粗体' },
+ { code: 'lighter', name: '细体' }
+ ],
+ value: 'normal'
+ },
+ {
+ type: 'el-select',
+ label: '字体风格',
+ name: 'textFontStyle',
+ required: false,
+ placeholder: '',
+ selectOptions: [
+ { code: 'normal', name: '正常' },
+ { code: 'italic', name: 'italic斜体' },
+ { code: 'oblique', name: 'oblique斜体' },
+ ],
+ value: 'normal'
+ },
+ {
+ type: 'el-select',
+ label: '字体位置',
+ name: 'textAlign',
+ required: false,
+ placeholder: '',
+ selectOptions: [
+ { code: 'center', name: '居中' },
+ { code: 'left', name: '左对齐' },
+ { code: 'right', name: '右对齐' },
+ ],
+ value: 'center'
+ },
+ {
+ type: 'el-input-text',
+ label: '副标题名',
+ name: 'subText',
+ required: false,
+ placeholder: '',
+ value: ''
+ },
+ {
+ type: 'vue-color',
+ label: '字体颜色',
+ name: 'subTextColor',
+ required: false,
+ placeholder: '',
+ value: 'rgba(30, 144, 255, 1)'
+ },
+ {
+ type: 'el-input-number',
+ label: '字体字号',
+ name: 'subTextFontSize',
+ required: false,
+ placeholder: '',
+ value: 20
+ },
+ {
+ type: 'el-select',
+ label: '字体粗细',
+ name: 'subTextFontWeight',
+ required: false,
+ placeholder: '',
+ selectOptions: [
+ { code: 'normal', name: '正常' },
+ { code: 'bold', name: '粗体' },
+ { code: 'bolder', name: '特粗体' },
+ { code: 'lighter', name: '细体' }
+ ],
+ value: 'normal'
+ },
+ {
+ type: 'el-select',
+ label: '字体风格',
+ name: 'subTextFontStyle',
+ required: false,
+ placeholder: '',
+ selectOptions: [
+ { code: 'normal', name: '正常' },
+ { code: 'italic', name: 'italic斜体' },
+ { code: 'oblique', name: 'oblique斜体' },
+ ],
+ value: 'normal'
+ },
+ ],
+ },
+ {
+ name: '刻度设定',
+ list: [
+ {
+ type: 'el-switch',
+ label: '刻度显示',
+ name: 'isShowScale',
+ required: false,
+ placeholder: '',
+ value: true,
+ },
+ {
+ type: 'el-input-number',
+ label: '最大刻度',
+ name: 'maxScale',
+ require: false,
+ placeholder: '',
+ value: 100,
+ },
+ {
+ type: 'vue-color',
+ label: '刻度颜色',
+ name: 'scaleColor',
+ required: false,
+ placeholder: '',
+ value: 'rgba(56, 128, 138,1)'
+ },
+ {
+ type: 'el-input-number',
+ label: '刻度宽度',
+ name: 'scaleBarWidth',
+ required: false,
+ placeholder: '',
+ value: 2,
+ },
+ {
+ type: 'el-input-number',
+ label: '刻度值字号',
+ name: 'scaleFontSize',
+ required: false,
+ placeholder: '',
+ value: 16,
+ },
+ {
+ type: 'vue-color',
+ label: '刻度值颜色',
+ name: 'scaleDataColor',
+ required: false,
+ placeholder: '',
+ value: 'rgba(56, 128, 138,1)'
+ },
+ {
+ type: 'el-select',
+ label: '刻度值粗细',
+ name: 'scaleFontWeight',
+ required: false,
+ placeholder: '',
+ selectOptions: [
+ { code: 'normal', name: '正常' },
+ { code: 'bold', name: '粗体' },
+ { code: 'bolder', name: '特粗体' },
+ { code: 'lighter', name: '细体' }
+ ],
+ value: 'normal'
+ },
+ ],
+ },
+ {
+ name: '外框设置',
+ list: [
+ {
+ type: 'el-input-number',
+ label: '宽度',
+ name: 'outBarWidth',
+ required: false,
+ placeholder: '',
+ value: 45,
+ },
+ {
+ type: 'vue-color',
+ label: '颜色',
+ name: 'outBarColor',
+ require: false,
+ placeholder: '',
+ value: '#00FEFF',
+ },
+ {
+ type: 'el-slider',
+ label: '圆角',
+ name: 'outBarRadius',
+ require: false,
+ placeholder: '',
+ value: 50,
+ },
+ ],
+ },
+ {
+ name: '内框设置',
+ list: [
+ {
+ type: 'el-input-number',
+ label: '宽度',
+ name: 'inBarWidth',
+ required: false,
+ placeholder: '',
+ value: 35,
+ },
+ {
+ type: 'vue-color',
+ label: '空白区颜色',
+ name: 'inBarColor',
+ require: false,
+ placeholder: '',
+ value: 'rgba(56, 128, 138,1)',
+ },
+ {
+ type: 'el-slider',
+ label: '圆角',
+ name: 'inBarRadius',
+ require: false,
+ placeholder: '',
+ value: 50,
+ },
+ ],
+ },
+ {
+ name: '数值设定',
+ list: [
+ {
+ type: 'el-switch',
+ label: '显示',
+ name: 'isShow',
+ required: false,
+ placeholder: '',
+ value: true,
+ },
+ {
+ type: 'el-input-number',
+ label: '位置',
+ name: 'fontDistance',
+ required: false,
+ placeholder: '',
+ value: 0,
+ },
+ {
+ type: 'el-input-number',
+ label: '字体字号',
+ name: 'fontSize',
+ required: false,
+ placeholder: '',
+ value: 16,
+ },
+ {
+ type: 'el-select',
+ label: '字体粗细',
+ name: 'fontWeight',
+ required: false,
+ placeholder: '',
+ selectOptions: [
+ { code: 'normal', name: '正常' },
+ { code: 'bold', name: '粗体' },
+ { code: 'bolder', name: '特粗体' },
+ { code: 'lighter', name: '细体' }
+ ],
+ value: 'normal'
+ },
+ ],
+ },
+ {
+ name: '渐变色',
+ list: [
+ {
+ type: 'vue-color',
+ label: '0%',
+ name: 'bar0Color',
+ required: false,
+ placeholder: '',
+ value: '#00FEFF'
+ },
+ {
+ type: 'vue-color',
+ label: '30%',
+ name: 'bar30Color',
+ required: false,
+ placeholder: '',
+ value: '#93FE94'
+ },
+ {
+ type: 'vue-color',
+ label: '70%',
+ name: 'bar70Color',
+ required: false,
+ placeholder: '',
+ value: '#E4D225'
+ },
+ {
+ type: 'vue-color',
+ label: '100%',
+ name: 'bar100Color',
+ required: false,
+ placeholder: '',
+ value: '#E01F28'
+ },
+ ],
+ },
+ {
+ name: '提示语设置',
+ list: [
+ {
+ type: 'el-input-number',
+ label: '字体字号',
+ name: 'tipFontSize',
+ required: false,
+ placeholder: '',
+ value: 16
+ },
+ {
+ type: 'vue-color',
+ label: '字体颜色',
+ name: 'tipsColor',
+ required: false,
+ placeholder: '',
+ value: '#00FEFF'
+ },
+ ],
+ },
+ {
+ name: '坐标轴边距设置',
+ list: [
+ {
+ type: 'el-slider',
+ label: '左边距(像素)',
+ name: 'marginLeft',
+ required: false,
+ placeholder: '',
+ value: 60,
+ }, {
+ type: 'el-slider',
+ label: '顶边距(像素)',
+ name: 'marginTop',
+ required: false,
+ placeholder: '',
+ value: 20,
+ }, {
+ type: 'el-slider',
+ label: '右边距(像素)',
+ name: 'marginRight',
+ required: false,
+ placeholder: '',
+ value: 30,
+ }, {
+ type: 'el-slider',
+ label: '底边距(像素)',
+ name: 'marginBottom',
+ required: false,
+ placeholder: '',
+ value: 10,
+ },
+ ],
+ },
+ ],
+ ],
+ // 数据
+ data: [
+ {
+ type: 'el-radio-group',
+ label: '数据类型',
+ name: 'dataType',
+ require: false,
+ placeholder: '',
+ selectValue: true,
+ selectOptions: [
+ {
+ code: 'staticData',
+ name: '静态数据',
+ },
+ {
+ code: 'dynamicData',
+ name: '动态数据',
+ },
+ ],
+ value: 'staticData',
+ },
+ {
+ type: 'el-input-number',
+ label: '刷新时间(毫秒)',
+ name: 'refreshTime',
+ relactiveDom: 'dataType',
+ relactiveDomValue: 'dynamicData',
+ value: 600000
+ },
+ {
+ type: 'el-button',
+ label: '静态数据',
+ name: 'staticData',
+ required: false,
+ placeholder: '',
+ relactiveDom: 'dataType',
+ relactiveDomValue: 'staticData',
+ value: [{"num": 50 }]
+ },
+ {
+ type: 'dycustComponents',
+ label: '',
+ name: 'dynamicData',
+ required: false,
+ placeholder: '',
+ relactiveDom: 'dataType',
+ chartType: 'widget-scale',
+ relactiveDomValue: 'dynamicData',
+ dictKey: 'TEXT_PROPERTIES',
+ value: null,
+ },
+ ],
+ // 坐标
+ position: [
+ {
+ type: 'el-input-number',
+ label: '左边距',
+ name: 'left',
+ required: false,
+ placeholder: '',
+ value: 0,
+ },
+ {
+ type: 'el-input-number',
+ label: '上边距',
+ name: 'top',
+ required: false,
+ placeholder: '',
+ value: 0,
+ },
+ {
+ type: 'el-input-number',
+ label: '宽度',
+ name: 'width',
+ required: false,
+ placeholder: '该容器在1920px大屏中的宽度',
+ value: 250,
+ },
+ {
+ type: 'el-input-number',
+ label: '高度',
+ name: 'height',
+ required: false,
+ placeholder: '该容器在1080px大屏中的高度',
+ value: 400,
+ },
+ ],
+ }
+}
diff --git a/report-ui/src/views/bigscreenDesigner/designer/tools/configure/texts/widget-href.js b/report-ui/src/views/bigscreenDesigner/designer/tools/configure/texts/widget-href.js
index 905aeeeb..40eeff55 100644
--- a/report-ui/src/views/bigscreenDesigner/designer/tools/configure/texts/widget-href.js
+++ b/report-ui/src/views/bigscreenDesigner/designer/tools/configure/texts/widget-href.js
@@ -3,8 +3,8 @@
* @version:
* @Author: qianlishi
* @Date: 2021-08-29 07:03:58
- * @LastEditors: qianlishi
- * @LastEditTime: 2021-09-28 14:14:21
+ * @LastEditors: qianlishi qianlishi@anji-plus.com
+ * @LastEditTime: 2023-01-11 13:16:21
*/
export const widgetHref = {
code: 'widget-href',
diff --git a/report-ui/src/views/bigscreenDesigner/designer/tools/configure/texts/widget-iframe.js b/report-ui/src/views/bigscreenDesigner/designer/tools/configure/texts/widget-iframe.js
index e56cc308..ab50309f 100644
--- a/report-ui/src/views/bigscreenDesigner/designer/tools/configure/texts/widget-iframe.js
+++ b/report-ui/src/views/bigscreenDesigner/designer/tools/configure/texts/widget-iframe.js
@@ -3,8 +3,8 @@
* @version:
* @Author: qianlishi
* @Date: 2021-08-29 07:17:55
- * @LastEditors: qianlishi
- * @LastEditTime: 2021-09-28 14:14:39
+ * @LastEditors: qianlishi qianlishi@anji-plus.com
+ * @LastEditTime: 2023-01-11 13:17:35
*/
export const widgetIframe = {
code: 'widget-iframe',
diff --git a/report-ui/src/views/bigscreenDesigner/designer/tools/configure/texts/widget-image.js b/report-ui/src/views/bigscreenDesigner/designer/tools/configure/texts/widget-image.js
index b09132b9..79c14c5d 100644
--- a/report-ui/src/views/bigscreenDesigner/designer/tools/configure/texts/widget-image.js
+++ b/report-ui/src/views/bigscreenDesigner/designer/tools/configure/texts/widget-image.js
@@ -7,106 +7,106 @@
* @LastEditTime: 2021-09-28 14:14:51
*/
export const widgetImage = {
- code: 'widget-image',
- type: 'text',
- tabName: '文本栏',
- label: '图片',
- icon: 'icontupian',
- options: {
- // 配置
- setup: [
- {
- type: 'el-input-text',
- label: '图层名称',
- name: 'layerName',
- required: false,
- placeholder: '',
- value: '图片',
- },
- {
- type: 'el-switch',
- label: '开启旋转',
- name: 'startRotate',
- required: false,
- placeholder: '',
- value: false,
- },
- {
- type: 'el-slider',
- label: '旋转速度',
- name: 'rotationSpeed',
- required: false,
- placeholder: '',
- value: 70
- },
- {
- type: 'el-slider',
- label: '透明度',
- name: 'transparency',
- required: false,
- placeholder: '',
- value: 100
- },
- {
- type: 'el-input-number',
- label: '圆角',
- name: 'borderRadius',
- required: false,
- placeholder: '',
- value: '0'
- },
- {
- type: 'custom-upload',
- label: '图片地址',
- name: 'imageAdress',
- required: false,
- placeholder: '',
- value: 'http://10.108.26.197:9095/file/download/fd20d563-00aa-45e2-b5db-aff951f814ec',
- },
- {
- type: 'vue-color',
- label: '背景颜色',
- name: 'background',
- required: false,
- placeholder: '',
- },
- ],
- // 数据
- data: [],
- // 坐标
- position: [
- {
- type: 'el-input-number',
- label: '左边距',
- name: 'left',
- required: false,
- placeholder: '',
- value: 0,
- },
- {
- type: 'el-input-number',
- label: '上边距',
- name: 'top',
- required: false,
- placeholder: '',
- value: 0,
- },
- {
- type: 'el-input-number',
- label: '宽度',
- name: 'width',
- required: false,
- placeholder: '该容器在1920px大屏中的宽度',
- value: 300,
- },
- {
- type: 'el-input-number',
- label: '高度',
- name: 'height',
- required: false,
- placeholder: '该容器在1080px大屏中的高度',
- value: 200,
- },
- ],
- }
+ code: 'widget-image',
+ type: 'text',
+ tabName: '文本栏',
+ label: '图片',
+ icon: 'icontupian',
+ options: {
+ // 配置
+ setup: [
+ {
+ type: 'el-input-text',
+ label: '图层名称',
+ name: 'layerName',
+ required: false,
+ placeholder: '',
+ value: '图片',
+ },
+ {
+ type: 'el-switch',
+ label: '开启旋转',
+ name: 'startRotate',
+ required: false,
+ placeholder: '',
+ value: false,
+ },
+ {
+ type: 'el-slider',
+ label: '旋转速度',
+ name: 'rotationSpeed',
+ required: false,
+ placeholder: '',
+ value: 70
+ },
+ {
+ type: 'el-slider',
+ label: '透明度',
+ name: 'transparency',
+ required: false,
+ placeholder: '',
+ value: 100
+ },
+ {
+ type: 'el-input-number',
+ label: '圆角',
+ name: 'borderRadius',
+ required: false,
+ placeholder: '',
+ value: '0'
+ },
+ {
+ type: 'custom-upload',
+ label: '图片地址',
+ name: 'imageAdress',
+ required: false,
+ placeholder: '',
+ value: 'http://10.108.26.197:9095/file/download/fd20d563-00aa-45e2-b5db-aff951f814ec',
+ },
+ {
+ type: 'vue-color',
+ label: '背景颜色',
+ name: 'background',
+ required: false,
+ placeholder: '',
+ },
+ ],
+ // 数据
+ data: [],
+ // 坐标
+ position: [
+ {
+ type: 'el-input-number',
+ label: '左边距',
+ name: 'left',
+ required: false,
+ placeholder: '',
+ value: 0,
+ },
+ {
+ type: 'el-input-number',
+ label: '上边距',
+ name: 'top',
+ required: false,
+ placeholder: '',
+ value: 0,
+ },
+ {
+ type: 'el-input-number',
+ label: '宽度',
+ name: 'width',
+ required: false,
+ placeholder: '该容器在1920px大屏中的宽度',
+ value: 300,
+ },
+ {
+ type: 'el-input-number',
+ label: '高度',
+ name: 'height',
+ required: false,
+ placeholder: '该容器在1080px大屏中的高度',
+ value: 200,
+ },
+ ],
}
+}
diff --git a/report-ui/src/views/bigscreenDesigner/designer/tools/configure/texts/widget-marquee.js b/report-ui/src/views/bigscreenDesigner/designer/tools/configure/texts/widget-marquee.js
index bbaed193..0dbb5ec7 100644
--- a/report-ui/src/views/bigscreenDesigner/designer/tools/configure/texts/widget-marquee.js
+++ b/report-ui/src/views/bigscreenDesigner/designer/tools/configure/texts/widget-marquee.js
@@ -3,175 +3,175 @@
* @version:
* @Author: qianlishi
* @Date: 2021-08-29 07:00:00
- * @LastEditors: qianlishi
- * @LastEditTime: 2021-09-28 14:17:39
+ * @LastEditors: qianlishi qianlishi@anji-plus.com
+ * @LastEditTime: 2023-01-11 13:18:02
*/
export const widgetMarquee = {
- code: 'widget-marquee',
- type: 'text',
- tabName: '文本栏',
- label: '滚动文本',
- icon: 'iconhengxiangwenzi',
- options: {
- // 配置
- setup: [
- {
- type: 'el-input-text',
- label: '图层名称',
- name: 'layerName',
- required: false,
- placeholder: '',
- value: '跑马灯',
- },
- {
- type: 'el-input-text',
- label: '文本内容',
- name: 'text',
- required: false,
- placeholder: '',
- value: '滚动文本',
- },
- {
- type: 'el-input-number',
- label: '字体字号',
- name: 'fontSize',
- required: false,
- placeholder: '',
- value: '26',
- },
- {
- type: 'vue-color',
- label: '字体颜色',
- name: 'color',
- required: false,
- placeholder: '',
- value: '#FAD400',
- },
- {
- type: 'el-input-number',
- label: '字体间距',
- name: 'letterSpacing',
- required: false,
- placeholder: '',
- value: '0',
- },
- {
- type: 'vue-color',
- label: '字体背景',
- name: 'background',
- required: false,
- placeholder: '',
- value: 'rgba(115,170,229,.5)',
- },
- {
- type: 'el-select',
- label: '文字粗细',
- name: 'fontWeight',
- required: false,
- placeholder: '',
- selectOptions: [
- {code: 'normal', name: '正常'},
- {code: 'bold', name: '粗体'},
- {code: 'bolder', name: '特粗体'},
- {code: 'lighter', name: '细体'}
- ],
- value: 'normal'
- },
-/* {
- type: 'el-input-number',
- label: '滚动速度',
- name: 'jScrollPane',
- //required: false,
- placeholder: '',
- value: '50',
- }*/
- ],
- // 数据
- data: [
- {
- type: 'el-radio-group',
- label: '数据类型',
- name: 'dataType',
- require: false,
- placeholder: '',
- selectValue: true,
- selectOptions: [
- {
- code: 'staticData',
- name: '静态数据',
- },
- {
- code: 'dynamicData',
- name: '动态数据',
- },
- ],
- value: 'staticData',
- },
- {
- type: 'el-input-number',
- label: '刷新时间(毫秒)',
- name: 'refreshTime',
- relactiveDom: 'dataType',
- relactiveDomValue: 'dynamicData',
- value: 5000
- },
- {
- type: 'el-button',
- label: '静态数据',
- name: 'staticData',
- required: false,
- placeholder: '',
- relactiveDom: 'dataType',
- relactiveDomValue: 'staticData',
- value: '文本框',
- },
- {
- type: 'dycustComponents',
- label: '',
- name: 'dynamicData',
- required: false,
- placeholder: '',
- relactiveDom: 'dataType',
- relactiveDomValue: 'dynamicData',
- chartType: 'widget-text',
- dictKey: 'TEXT_PROPERTIES',
- value: '',
- }
- ],
- // 坐标
- position: [
- {
- type: 'el-input-number',
- label: '左边距',
- name: 'left',
- required: false,
- placeholder: '',
- value: 0,
- },
- {
- type: 'el-input-number',
- label: '上边距',
- name: 'top',
- required: false,
- placeholder: '',
- value: 0,
- },
- {
- type: 'el-input-number',
- label: '宽度',
- name: 'width',
- required: false,
- placeholder: '该容器在1920px大屏中的宽度',
- value: 100,
- },
- {
- type: 'el-input-number',
- label: '高度',
- name: 'height',
- required: false,
- placeholder: '该容器在1080px大屏中的高度',
- value: 40,
- },
- ],
- }
+ code: 'widget-marquee',
+ type: 'text',
+ tabName: '文本栏',
+ label: '滚动文本',
+ icon: 'iconhengxiangwenzi',
+ options: {
+ // 配置
+ setup: [
+ {
+ type: 'el-input-text',
+ label: '图层名称',
+ name: 'layerName',
+ required: false,
+ placeholder: '',
+ value: '跑马灯',
+ },
+ {
+ type: 'el-input-text',
+ label: '文本内容',
+ name: 'text',
+ required: false,
+ placeholder: '',
+ value: '滚动文本',
+ },
+ {
+ type: 'el-input-number',
+ label: '字体字号',
+ name: 'fontSize',
+ required: false,
+ placeholder: '',
+ value: '26',
+ },
+ {
+ type: 'vue-color',
+ label: '字体颜色',
+ name: 'color',
+ required: false,
+ placeholder: '',
+ value: '#FAD400',
+ },
+ {
+ type: 'el-input-number',
+ label: '字体间距',
+ name: 'letterSpacing',
+ required: false,
+ placeholder: '',
+ value: '0',
+ },
+ {
+ type: 'vue-color',
+ label: '字体背景',
+ name: 'background',
+ required: false,
+ placeholder: '',
+ value: 'rgba(115,170,229,.5)',
+ },
+ {
+ type: 'el-select',
+ label: '文字粗细',
+ name: 'fontWeight',
+ required: false,
+ placeholder: '',
+ selectOptions: [
+ { code: 'normal', name: '正常' },
+ { code: 'bold', name: '粗体' },
+ { code: 'bolder', name: '特粗体' },
+ { code: 'lighter', name: '细体' }
+ ],
+ value: 'normal'
+ },
+ /* {
+ type: 'el-input-number',
+ label: '滚动速度',
+ name: 'jScrollPane',
+ //required: false,
+ placeholder: '',
+ value: '50',
+ }*/
+ ],
+ // 数据
+ data: [
+ {
+ type: 'el-radio-group',
+ label: '数据类型',
+ name: 'dataType',
+ require: false,
+ placeholder: '',
+ selectValue: true,
+ selectOptions: [
+ {
+ code: 'staticData',
+ name: '静态数据',
+ },
+ {
+ code: 'dynamicData',
+ name: '动态数据',
+ },
+ ],
+ value: 'staticData',
+ },
+ {
+ type: 'el-input-number',
+ label: '刷新时间(毫秒)',
+ name: 'refreshTime',
+ relactiveDom: 'dataType',
+ relactiveDomValue: 'dynamicData',
+ value: 600000
+ },
+ {
+ type: 'el-button',
+ label: '静态数据',
+ name: 'staticData',
+ required: false,
+ placeholder: '',
+ relactiveDom: 'dataType',
+ relactiveDomValue: 'staticData',
+ value: '文本框',
+ },
+ {
+ type: 'dycustComponents',
+ label: '',
+ name: 'dynamicData',
+ required: false,
+ placeholder: '',
+ relactiveDom: 'dataType',
+ relactiveDomValue: 'dynamicData',
+ chartType: 'widget-text',
+ dictKey: 'TEXT_PROPERTIES',
+ value: '',
+ }
+ ],
+ // 坐标
+ position: [
+ {
+ type: 'el-input-number',
+ label: '左边距',
+ name: 'left',
+ required: false,
+ placeholder: '',
+ value: 0,
+ },
+ {
+ type: 'el-input-number',
+ label: '上边距',
+ name: 'top',
+ required: false,
+ placeholder: '',
+ value: 0,
+ },
+ {
+ type: 'el-input-number',
+ label: '宽度',
+ name: 'width',
+ required: false,
+ placeholder: '该容器在1920px大屏中的宽度',
+ value: 100,
+ },
+ {
+ type: 'el-input-number',
+ label: '高度',
+ name: 'height',
+ required: false,
+ placeholder: '该容器在1080px大屏中的高度',
+ value: 40,
+ },
+ ],
}
+}
diff --git a/report-ui/src/views/bigscreenDesigner/designer/tools/configure/texts/widget-slider.js b/report-ui/src/views/bigscreenDesigner/designer/tools/configure/texts/widget-slider.js
index 0e325bdb..a466face 100644
--- a/report-ui/src/views/bigscreenDesigner/designer/tools/configure/texts/widget-slider.js
+++ b/report-ui/src/views/bigscreenDesigner/designer/tools/configure/texts/widget-slider.js
@@ -3,86 +3,86 @@
* @version:
* @Author: qianlishi
* @Date: 2021-08-29 07:08:53
- * @LastEditors: qianlishi
- * @LastEditTime: 2021-09-28 14:19:30
+ * @LastEditors: qianlishi qianlishi@anji-plus.com
+ * @LastEditTime: 2023-01-11 13:18:15
*/
-export const widgetSliders = {
- code: 'widget-slider',
- type: 'text',
- tabName: '文本栏',
- label: '轮播图片',
- icon: 'slider',
- options: {
- // 配置
- setup: [
- {
- type: 'el-input-text',
- label: '图层名称',
- name: 'layerName',
- required: false,
- placeholder: '',
- },
- {
- type: 'el-switch',
- label: '隐藏图层',
- name: 'hideLayer',
- required: false,
- placeholder: '',
- },
- {
- type: 'el-select',
- label: '轮播方向',
- name: 'tabDirection',
- required: false,
- placeholder: '',
- },
- {
- type: 'el-select',
- label: '选择器',
- name: 'tabSelector',
- required: false,
- placeholder: '',
- },
- {
- type: 'el-input-number',
- label: '轮播时间',
- name: 'tabTime',
- required: false,
- placeholder: '',
- },
- ],
- // 数据
- data: [],
- // 坐标
- position: [
- {
- type: 'el-input-number',
- label: '左边距',
- name: 'left',
- required: true,
- placeholder: '',
- },
- {
- type: 'el-input-number',
- label: '上边距',
- name: 'top',
- required: true,
- placeholder: '',
- },
- {
- type: 'el-input-number',
- label: '宽度',
- name: 'width',
- required: true,
- placeholder: '该容器在1920px大屏中的宽度',
- },
- {
- type: 'el-input-number',
- label: '高度',
- name: 'height',
- required: true,
- placeholder: '该容器在1080px大屏中的高度',
- },
- ],
- }
- }
\ No newline at end of file
+export const widgetSliders = {
+ code: 'widget-slider',
+ type: 'text',
+ tabName: '文本栏',
+ label: '轮播图片',
+ icon: 'slider',
+ options: {
+ // 配置
+ setup: [
+ {
+ type: 'el-input-text',
+ label: '图层名称',
+ name: 'layerName',
+ required: false,
+ placeholder: '',
+ },
+ {
+ type: 'el-switch',
+ label: '隐藏图层',
+ name: 'hideLayer',
+ required: false,
+ placeholder: '',
+ },
+ {
+ type: 'el-select',
+ label: '轮播方向',
+ name: 'tabDirection',
+ required: false,
+ placeholder: '',
+ },
+ {
+ type: 'el-select',
+ label: '选择器',
+ name: 'tabSelector',
+ required: false,
+ placeholder: '',
+ },
+ {
+ type: 'el-input-number',
+ label: '轮播时间',
+ name: 'tabTime',
+ required: false,
+ placeholder: '',
+ },
+ ],
+ // 数据
+ data: [],
+ // 坐标
+ position: [
+ {
+ type: 'el-input-number',
+ label: '左边距',
+ name: 'left',
+ required: true,
+ placeholder: '',
+ },
+ {
+ type: 'el-input-number',
+ label: '上边距',
+ name: 'top',
+ required: true,
+ placeholder: '',
+ },
+ {
+ type: 'el-input-number',
+ label: '宽度',
+ name: 'width',
+ required: true,
+ placeholder: '该容器在1920px大屏中的宽度',
+ },
+ {
+ type: 'el-input-number',
+ label: '高度',
+ name: 'height',
+ required: true,
+ placeholder: '该容器在1080px大屏中的高度',
+ },
+ ],
+ }
+}
\ No newline at end of file
diff --git a/report-ui/src/views/bigscreenDesigner/designer/tools/configure/texts/widget-table.js b/report-ui/src/views/bigscreenDesigner/designer/tools/configure/texts/widget-table.js
index ea67c25c..13eb6a09 100644
--- a/report-ui/src/views/bigscreenDesigner/designer/tools/configure/texts/widget-table.js
+++ b/report-ui/src/views/bigscreenDesigner/designer/tools/configure/texts/widget-table.js
@@ -3,303 +3,304 @@
* @version:
* @Author: qianlishi
* @Date: 2021-08-29 07:16:10
- * @LastEditors: qianlishi
- * @LastEditTime: 2021-09-28 14:19:54
+ * @LastEditors: qianlishi qianlishi@anji-plus.com
+ * @LastEditTime: 2023-01-11 13:18:28
*/
export const widgetTable = {
- code: 'widget-table',
- type: 'text',
- tabName: '文本栏',
- label: '表格',
- icon: 'iconbiaoge',
- options: {
- setup: [
- {
- type: 'el-input-text',
- label: '图层名称',
- name: 'layerName',
- required: false,
- placeholder: '',
- value: '表格',
- },
- {
- type: 'el-select',
- label: '字体位置',
- name: 'textAlign',
- required: false,
- placeholder: '',
- selectOptions: [
- {code: 'center', name: '居中'},
- {code: 'left', name: '左对齐'},
- {code: 'right', name: '右对齐'},
- ],
- value: 'center'
- },
- {
- type: 'el-input-number',
- label: '字体字号',
- name: 'fontSize',
- required: false,
- placeholder: '',
- value: '16'
- },
- {
- type: 'el-input-number',
- label: '显示行数',
- name: 'vis',
- required: false,
- placeholder: '',
- value: '5'
- },
- {
- type: 'el-input-number',
- label: '行高',
- name: 'rowHeight',
- required: false,
- placeholder: '',
- value: '50'
- },
- {
- type: 'el-switch',
- label: '开启滚动',
- name: 'isRoll',
- required: false,
- placeholder: '',
- value: true
- },
- {
- type: 'el-select',
- label: '动画效果',
- name: 'effect',
- required: false,
- placeholder: '',
- selectOptions: [
- {code: 'top', name: '上滚动'},
- {code: 'topLoop', name: '上循环滚动'},
- ],
- value: 'topLoop'
- },
- {
- type: 'el-input-number',
- label: '滚动间隔(毫秒)',
- name: 'interTime',
- required: false,
- placeholder: '',
- value: 2500
- },
- {
- type: 'el-input-number',
- label: '动效时间(毫秒)',
- name: 'delayTime',
- required: false,
- placeholder: '',
- value: 500
- },
- {
- type: 'el-input-number',
- label: '滚动个数',
- name: 'scroll',
- required: false,
- placeholder: '',
- value: 1
- },
- {
- type: 'el-switch',
- label: '边框线',
- name: 'isLine',
- required: false,
- placeholder: '',
- value: false
- },
- {
- type: 'el-input-number',
- label: '边框宽度',
- name: 'borderWidth',
- required: false,
- placeholder: '',
- value: 1
- },
- {
- type: 'vue-color',
- label: '边框颜色',
- name: 'borderColor',
- required: false,
- placeholder: '',
- value: '#fff'
- },
- [
- {
- name: '表头设置',
- list: [
- {
- type: 'el-switch',
- label: '表头显隐',
- name: 'isHeader',
- required: false,
- placeholder: '',
- value: true,
- },
- {
- type: 'vue-color',
- label: '表头颜色',
- name: 'headColor',
- require: false,
- placeholder: '',
- value: '#fff',
- },
- {
- type: 'vue-color',
- label: '表头背景',
- name: 'headBackColor',
- require: false,
- placeholder: '',
- value: '#0a73ff',
- },
- ],
- },
- {
- name: '表体设置',
- list: [
- {
- type: 'vue-color',
- label: '文字颜色',
- name: 'bodyColor',
- required: false,
- placeholder: '',
- value: '#fff',
- },
- {
- type: 'vue-color',
- label: '表格背景色',
- name: 'tableBgColor',
- require: false,
- placeholder: '',
- value: '',
- },
- {
- type: 'vue-color',
- label: '奇行颜色',
- name: 'oldColor',
- require: false,
- placeholder: '',
- value: '#0a2732',
- },
- {
- type: 'vue-color',
- label: '偶行颜色',
- name: 'eventColor',
- required: false,
- placeholder: '',
- value: '#003b51'
- }
- ],
- },
+ code: 'widget-table',
+ type: 'text',
+ tabName: '文本栏',
+ label: '表格',
+ icon: 'iconbiaoge',
+ options: {
+ setup: [
+ {
+ type: 'el-input-text',
+ label: '图层名称',
+ name: 'layerName',
+ required: false,
+ placeholder: '',
+ value: '表格',
+ },
+ {
+ type: 'el-select',
+ label: '字体位置',
+ name: 'textAlign',
+ required: false,
+ placeholder: '',
+ selectOptions: [
+ { code: 'center', name: '居中' },
+ { code: 'left', name: '左对齐' },
+ { code: 'right', name: '右对齐' },
],
+ value: 'center'
+ },
+ {
+ type: 'el-input-number',
+ label: '字体字号',
+ name: 'fontSize',
+ required: false,
+ placeholder: '',
+ value: '16'
+ },
+ {
+ type: 'el-input-number',
+ label: '显示行数',
+ name: 'vis',
+ required: false,
+ placeholder: '',
+ value: '5'
+ },
+ {
+ type: 'el-input-number',
+ label: '行高',
+ name: 'rowHeight',
+ required: false,
+ placeholder: '',
+ value: '50'
+ },
+ {
+ type: 'el-switch',
+ label: '开启滚动',
+ name: 'isRoll',
+ required: false,
+ placeholder: '',
+ value: true
+ },
+ {
+ type: 'el-select',
+ label: '动画效果',
+ name: 'effect',
+ required: false,
+ placeholder: '',
+ selectOptions: [
+ { code: 'top', name: '上滚动' },
+ { code: 'topLoop', name: '上循环滚动' },
+ ],
+ value: 'topLoop'
+ },
+ {
+ type: 'el-input-number',
+ label: '滚动间隔(毫秒)',
+ name: 'interTime',
+ required: false,
+ placeholder: '',
+ value: 2500
+ },
+ {
+ type: 'el-input-number',
+ label: '动效时间(毫秒)',
+ name: 'delayTime',
+ required: false,
+ placeholder: '',
+ value: 500
+ },
+ {
+ type: 'el-input-number',
+ label: '滚动个数',
+ name: 'scroll',
+ required: false,
+ placeholder: '',
+ value: 1
+ },
+ {
+ type: 'el-switch',
+ label: '边框线',
+ name: 'isLine',
+ required: false,
+ placeholder: '',
+ value: false
+ },
+ {
+ type: 'el-input-number',
+ label: '边框宽度',
+ name: 'borderWidth',
+ required: false,
+ placeholder: '',
+ value: 1
+ },
+ {
+ type: 'vue-color',
+ label: '边框颜色',
+ name: 'borderColor',
+ required: false,
+ placeholder: '',
+ value: '#fff'
+ },
+ [
{
- type: 'dynamic-add-table',
- label: '',
- name: 'dynamicAddTable',
- required: false,
- placeholder: '',
- value: [
- {name: '日期', key: 'date', width: '50%'},
- {name: '姓名', key: 'name', width: '50%'},
- {name: '地址', key: 'address', width: '200%',
- }]
- }
- ],
- data: [
- {
- type: 'el-radio-group',
- label: '数据类型',
- name: 'dataType',
- require: false,
- placeholder: '',
- selectValue: true,
- selectOptions: [
+ name: '表头设置',
+ list: [
+ {
+ type: 'el-switch',
+ label: '表头显隐',
+ name: 'isHeader',
+ required: false,
+ placeholder: '',
+ value: true,
+ },
{
- code: 'staticData',
- name: '静态数据',
+ type: 'vue-color',
+ label: '表头颜色',
+ name: 'headColor',
+ require: false,
+ placeholder: '',
+ value: '#fff',
},
{
- code: 'dynamicData',
- name: '动态数据',
+ type: 'vue-color',
+ label: '表头背景',
+ name: 'headBackColor',
+ require: false,
+ placeholder: '',
+ value: '#0a73ff',
},
],
- value: 'staticData',
- },
- {
- type: 'el-input-number',
- label: '刷新时间(毫秒)',
- name: 'refreshTime',
- relactiveDom: 'dataType',
- relactiveDomValue: 'dynamicData',
- value: 30000
},
{
- type: 'el-button',
- label: '静态数据',
- name: 'staticData',
- required: false,
- placeholder: '',
- relactiveDom: 'dataType',
- relactiveDomValue: 'staticData',
- value: [
- {date: '2016-05-02', name: '王小虎', address: '上海市普陀区金沙江路 1518 弄0001'},
- {date: '2016-05-02', name: '王小虎', address: '上海市普陀区金沙江路 1518 弄0002'},
- {date: '2016-05-02', name: '王小虎', address: '上海市普陀区金沙江路 1518 弄0003'},
- {date: '2016-05-02', name: '王小虎', address: '上海市普陀区金沙江路 1518 弄0004'},
- {date: '2016-05-02', name: '王小虎', address: '上海市普陀区金沙江路 1518 弄0005'},
- {date: '2016-05-02', name: '王小虎', address: '上海市普陀区金沙江路 1518 弄0006'},
- {date: '2016-05-02', name: '王小虎', address: '上海市普陀区金沙江路 1518 弄0007'},
+ name: '表体设置',
+ list: [
+ {
+ type: 'vue-color',
+ label: '文字颜色',
+ name: 'bodyColor',
+ required: false,
+ placeholder: '',
+ value: '#fff',
+ },
+ {
+ type: 'vue-color',
+ label: '表格背景色',
+ name: 'tableBgColor',
+ require: false,
+ placeholder: '',
+ value: '',
+ },
+ {
+ type: 'vue-color',
+ label: '奇行颜色',
+ name: 'oldColor',
+ require: false,
+ placeholder: '',
+ value: '#0a2732',
+ },
+ {
+ type: 'vue-color',
+ label: '偶行颜色',
+ name: 'eventColor',
+ required: false,
+ placeholder: '',
+ value: '#003b51'
+ }
],
},
- {
- type: 'dycustComponents',
- label: '',
- name: 'dynamicData',
- required: false,
- placeholder: '',
- relactiveDom: 'dataType',
- relactiveDomValue: 'dynamicData',
- chartType: 'widget-table',
- dictKey: 'TEXT_PROPERTIES',
- value: '',
- },
],
- position: [
- {
- type: 'el-input-number',
- label: '左边距',
- name: 'left',
- required: false,
- placeholder: '',
- value: 0,
- },
- {
- type: 'el-input-number',
- label: '上边距',
- name: 'top',
- required: false,
- placeholder: '',
- value: 0,
- },
- {
- type: 'el-input-number',
- label: '宽度',
- name: 'width',
- required: false,
- placeholder: '该容器在1920px大屏中的宽度',
- value: 600,
- },
- {
- type: 'el-input-number',
- label: '高度',
- name: 'height',
- required: false,
- placeholder: '该容器在1080px大屏中的高度',
- value: 300,
- },
- ]
- }
+ {
+ type: 'dynamic-add-table',
+ label: '',
+ name: 'dynamicAddTable',
+ required: false,
+ placeholder: '',
+ value: [
+ { name: '日期', key: 'date', width: '50%' },
+ { name: '姓名', key: 'name', width: '50%' },
+ {
+ name: '地址', key: 'address', width: '200%',
+ }]
+ }
+ ],
+ data: [
+ {
+ type: 'el-radio-group',
+ label: '数据类型',
+ name: 'dataType',
+ require: false,
+ placeholder: '',
+ selectValue: true,
+ selectOptions: [
+ {
+ code: 'staticData',
+ name: '静态数据',
+ },
+ {
+ code: 'dynamicData',
+ name: '动态数据',
+ },
+ ],
+ value: 'staticData',
+ },
+ {
+ type: 'el-input-number',
+ label: '刷新时间(毫秒)',
+ name: 'refreshTime',
+ relactiveDom: 'dataType',
+ relactiveDomValue: 'dynamicData',
+ value: 30000
+ },
+ {
+ type: 'el-button',
+ label: '静态数据',
+ name: 'staticData',
+ required: false,
+ placeholder: '',
+ relactiveDom: 'dataType',
+ relactiveDomValue: 'staticData',
+ value: [
+ { date: '2016-05-02', name: '王小虎', address: '上海市普陀区金沙江路 1518 弄0001' },
+ { date: '2016-05-02', name: '王小虎', address: '上海市普陀区金沙江路 1518 弄0002' },
+ { date: '2016-05-02', name: '王小虎', address: '上海市普陀区金沙江路 1518 弄0003' },
+ { date: '2016-05-02', name: '王小虎', address: '上海市普陀区金沙江路 1518 弄0004' },
+ { date: '2016-05-02', name: '王小虎', address: '上海市普陀区金沙江路 1518 弄0005' },
+ { date: '2016-05-02', name: '王小虎', address: '上海市普陀区金沙江路 1518 弄0006' },
+ { date: '2016-05-02', name: '王小虎', address: '上海市普陀区金沙江路 1518 弄0007' },
+ ],
+ },
+ {
+ type: 'dycustComponents',
+ label: '',
+ name: 'dynamicData',
+ required: false,
+ placeholder: '',
+ relactiveDom: 'dataType',
+ relactiveDomValue: 'dynamicData',
+ chartType: 'widget-table',
+ dictKey: 'TEXT_PROPERTIES',
+ value: '',
+ },
+ ],
+ position: [
+ {
+ type: 'el-input-number',
+ label: '左边距',
+ name: 'left',
+ required: false,
+ placeholder: '',
+ value: 0,
+ },
+ {
+ type: 'el-input-number',
+ label: '上边距',
+ name: 'top',
+ required: false,
+ placeholder: '',
+ value: 0,
+ },
+ {
+ type: 'el-input-number',
+ label: '宽度',
+ name: 'width',
+ required: false,
+ placeholder: '该容器在1920px大屏中的宽度',
+ value: 600,
+ },
+ {
+ type: 'el-input-number',
+ label: '高度',
+ name: 'height',
+ required: false,
+ placeholder: '该容器在1080px大屏中的高度',
+ value: 300,
+ },
+ ]
}
+}
diff --git a/report-ui/src/views/bigscreenDesigner/designer/tools/configure/texts/widget-text.js b/report-ui/src/views/bigscreenDesigner/designer/tools/configure/texts/widget-text.js
index 74bba57e..51009820 100644
--- a/report-ui/src/views/bigscreenDesigner/designer/tools/configure/texts/widget-text.js
+++ b/report-ui/src/views/bigscreenDesigner/designer/tools/configure/texts/widget-text.js
@@ -3,181 +3,181 @@
* @version:
* @Author: qianlishi
* @Date: 2021-08-29 06:52:13
- * @LastEditors: qianlishi
- * @LastEditTime: 2021-09-28 14:20:12
+ * @LastEditors: qianlishi qianlishi@anji-plus.com
+ * @LastEditTime: 2023-01-11 13:18:36
*/
-export const widgetText = {
- code: 'widget-text',
- type: 'text',
- tabName: '文本栏',
- label: '文本',
- icon: 'iconziyuan',
- options: {
- // 配置
- setup: [
- {
- type: 'el-input-text',
- label: '图层名称',
- name: 'layerName',
- required: false,
- placeholder: '',
- value: '文本框',
- },
- {
- type: 'el-input-text',
- label: '文本内容',
- name: 'text',
- required: false,
- placeholder: '',
- value: '文本框',
- },
- {
- type: 'el-input-number',
- label: '字体字号',
- name: 'fontSize',
- required: false,
- placeholder: '',
- value: '26',
- },
- {
- type: 'vue-color',
- label: '字体颜色',
- name: 'color',
- required: false,
- placeholder: '',
- value: '#FAD400',
- },
- {
- type: 'el-input-number',
- label: '字体间距',
- name: 'letterSpacing',
- required: false,
- placeholder: '',
- value: '0',
- },
- {
- type: 'vue-color',
- label: '字体背景',
- name: 'background',
- required: false,
- placeholder: '',
- value: 'rgba(115,170,229,.0)',
- },
- {
- type: 'el-select',
- label: '文字粗细',
- name: 'fontWeight',
- required: false,
- placeholder: '',
- selectOptions: [
- {code: 'normal', name: '正常'},
- {code: 'bold', name: '粗体'},
- {code: 'bolder', name: '特粗体'},
- {code: 'lighter', name: '细体'}
- ],
- value: 'normal'
- },
- {
- type: 'el-select',
- label: '对齐方式',
- name: 'textAlign',
- required: false,
- placeholder: '',
- selectOptions: [
- {code: 'center', name: '居中'},
- {code: 'left', name: '左对齐'},
- {code: 'right', name: '右对齐'},
- ],
- value: 'center'
- },
- ],
- // 数据
- data: [
- {
- type: 'el-radio-group',
- label: '数据类型',
- name: 'dataType',
- require: false,
- placeholder: '',
- selectValue: true,
- selectOptions: [
- {
- code: 'staticData',
- name: '静态数据',
- },
- {
- code: 'dynamicData',
- name: '动态数据',
- },
- ],
- value: 'staticData',
- },
- {
- type: 'el-input-number',
- label: '刷新时间(毫秒)',
- name: 'refreshTime',
- relactiveDom: 'dataType',
- relactiveDomValue: 'dynamicData',
- value: 5000
- },
- {
- type: 'el-button',
- label: '静态数据',
- name: 'staticData',
- required: false,
- placeholder: '',
- relactiveDom: 'dataType',
- relactiveDomValue: 'staticData',
- value: '文本框',
- },
- {
- type: 'dycustComponents',
- label: '',
- name: 'dynamicData',
- required: false,
- placeholder: '',
- relactiveDom: 'dataType',
- relactiveDomValue: 'dynamicData',
- chartType: 'widget-text',
- dictKey: 'TEXT_PROPERTIES',
- value: '',
- }
- ],
+export const widgetText = {
+ code: 'widget-text',
+ type: 'text',
+ tabName: '文本栏',
+ label: '文本',
+ icon: 'iconziyuan',
+ options: {
+ // 配置
+ setup: [
+ {
+ type: 'el-input-text',
+ label: '图层名称',
+ name: 'layerName',
+ required: false,
+ placeholder: '',
+ value: '文本框',
+ },
+ {
+ type: 'el-input-text',
+ label: '文本内容',
+ name: 'text',
+ required: false,
+ placeholder: '',
+ value: '文本框',
+ },
+ {
+ type: 'el-input-number',
+ label: '字体字号',
+ name: 'fontSize',
+ required: false,
+ placeholder: '',
+ value: '26',
+ },
+ {
+ type: 'vue-color',
+ label: '字体颜色',
+ name: 'color',
+ required: false,
+ placeholder: '',
+ value: '#FAD400',
+ },
+ {
+ type: 'el-input-number',
+ label: '字体间距',
+ name: 'letterSpacing',
+ required: false,
+ placeholder: '',
+ value: '0',
+ },
+ {
+ type: 'vue-color',
+ label: '字体背景',
+ name: 'background',
+ required: false,
+ placeholder: '',
+ value: 'rgba(115,170,229,.0)',
+ },
+ {
+ type: 'el-select',
+ label: '文字粗细',
+ name: 'fontWeight',
+ required: false,
+ placeholder: '',
+ selectOptions: [
+ { code: 'normal', name: '正常' },
+ { code: 'bold', name: '粗体' },
+ { code: 'bolder', name: '特粗体' },
+ { code: 'lighter', name: '细体' }
+ ],
+ value: 'normal'
+ },
+ {
+ type: 'el-select',
+ label: '对齐方式',
+ name: 'textAlign',
+ required: false,
+ placeholder: '',
+ selectOptions: [
+ { code: 'center', name: '居中' },
+ { code: 'left', name: '左对齐' },
+ { code: 'right', name: '右对齐' },
+ ],
+ value: 'center'
+ },
+ ],
+ // 数据
+ data: [
+ {
+ type: 'el-radio-group',
+ label: '数据类型',
+ name: 'dataType',
+ require: false,
+ placeholder: '',
+ selectValue: true,
+ selectOptions: [
+ {
+ code: 'staticData',
+ name: '静态数据',
+ },
+ {
+ code: 'dynamicData',
+ name: '动态数据',
+ },
+ ],
+ value: 'staticData',
+ },
+ {
+ type: 'el-input-number',
+ label: '刷新时间(毫秒)',
+ name: 'refreshTime',
+ relactiveDom: 'dataType',
+ relactiveDomValue: 'dynamicData',
+ value: 600000
+ },
+ {
+ type: 'el-button',
+ label: '静态数据',
+ name: 'staticData',
+ required: false,
+ placeholder: '',
+ relactiveDom: 'dataType',
+ relactiveDomValue: 'staticData',
+ value: '文本框',
+ },
+ {
+ type: 'dycustComponents',
+ label: '',
+ name: 'dynamicData',
+ required: false,
+ placeholder: '',
+ relactiveDom: 'dataType',
+ relactiveDomValue: 'dynamicData',
+ chartType: 'widget-text',
+ dictKey: 'TEXT_PROPERTIES',
+ value: '',
+ }
+ ],
- // 坐标
- position: [
- {
- type: 'el-input-number',
- label: '左边距',
- name: 'left',
- required: false,
- placeholder: '',
- value: 0,
- },
- {
- type: 'el-input-number',
- label: '上边距',
- name: 'top',
- required: false,
- placeholder: '',
- value: 0,
- },
- {
- type: 'el-input-number',
- label: '宽度',
- name: 'width',
- required: false,
- placeholder: '该容器在1920px大屏中的宽度',
- value: 100,
- },
- {
- type: 'el-input-number',
- label: '高度',
- name: 'height',
- required: false,
- placeholder: '该容器在1080px大屏中的高度',
- value: 40
- },
- ],
- }
+ // 坐标
+ position: [
+ {
+ type: 'el-input-number',
+ label: '左边距',
+ name: 'left',
+ required: false,
+ placeholder: '',
+ value: 0,
+ },
+ {
+ type: 'el-input-number',
+ label: '上边距',
+ name: 'top',
+ required: false,
+ placeholder: '',
+ value: 0,
+ },
+ {
+ type: 'el-input-number',
+ label: '宽度',
+ name: 'width',
+ required: false,
+ placeholder: '该容器在1920px大屏中的宽度',
+ value: 100,
+ },
+ {
+ type: 'el-input-number',
+ label: '高度',
+ name: 'height',
+ required: false,
+ placeholder: '该容器在1080px大屏中的高度',
+ value: 40
+ },
+ ],
}
+}
diff --git a/report-ui/src/views/bigscreenDesigner/designer/tools/configure/texts/widget-time.js b/report-ui/src/views/bigscreenDesigner/designer/tools/configure/texts/widget-time.js
index 9779698f..15ef2a69 100644
--- a/report-ui/src/views/bigscreenDesigner/designer/tools/configure/texts/widget-time.js
+++ b/report-ui/src/views/bigscreenDesigner/designer/tools/configure/texts/widget-time.js
@@ -3,142 +3,142 @@
* @version:
* @Author: qianlishi
* @Date: 2021-08-29 07:05:52
- * @LastEditors: qianlishi
- * @LastEditTime: 2021-09-28 14:20:30
+ * @LastEditors: qianlishi qianlishi@anji-plus.com
+ * @LastEditTime: 2023-01-11 13:18:54
*/
-export const widgetTime = {
- code: 'widget-time',
- type: 'text',
- tabName: '文本栏',
- label: '当前时间',
- icon: 'iconshijian',
- options: {
- // 配置
- setup: [
- {
- type: 'el-input-text',
- label: '图层名称',
- name: 'layerName',
- required: false,
- placeholder: '',
- value: '当前时间',
- },
- {
- type: 'el-select',
- label: '时间格式',
- name: 'timeFormat',
- required: false,
- placeholder: '',
- selectOptions: [
- {code: 'yyyy-MM-dd', name: '日期'},
- {code: 'yyyy-MM-dd hh:mm', name: '日期+时分'},
- {code: 'yyyy-MM-dd hh:mm:ss', name: '日期+时分秒'},
- {code: 'MM-dd', name: '日期无年'},
- {code: 'hh:mm', name: '时分'},
- {code: 'hh:mm:ss', name: '时分秒'},
- {code: 'year-week', name: '日期+星期'},
- {code: 'year-h-m-week', name: '日期+时分+星期'},
- {code: 'year-h-m-s-week', name: '日期+时分秒+星期'},
- {code: 'week', name: '星期'}
- ],
- value: 'yyyy-MM-dd hh:mm:ss'
- },
- {
- type: 'el-input-number',
- label: '字体间距',
- name: 'letterSpacing',
- required: false,
- placeholder: '',
- value: '0'
- },
- {
- type: 'el-input-number',
- label: '字体字号',
- name: 'fontSize',
- required: false,
- placeholder: '',
- value: '36'
- },
- {
- type: 'vue-color',
- label: '字体颜色',
- name: 'color',
- required: false,
- placeholder: '',
- value: '#FAD400'
- },
- {
- type: 'vue-color',
- label: '字体背景',
- name: 'background',
- required: false,
- placeholder: '',
- value: 'rgba(115,170,229,.5)'
- },
- {
- type: 'el-select',
- label: '文字粗细',
- name: 'fontWeight',
- required: false,
- placeholder: '',
- selectOptions: [
- {code: 'normal', name: '正常'},
- {code: 'bold', name: '粗体'},
- {code: 'bolder', name: '特粗体'},
- {code: 'lighter', name: '细体'}
- ],
- value: 'normal'
- },
- {
- type: 'el-select',
- label: '对齐方式',
- name: 'textAlign',
- required: false,
- placeholder: '',
- selectOptions: [
- {code: 'center', name: '居中'},
- {code: 'left', name: '左对齐'},
- {code: 'right', name: '右对齐'},
- ],
- value: 'left'
- },
- ],
- // 数据
- data: [],
- // 坐标
- position: [
- {
- type: 'el-input-number',
- label: '左边距',
- name: 'left',
- required: false,
- placeholder: '',
- value: 0,
- },
- {
- type: 'el-input-number',
- label: '上边距',
- name: 'top',
- required: false,
- placeholder: '',
- value: 0,
- },
- {
- type: 'el-input-number',
- label: '宽度',
- name: 'width',
- required: false,
- placeholder: '该容器在1920px大屏中的宽度',
- value: 400,
- },
- {
- type: 'el-input-number',
- label: '高度',
- name: 'height',
- required: false,
- placeholder: '该容器在1080px大屏中的高度',
- value: 50,
- },
- ],
- }
+export const widgetTime = {
+ code: 'widget-time',
+ type: 'text',
+ tabName: '文本栏',
+ label: '当前时间',
+ icon: 'iconshijian',
+ options: {
+ // 配置
+ setup: [
+ {
+ type: 'el-input-text',
+ label: '图层名称',
+ name: 'layerName',
+ required: false,
+ placeholder: '',
+ value: '当前时间',
+ },
+ {
+ type: 'el-select',
+ label: '时间格式',
+ name: 'timeFormat',
+ required: false,
+ placeholder: '',
+ selectOptions: [
+ { code: 'yyyy-MM-dd', name: '日期' },
+ { code: 'yyyy-MM-dd hh:mm', name: '日期+时分' },
+ { code: 'yyyy-MM-dd hh:mm:ss', name: '日期+时分秒' },
+ { code: 'MM-dd', name: '日期无年' },
+ { code: 'hh:mm', name: '时分' },
+ { code: 'hh:mm:ss', name: '时分秒' },
+ { code: 'year-week', name: '日期+星期' },
+ { code: 'year-h-m-week', name: '日期+时分+星期' },
+ { code: 'year-h-m-s-week', name: '日期+时分秒+星期' },
+ { code: 'week', name: '星期' }
+ ],
+ value: 'yyyy-MM-dd hh:mm:ss'
+ },
+ {
+ type: 'el-input-number',
+ label: '字体间距',
+ name: 'letterSpacing',
+ required: false,
+ placeholder: '',
+ value: '0'
+ },
+ {
+ type: 'el-input-number',
+ label: '字体字号',
+ name: 'fontSize',
+ required: false,
+ placeholder: '',
+ value: '36'
+ },
+ {
+ type: 'vue-color',
+ label: '字体颜色',
+ name: 'color',
+ required: false,
+ placeholder: '',
+ value: '#FAD400'
+ },
+ {
+ type: 'vue-color',
+ label: '字体背景',
+ name: 'background',
+ required: false,
+ placeholder: '',
+ value: 'rgba(115,170,229,.5)'
+ },
+ {
+ type: 'el-select',
+ label: '文字粗细',
+ name: 'fontWeight',
+ required: false,
+ placeholder: '',
+ selectOptions: [
+ { code: 'normal', name: '正常' },
+ { code: 'bold', name: '粗体' },
+ { code: 'bolder', name: '特粗体' },
+ { code: 'lighter', name: '细体' }
+ ],
+ value: 'normal'
+ },
+ {
+ type: 'el-select',
+ label: '对齐方式',
+ name: 'textAlign',
+ required: false,
+ placeholder: '',
+ selectOptions: [
+ { code: 'center', name: '居中' },
+ { code: 'left', name: '左对齐' },
+ { code: 'right', name: '右对齐' },
+ ],
+ value: 'left'
+ },
+ ],
+ // 数据
+ data: [],
+ // 坐标
+ position: [
+ {
+ type: 'el-input-number',
+ label: '左边距',
+ name: 'left',
+ required: false,
+ placeholder: '',
+ value: 0,
+ },
+ {
+ type: 'el-input-number',
+ label: '上边距',
+ name: 'top',
+ required: false,
+ placeholder: '',
+ value: 0,
+ },
+ {
+ type: 'el-input-number',
+ label: '宽度',
+ name: 'width',
+ required: false,
+ placeholder: '该容器在1920px大屏中的宽度',
+ value: 400,
+ },
+ {
+ type: 'el-input-number',
+ label: '高度',
+ name: 'height',
+ required: false,
+ placeholder: '该容器在1080px大屏中的高度',
+ value: 50,
+ },
+ ],
}
+}
diff --git a/report-ui/src/views/bigscreenDesigner/designer/tools/configure/texts/widget-video.js b/report-ui/src/views/bigscreenDesigner/designer/tools/configure/texts/widget-video.js
index c8b8de33..1b921bee 100644
--- a/report-ui/src/views/bigscreenDesigner/designer/tools/configure/texts/widget-video.js
+++ b/report-ui/src/views/bigscreenDesigner/designer/tools/configure/texts/widget-video.js
@@ -4,7 +4,7 @@
* @Author: qianlishi
* @Date: 2021-08-29 07:10:22
* @LastEditors: qianlishi qianlishi@anji-plus.com
- * @LastEditTime: 2022-11-07 15:42:46
+ * @LastEditTime: 2023-01-11 13:19:06
*/
export const widgetVideo = {
code: 'widget-video',
diff --git a/report-ui/src/views/bigscreenDesigner/designer/tools/index.js b/report-ui/src/views/bigscreenDesigner/designer/tools/index.js
index 4a298073..3fc31c01 100644
--- a/report-ui/src/views/bigscreenDesigner/designer/tools/index.js
+++ b/report-ui/src/views/bigscreenDesigner/designer/tools/index.js
@@ -4,7 +4,7 @@
* @Author: qianlishi
* @Date: 2021-08-29 06:43:07
* @LastEditors: qianlishi qianlishi@anji-plus.com
- * @LastEditTime: 2022-11-07 15:35:42
+ * @LastEditTime: 2023-03-06 16:00:09
*/
import { widgetTool } from "./main"
const screenConfig = {
@@ -52,7 +52,7 @@ const screenConfig = {
name: 'backgroundColor',
required: false,
placeholder: '',
- value: 'rgba(45, 86, 126, 1)',
+ value: '#1E1E1E',
},
{
type: 'custom-upload',
@@ -72,6 +72,7 @@ export const converArr = (data) => {
let tempArr = [], newArr = []
for (let i = 0; i < data.length; i++) {
const item = data[i]
+ item.widgetId = ''
if (tempArr.indexOf(item.type) === -1) {
newArr.push({
name: item.tabName,
diff --git a/report-ui/src/views/bigscreenDesigner/designer/tools/main.js b/report-ui/src/views/bigscreenDesigner/designer/tools/main.js
index 67d41a9a..db8e376b 100644
--- a/report-ui/src/views/bigscreenDesigner/designer/tools/main.js
+++ b/report-ui/src/views/bigscreenDesigner/designer/tools/main.js
@@ -4,7 +4,7 @@
* @Author: qianlishi
* @Date: 2021-08-29 07:46:46
* @LastEditors: qianlishi qianlishi@anji-plus.com
- * @LastEditTime: 2022-11-07 15:34:02
+ * @LastEditTime: 2023-04-19 09:22:37
*/
import { widgetText } from "./configure/texts/widget-text"
@@ -38,6 +38,12 @@ import { widgetWordCloud } from "./configure/wordcloudCharts/widget-word-cloud";
import { widgetHeatmap } from "./configure/heatmap/widget-heatmap";
import { widgetRadar } from "./configure/radarCharts/widget-radar";
import { widgetBarLineStack } from "./configure/barlineCharts/widget-bar-line-stack";
+import { widgetSelect } from "./configure/form/widget-select";
+// import { widgetInput } from "./configure/form/widget-input";
+import { widgetFormTime } from "./configure/form/widget-form-time";
+import { widgetScaleVertical } from "./configure/scaleCharts/widget-scale-vertical";
+import { widgetScaleHorizontal } from "./configure/scaleCharts/widget-scale-horizontal"
+import {widgetBarDoubleYaxis} from "./configure/barCharts/widget-bar-double-yaxis-chart";
export const widgetTool = [
// type=html类型的组件
@@ -71,5 +77,11 @@ export const widgetTool = [
widgetWordCloud,
widgetHeatmap,
widgetRadar,
- widgetBarLineStack
+ widgetBarLineStack,
+ widgetScaleVertical,
+ widgetScaleHorizontal,
+ widgetSelect,
+ // widgetInput,
+ widgetFormTime,
+ widgetBarDoubleYaxis,
]
diff --git a/report-ui/src/views/bigscreenDesigner/designer/widget/bar/widgetBarCompareChart.vue b/report-ui/src/views/bigscreenDesigner/designer/widget/bar/widgetBarCompareChart.vue
index d4062b83..72170876 100644
--- a/report-ui/src/views/bigscreenDesigner/designer/widget/bar/widgetBarCompareChart.vue
+++ b/report-ui/src/views/bigscreenDesigner/designer/widget/bar/widgetBarCompareChart.vue
@@ -1,171 +1,183 @@
-
+
@@ -651,5 +690,4 @@ export default {
height: 100%;
overflow: hidden;
}
-
diff --git a/report-ui/src/views/bigscreenDesigner/designer/widget/bar/widgetBarDoubleYaxisChart.vue b/report-ui/src/views/bigscreenDesigner/designer/widget/bar/widgetBarDoubleYaxisChart.vue
new file mode 100644
index 00000000..c528887b
--- /dev/null
+++ b/report-ui/src/views/bigscreenDesigner/designer/widget/bar/widgetBarDoubleYaxisChart.vue
@@ -0,0 +1,524 @@
+
+
+
+
+
+
+
+
+
diff --git a/report-ui/src/views/bigscreenDesigner/designer/widget/bar/widgetBarStackChart.vue b/report-ui/src/views/bigscreenDesigner/designer/widget/bar/widgetBarStackChart.vue
index acf82a5b..9217e588 100644
--- a/report-ui/src/views/bigscreenDesigner/designer/widget/bar/widgetBarStackChart.vue
+++ b/report-ui/src/views/bigscreenDesigner/designer/widget/bar/widgetBarStackChart.vue
@@ -1,16 +1,19 @@
-
+
@@ -454,5 +477,4 @@ export default {
height: 100%;
overflow: hidden;
}
-
diff --git a/report-ui/src/views/bigscreenDesigner/designer/widget/bar/widgetBarchart.vue b/report-ui/src/views/bigscreenDesigner/designer/widget/bar/widgetBarchart.vue
index 21143686..e0011f61 100644
--- a/report-ui/src/views/bigscreenDesigner/designer/widget/bar/widgetBarchart.vue
+++ b/report-ui/src/views/bigscreenDesigner/designer/widget/bar/widgetBarchart.vue
@@ -1,16 +1,24 @@
-
+
diff --git a/report-ui/src/views/bigscreenDesigner/designer/widget/bar/widgetGradientColorBarchart.vue b/report-ui/src/views/bigscreenDesigner/designer/widget/bar/widgetGradientColorBarchart.vue
index 02165bce..142b0a61 100644
--- a/report-ui/src/views/bigscreenDesigner/designer/widget/bar/widgetGradientColorBarchart.vue
+++ b/report-ui/src/views/bigscreenDesigner/designer/widget/bar/widgetGradientColorBarchart.vue
@@ -1,18 +1,25 @@
-
+
diff --git a/report-ui/src/views/bigscreenDesigner/designer/widget/barline/widgetBarLineStackChart.vue b/report-ui/src/views/bigscreenDesigner/designer/widget/barline/widgetBarLineStackChart.vue
index 194800aa..5d4387d1 100644
--- a/report-ui/src/views/bigscreenDesigner/designer/widget/barline/widgetBarLineStackChart.vue
+++ b/report-ui/src/views/bigscreenDesigner/designer/widget/barline/widgetBarLineStackChart.vue
@@ -1,16 +1,19 @@
-
+
@@ -581,5 +620,4 @@ export default {
height: 100%;
overflow: hidden;
}
-
diff --git a/report-ui/src/views/bigscreenDesigner/designer/widget/barline/widgetBarlinechart.vue b/report-ui/src/views/bigscreenDesigner/designer/widget/barline/widgetBarlinechart.vue
index 542381da..ad5b805f 100644
--- a/report-ui/src/views/bigscreenDesigner/designer/widget/barline/widgetBarlinechart.vue
+++ b/report-ui/src/views/bigscreenDesigner/designer/widget/barline/widgetBarlinechart.vue
@@ -1,16 +1,19 @@
-
+
diff --git a/report-ui/src/views/bigscreenDesigner/designer/widget/barline/widgetMoreBarLineChart.vue b/report-ui/src/views/bigscreenDesigner/designer/widget/barline/widgetMoreBarLineChart.vue
index 0123755f..b7d5fa84 100644
--- a/report-ui/src/views/bigscreenDesigner/designer/widget/barline/widgetMoreBarLineChart.vue
+++ b/report-ui/src/views/bigscreenDesigner/designer/widget/barline/widgetMoreBarLineChart.vue
@@ -1,79 +1,88 @@
-
-
+
+
diff --git a/report-ui/src/views/bigscreenDesigner/designer/widget/form/widgetInput.vue b/report-ui/src/views/bigscreenDesigner/designer/widget/form/widgetInput.vue
new file mode 100644
index 00000000..7e392d35
--- /dev/null
+++ b/report-ui/src/views/bigscreenDesigner/designer/widget/form/widgetInput.vue
@@ -0,0 +1,86 @@
+
+
+
+
+
diff --git a/report-ui/src/views/bigscreenDesigner/designer/widget/form/widgetSelect.vue b/report-ui/src/views/bigscreenDesigner/designer/widget/form/widgetSelect.vue
new file mode 100644
index 00000000..fa1f9afa
--- /dev/null
+++ b/report-ui/src/views/bigscreenDesigner/designer/widget/form/widgetSelect.vue
@@ -0,0 +1,132 @@
+
+
+
+
+
diff --git a/report-ui/src/views/bigscreenDesigner/designer/widget/funnel/widgetFunnel.vue b/report-ui/src/views/bigscreenDesigner/designer/widget/funnel/widgetFunnel.vue
index 684e5f75..e4f35d29 100644
--- a/report-ui/src/views/bigscreenDesigner/designer/widget/funnel/widgetFunnel.vue
+++ b/report-ui/src/views/bigscreenDesigner/designer/widget/funnel/widgetFunnel.vue
@@ -1,16 +1,19 @@
-
+
diff --git a/report-ui/src/views/bigscreenDesigner/designer/widget/heatmap/widgetHeatmap.vue b/report-ui/src/views/bigscreenDesigner/designer/widget/heatmap/widgetHeatmap.vue
index f3cb9f59..db554cd8 100644
--- a/report-ui/src/views/bigscreenDesigner/designer/widget/heatmap/widgetHeatmap.vue
+++ b/report-ui/src/views/bigscreenDesigner/designer/widget/heatmap/widgetHeatmap.vue
@@ -1,16 +1,19 @@
-
+
@@ -695,5 +742,4 @@ export default {
height: 100%;
overflow: hidden;
}
-
diff --git a/report-ui/src/views/bigscreenDesigner/designer/widget/line/widgetLineStackChart.vue b/report-ui/src/views/bigscreenDesigner/designer/widget/line/widgetLineStackChart.vue
index b57c6c20..d979bcb7 100644
--- a/report-ui/src/views/bigscreenDesigner/designer/widget/line/widgetLineStackChart.vue
+++ b/report-ui/src/views/bigscreenDesigner/designer/widget/line/widgetLineStackChart.vue
@@ -1,16 +1,19 @@
-
+
@@ -485,5 +508,4 @@ export default {
height: 100%;
overflow: hidden;
}
-
diff --git a/report-ui/src/views/bigscreenDesigner/designer/widget/line/widgetLinechart.vue b/report-ui/src/views/bigscreenDesigner/designer/widget/line/widgetLinechart.vue
index f650fce8..9ddff668 100644
--- a/report-ui/src/views/bigscreenDesigner/designer/widget/line/widgetLinechart.vue
+++ b/report-ui/src/views/bigscreenDesigner/designer/widget/line/widgetLinechart.vue
@@ -1,16 +1,24 @@
-
+
diff --git a/report-ui/src/views/bigscreenDesigner/designer/widget/map/widgetAirBubbleMap.vue b/report-ui/src/views/bigscreenDesigner/designer/widget/map/widgetAirBubbleMap.vue
index 1fcd4824..5cbe0800 100644
--- a/report-ui/src/views/bigscreenDesigner/designer/widget/map/widgetAirBubbleMap.vue
+++ b/report-ui/src/views/bigscreenDesigner/designer/widget/map/widgetAirBubbleMap.vue
@@ -1,9 +1,11 @@
-
+
diff --git a/report-ui/src/views/bigscreenDesigner/designer/widget/scale/widgetScaleVertical.vue b/report-ui/src/views/bigscreenDesigner/designer/widget/scale/widgetScaleVertical.vue
new file mode 100644
index 00000000..cc5e57cd
--- /dev/null
+++ b/report-ui/src/views/bigscreenDesigner/designer/widget/scale/widgetScaleVertical.vue
@@ -0,0 +1,548 @@
+
+
+
+
+
+
+
+
+
diff --git a/report-ui/src/views/bigscreenDesigner/designer/widget/temp.vue b/report-ui/src/views/bigscreenDesigner/designer/widget/temp.vue
index b9507f6b..5c2037ad 100644
--- a/report-ui/src/views/bigscreenDesigner/designer/widget/temp.vue
+++ b/report-ui/src/views/bigscreenDesigner/designer/widget/temp.vue
@@ -1,24 +1,23 @@
-
-
+
diff --git a/report-ui/src/views/bigscreenDesigner/designer/widget/widgetHref.vue b/report-ui/src/views/bigscreenDesigner/designer/widget/texts/widgetHref.vue
similarity index 94%
rename from report-ui/src/views/bigscreenDesigner/designer/widget/widgetHref.vue
rename to report-ui/src/views/bigscreenDesigner/designer/widget/texts/widgetHref.vue
index afa18304..469f983c 100644
--- a/report-ui/src/views/bigscreenDesigner/designer/widget/widgetHref.vue
+++ b/report-ui/src/views/bigscreenDesigner/designer/widget/texts/widgetHref.vue
@@ -19,11 +19,11 @@ export default {
components: {},
props: {
value: Object,
- ispreview: Boolean
+ ispreview: Boolean,
},
data() {
return {
- options: {}
+ options: {},
};
},
computed: {
@@ -52,22 +52,22 @@ export default {
top: this.transStyle.top + "px",
right: this.transStyle.right + "px",
linkAdress: this.transStyle.linkAdress,
- jumpMode: this.transStyle.jumpMode == "other" ? "_blank" : "_self"
+ jumpMode: this.transStyle.jumpMode == "other" ? "_blank" : "_self",
};
- }
+ },
},
watch: {
value: {
handler(val) {
this.options = val;
},
- deep: true
- }
+ deep: true,
+ },
},
mounted() {
this.options = this.value;
},
- methods: {}
+ methods: {},
};
diff --git a/report-ui/src/views/bigscreenDesigner/designer/widget/widgetIframe.vue b/report-ui/src/views/bigscreenDesigner/designer/widget/texts/widgetIframe.vue
similarity index 100%
rename from report-ui/src/views/bigscreenDesigner/designer/widget/widgetIframe.vue
rename to report-ui/src/views/bigscreenDesigner/designer/widget/texts/widgetIframe.vue
diff --git a/report-ui/src/views/bigscreenDesigner/designer/widget/widgetImage.vue b/report-ui/src/views/bigscreenDesigner/designer/widget/texts/widgetImage.vue
similarity index 100%
rename from report-ui/src/views/bigscreenDesigner/designer/widget/widgetImage.vue
rename to report-ui/src/views/bigscreenDesigner/designer/widget/texts/widgetImage.vue
diff --git a/report-ui/src/views/bigscreenDesigner/designer/widget/widgetMarquee.vue b/report-ui/src/views/bigscreenDesigner/designer/widget/texts/widgetMarquee.vue
similarity index 100%
rename from report-ui/src/views/bigscreenDesigner/designer/widget/widgetMarquee.vue
rename to report-ui/src/views/bigscreenDesigner/designer/widget/texts/widgetMarquee.vue
diff --git a/report-ui/src/views/bigscreenDesigner/designer/widget/widgetSlider.vue b/report-ui/src/views/bigscreenDesigner/designer/widget/texts/widgetSlider.vue
similarity index 100%
rename from report-ui/src/views/bigscreenDesigner/designer/widget/widgetSlider.vue
rename to report-ui/src/views/bigscreenDesigner/designer/widget/texts/widgetSlider.vue
diff --git a/report-ui/src/views/bigscreenDesigner/designer/widget/widgetTable.vue b/report-ui/src/views/bigscreenDesigner/designer/widget/texts/widgetTable.vue
similarity index 100%
rename from report-ui/src/views/bigscreenDesigner/designer/widget/widgetTable.vue
rename to report-ui/src/views/bigscreenDesigner/designer/widget/texts/widgetTable.vue
diff --git a/report-ui/src/views/bigscreenDesigner/designer/widget/widgetText.vue b/report-ui/src/views/bigscreenDesigner/designer/widget/texts/widgetText.vue
similarity index 100%
rename from report-ui/src/views/bigscreenDesigner/designer/widget/widgetText.vue
rename to report-ui/src/views/bigscreenDesigner/designer/widget/texts/widgetText.vue
diff --git a/report-ui/src/views/bigscreenDesigner/designer/widget/widgetTime.vue b/report-ui/src/views/bigscreenDesigner/designer/widget/texts/widgetTime.vue
similarity index 100%
rename from report-ui/src/views/bigscreenDesigner/designer/widget/widgetTime.vue
rename to report-ui/src/views/bigscreenDesigner/designer/widget/texts/widgetTime.vue
diff --git a/report-ui/src/views/bigscreenDesigner/designer/widget/widgetUniversalComponentsChart.vue b/report-ui/src/views/bigscreenDesigner/designer/widget/texts/widgetUniversalComponentsChart.vue
similarity index 100%
rename from report-ui/src/views/bigscreenDesigner/designer/widget/widgetUniversalComponentsChart.vue
rename to report-ui/src/views/bigscreenDesigner/designer/widget/texts/widgetUniversalComponentsChart.vue
diff --git a/report-ui/src/views/bigscreenDesigner/designer/widget/widgetVideo.vue b/report-ui/src/views/bigscreenDesigner/designer/widget/texts/widgetVideo.vue
similarity index 100%
rename from report-ui/src/views/bigscreenDesigner/designer/widget/widgetVideo.vue
rename to report-ui/src/views/bigscreenDesigner/designer/widget/texts/widgetVideo.vue
diff --git a/report-ui/src/views/bigscreenDesigner/designer/widget/widget.vue b/report-ui/src/views/bigscreenDesigner/designer/widget/widget.vue
index 621830d4..d9ad8dda 100644
--- a/report-ui/src/views/bigscreenDesigner/designer/widget/widget.vue
+++ b/report-ui/src/views/bigscreenDesigner/designer/widget/widget.vue
@@ -1,35 +1,30 @@
-
-
+
+
diff --git a/report-ui/src/views/bigscreenDesigner/designer/widget/wordcloud/widgetWordCloud.vue b/report-ui/src/views/bigscreenDesigner/designer/widget/wordcloud/widgetWordCloud.vue
index acad3ff4..b2f9fd6c 100644
--- a/report-ui/src/views/bigscreenDesigner/designer/widget/wordcloud/widgetWordCloud.vue
+++ b/report-ui/src/views/bigscreenDesigner/designer/widget/wordcloud/widgetWordCloud.vue
@@ -1,56 +1,59 @@
-
+
@@ -221,7 +230,6 @@ AJ-Report使用[Apache2.0开源协议](http://www.apache.org/licenses/LICENSE-2.
-
## 加入我们
- 提交PR是最快的加入方式:
diff --git a/doc/docs/guide/charts.md b/doc/docs/guide/charts.md
index a04aa39a..fec268d8 100644
--- a/doc/docs/guide/charts.md
+++ b/doc/docs/guide/charts.md
@@ -1,231 +1,302 @@
## 图表和数据集之间的关系
-图表和数据集是强关联关系，一个图表需要什么样的数据才能进行展示下面都有说明，以柱状图举例，只能用俩个字段的数据集进行数据展示，那使用数据集有2个以上字段那肯定图表无法正常展示，反之有个数据集是3个字段，那就找能展示3个字段的图表，千万别搞小聪明定了好多个字段的数据集，然后从里面挑几个字段进行展示，不要这么干。