|
@@ -7,14 +7,14 @@
|
|
|
<el-input size="small" v-model="scope.row.parametername" placeholder="请输入参数名" />
|
|
|
</template>
|
|
|
</el-table-column>
|
|
|
- <el-table-column prop="datasource" label="参数类型">
|
|
|
+ <el-table-column prop="datasource" label="数据来源">
|
|
|
<template slot-scope="scope">
|
|
|
<el-select size="small" v-model="scope.row.datasource" placeholder="请选择">
|
|
|
<el-option v-for="(item,index) in datasources" :key="index" :label="item.name" :value="formatString(item.id)"></el-option>
|
|
|
</el-select>
|
|
|
</template>
|
|
|
</el-table-column>
|
|
|
- <el-table-column prop="parametertype" label="数据来源">
|
|
|
+ <el-table-column prop="parametertype" label="参数类型">
|
|
|
<template slot-scope="scope">
|
|
|
<el-select size="small" v-model="scope.row.parametertype" placeholder="请选择">
|
|
|
<el-option v-for="(item,index) in datatypes" :key="index" :label="item.name" :value="item.id"></el-option>
|
|
@@ -35,14 +35,14 @@
|
|
|
<el-input size="small" v-model="scope.row.name" placeholder="请输入参数名" />
|
|
|
</template>
|
|
|
</el-table-column>
|
|
|
- <el-table-column prop="datasource" label="参数类型">
|
|
|
+ <el-table-column prop="datasource" label="数据来源">
|
|
|
<template slot-scope="scope">
|
|
|
<el-select size="small" v-model="scope.row.datasource" placeholder="请选择">
|
|
|
<el-option v-for="(item,index) in datasources" :key="index" :label="item.name" :value="formatString(item.id)"></el-option>
|
|
|
</el-select>
|
|
|
</template>
|
|
|
</el-table-column>
|
|
|
- <el-table-column prop="datatype" label="数据来源">
|
|
|
+ <el-table-column prop="datatype" label="参数类型">
|
|
|
<template slot-scope="scope">
|
|
|
<el-select size="small" v-model="scope.row.datatype" placeholder="请选择">
|
|
|
<el-option v-for="(item,index) in datatypes" :key="index" :label="item.name" :value="item.id"></el-option>
|
|
@@ -106,10 +106,18 @@ export default {
|
|
|
setFormSelectData (name, returnData) {
|
|
|
switch (name) {
|
|
|
case 'datasource':
|
|
|
- this.datasources = [...returnData]
|
|
|
+ if (typeof returnData == 'string') {
|
|
|
+ this.datasources = JSON.parse(returnData)
|
|
|
+ } else {
|
|
|
+ this.datasources = [...returnData]
|
|
|
+ }
|
|
|
break;
|
|
|
case 'datatype':
|
|
|
- this.datatypes = [...returnData]
|
|
|
+ if (typeof returnData == 'string') {
|
|
|
+ this.datatypes = JSON.parse(returnData)
|
|
|
+ } else {
|
|
|
+ this.datatypes = [...returnData]
|
|
|
+ }
|
|
|
break;
|
|
|
case 'tabledata':
|
|
|
this.tableData = [...returnData]
|