Commit 10959c3f83cb9ebf6e8589a02a26150bd8f0ce27

Authored by 陈鑫涛
1 parent e91f016d

el-input-text展示文字提示

src/views/bigscreenDesigner/designer/components/dynamicForm.vue
@@ -227,13 +227,12 @@ @@ -227,13 +227,12 @@
227 :placeholder="itemChildList.placeholder" 227 :placeholder="itemChildList.placeholder"
228 @change="changed($event, itemChildList.name)" 228 @change="changed($event, itemChildList.name)"
229 /> 229 />
230 -  
231 <el-input 230 <el-input
232 v-if="itemChildList.type == 'el-input-text'" 231 v-if="itemChildList.type == 'el-input-text'"
233 v-model.trim="formData[itemChildList.name]" 232 v-model.trim="formData[itemChildList.name]"
234 type="text" 233 type="text"
235 size="mini" 234 size="mini"
236 - placeholder="请输入内容" 235 + :placeholder="itemChildList.placeholder"
237 clearable 236 clearable
238 @change="changed($event, itemChildList.name)" 237 @change="changed($event, itemChildList.name)"
239 /> 238 />
@@ -514,6 +513,7 @@ export default { @@ -514,6 +513,7 @@ export default {
514 } 513 }
515 } 514 }
516 this.formData = Object.assign({}, this.formData); 515 this.formData = Object.assign({}, this.formData);
  516 + console.log("🚀 ~ setDefaultValue ~ this.formData :", this.formData )
517 } 517 }
518 }, 518 },
519 // 是否显示 那种格式 519 // 是否显示 那种格式
src/views/bigscreenDesigner/designer/tools/configure/barCharts/widget-bar-stack.js
@@ -60,6 +60,14 @@ export const widgetBarStack = { @@ -60,6 +60,14 @@ export const widgetBarStack = {
60 }, 60 },
61 { 61 {
62 type: 'el-slider', 62 type: 'el-slider',
  63 + label: '柱间距',
  64 + name: 'barGap',
  65 + required: false,
  66 + placeholder: '',
  67 + value: 0,
  68 + },
  69 + {
  70 + type: 'el-slider',
63 label: '圆角', 71 label: '圆角',
64 name: 'radius', 72 name: 'radius',
65 require: false, 73 require: false,
src/views/bigscreenDesigner/designer/tools/configure/barlineCharts/widget-more-bar-line.js
@@ -257,7 +257,7 @@ export const widgetMoreBarLine = { @@ -257,7 +257,7 @@ export const widgetMoreBarLine = {
257 label: '图例名称', 257 label: '图例名称',
258 name: 'legendName', 258 name: 'legendName',
259 required: false, 259 required: false,
260 - placeholder: '多值以' | '隔开', 260 + placeholder: '多值以 | 隔开',
261 value: '' 261 value: ''
262 }, 262 },
263 { 263 {
src/views/bigscreenDesigner/designer/widget/bar/widgetBarStackChart.vue
@@ -322,7 +322,7 @@ export default { @@ -322,7 +322,7 @@ export default {
322 name: yAxisList[i], 322 name: yAxisList[i],
323 type: "bar", 323 type: "bar",
324 data: data, 324 data: data,
325 - barGap: "0%", 325 + barGap: optionsSetup.barGap + '%',
326 stack: this.getStackStyle(), 326 stack: this.getStackStyle(),
327 barWidth: optionsSetup.maxWidth, 327 barWidth: optionsSetup.maxWidth,
328 label: { 328 label: {
src/views/bigscreenDesigner/designer/widget/barline/widgetBarlinechart.vue
@@ -127,6 +127,7 @@ export default { @@ -127,6 +127,7 @@ export default {
127 this.optionsCollapse = this.value.collapse; 127 this.optionsCollapse = this.value.collapse;
128 this.optionsSetup = this.value.setup; 128 this.optionsSetup = this.value.setup;
129 this.editorOptions(); 129 this.editorOptions();
  130 +
130 }, 131 },
131 methods: { 132 methods: {
132 // 修改图标options属性 133 // 修改图标options属性
src/views/bigscreenDesigner/designer/widget/barline/widgetMoreBarLineChart.vue
@@ -89,7 +89,7 @@ export default { @@ -89,7 +89,7 @@ export default {
89 ], 89 ],
90 series: [ 90 series: [
91 { 91 {
92 - name: '调解成功', 92 + name: '',
93 type: 'bar', 93 type: 'bar',
94 itemStyle: { 94 itemStyle: {
95 normal: { 95 normal: {
@@ -106,7 +106,7 @@ export default { @@ -106,7 +106,7 @@ export default {
106 data: [] 106 data: []
107 }, 107 },
108 { 108 {
109 - name: '调解失败', 109 + name: '',
110 type: 'bar', 110 type: 'bar',
111 itemStyle: { 111 itemStyle: {
112 normal: { 112 normal: {
@@ -124,7 +124,7 @@ export default { @@ -124,7 +124,7 @@ export default {
124 data: [] 124 data: []
125 }, 125 },
126 { 126 {
127 - name: '调解成功率', 127 + name: '',
128 type: 'line', 128 type: 'line',
129 yAxisIndex: 1, //使用的 y 轴的 index,在单个图表实例中存在多个 y轴的时候有用 129 yAxisIndex: 1, //使用的 y 轴的 index,在单个图表实例中存在多个 y轴的时候有用
130 smooth: false, //平滑曲线显示 130 smooth: false, //平滑曲线显示
@@ -429,9 +429,9 @@ export default { @@ -429,9 +429,9 @@ export default {
429 line[i] = val[i].sales; 429 line[i] = val[i].sales;
430 } 430 }
431 const legendName = []; 431 const legendName = [];
432 - legendName.push('调解成功');  
433 - legendName.push('调解失败');  
434 - legendName.push('调解成功率'); 432 + // legendName.push('调解成功');
  433 + // legendName.push('调解失败');
  434 + // legendName.push('调解成功率');
435 // x轴 435 // x轴
436 this.options.xAxis.data = axis; 436 this.options.xAxis.data = axis;
437 // series 437 // series
src/views/screenDesigner/widget/barlineCharts/widgetMoreBarLineChart.vue
@@ -32,7 +32,7 @@ export default { @@ -32,7 +32,7 @@ export default {
32 containLabel: true 32 containLabel: true
33 }, 33 },
34 legend: { 34 legend: {
35 - data: ['调解成功', '调解失败', '调解终止', '调解成功率'], 35 + data: [],
36 left: '7%', 36 left: '7%',
37 top: '5%', 37 top: '5%',
38 textStyle: { 38 textStyle: {
@@ -99,7 +99,7 @@ export default { @@ -99,7 +99,7 @@ export default {
99 ], 99 ],
100 series: [ 100 series: [
101 { 101 {
102 - name: '调解成功', 102 + name: '',
103 type: 'bar', 103 type: 'bar',
104 itemStyle: { 104 itemStyle: {
105 normal: { 105 normal: {
@@ -116,7 +116,7 @@ export default { @@ -116,7 +116,7 @@ export default {
116 data: [] 116 data: []
117 }, 117 },
118 { 118 {
119 - name: '调解失败', 119 + name: '',
120 type: 'bar', 120 type: 'bar',
121 itemStyle: { 121 itemStyle: {
122 normal: { 122 normal: {
@@ -134,7 +134,7 @@ export default { @@ -134,7 +134,7 @@ export default {
134 data: [] 134 data: []
135 }, 135 },
136 { 136 {
137 - name: '调解终止', 137 + name: '',
138 type: 'bar', 138 type: 'bar',
139 itemStyle: { 139 itemStyle: {
140 normal: { 140 normal: {
@@ -151,7 +151,7 @@ export default { @@ -151,7 +151,7 @@ export default {
151 data: [] 151 data: []
152 }, 152 },
153 { 153 {
154 - name: '调解成功率', 154 + name: '',
155 type: 'line', 155 type: 'line',
156 yAxisIndex: 1, //使用的 y 轴的 index,在单个图表实例中存在多个 y轴的时候有用 156 yAxisIndex: 1, //使用的 y 轴的 index,在单个图表实例中存在多个 y轴的时候有用
157 smooth: false, //平滑曲线显示 157 smooth: false, //平滑曲线显示
@@ -479,10 +479,10 @@ export default { @@ -479,10 +479,10 @@ export default {
479 series[2].data = bar3; 479 series[2].data = bar3;
480 series[3].data = line; 480 series[3].data = line;
481 const legendName = []; 481 const legendName = [];
482 - legendName.push('调解成功');  
483 - legendName.push('调解失败');  
484 - legendName.push('调解终止');  
485 - legendName.push('调解成功率'); 482 + // legendName.push('调解成功');
  483 + // legendName.push('调解失败');
  484 + // legendName.push('调解终止');
  485 + // legendName.push('调解成功率');
486 this.options.legend['data'] = legendName; 486 this.options.legend['data'] = legendName;
487 this.setOptionsLegendName(legendName); 487 this.setOptionsLegendName(legendName);
488 }, 488 },