Skip to content

liangzhen / framework-tools-web

Go to a project
Commit 250b4e00 by liuyong
Options

Merge branch 'master' of http://47.97.176.204:19000/wangwansu/iact_jiagou_drowio

2 parents f4f984df 1b2ca831
Expand all
Inline Side-by-side
Showing with 31 additions and 31 deletions
src/views/metaModelDic/pages/page1.vue
...@@ -114,10 +114,10 @@ ...@@ -114,10 +114,10 @@
<el-input v-show="columnIsShow&& (editIndex== scope.row.index)" @blur="columnIsShow = false" v-model="scope.row.fieldName"></el-input> <el-input v-show="columnIsShow&& (editIndex== scope.row.index)" @blur="columnIsShow = false" v-model="scope.row.fieldName"></el-input>
</template> --> </template> -->
</el-table-column> </el-table-column>
<el-table-column prop="chineseName" label="中文名" align="center"> <el-table-column prop="cnName" label="中文名" align="center">
<!-- <template slot-scope="scope"> <!-- <template slot-scope="scope">
<div v-show=" !columnIsShow|| (editIndex!= scope.row.index)">{{scope.row.chineseName}}</div> <div v-show=" !columnIsShow|| (editIndex!= scope.row.index)">{{scope.row.cnName}}</div>
<el-input v-show="columnIsShow&& (editIndex== scope.row.index)" @blur="columnIsShow = false" v-model="scope.row.chineseName"></el-input> <el-input v-show="columnIsShow&& (editIndex== scope.row.index)" @blur="columnIsShow = false" v-model="scope.row.cnName"></el-input>
</template> --> </template> -->
</el-table-column> </el-table-column>
<el-table-column prop="displayOrder" label="排序" align="center"> <el-table-column prop="displayOrder" label="排序" align="center">
...@@ -179,8 +179,8 @@ ...@@ -179,8 +179,8 @@
<el-form-item class="cross" label="字段名:" prop="fieldName"> <el-form-item class="cross" label="字段名:" prop="fieldName">
<el-input v-model="formData2.fieldName" maxlength="100"></el-input> <el-input v-model="formData2.fieldName" maxlength="100"></el-input>
</el-form-item> </el-form-item>
<el-form-item class="cross" label="中文名:" prop="chineseName"> <el-form-item class="cross" label="中文名:" prop="cnName">
<el-input v-model="formData2.chineseName" maxlength="100"></el-input> <el-input v-model="formData2.cnName" maxlength="100"></el-input>
</el-form-item> </el-form-item>
<el-form-item class="cross" label="排序:" prop="displayOrder"> <el-form-item class="cross" label="排序:" prop="displayOrder">
<el-input v-model="formData2.displayOrder" maxlength="100"></el-input> <el-input v-model="formData2.displayOrder" maxlength="100"></el-input>
...@@ -248,7 +248,7 @@ export default { ...@@ -248,7 +248,7 @@ export default {
}, },
formData2: { formData2: {
fieldName: "", fieldName: "",
chineseName: "", cnName: "",
displayOrder: "", displayOrder: "",
contentLength: "", contentLength: "",
controlType: "", controlType: "",
...@@ -257,7 +257,7 @@ export default { ...@@ -257,7 +257,7 @@ export default {
fieldName: [ fieldName: [
{ required: true, message: '请输入字段名', trigger: 'blur' }, { required: true, message: '请输入字段名', trigger: 'blur' },
], ],
chineseName: [ cnName: [
{ required: true, message: '请输入中文名', trigger: 'blur' }, { required: true, message: '请输入中文名', trigger: 'blur' },
], ],
displayOrder: [ displayOrder: [
...@@ -495,7 +495,7 @@ export default { ...@@ -495,7 +495,7 @@ export default {
resetFormData2(){ resetFormData2(){
this.formData2 = { this.formData2 = {
fieldName: "", fieldName: "",
chineseName: "", cnName: "",
displayOrder: "", displayOrder: "",
contentLength: "", contentLength: "",
controlType: "", controlType: "",
...@@ -562,7 +562,7 @@ export default { ...@@ -562,7 +562,7 @@ export default {
if (this.formData2.propertyId) { if (this.formData2.propertyId) {
let params = { let params = {
fieldName: this.formData2.fieldName, fieldName: this.formData2.fieldName,
chineseName: this.formData2.chineseName, cnName: this.formData2.cnName,
displayOrder: this.formData2.displayOrder, displayOrder: this.formData2.displayOrder,
contentLength: this.formData2.contentLength, contentLength: this.formData2.contentLength,
controlType: this.formData2.controlType, controlType: this.formData2.controlType,
...@@ -587,7 +587,7 @@ export default { ...@@ -587,7 +587,7 @@ export default {
}else{ }else{
let params = { let params = {
fieldName: this.formData2.fieldName, fieldName: this.formData2.fieldName,
chineseName: this.formData2.chineseName, cnName: this.formData2.cnName,
displayOrder: this.formData2.displayOrder, displayOrder: this.formData2.displayOrder,
contentLength: this.formData2.contentLength, contentLength: this.formData2.contentLength,
controlType: this.formData2.controlType, controlType: this.formData2.controlType,
......
src/views/metaModelDic/pages/page2.vue
...@@ -106,10 +106,10 @@ ...@@ -106,10 +106,10 @@
<el-input v-show="columnIsShow&& (editIndex== scope.row.index)" @blur="columnIsShow = false" v-model="scope.row.fieldName"></el-input> <el-input v-show="columnIsShow&& (editIndex== scope.row.index)" @blur="columnIsShow = false" v-model="scope.row.fieldName"></el-input>
</template> --> </template> -->
</el-table-column> </el-table-column>
<el-table-column prop="chineseName" label="中文名" align="center"> <el-table-column prop="cnName" label="中文名" align="center">
<!-- <template slot-scope="scope"> <!-- <template slot-scope="scope">
<div v-show=" !columnIsShow|| (editIndex!= scope.row.index)">{{scope.row.chineseName}}</div> <div v-show=" !columnIsShow|| (editIndex!= scope.row.index)">{{scope.row.cnName}}</div>
<el-input v-show="columnIsShow&& (editIndex== scope.row.index)" @blur="columnIsShow = false" v-model="scope.row.chineseName"></el-input> <el-input v-show="columnIsShow&& (editIndex== scope.row.index)" @blur="columnIsShow = false" v-model="scope.row.cnName"></el-input>
</template> --> </template> -->
</el-table-column> </el-table-column>
<el-table-column prop="displayOrder" label="排序" align="center"> <el-table-column prop="displayOrder" label="排序" align="center">
...@@ -171,8 +171,8 @@ ...@@ -171,8 +171,8 @@
<el-form-item class="cross" label="字段名:" prop="fieldName"> <el-form-item class="cross" label="字段名:" prop="fieldName">
<el-input v-model="formData2.fieldName" maxlength="100"></el-input> <el-input v-model="formData2.fieldName" maxlength="100"></el-input>
</el-form-item> </el-form-item>
<el-form-item class="cross" label="中文名:" prop="chineseName"> <el-form-item class="cross" label="中文名:" prop="cnName">
<el-input v-model="formData2.chineseName" maxlength="100"></el-input> <el-input v-model="formData2.cnName" maxlength="100"></el-input>
</el-form-item> </el-form-item>
<el-form-item class="cross" label="排序:" prop="displayOrder"> <el-form-item class="cross" label="排序:" prop="displayOrder">
<el-input v-model="formData2.displayOrder" maxlength="100"></el-input> <el-input v-model="formData2.displayOrder" maxlength="100"></el-input>
...@@ -221,7 +221,7 @@ export default { ...@@ -221,7 +221,7 @@ export default {
tableData2: [ tableData2: [
{ {
fieldName: "", fieldName: "",
chineseName: "", cnName: "",
displayOrder: "", displayOrder: "",
controlType: "", controlType: "",
contentLength: "", contentLength: "",
...@@ -247,7 +247,7 @@ export default { ...@@ -247,7 +247,7 @@ export default {
}, },
formData2: { formData2: {
fieldName: "", fieldName: "",
chineseName: "", cnName: "",
displayOrder: "", displayOrder: "",
contentLength: "", contentLength: "",
controlType: "", controlType: "",
...@@ -256,7 +256,7 @@ export default { ...@@ -256,7 +256,7 @@ export default {
fieldName: [ fieldName: [
{ required: true, message: '请输入字段名', trigger: 'blur' }, { required: true, message: '请输入字段名', trigger: 'blur' },
], ],
chineseName: [ cnName: [
{ required: true, message: '请输入中文名', trigger: 'blur' }, { required: true, message: '请输入中文名', trigger: 'blur' },
], ],
displayOrder: [ displayOrder: [
...@@ -273,7 +273,7 @@ export default { ...@@ -273,7 +273,7 @@ export default {
current: 1, current: 1,
pageSize: 10, pageSize: 10,
rsName: "", rsName: "",
scope: "", // scope: "",
state: "", state: "",
type: 2, type: 2,
}, },
...@@ -372,7 +372,7 @@ export default { ...@@ -372,7 +372,7 @@ export default {
current: 1, current: 1,
pageSize: 10, pageSize: 10,
rsName: "", rsName: "",
scope: "", // scope: "",
state: "", state: "",
type: 2, type: 2,
} }
...@@ -496,7 +496,7 @@ export default { ...@@ -496,7 +496,7 @@ export default {
resetFormData2(){ resetFormData2(){
this.formData2 = { this.formData2 = {
fieldName: "", fieldName: "",
chineseName: "", cnName: "",
displayOrder: "", displayOrder: "",
contentLength: "", contentLength: "",
controlType: "", controlType: "",
...@@ -540,7 +540,7 @@ export default { ...@@ -540,7 +540,7 @@ export default {
if (this.formData2.propertyId) { if (this.formData2.propertyId) {
let params = { let params = {
fieldName: this.formData2.fieldName, fieldName: this.formData2.fieldName,
chineseName: this.formData2.chineseName, cnName: this.formData2.cnName,
displayOrder: this.formData2.displayOrder, displayOrder: this.formData2.displayOrder,
contentLength: this.formData2.contentLength, contentLength: this.formData2.contentLength,
controlType: this.formData2.controlType, controlType: this.formData2.controlType,
...@@ -565,7 +565,7 @@ export default { ...@@ -565,7 +565,7 @@ export default {
}else{ }else{
let params = { let params = {
fieldName: this.formData2.fieldName, fieldName: this.formData2.fieldName,
chineseName: this.formData2.chineseName, cnName: this.formData2.cnName,
displayOrder: this.formData2.displayOrder, displayOrder: this.formData2.displayOrder,
contentLength: this.formData2.contentLength, contentLength: this.formData2.contentLength,
controlType: this.formData2.controlType, controlType: this.formData2.controlType,
......
src/views/metaModelDic/pages/page3.vue
...@@ -110,7 +110,7 @@ ...@@ -110,7 +110,7 @@
<el-table-column type="index" label="序号" width="80" align="center"></el-table-column> <el-table-column type="index" label="序号" width="80" align="center"></el-table-column>
<el-table-column prop="fieldName" label="字段名" align="center"> <el-table-column prop="fieldName" label="字段名" align="center">
</el-table-column> </el-table-column>
<el-table-column prop="chineseName" label="中文名" align="center"> <el-table-column prop="cnName" label="中文名" align="center">
</el-table-column> </el-table-column>
<el-table-column prop="displayOrder" label="排序" align="center"> <el-table-column prop="displayOrder" label="排序" align="center">
</el-table-column> </el-table-column>
...@@ -152,8 +152,8 @@ ...@@ -152,8 +152,8 @@
<el-form-item class="cross" label="字段名:" prop="fieldName"> <el-form-item class="cross" label="字段名:" prop="fieldName">
<el-input v-model="formData2.fieldName" maxlength="100"></el-input> <el-input v-model="formData2.fieldName" maxlength="100"></el-input>
</el-form-item> </el-form-item>
<el-form-item class="cross" label="中文名:" prop="chineseName"> <el-form-item class="cross" label="中文名:" prop="cnName">
<el-input v-model="formData2.chineseName" maxlength="100"></el-input> <el-input v-model="formData2.cnName" maxlength="100"></el-input>
</el-form-item> </el-form-item>
<el-form-item class="cross" label="排序:" prop="displayOrder"> <el-form-item class="cross" label="排序:" prop="displayOrder">
<el-input v-model="formData2.displayOrder" maxlength="100"></el-input> <el-input v-model="formData2.displayOrder" maxlength="100"></el-input>
...@@ -224,7 +224,7 @@ export default { ...@@ -224,7 +224,7 @@ export default {
}, },
formData2: { formData2: {
fieldName: "", fieldName: "",
chineseName: "", cnName: "",
displayOrder: "", displayOrder: "",
contentLength: "", contentLength: "",
controlType: "", controlType: "",
...@@ -233,7 +233,7 @@ export default { ...@@ -233,7 +233,7 @@ export default {
fieldName: [ fieldName: [
{ required: true, message: '请输入字段名', trigger: 'blur' }, { required: true, message: '请输入字段名', trigger: 'blur' },
], ],
chineseName: [ cnName: [
{ required: true, message: '请输入中文名', trigger: 'blur' }, { required: true, message: '请输入中文名', trigger: 'blur' },
], ],
displayOrder: [ displayOrder: [
...@@ -501,7 +501,7 @@ export default { ...@@ -501,7 +501,7 @@ export default {
resetFormData2(){ resetFormData2(){
this.formData2 = { this.formData2 = {
fieldName: "", fieldName: "",
chineseName: "", cnName: "",
displayOrder: "", displayOrder: "",
contentLength: "", contentLength: "",
controlType: "", controlType: "",
...@@ -545,7 +545,7 @@ export default { ...@@ -545,7 +545,7 @@ export default {
if (this.formData2.propertyId) { if (this.formData2.propertyId) {
let params = { let params = {
fieldName: this.formData2.fieldName, fieldName: this.formData2.fieldName,
chineseName: this.formData2.chineseName, cnName: this.formData2.cnName,
displayOrder: this.formData2.displayOrder, displayOrder: this.formData2.displayOrder,
contentLength: this.formData2.contentLength, contentLength: this.formData2.contentLength,
controlType: this.formData2.controlType, controlType: this.formData2.controlType,
...@@ -570,7 +570,7 @@ export default { ...@@ -570,7 +570,7 @@ export default {
}else{ }else{
let params = { let params = {
fieldName: this.formData2.fieldName, fieldName: this.formData2.fieldName,
chineseName: this.formData2.chineseName, cnName: this.formData2.cnName,
displayOrder: this.formData2.displayOrder, displayOrder: this.formData2.displayOrder,
contentLength: this.formData2.contentLength, contentLength: this.formData2.contentLength,
controlType: this.formData2.controlType, controlType: this.formData2.controlType,
......
Markdown is supported
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!