sxyanzhu
/
jhprjv2
4
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

提交代码

dev_xds
姜玉琦 2024-01-13 22:51:27 +08:00
parent 7065aa0648
commit de7301d3d2
2 changed files with 27 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

20
ruoyi-system/src/main/java/com/ruoyi/system/domain/SysApplyConfig.java
View File

@ -34,7 +34,7 @@ public class SysApplyConfig extends BaseEntity
/** 项目名称 */
@Excel(name = "项目名称")
private Long projectName;
private String projectName;
/** 部门主键 */
@Excel(name = "部门主键")
@ -42,7 +42,7 @@ public class SysApplyConfig extends BaseEntity
/** 部门名称 */
@Excel(name = "部门名称")
private Long deptName;
private String deptName;
/** 是否删除 */
@Excel(name = "是否删除")
@ -113,6 +113,22 @@ public class SysApplyConfig extends BaseEntity
return isDel;
}
public String getProjectName() {
return projectName;
}
public void setProjectName(String projectName) {
this.projectName = projectName;
}
public String getDeptName() {
return deptName;
}
public void setDeptName(String deptName) {
this.deptName = deptName;
}
@Override
public String toString() {
return new ToStringBuilder(this,ToStringStyle.MULTI_LINE_STYLE)

17
ruoyi-ui/src/views/system/applyConfig/index.vue
View File

@ -25,7 +25,7 @@
@keyup.enter.native="handleQuery"
/>
</el-form-item>
<el-form-item label="是否删除" prop="isDel">
<el-form-item label="是否有效" prop="isDel">
<el-select v-model="queryParams.isDel" placeholder="请选择是否删除" clearable>
<el-option
v-for="dict in dict.type.sys_normal_disable"
@ -89,18 +89,19 @@
<el-table v-loading="loading" :data="applyConfigList" @selection-change="handleSelectionChange">
<el-table-column type="selection" width="55" align="center" />
<el-table-column label="主键" align="center" prop="id" />
<el-table-column label="应用主键" align="center" prop="appId" />
<el-table-column label="项目主键" align="center" prop="projectId" />
<el-table-column label="部门主键" align="center" prop="deptId" />
<el-table-column label="是否删除" align="center" prop="isDel">
<el-table-column label="AppId" align="center" prop="appId" />
<el-table-column label="AppSecret" align="center" prop="publicKey" width="250"/>
<el-table-column label="项目信息" align="center" prop="projectName" />
<el-table-column label="部门信息" align="center" prop="deptName" />
<el-table-column label="是否有效" align="center" prop="isDel">
<template slot-scope="scope">
<dict-tag :options="dict.type.sys_normal_disable" :value="scope.row.isDel"/>
</template>
</el-table-column>
<el-table-column label="创建人" align="center" prop="createBy" />
<el-table-column label="创建时间" align="center" prop="createTime" width="180">
<template slot-scope="scope">
<span>{{ parseTime(scope.row.createTime, '{y}-{m}-{d}') }}</span>
<span>{{ parseTime(scope.row.createTime, '{y}-{m}-{d} {h}:{i}') }}</span>
</template>
</el-table-column>
<el-table-column label="操作" align="center" class-name="small-padding fixed-width">
@ -141,7 +142,7 @@
<el-input v-model="form.appId" placeholder="请输入应用主键" :disabled="true"/>
</el-form-item>
<el-form-item label="应用公钥" prop="publicKey" v-if="form.publicKey">
<el-input type="textarea" :rows="3" v-model="form.publicKey" placeholder="请输入应用公钥" :disabled="true"/>
<el-input type="textarea" :rows="6" v-model="form.publicKey" placeholder="请输入应用公钥" :disabled="true"/>
</el-form-item>
<el-form-item label="项目信息" prop="projectId">
<el-select