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

提交代码

dev_xds
姜玉琦 2023-12-25 00:54:26 +08:00
parent d6a7af16d9
commit b4e546c58f
4 changed files with 80 additions and 48 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
ruoyi-ui/src/components/ImageUpload/index.vue
View File

@ -93,7 +93,7 @@ export default {
// 然后将数组转为对象数组
this.fileList = list.map(item => {
if (typeof item === "string") {
if (item.indexOf(this.baseUrl) === -1) {
if (item.indexOf(this.baseUrl) === -1 && item.indexOf('http') === -1) {
item = { name: this.baseUrl + item, url: this.baseUrl + item };
} else {
item = { name: item, url: item };

4
ruoyi-ui/src/layout/components/Navbar.vue
View File

@ -90,7 +90,9 @@ export default {
window.open("/jhbs/")
},
toggleSideBar() {
this.$store.dispatch('app/toggleSideBar')
this.$store.dispatch('app/toggleSideBar');
//查询任务tips
this.$store.dispatch('settingAwaitNum');
},
async logout() {
this.$confirm('确定注销并退出系统吗？', '提示', {

2
ruoyi-ui/src/views/system/user/index.vue
View File

@ -314,8 +314,8 @@
</el-row>
</el-form>
<div class="page-warning">
<p><strong style="color: #E6A23C;">“总包公司”</strong> 有总包公司所有项目权限。</p>
<p><strong style="color: #E6A23C;">“总包公司个人”</strong> 有项目人员中担任职务项目的权限。</p>
<p><strong style="color: #E6A23C;">“【工作流】”</strong>标记角色，对应项目审批相关。</p>
<p><strong style="color: #67C23A;">监理单位，分包单位同上。总包公司权限大于个人权限，请选择角色时以个人角色为主</strong></p>
</div>
<div slot="footer" class="dialog-footer">

118
ruoyi-ui/src/views/wxsetting/wxMenConfig/index.vue
View File

@ -9,37 +9,15 @@
@keyup.enter.native="handleQuery"
/>
</el-form-item>
<el-form-item label="菜单标识" prop="menuIdenti">
<el-input
v-model="queryParams.menuIdenti"
placeholder="请输入菜单标识"
clearable
@keyup.enter.native="handleQuery"
/>
</el-form-item>
<el-form-item label="菜单图片" prop="menuImg">
<el-input
v-model="queryParams.menuImg"
placeholder="请输入菜单图片"
clearable
@keyup.enter.native="handleQuery"
/>
</el-form-item>
<el-form-item label="菜单地址" prop="menuUrl">
<el-input
v-model="queryParams.menuUrl"
placeholder="请输入菜单地址"
clearable
@keyup.enter.native="handleQuery"
/>
</el-form-item>
<el-form-item label="删除状态" prop="delFlag">
<el-input
v-model="queryParams.delFlag"
placeholder="请输入删除状态"
clearable
@keyup.enter.native="handleQuery"
<el-form-item label="菜单分类" prop="menuType">
<el-select v-model="queryParams.menuType" placeholder="请选择菜单分类" clearable>
<el-option
v-for="dict in dict.type.sys_wechat_menu_type"
:key="dict.value"
:label="dict.label"
:value="dict.value"
/>
</el-select>
</el-form-item>
<el-form-item>
<el-button type="primary" icon="el-icon-search" size="mini" @click="handleQuery">搜索</el-button>
@ -95,11 +73,37 @@
<el-table v-loading="loading" :data="wxMenConfigList" @selection-change="handleSelectionChange" stripe>
<el-table-column type="selection" width="55" align="center" />
<el-table-column label="${comment}" align="center" prop="id" />
<el-table-column label="菜单名称" align="center" prop="menuName" />
<el-table-column label="菜单标识" align="center" prop="menuIdenti" />
<el-table-column label="菜单图片" align="center" prop="menuImg" />
<el-table-column label="菜单地址" align="center" prop="menuUrl" />
<el-table-column label="菜单图标" align="center" prop="menuImg" width="100">
<template slot-scope="scope">
<image-preview :src="scope.row.menuImg" :width="80" :height="80"/>
</template>
</el-table-column>
<el-table-column label="菜单名称" align="center" prop="menuName" width="180" show-overflow-tooltip />
<el-table-column label="菜单标识" align="center" prop="menuIdenti" width="100" show-overflow-tooltip />
<el-table-column label="菜单分类" align="center" prop="menuType">
<template slot-scope="scope">
<dict-tag :options="dict.type.sys_wechat_menu_type" :value="scope.row.menuType" />
</template>
</el-table-column>
<el-table-column label="菜单路由" align="center" prop="menuUrl" width="350" show-overflow-tooltip/>
<el-table-column label="菜单排序" align="center" prop="menuSort" width="100" show-overflow-tooltip/>
<el-table-column label="修改时间" align="center" prop="createTime" show-overflow-tooltip>
<template slot-scope="scope">
<span>{{ parseTime(scope.row.createTime, "{y}-{m}-{d} {h}:{i}") }}</span>
</template>
</el-table-column>
<el-table-column
label="菜单状态"
align="center"
prop="delFlag"
>
<template slot-scope="scope">
<dict-tag
:options="dict.type.sys_common_isdel"
:value="scope.row.delFlag"
/>
</template>
</el-table-column>
<el-table-column label="操作" align="center" class-name="small-padding fixed-width">
<template slot-scope="scope">
<el-button
@ -131,20 +135,30 @@
<!-- 添加或修改菜单配置对话框 -->
<el-dialog :title="title" :visible.sync="open" width="500px" append-to-body>
<el-form ref="form" :model="form" :rules="rules" label-width="80px">
<el-form-item label="菜单图标" prop="menuImg">
<image-upload v-model="form.menuImg" :limit="1"/>
</el-form-item>
<el-form-item label="菜单名称" prop="menuName">
<el-input v-model="form.menuName" placeholder="请输入菜单名称" />
</el-form-item>
<el-form-item label="菜单标识" prop="menuIdenti">
<el-input v-model="form.menuIdenti" placeholder="请输入菜单标识" />
</el-form-item>
<el-form-item label="菜单图片" prop="menuImg">
<el-input v-model="form.menuImg" placeholder="请输入菜单图片" />
</el-form-item>
<el-form-item label="菜单地址" prop="menuUrl">
<el-form-item label="菜单路由" prop="menuUrl">
<el-input v-model="form.menuUrl" placeholder="请输入菜单地址" />
</el-form-item>
<el-form-item label="删除状态" prop="delFlag">
<el-input v-model="form.delFlag" placeholder="请输入删除状态" />
<el-form-item label="菜单分类" prop="menuType">
<el-select v-model="form.menuType" placeholder="请选择菜单分类" style="width:100%">
<el-option
v-for="dict in dict.type.sys_wechat_menu_type"
:key="dict.value"
:label="dict.label"
:value="dict.value"
></el-option>
</el-select>
</el-form-item>
<el-form-item label="菜单排序" prop="menuSort">
<el-input v-model="form.menuSort" placeholder="请输入菜单排序" />
</el-form-item>
<el-divider content-position="center">菜单配置角色信息</el-divider>
<el-row :gutter="10" class="mb8">
@ -158,9 +172,16 @@
<el-table :data="surMenuConfigRoleList" :row-class-name="rowSurMenuConfigRoleIndex" @selection-change="handleSurMenuConfigRoleSelectionChange" ref="surMenuConfigRole">
<el-table-column type="selection" width="50" align="center" />
<el-table-column label="序号" align="center" prop="index" width="50"/>
<el-table-column label="角色主键" prop="roleId" width="150">
<el-table-column label="菜单角色" prop="roleId">
<template slot-scope="scope">
<el-input v-model="scope.row.roleId" placeholder="请输入角色主键" />
<el-select v-model="scope.row.roleId" placeholder="选择菜单角色" >
<el-option
v-for="role in roles"
:key="role.roleId"
:label="role.roleName+'['+role.roleKey+']'"
:value="role.roleId"
/>
</el-select>
</template>
</el-table-column>
</el-table>
@ -175,9 +196,10 @@
<script>
import { listWxMenConfig, getWxMenConfig, delWxMenConfig, addWxMenConfig, updateWxMenConfig } from "@/api/wxsetting/wxMenConfig";
import { listRole } from "@/api/system/role";
export default {
name: "WxMenConfig",
dicts: ["sys_wechat_menu_type","sys_common_isdel"],
data() {
return {
// 遮罩层
@ -212,6 +234,7 @@ export default {
menuUrl: null,
delFlag: null,
},
roles:[],
// 表单参数
form: {},
// 表单校验
@ -221,6 +244,7 @@ export default {
},
created() {
this.getList();
this.getRoles();
},
methods: {
/** 查询菜单配置列表 */
@ -232,6 +256,12 @@ export default {
this.loading = false;
});
},
/** 角色列表 */
getRoles() {
listRole({pageNum: 1, pageSize: 100}).then(response => {
this.roles = response.rows;
});
},
// 取消按钮
cancel() {
this.open = false;