Commit 7261a585 authored by p-wanping.song's avatar p-wanping.song

Merge branch 'develop' of http://git.censoft.com.cn/rongtong/ruoyi-ui into swp-develop

parents 5c5ca2e0 e73ca39a
......@@ -38,7 +38,6 @@ const permission = {
const rdata = JSON.parse(JSON.stringify(res.data));
const sidebarRoutes = filterAsyncRouter(sdata);
const rewriteRoutes = filterAsyncRouter(rdata, false, true);
debugger;
const asyncRoutes = filterDynamicRoutes(dynamicRoutes);
rewriteRoutes.push({ path: "*", redirect: "/404", hidden: true });
router.addRoutes(asyncRoutes);
......@@ -109,7 +108,6 @@ function filterChildren(childrenMap, lastRouter = false) {
export function filterDynamicRoutes(routes) {
const res = [];
routes.forEach((route) => {
debugger;
if (route.permissions) {
if (auth.hasPermiOr(route.permissions)) {
res.push(route);
......
......@@ -153,8 +153,8 @@
<div class="approveResult">
<div class="approveL">
<el-button type="warning" plain icon="el-icon-download" size="mini"
@click="downList(InfoList.detailsDto.id)" style="float: right; margin-bottom: 8px">导出风险清单</el-button>
<!-- <el-button type="warning" plain icon="el-icon-download" size="mini"
@click="downList(InfoList.detailsDto.id)" style="float: right; margin-bottom: 8px">导出风险清单</el-button> -->
<el-table v-loading="loading" :data="listList">
<el-table-column label="序号" align="center">
<template slot-scope="scope">
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment