sleepyocean
/
smartbi2
forked from wuguolin/smartbi2
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

modify

Browse Source
master
wuguolin 4 years ago
parent 7b49dd1598
commit cc5c3af1b2
3 changed files with 19 additions and 15 deletions
Show Stats Download Patch File Download Diff File

24
frontend/src/views/chart/view/ChartEdit.vue
Unescape Escape View File

@ -131,6 +131,7 @@
<svg-icon icon-class="bar-stack" class="chart-icon" /> <svg-icon icon-class="bar-stack" class="chart-icon" />
</span> </span>
</el-radio> </el-radio>
</div> </div>
<div style="width: 100%;display: flex;display: -webkit-flex;justify-content: space-between;flex-direction: row;flex-wrap: wrap;"> <div style="width: 100%;display: flex;display: -webkit-flex;justify-content: space-between;flex-direction: row;flex-wrap: wrap;">
<el-radio value="bar-horizontal" label="bar-horizontal"> <el-radio value="bar-horizontal" label="bar-horizontal">
@ -153,18 +154,10 @@
<svg-icon icon-class="line-stack" class="chart-icon" /> <svg-icon icon-class="line-stack" class="chart-icon" />
</span> </span>
</el-radio> </el-radio>
<el-radio value="scatter" label="scatter">
<span :title="$t('chart.chart_scatter')">
<svg-icon icon-class="scatter" class="chart-icon" />
</span>
</el-radio>
</div> </div>
<div style="width: 100%;display: flex;display: -webkit-flex;justify-content: space-between;flex-direction: row;flex-wrap: wrap;"> <div style="width: 100%;display: flex;display: -webkit-flex;justify-content: space-between;flex-direction: row;flex-wrap: wrap;">
<el-radio value="chart-mix" label="chart-mix">
<span :title="$t('chart.chart_mix')">
<svg-icon icon-class="chart-mix" class="chart-icon" />
</span>
</el-radio>
<!-- <el-radio value="map" label="map">--> <!-- <el-radio value="map" label="map">-->
<!-- <span :title="$t('chart.chart_map')">--> <!-- <span :title="$t('chart.chart_map')">-->
<!-- <svg-icon icon-class="map" class="chart-icon" />--> <!-- <svg-icon icon-class="map" class="chart-icon" />-->
@ -175,6 +168,16 @@
<!-- <svg-icon icon-class="radar" class="chart-icon" />--> <!-- <svg-icon icon-class="radar" class="chart-icon" />-->
<!-- </span>--> <!-- </span>-->
<!-- </el-radio>--> <!-- </el-radio>-->
<el-radio value="scatter" label="scatter">
<span :title="$t('chart.chart_scatter')">
<svg-icon icon-class="scatter" class="chart-icon" />
</span>
</el-radio>
<el-radio value="chart-mix" label="chart-mix">
<span :title="$t('chart.chart_mix')">
<svg-icon icon-class="chart-mix" class="chart-icon" />
</span>
</el-radio>
<el-radio value="liquid" label="liquid"> <el-radio value="liquid" label="liquid">
<span :title="$t('chart.chart_liquid')"> <span :title="$t('chart.chart_liquid')">
<svg-icon icon-class="liquid" class="chart-icon" /> <svg-icon icon-class="liquid" class="chart-icon" />
@ -185,6 +188,7 @@
<svg-icon icon-class="gauge" class="chart-icon" /> <svg-icon icon-class="gauge" class="chart-icon" />
</span> </span>
</el-radio> </el-radio>
</div> </div>
<div style="width: 100%;display: flex;display: -webkit-flex;justify-content: space-between;flex-direction: row;flex-wrap: wrap;"> <div style="width: 100%;display: flex;display: -webkit-flex;justify-content: space-between;flex-direction: row;flex-wrap: wrap;">
<el-radio value="pie" label="pie"> <el-radio value="pie" label="pie">

2
frontend/src/views/dataset/common/DatasetChartDetail.vue
Unescape Escape View File

@ -37,7 +37,7 @@
<p class="info-title">{{ $t('dataset.type') }}</p> <p class="info-title">{{ $t('dataset.type') }}</p>
<p v-if="detail.table.type === 'db'" class="info-content">{{ $t('dataset.db_data') }}</p> <p v-if="detail.table.type === 'db'" class="info-content">{{ $t('dataset.db_data') }}</p>
<p v-if="detail.table.type === 'sql'" class="info-content">{{ $t('dataset.sql_data') }}</p> <p v-if="detail.table.type === 'sql'" class="info-content">{{ $t('dataset.sql_data') }}</p>
<p v-if="detail.table.type === 'excel'" class="info-content">{{ $t('dataset.excel_data') }}</p> <!-- <p v-if="detail.table.type === 'excel'" class="info-content">{{ $t('dataset.excel_data') }}</p>-->
<p v-if="detail.table.type === 'custom'" class="info-content">{{ $t('dataset.custom_data') }}</p> <p v-if="detail.table.type === 'custom'" class="info-content">{{ $t('dataset.custom_data') }}</p>
</el-col> </el-col>
<el-col v-show="detail.table.type === 'db'" class="info-item"> <el-col v-show="detail.table.type === 'db'" class="info-item">

8
frontend/src/views/dataset/group/Group.vue
Unescape Escape View File

@ -101,10 +101,10 @@
<svg-icon icon-class="ds-sql" class="ds-icon-sql" /> <svg-icon icon-class="ds-sql" class="ds-icon-sql" />
{{ $t('dataset.sql_data') }} {{ $t('dataset.sql_data') }}
</el-dropdown-item> </el-dropdown-item>
<el-dropdown-item :command="beforeClickAddData('excel',data)" :disabled="!kettleRunning"> <!-- <el-dropdown-item :command="beforeClickAddData('excel',data)" :disabled="!kettleRunning">-->
<svg-icon icon-class="ds-excel" class="ds-icon-excel" /> <!-- <svg-icon icon-class="ds-excel" class="ds-icon-excel" />-->
{{ $t('dataset.excel_data') }} <!-- {{ $t('dataset.excel_data') }}-->
</el-dropdown-item> <!-- </el-dropdown-item>-->
<el-dropdown-item :command="beforeClickAddData('custom',data)"> <el-dropdown-item :command="beforeClickAddData('custom',data)">
<svg-icon icon-class="ds-custom" class="ds-icon-custom" /> <svg-icon icon-class="ds-custom" class="ds-icon-custom" />
{{ $t('dataset.custom_data') }} {{ $t('dataset.custom_data') }}

Write Preview
Loading…
Cancel
Save