314637581
/
flossom-cloud
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

优化：模式类型返回字典值

Browse Source
master
382696293@qq.com 2 years ago
parent 1f8394f2bb
commit 43698cc4a6
3 changed files with 8 additions and 8 deletions
Show Stats Download Patch File Download Diff File

6
flossom-common/flossom-common-core/src/main/java/com/flossom/common/core/domain/entity/WxMode.java
Unescape Escape View File

@ -49,7 +49,7 @@ public class WxMode extends BaseEntity
/** 模式类型(每个仪器有不一样的模式类型) */
@Excel(name = "模式类型(每个仪器有不一样的模式类型)")
private Long modeType;
private String modeType;
/** 模式分类(每个仪器有不一样的模式分类) */
@Excel(name = "模式分类(每个仪器有不一样的模式分类)")
@ -165,12 +165,12 @@ public class WxMode extends BaseEntity
{
return modeVideo;
}
public void setModeType(Long modeType)
public void setModeType(String modeType)
{
this.modeType = modeType;
}
public Long getModeType()
public String getModeType()
{
return modeType;
}

6
flossom-common/flossom-common-core/src/main/java/com/flossom/common/core/domain/ret/WxModeRet.java
Unescape Escape View File

@ -67,7 +67,7 @@ public class WxModeRet {
* 模式类型(每个仪器有不一样的模式类型)
*/
@Excel(name = "模式类型(每个仪器有不一样的模式类型)")
private Long modeType;
private String modeType;
/**
* 模式分类(每个仪器有不一样的模式分类)
@ -195,11 +195,11 @@ public class WxModeRet {
return modeVideo;
}
public void setModeType(Long modeType) {
public void setModeType(String modeType) {
this.modeType = modeType;
}
public Long getModeType() {
public String getModeType() {
return modeType;
}

4
flossom-ui/src/views/system/mode/index.vue
Unescape Escape View File

@ -181,7 +181,7 @@
</el-row>
<el-row>
<el-col :span ="12">
<el-form-item label="舱体模式" prop="isCabinMode" v-if="form.instrumentModel == 'WL200' & form.modeType != 10">
<el-form-item label="舱体模式" prop="isCabinMode" v-if="form.instrumentModel == 'WL200' & form.modeType != '10'">
<el-select v-model="form.isCabinMode">
<el-option label="是" :value="1"></el-option>
<el-option label="否" :value="0"></el-option>
@ -189,7 +189,7 @@
</el-form-item>
</el-col>
<el-col :span ="12">
<el-form-item label="自定义组合" prop="isCustomMode" v-if="(form.modeType != 10&&form.instrumentType==2)" label-width="100px">
<el-form-item label="自定义组合" prop="isCustomMode" v-if="(form.modeType != '10'&&form.instrumentType==2)" label-width="100px">
<el-select v-model="form.isCustomMode">
<el-option label="是" :value="1"></el-option>
<el-option label="否" :value="0"></el-option>

Write Preview
Loading…
Cancel
Save