|
@@ -73,7 +73,7 @@
|
|
</el-select>
|
|
</el-select>
|
|
</el-form-item>
|
|
</el-form-item>
|
|
<el-form-item label="排序方式" label-width="100px">
|
|
<el-form-item label="排序方式" label-width="100px">
|
|
- <el-select v-model="node.dimord" placeholder="请选择">
|
|
|
|
|
|
+ <el-select v-model="node.dimord" clearable="clearable" style="width:100%" placeholder="请选择">
|
|
<el-option
|
|
<el-option
|
|
v-for="item in opts.dimord"
|
|
v-for="item in opts.dimord"
|
|
:key="item.value"
|
|
:key="item.value"
|
|
@@ -108,7 +108,10 @@ export default {
|
|
alias:"",
|
|
alias:"",
|
|
dimtype:"",
|
|
dimtype:"",
|
|
dateformat:"",
|
|
dateformat:"",
|
|
- colTable:""
|
|
|
|
|
|
+ colTable:"",
|
|
|
|
+ colkey:"",
|
|
|
|
+ coltext:"",
|
|
|
|
+ dimord:""
|
|
},
|
|
},
|
|
dset:null,
|
|
dset:null,
|
|
rule:{
|
|
rule:{
|
|
@@ -118,10 +121,11 @@ export default {
|
|
type:'', //dim/kpi 2种
|
|
type:'', //dim/kpi 2种
|
|
opts:{
|
|
opts:{
|
|
dimtype:[
|
|
dimtype:[
|
|
|
|
+ {value:"frd",text:"未选择"},
|
|
{value:"year",text:"年"},
|
|
{value:"year",text:"年"},
|
|
{value:"quarter",text:"季度"},
|
|
{value:"quarter",text:"季度"},
|
|
- {value:"month",text:"月"},
|
|
|
|
- {value:"day",text:"日"},
|
|
|
|
|
|
+ {value:"month",text:"月份"},
|
|
|
|
+ {value:"day",text:"日期"},
|
|
{value:"prov",text:"省份"},
|
|
{value:"prov",text:"省份"},
|
|
{value:"city",text:"地市"}
|
|
{value:"city",text:"地市"}
|
|
],
|
|
],
|