Commit 10959c3f83cb9ebf6e8589a02a26150bd8f0ce27
1 parent
e91f016d
el-input-text展示文字提示
Showing
7 changed files
with
28 additions
and
19 deletions
src/views/bigscreenDesigner/designer/components/dynamicForm.vue
| ... | ... | @@ -227,13 +227,12 @@ |
| 227 | 227 | :placeholder="itemChildList.placeholder" |
| 228 | 228 | @change="changed($event, itemChildList.name)" |
| 229 | 229 | /> |
| 230 | - | |
| 231 | 230 | <el-input |
| 232 | 231 | v-if="itemChildList.type == 'el-input-text'" |
| 233 | 232 | v-model.trim="formData[itemChildList.name]" |
| 234 | 233 | type="text" |
| 235 | 234 | size="mini" |
| 236 | - placeholder="请输入内容" | |
| 235 | + :placeholder="itemChildList.placeholder" | |
| 237 | 236 | clearable |
| 238 | 237 | @change="changed($event, itemChildList.name)" |
| 239 | 238 | /> |
| ... | ... | @@ -514,6 +513,7 @@ export default { |
| 514 | 513 | } |
| 515 | 514 | } |
| 516 | 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 | 60 | }, |
| 61 | 61 | { |
| 62 | 62 | type: 'el-slider', |
| 63 | + label: '柱间距', | |
| 64 | + name: 'barGap', | |
| 65 | + required: false, | |
| 66 | + placeholder: '', | |
| 67 | + value: 0, | |
| 68 | + }, | |
| 69 | + { | |
| 70 | + type: 'el-slider', | |
| 63 | 71 | label: '圆角', |
| 64 | 72 | name: 'radius', |
| 65 | 73 | require: false, | ... | ... |
src/views/bigscreenDesigner/designer/tools/configure/barlineCharts/widget-more-bar-line.js
src/views/bigscreenDesigner/designer/widget/bar/widgetBarStackChart.vue
src/views/bigscreenDesigner/designer/widget/barline/widgetBarlinechart.vue
src/views/bigscreenDesigner/designer/widget/barline/widgetMoreBarLineChart.vue
| ... | ... | @@ -89,7 +89,7 @@ export default { |
| 89 | 89 | ], |
| 90 | 90 | series: [ |
| 91 | 91 | { |
| 92 | - name: '调解成功', | |
| 92 | + name: '', | |
| 93 | 93 | type: 'bar', |
| 94 | 94 | itemStyle: { |
| 95 | 95 | normal: { |
| ... | ... | @@ -106,7 +106,7 @@ export default { |
| 106 | 106 | data: [] |
| 107 | 107 | }, |
| 108 | 108 | { |
| 109 | - name: '调解失败', | |
| 109 | + name: '', | |
| 110 | 110 | type: 'bar', |
| 111 | 111 | itemStyle: { |
| 112 | 112 | normal: { |
| ... | ... | @@ -124,7 +124,7 @@ export default { |
| 124 | 124 | data: [] |
| 125 | 125 | }, |
| 126 | 126 | { |
| 127 | - name: '调解成功率', | |
| 127 | + name: '', | |
| 128 | 128 | type: 'line', |
| 129 | 129 | yAxisIndex: 1, //使用的 y 轴的 index,在单个图表实例中存在多个 y轴的时候有用 |
| 130 | 130 | smooth: false, //平滑曲线显示 |
| ... | ... | @@ -429,9 +429,9 @@ export default { |
| 429 | 429 | line[i] = val[i].sales; |
| 430 | 430 | } |
| 431 | 431 | const legendName = []; |
| 432 | - legendName.push('调解成功'); | |
| 433 | - legendName.push('调解失败'); | |
| 434 | - legendName.push('调解成功率'); | |
| 432 | + // legendName.push('调解成功'); | |
| 433 | + // legendName.push('调解失败'); | |
| 434 | + // legendName.push('调解成功率'); | |
| 435 | 435 | // x轴 |
| 436 | 436 | this.options.xAxis.data = axis; |
| 437 | 437 | // series | ... | ... |
src/views/screenDesigner/widget/barlineCharts/widgetMoreBarLineChart.vue
| ... | ... | @@ -32,7 +32,7 @@ export default { |
| 32 | 32 | containLabel: true |
| 33 | 33 | }, |
| 34 | 34 | legend: { |
| 35 | - data: ['调解成功', '调解失败', '调解终止', '调解成功率'], | |
| 35 | + data: [], | |
| 36 | 36 | left: '7%', |
| 37 | 37 | top: '5%', |
| 38 | 38 | textStyle: { |
| ... | ... | @@ -99,7 +99,7 @@ export default { |
| 99 | 99 | ], |
| 100 | 100 | series: [ |
| 101 | 101 | { |
| 102 | - name: '调解成功', | |
| 102 | + name: '', | |
| 103 | 103 | type: 'bar', |
| 104 | 104 | itemStyle: { |
| 105 | 105 | normal: { |
| ... | ... | @@ -116,7 +116,7 @@ export default { |
| 116 | 116 | data: [] |
| 117 | 117 | }, |
| 118 | 118 | { |
| 119 | - name: '调解失败', | |
| 119 | + name: '', | |
| 120 | 120 | type: 'bar', |
| 121 | 121 | itemStyle: { |
| 122 | 122 | normal: { |
| ... | ... | @@ -134,7 +134,7 @@ export default { |
| 134 | 134 | data: [] |
| 135 | 135 | }, |
| 136 | 136 | { |
| 137 | - name: '调解终止', | |
| 137 | + name: '', | |
| 138 | 138 | type: 'bar', |
| 139 | 139 | itemStyle: { |
| 140 | 140 | normal: { |
| ... | ... | @@ -151,7 +151,7 @@ export default { |
| 151 | 151 | data: [] |
| 152 | 152 | }, |
| 153 | 153 | { |
| 154 | - name: '调解成功率', | |
| 154 | + name: '', | |
| 155 | 155 | type: 'line', |
| 156 | 156 | yAxisIndex: 1, //使用的 y 轴的 index,在单个图表实例中存在多个 y轴的时候有用 |
| 157 | 157 | smooth: false, //平滑曲线显示 |
| ... | ... | @@ -479,10 +479,10 @@ export default { |
| 479 | 479 | series[2].data = bar3; |
| 480 | 480 | series[3].data = line; |
| 481 | 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 | 486 | this.options.legend['data'] = legendName; |
| 487 | 487 | this.setOptionsLegendName(legendName); |
| 488 | 488 | }, | ... | ... |