diff --git a/src/views/bigscreenDesigner/designer/tools/configure/barCharts/widget-capsule-chart.js b/src/views/bigscreenDesigner/designer/tools/configure/barCharts/widget-capsule-chart.js
index 4c307ba..5403e54 100644
--- a/src/views/bigscreenDesigner/designer/tools/configure/barCharts/widget-capsule-chart.js
+++ b/src/views/bigscreenDesigner/designer/tools/configure/barCharts/widget-capsule-chart.js
@@ -105,7 +105,7 @@ export const widgetCapsuleChart = {
relactiveDom: 'dataType',
relactiveDomValue: 'dynamicData',
chartType: 'widget-capsule-chart',
- dictKey: 'STACK_PROPERTIES',
+ dictKey: 'BAR_PROPERTIES',
value: '',
},
],
diff --git a/src/views/bigscreenDesigner/designer/tools/configure/div/widget-water-level-pond.js b/src/views/bigscreenDesigner/designer/tools/configure/div/widget-water-level-pond.js
new file mode 100644
index 0000000..e0e4185
--- /dev/null
+++ b/src/views/bigscreenDesigner/designer/tools/configure/div/widget-water-level-pond.js
@@ -0,0 +1,134 @@
+/*
+ * @Descripttion: 水位图
+ */
+export const widgetWaterLevelPond= {
+ code: 'widget-water-level-pond',
+ type: 'html',
+ tabName: '图层',
+ label: '水位图',
+ icon: 'iconshouji',
+ options: {
+ // 配置
+ setup: [
+ {
+ type: 'el-input-text',
+ label: '图层名称',
+ name: 'layerName',
+ required: false,
+ placeholder: '',
+ value: '水位图',
+ },
+ {
+ type: 'el-input-text',
+ label: '水位数据',
+ name: 'waterLevelPondDataText',
+ required: false,
+ placeholder: '',
+ value: '0',
+ },
+ {
+ type: 'el-select-static',
+ label: '主数据源数据',
+ name: 'slectedDataType',
+ require: false,
+ placeholder: '',
+ selectOptions: [],
+ value: '',
+ },
+ {
+ type: 'el-select',
+ label: '水位图形状',
+ name: 'shape',
+ required: false,
+ placeholder: '',
+ selectOptions: [
+ {code: 'rect', name: '矩形'},
+ {code: 'roundRect', name: '圆角矩形'},
+ {code: 'round', name: '圆形'}
+ ],
+ value: 'rect'
+ },
+ {
+ type: 'el-input-number',
+ label: '波浪数量',
+ name: 'waveNum',
+ required: false,
+ placeholder: '',
+ value: 1,
+ },
+ {
+ type: 'el-input-number',
+ label: '波浪高度',
+ name: 'waveHeight',
+ required: false,
+ placeholder: '',
+ value: 40,
+ },
+ {
+ type: 'el-slider',
+ label: '波浪透明度',
+ name: 'waveOpacity',
+ required: false,
+ placeholder: '',
+ value: 0.4,
+ },
+ {
+ type: 'el-input-text',
+ label: '信息格式化',
+ name: 'formatter',
+ required: false,
+ placeholder: '',
+ value: '{value}%',
+ },
+ [{
+ name: '水位图配色',
+ list: [
+ {
+ type: 'customColor',
+ label: '',
+ name: 'customColor',
+ required: false,
+ value: [{ color: '#1E90FF' }, { color: '#96bfff' }],
+ },
+ ],
+ }],
+ ],
+ // 数据
+ data: [],
+ // 坐标
+ position: [
+ {
+ type: 'el-input-number',
+ label: '左边距',
+ name: 'left',
+ required: false,
+ placeholder: '',
+ value: 10,
+ },
+ {
+ type: 'el-input-number',
+ label: '上边距',
+ name: 'top',
+ required: false,
+ placeholder: '',
+ value: 10,
+ },
+ {
+ 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: 350,
+ },
+ ],
+ }
+}
diff --git a/src/views/bigscreenDesigner/designer/tools/index.js b/src/views/bigscreenDesigner/designer/tools/index.js
index 80f099e..5d5c745 100644
--- a/src/views/bigscreenDesigner/designer/tools/index.js
+++ b/src/views/bigscreenDesigner/designer/tools/index.js
@@ -51,7 +51,7 @@ const screenConfig = {
label: '主数据源',
name: 'master',
required: false,
- placeholder: '全局数据源[List:sName、sValue] ',/**LIST sName、sValue 后台代码自动转成 sName:sValue Map形式*/
+ placeholder: '主数据源[List:sName、sValue] ',/**LIST sName、sValue 后台代码自动转成 sName:sValue Map形式*/
value: ''
},
{
@@ -115,7 +115,7 @@ const screenConfig = {
placeholder: '',
relactiveDom: 'dataType',
relactiveDomValue: 'staticData',
- value: {title:'标题', name: '测试名字', address: '上海市普陀区金沙江路 1518 弄0001'},
+ value: {title:'标题', name: '测试名字', address: '上海市普陀区金沙江路 1518 弄0001','dProductQty':100,'dProductRate':13},
},
{
type: 'dycustComponents',
diff --git a/src/views/bigscreenDesigner/designer/tools/main.js b/src/views/bigscreenDesigner/designer/tools/main.js
index cf60961..48b1aae 100644
--- a/src/views/bigscreenDesigner/designer/tools/main.js
+++ b/src/views/bigscreenDesigner/designer/tools/main.js
@@ -43,6 +43,8 @@ import { widgetHeatmap } from "./configure/heatmap/widget-heatmap";
import { widgetRadar } from "./configure/radarCharts/widget-radar";
import { widgetBarLineStack } from "./configure/barlineCharts/widget-bar-line-stack";
import { widgetProgress } from "./configure/percentCharts/widget-progress";
+import {widgetWaterLevelPond} from "./configure/div/widget-water-level-pond";
+
export const widgetTool = [
//图层
@@ -84,5 +86,7 @@ export const widgetTool = [
widgetHeatmap,
widgetRadar,
widgetBarLineStack,
- widgetProgress
+ widgetProgress,
+ widgetWaterLevelPond
+
]
diff --git a/src/views/bigscreenDesigner/designer/widget/div/widgetWaterLevelPond.vue b/src/views/bigscreenDesigner/designer/widget/div/widgetWaterLevelPond.vue
new file mode 100644
index 0000000..e37e417
--- /dev/null
+++ b/src/views/bigscreenDesigner/designer/widget/div/widgetWaterLevelPond.vue
@@ -0,0 +1,116 @@
+
+
+
+
+
+
diff --git a/src/views/bigscreenDesigner/designer/widget/temp.vue b/src/views/bigscreenDesigner/designer/widget/temp.vue
index 50b61e2..eb36d80 100644
--- a/src/views/bigscreenDesigner/designer/widget/temp.vue
+++ b/src/views/bigscreenDesigner/designer/widget/temp.vue
@@ -43,10 +43,12 @@ import widgetRadar from "./radar/widgetRadar";
import widgetBarLineStackChart from "./barline/widgetBarLineStackChart";
import widgetDecorate from "./decorate/decorate.vue";
// import widgetDiv from "./div/widgetDiv.vue";
-import widgetBorderBox from "./div/widgetBorderBox.vue";
+import widgetBorderBox from "./div/widgetBorderBox";
import widgetProgress from "./percent/widgetProgress";
-import widgetDecoration from "./div/widgetDecoration.vue";
-import widgetCapsuleCart from "./bar/widgetCapsuleChart.vue";
+import widgetDecoration from "./div/widgetDecoration";
+import widgetCapsuleChart from "./bar/widgetCapsuleChart";
+import widgetWaterLevelPond from "./div/widgetWaterLevelPond";
+
export default {
name: "WidgetTemp",
@@ -85,8 +87,9 @@ export default {
widgetBarLineStackChart,
widgetBorderBox,
widgetDecoration,
- widgetCapsuleCart,
- widgetProgress
+ widgetCapsuleChart,
+ widgetProgress,
+ widgetWaterLevelPond
},
model: {
prop: "value",
diff --git a/src/views/bigscreenDesigner/designer/widget/widget.vue b/src/views/bigscreenDesigner/designer/widget/widget.vue
index fd04ff5..aeb9d07 100644
--- a/src/views/bigscreenDesigner/designer/widget/widget.vue
+++ b/src/views/bigscreenDesigner/designer/widget/widget.vue
@@ -52,6 +52,7 @@ import widgetBorderBox from "./div/widgetBorderBox.vue";
import widgetDecoration from "./div/widgetDecoration.vue";
import widgetCapsuleChart from "./bar/widgetCapsuleChart";
import widgetProgress from "./percent/widgetProgress";
+import widgetWaterLevelPond from "./div/widgetWaterLevelPond";
export default {
name: "Widget",
@@ -91,7 +92,8 @@ export default {
widgetHeatmap,
widgetRadar,
widgetBarLineStackChart,
- widgetProgress
+ widgetProgress,
+ widgetWaterLevelPond
},
model: {
prop: "value",