Merge remote-tracking branch 'upstream/master'

fungleo

2020-08-04 107672419e484d7893ecf624d4af2101cc72d890

Merge remote-tracking branch 'upstream/master'

 README.md

@@ -6,8 +6,8 @@
* 支持加载动态权限菜单，多方式轻松权限控制。
* 高效率开发，使用代码生成器可以一键生成前后端代码。
* 提供了一个Oracle版本[RuoYi-Vue-Oracle](https://github.com/yangzongzhuan/RuoYi-Vue-Oracle)，保持同步更新。
* 感谢[Vue-Element-Admin](https://github.com/PanJiaChen/vue-element-admin)，[eladmin-web](https://gitee.com/elunez/eladmin-web?_from=gitee_search)。
* 不分离版本，请移步[RuoYi](https://gitee.com/y_project/RuoYi)，微服务版本，请移步[RuoYi-Cloud](https://gitee.com/y_project/RuoYi-Cloud)
* 感谢[Vue-Element-Admin](https://github.com/PanJiaChen/vue-element-admin)，[eladmin-web](https://gitee.com/elunez/eladmin-web?_from=gitee_search)。
* 阿里云优惠券：[点我进入](https://www.aliyun.com/minisite/goods?userCode=brki8iof&share_source=copy_link)，腾讯云优惠券：[点我领取](https://cloud.tencent.com/redirect.php?redirect=1025&cps_key=198c8df2ed259157187173bc7f4f32fd&from=console)  

## 内置功能
@@ -46,27 +46,27 @@
        <td><img src="https://oscimg.oschina.net/oscnet/1cbcf0e6f257c7d3a063c0e3f2ff989e4b3.jpg"/></td>
    </tr>
    <tr>
        <td><img src="https://oscimg.oschina.net/oscnet/707825ad3f29de74a8d6d02fbd73ad631ea.jpg"/></td>
        <td><img src="https://oscimg.oschina.net/oscnet/46be40cc6f01aa300eed53a19b5012bf484.jpg"/></td>
        <td><img src="https://oscimg.oschina.net/oscnet/up-8074972883b5ba0622e13246738ebba237a.png"/></td>
        <td><img src="https://oscimg.oschina.net/oscnet/up-9f88719cdfca9af2e58b352a20e23d43b12.png"/></td>
    </tr>
    <tr>
        <td><img src="https://oscimg.oschina.net/oscnet/4284796d4cea240d181b8f2201813dda710.jpg"/></td>
        <td><img src="https://oscimg.oschina.net/oscnet/3ecfac87a049f7fe36abbcaafb2c40d36cf.jpg"/></td>
        <td><img src="https://oscimg.oschina.net/oscnet/up-39bf2584ec3a529b0d5a3b70d15c9b37646.png"/></td>
        <td><img src="https://oscimg.oschina.net/oscnet/up-936ec82d1f4872e1bc980927654b6007307.png"/></td>
    </tr>
    <tr>
        <td><img src="https://oscimg.oschina.net/oscnet/71c2d48905221a09a728df4aff4160b8607.jpg"/></td>
        <td><img src="https://oscimg.oschina.net/oscnet/c14c1ee9a64a6a9c2c22f67d43198767dbe.jpg"/></td>
        <td><img src="https://oscimg.oschina.net/oscnet/up-b2d62ceb95d2dd9b3fbe157bb70d26001e9.png"/></td>
        <td><img src="https://oscimg.oschina.net/oscnet/up-d67451d308b7a79ad6819723396f7c3d77a.png"/></td>
    </tr>     
    <tr>
        <td><img src="https://oscimg.oschina.net/oscnet/5e8c387724954459291aafd5eb52b456f53.jpg"/></td>
        <td><img src="https://oscimg.oschina.net/oscnet/644e78da53c2e92a95dfda4f76e6d117c4b.jpg"/></td>
    </tr>
    <tr>
        <td><img src="https://oscimg.oschina.net/oscnet/fdea1d8bb8625c27bf964176a2c8ebc6945.jpg"/></td>
        <td><img src="https://oscimg.oschina.net/oscnet/509d2708cfd762b6e6339364cac1cc1970c.jpg"/></td>
        <td><img src="https://oscimg.oschina.net/oscnet/up-8370a0d02977eebf6dbf854c8450293c937.png"/></td>
        <td><img src="https://oscimg.oschina.net/oscnet/up-49003ed83f60f633e7153609a53a2b644f7.png"/></td>
    </tr>
    <tr>
        <td><img src="https://oscimg.oschina.net/oscnet/up-f1fd681cc9d295db74e85ad6d2fe4389454.png"/></td>
        <td><img src="https://oscimg.oschina.net/oscnet/up-d4fe726319ece268d4746602c39cffc0621.png"/></td>
        <td><img src="https://oscimg.oschina.net/oscnet/up-c195234bbcd30be6927f037a6755e6ab69c.png"/></td>
    </tr>
    <tr>

 ruoyi-admin/src/main/java/com/ruoyi/web/controller/system/SysRoleController.java

@@ -17,11 +17,17 @@
import com.ruoyi.common.core.controller.BaseController;

import com.ruoyi.common.core.domain.AjaxResult;

import com.ruoyi.common.core.domain.entity.SysRole;

import com.ruoyi.common.core.domain.model.LoginUser;

import com.ruoyi.common.core.page.TableDataInfo;

import com.ruoyi.common.enums.BusinessType;

import com.ruoyi.common.utils.SecurityUtils;

import com.ruoyi.common.utils.ServletUtils;

import com.ruoyi.common.utils.StringUtils;

import com.ruoyi.common.utils.poi.ExcelUtil;

import com.ruoyi.framework.web.service.SysPermissionService;

import com.ruoyi.framework.web.service.TokenService;

import com.ruoyi.system.service.ISysRoleService;

import com.ruoyi.system.service.ISysUserService;



/**

 * 角色信息

@@ -34,6 +40,15 @@
{

    @Autowired

    private ISysRoleService roleService;



    @Autowired

    private TokenService tokenService;

    
    @Autowired

    private SysPermissionService permissionService;

    
    @Autowired

    private ISysUserService userService;



    @PreAuthorize("@ss.hasPermi('system:role:list')")

    @GetMapping("/list")

@@ -103,7 +118,20 @@
            return AjaxResult.error("修改角色'" + role.getRoleName() + "'失败，角色权限已存在");

        }

        role.setUpdateBy(SecurityUtils.getUsername());

        return toAjax(roleService.updateRole(role));

        
        if (roleService.updateRole(role) > 0)

        {

            // 更新缓存用户权限

            LoginUser loginUser = tokenService.getLoginUser(ServletUtils.getRequest());

            if (StringUtils.isNotNull(loginUser.getUser()) && !loginUser.getUser().isAdmin())

            {

                loginUser.setPermissions(permissionService.getMenuPermission(loginUser.getUser()));

                loginUser.setUser(userService.selectUserByUserName(loginUser.getUser().getUserName()));

                tokenService.setLoginUser(loginUser);

            }

            return AjaxResult.success();

        }

        return AjaxResult.error("修改角色'" + role.getRoleName() + "'失败，请联系管理员");

    }



    /**


 ruoyi-common/src/main/java/com/ruoyi/common/constant/Constants.java

@@ -61,6 +61,11 @@
     * 登录用户 redis key

     */

    public static final String LOGIN_TOKEN_KEY = "login_tokens:";

    
    /**

     * 防重提交 redis key

     */

    public static final String REPEAT_SUBMIT_KEY = "repeat_submit:";



    /**

     * 验证码有效期（分钟）


 ruoyi-framework/src/main/java/com/ruoyi/framework/interceptor/impl/SameUrlDataInterceptor.java

@@ -5,8 +5,10 @@
import java.util.concurrent.TimeUnit;

import javax.servlet.http.HttpServletRequest;

import org.springframework.beans.factory.annotation.Autowired;

import org.springframework.beans.factory.annotation.Value;

import org.springframework.stereotype.Component;

import com.alibaba.fastjson.JSONObject;

import com.ruoyi.common.constant.Constants;

import com.ruoyi.common.core.redis.RedisCache;

import com.ruoyi.common.filter.RepeatedlyRequestWrapper;

import com.ruoyi.common.utils.StringUtils;

@@ -26,7 +28,9 @@


    public final String REPEAT_TIME = "repeatTime";



    public final String CACHE_REPEAT_KEY = "repeatData";

    // 令牌自定义标识

    @Value("${token.header}")

    private String header;



    @Autowired

    private RedisCache redisCache;

@@ -62,7 +66,10 @@
        // 请求地址（作为存放cache的key值）

        String url = request.getRequestURI();



        Object sessionObj = redisCache.getCacheObject(CACHE_REPEAT_KEY);

        // 唯一标识（指定key + 消息头）

        String cache_repeat_key = Constants.REPEAT_SUBMIT_KEY + request.getHeader(header);



        Object sessionObj = redisCache.getCacheObject(cache_repeat_key);

        if (sessionObj != null)

        {

            Map<String, Object> sessionMap = (Map<String, Object>) sessionObj;

@@ -77,7 +84,7 @@
        }

        Map<String, Object> cacheMap = new HashMap<String, Object>();

        cacheMap.put(url, nowDataMap);

        redisCache.setCacheObject(CACHE_REPEAT_KEY, cacheMap, intervalTime, TimeUnit.SECONDS);

        redisCache.setCacheObject(cache_repeat_key, cacheMap, intervalTime, TimeUnit.SECONDS);

        return false;

    }




 ruoyi-generator/src/main/resources/vm/vue/index-tree.vue.vm

@@ -1,6 +1,6 @@
<template>

  <div class="app-container">

    <el-form :model="queryParams" ref="queryForm" :inline="true" label-width="68px">

    <el-form :model="queryParams" ref="queryForm" :inline="true" v-show="showSearch" label-width="68px">

#foreach($column in $columns)

#if($column.query)

#set($dictType=$column.dictType)

@@ -51,23 +51,30 @@
#end

#end

      <el-form-item>

        <el-button type="cyan" icon="el-icon-search" size="mini" @click="handleQuery">搜索</el-button>

        <el-button icon="el-icon-refresh" size="mini" @click="resetQuery">重置</el-button>

      </el-form-item>

    </el-form>



    <el-row :gutter="10" class="mb8">

      <el-col :span="1.5">

        <el-button

          class="filter-item"

          type="primary"

          icon="el-icon-search"

          size="mini"

          @click="handleQuery"

        >搜索</el-button>

        <el-button

          class="filter-item"

          type="primary"

          icon="el-icon-plus"

          size="mini"

          @click="handleAdd"

          v-hasPermi="['${moduleName}:${businessName}:add']"

        >新增</el-button>

      </el-form-item>

    </el-form>

      </el-col>

      <div class="top-right-btn">

        <el-tooltip class="item" effect="dark" content="刷新" placement="top">

          <el-button size="mini" circle icon="el-icon-refresh" @click="handleQuery" />

        </el-tooltip>

        <el-tooltip class="item" effect="dark" :content="showSearch ? '隐藏搜索' : '显示搜索'" placement="top">

          <el-button size="mini" circle icon="el-icon-search" @click="showSearch=!showSearch" />

        </el-tooltip>

      </div>

    </el-row>



    <el-table

      v-loading="loading"

@@ -229,6 +236,8 @@
    return {

      // 遮罩层

      loading: true,

      // 显示搜索条件

      showSearch: true,

      // ${functionName}表格数据

      ${businessName}List: [],

      // ${functionName}树选项


 ruoyi-generator/src/main/resources/vm/vue/index.vue.vm

@@ -1,6 +1,6 @@
<template>

  <div class="app-container">

    <el-form :model="queryParams" ref="queryForm" :inline="true" label-width="68px">

    <el-form :model="queryParams" ref="queryForm" :inline="true" v-show="showSearch" label-width="68px">

#foreach($column in $columns)

#if($column.query)

#set($dictType=$column.dictType)

@@ -51,7 +51,7 @@
#end

#end

      <el-form-item>

        <el-button type="primary" icon="el-icon-search" size="mini" @click="handleQuery">搜索</el-button>

        <el-button type="cyan" icon="el-icon-search" size="mini" @click="handleQuery">搜索</el-button>

        <el-button icon="el-icon-refresh" size="mini" @click="resetQuery">重置</el-button>

      </el-form-item>

    </el-form>

@@ -95,6 +95,14 @@
          v-hasPermi="['${moduleName}:${businessName}:export']"

        >导出</el-button>

      </el-col>

      <div class="top-right-btn">

        <el-tooltip class="item" effect="dark" content="刷新" placement="top">

          <el-button size="mini" circle icon="el-icon-refresh" @click="handleQuery" />

        </el-tooltip>

        <el-tooltip class="item" effect="dark" :content="showSearch ? '隐藏搜索' : '显示搜索'" placement="top">

          <el-button size="mini" circle icon="el-icon-search" @click="showSearch=!showSearch" />

        </el-tooltip>

      </div>

    </el-row>



    <el-table v-loading="loading" :data="${businessName}List" @selection-change="handleSelectionChange">

@@ -260,6 +268,8 @@
      single: true,

      // 非多个禁用

      multiple: true,

      // 显示搜索条件

      showSearch: true,

      // 总条数

      total: 0,

      // ${functionName}表格数据


 ruoyi-system/src/main/resources/mapper/system/SysDeptMapper.xml

@@ -77,8 +77,7 @@
    

    <select id="checkDeptNameUnique" resultMap="SysDeptResult">

        <include refid="selectDeptVo"/>

        where dept_name=#{deptName} and parent_id = #{parentId}

              limit 1

        where dept_name=#{deptName} and parent_id = #{parentId} limit 1

    </select>

    

    <insert id="insertDept" parameterType="SysDept">


 ruoyi-ui/babel.config.js

@@ -1,5 +1,13 @@
module.exports = {

  presets: [

    '@vue/app'

  ]

    // https://github.com/vuejs/vue-cli/tree/master/packages/@vue/babel-preset-app

    '@vue/cli-plugin-babel/preset'

  ],

  'env': {

    'development': {

      // babel-plugin-dynamic-import-node plugin only does one thing by converting all import() to require().

      // This plugin can significantly increase the speed of hot updates, when you have a large number of pages.

      'plugins': ['dynamic-import-node']

    }

  }

}


 ruoyi-ui/package.json

@@ -5,7 +5,7 @@
  "author": "若依",

  "license": "MIT",

  "scripts": {

    "dev": "vue-cli-service serve --open",

    "dev": "vue-cli-service serve",

    "build:prod": "vue-cli-service build",

    "build:stage": "vue-cli-service build --mode staging",

    "preview": "node build/index.js --preview",

@@ -43,10 +43,11 @@
    "@riophae/vue-treeselect": "0.4.0",

    "axios": "0.18.1",

    "clipboard": "2.0.4",

    "core-js": "3.6.5",

    "echarts": "4.2.1",

    "element-ui": "2.13.2",

    "file-saver": "2.0.1",

    "js-beautify": "^1.10.2",

    "js-beautify": "1.10.2",

    "fuse.js": "3.4.4",

    "js-cookie": "2.2.0",

    "jsencrypt": "3.0.0-rc.1",

@@ -65,32 +66,31 @@
    "vuex": "3.1.0"

  },

  "devDependencies": {

    "@vue/cli-plugin-babel": "3.5.3",

    "@vue/cli-plugin-eslint": "^3.9.1",

    "@vue/cli-plugin-unit-jest": "3.5.3",

    "@vue/cli-service": "3.5.3",

    "@vue/cli-plugin-babel": "4.4.4",

    "@vue/cli-plugin-eslint": "4.4.4",

    "@vue/cli-plugin-unit-jest": "4.4.4",

    "@vue/cli-service": "4.4.4",

    "@vue/test-utils": "1.0.0-beta.29",

    "autoprefixer": "^9.5.1",

    "babel-core": "7.0.0-bridge.0",

    "babel-eslint": "10.0.1",

    "autoprefixer": "9.5.1",

    "babel-eslint": "10.1.0",

    "babel-jest": "23.6.0",

    "babel-plugin-dynamic-import-node": "2.3.3",

    "chalk": "2.4.2",

    "chokidar": "2.1.5",

    "connect": "3.6.6",

    "eslint": "5.15.3",

    "eslint-plugin-vue": "5.2.2",

    "eslint": "6.7.2",

    "eslint-plugin-vue": "6.2.2",

    "html-webpack-plugin": "3.2.0",

    "http-proxy-middleware": "^0.19.1",

    "husky": "1.3.1",

    "lint-staged": "8.1.5",

    "mockjs": "1.0.1-beta3",

    "plop": "2.3.0",

    "runjs": "^4.3.2",

    "sass": "^1.26.10",

    "sass-loader": "^7.1.0",

    "runjs": "4.3.2",

    "sass": "1.26.10",

    "sass-loader": "8.0.2",

    "script-ext-html-webpack-plugin": "2.1.3",

    "script-loader": "0.7.2",

    "serve-static": "^1.13.2",

    "serve-static": "1.13.2",

    "svg-sprite-loader": "4.1.3",

    "svgo": "1.2.0",

    "vue-template-compiler": "2.6.10"


 ruoyi-ui/src/assets/styles/ruoyi.scss

@@ -143,6 +143,27 @@
    margin-bottom: 10px;

}

  

/* button color */

.el-button--cyan.is-active,

.el-button--cyan:active {

  background: #20B2AA;

  border-color: #20B2AA;

  color: #FFFFFF;

}



.el-button--cyan:focus,

.el-button--cyan:hover {

  background: #48D1CC;

  border-color: #48D1CC;

  color: #FFFFFF;

}



.el-button--cyan {

  background-color: #20B2AA;

  border-color: #20B2AA;

  color: #FFFFFF;

}



/* text color */

.text-navy {

    color: #1ab394;

@@ -199,3 +220,7 @@
    color: #fff!important;

    background: #42b983!important;

}


.top-right-btn {

    float: right;

}

 ruoyi-ui/src/utils/request.js

@@ -30,7 +30,7 @@
    // 未设置状态码则默认成功状态

    const code = res.data.code || 200;

    // 获取错误信息

    const message = errorCode[code] || res.data.msg || errorCode['default']

    const msg = errorCode[code] || res.data.msg || errorCode['default']

    if (code === 401) {

      MessageBox.confirm(

        '登录状态已过期，您可以继续留在该页面，或者重新登录',

@@ -47,13 +47,13 @@
      })

    } else if (code === 500) {

      Message({

        message: message,

        message: msg,

        type: 'error'

      })

      return Promise.reject(new Error(message))

      return Promise.reject(new Error(msg))

    } else if (code !== 200) {

      Notification.error({

        title: message

        title: msg

      })

      return Promise.reject('error')

    } else {

@@ -62,8 +62,18 @@
  },

  error => {

    console.log('err' + error)

    let { message } = error;

    if (message == "Network Error") {

      message = "后端接口连接异常";

    }

    else if (message.includes("timeout")) {

      message = "系统接口请求超时";

    }

    else if (message.includes("Request failed with status code")) {

      message = "系统接口" + message.substr(message.length - 3) + "异常";

    }

    Message({

      message: error.message,

      message: message,

      type: 'error',

      duration: 5 * 1000

    })


 ruoyi-ui/src/views/monitor/job/index.vue

@@ -1,6 +1,6 @@
<template>

  <div class="app-container">

    <el-form :model="queryParams" ref="queryForm" :inline="true" label-width="68px">

    <el-form :model="queryParams" ref="queryForm" :inline="true" v-show="showSearch" label-width="68px">

      <el-form-item label="任务名称" prop="jobName">

        <el-input

          v-model="queryParams.jobName"

@@ -31,7 +31,7 @@
        </el-select>

      </el-form-item>

      <el-form-item>

        <el-button type="primary" icon="el-icon-search" size="mini" @click="handleQuery">搜索</el-button>

        <el-button type="cyan" icon="el-icon-search" size="mini" @click="handleQuery">搜索</el-button>

        <el-button icon="el-icon-refresh" size="mini" @click="resetQuery">重置</el-button>

      </el-form-item>

    </el-form>

@@ -84,6 +84,14 @@
          v-hasPermi="['monitor:job:query']"

        >日志</el-button>

      </el-col>

      <div class="top-right-btn">

        <el-tooltip class="item" effect="dark" content="刷新" placement="top">

          <el-button size="mini" circle icon="el-icon-refresh" @click="handleQuery" />

        </el-tooltip>

        <el-tooltip class="item" effect="dark" :content="showSearch ? '隐藏搜索' : '显示搜索'" placement="top">

          <el-button size="mini" circle icon="el-icon-search" @click="showSearch=!showSearch" />

        </el-tooltip>

      </div>

    </el-row>



    <el-table v-loading="loading" :data="jobList" @selection-change="handleSelectionChange">

@@ -274,6 +282,8 @@
      single: true,

      // 非多个禁用

      multiple: true,

      // 显示搜索条件

      showSearch: true,

      // 总条数

      total: 0,

      // 定时任务表格数据


 ruoyi-ui/src/views/monitor/job/log.vue

@@ -1,6 +1,6 @@
<template>
  <div class="app-container">
    <el-form :model="queryParams" ref="queryForm" :inline="true" label-width="68px">
    <el-form :model="queryParams" ref="queryForm" :inline="true" v-show="showSearch" label-width="68px">
      <el-form-item label="任务名称" prop="jobName">
        <el-input
          v-model="queryParams.jobName"
@@ -56,7 +56,7 @@
        ></el-date-picker>
      </el-form-item>
      <el-form-item>
        <el-button type="primary" icon="el-icon-search" size="mini" @click="handleQuery">搜索</el-button>
        <el-button type="cyan" icon="el-icon-search" size="mini" @click="handleQuery">搜索</el-button>
        <el-button icon="el-icon-refresh" size="mini" @click="resetQuery">重置</el-button>
      </el-form-item>
    </el-form>
@@ -90,6 +90,14 @@
          v-hasPermi="['monitor:job:export']"
        >导出</el-button>
      </el-col>
      <div class="top-right-btn">
        <el-tooltip class="item" effect="dark" content="刷新" placement="top">
          <el-button size="mini" circle icon="el-icon-refresh" @click="handleQuery" />
        </el-tooltip>
        <el-tooltip class="item" effect="dark" :content="showSearch ? '隐藏搜索' : '显示搜索'" placement="top">
          <el-button size="mini" circle icon="el-icon-search" @click="showSearch=!showSearch" />
        </el-tooltip>
      </div>
    </el-row>

    <el-table v-loading="loading" :data="jobLogList" @selection-change="handleSelectionChange">
@@ -175,6 +183,8 @@
      ids: [],
      // 非多个禁用
      multiple: true,
      // 显示搜索条件
      showSearch: true,
      // 总条数
      total: 0,
      // 调度日志表格数据

 ruoyi-ui/src/views/monitor/logininfor/index.vue

@@ -1,6 +1,6 @@
<template>

  <div class="app-container">

    <el-form :model="queryParams" ref="queryForm" :inline="true" label-width="68px">

    <el-form :model="queryParams" ref="queryForm" :inline="true" v-show="showSearch" label-width="68px">

      <el-form-item label="登录地址" prop="ipaddr">

        <el-input

          v-model="queryParams.ipaddr"

@@ -50,7 +50,7 @@
        ></el-date-picker>

      </el-form-item>

      <el-form-item>

        <el-button type="primary" icon="el-icon-search" size="mini" @click="handleQuery">搜索</el-button>

        <el-button type="cyan" icon="el-icon-search" size="mini" @click="handleQuery">搜索</el-button>

        <el-button icon="el-icon-refresh" size="mini" @click="resetQuery">重置</el-button>

      </el-form-item>

    </el-form>

@@ -84,6 +84,14 @@
          v-hasPermi="['system:logininfor:export']"

        >导出</el-button>

      </el-col>

      <div class="top-right-btn">

        <el-tooltip class="item" effect="dark" content="刷新" placement="top">

          <el-button size="mini" circle icon="el-icon-refresh" @click="handleQuery" />

        </el-tooltip>

        <el-tooltip class="item" effect="dark" :content="showSearch ? '隐藏搜索' : '显示搜索'" placement="top">

          <el-button size="mini" circle icon="el-icon-search" @click="showSearch=!showSearch" />

        </el-tooltip>

      </div>

    </el-row>



    <el-table v-loading="loading" :data="list" @selection-change="handleSelectionChange">

@@ -126,6 +134,8 @@
      ids: [],

      // 非多个禁用

      multiple: true,

      // 显示搜索条件

      showSearch: true,

      // 总条数

      total: 0,

      // 表格数据


 ruoyi-ui/src/views/monitor/online/index.vue

@@ -20,7 +20,7 @@
        />

      </el-form-item>

      <el-form-item>

        <el-button type="primary" icon="el-icon-search" size="mini" @click="handleQuery">搜索</el-button>

        <el-button type="cyan" icon="el-icon-search" size="mini" @click="handleQuery">搜索</el-button>

        <el-button icon="el-icon-refresh" size="mini" @click="resetQuery">重置</el-button>

      </el-form-item>

    </el-form>


 ruoyi-ui/src/views/monitor/operlog/index.vue

@@ -1,6 +1,6 @@
<template>

  <div class="app-container">

    <el-form :model="queryParams" ref="queryForm" :inline="true" label-width="68px">

    <el-form :model="queryParams" ref="queryForm" :inline="true" v-show="showSearch" label-width="68px">

      <el-form-item label="系统模块" prop="title">

        <el-input

          v-model="queryParams.title"

@@ -66,7 +66,7 @@
        ></el-date-picker>

      </el-form-item>

      <el-form-item>

        <el-button type="primary" icon="el-icon-search" size="mini" @click="handleQuery">搜索</el-button>

        <el-button type="cyan" icon="el-icon-search" size="mini" @click="handleQuery">搜索</el-button>

        <el-button icon="el-icon-refresh" size="mini" @click="resetQuery">重置</el-button>

      </el-form-item>

    </el-form>

@@ -100,6 +100,14 @@
          v-hasPermi="['system:config:export']"

        >导出</el-button>

      </el-col>

      <div class="top-right-btn">

        <el-tooltip class="item" effect="dark" content="刷新" placement="top">

          <el-button size="mini" circle icon="el-icon-refresh" @click="handleQuery" />

        </el-tooltip>

        <el-tooltip class="item" effect="dark" :content="showSearch ? '隐藏搜索' : '显示搜索'" placement="top">

          <el-button size="mini" circle icon="el-icon-search" @click="showSearch=!showSearch" />

        </el-tooltip>

      </div>

    </el-row>



    <el-table v-loading="loading" :data="list" @selection-change="handleSelectionChange">

@@ -195,6 +203,8 @@
      ids: [],

      // 非多个禁用

      multiple: true,

      // 显示搜索条件

      showSearch: true,

      // 总条数

      total: 0,

      // 表格数据


 ruoyi-ui/src/views/system/config/index.vue

@@ -1,6 +1,6 @@
<template>

  <div class="app-container">

    <el-form :model="queryParams" ref="queryForm" :inline="true" label-width="68px">

    <el-form :model="queryParams" ref="queryForm" :inline="true" v-show="showSearch" label-width="68px">

      <el-form-item label="参数名称" prop="configName">

        <el-input

          v-model="queryParams.configName"

@@ -44,7 +44,7 @@
        ></el-date-picker>

      </el-form-item>

      <el-form-item>

        <el-button type="primary" icon="el-icon-search" size="mini" @click="handleQuery">搜索</el-button>

        <el-button type="cyan" icon="el-icon-search" size="mini" @click="handleQuery">搜索</el-button>

        <el-button icon="el-icon-refresh" size="mini" @click="resetQuery">重置</el-button>

      </el-form-item>

    </el-form>

@@ -97,6 +97,14 @@
          v-hasPermi="['system:config:remove']"

        >清理缓存</el-button>

      </el-col>

      <div class="top-right-btn">

        <el-tooltip class="item" effect="dark" content="刷新" placement="top">

          <el-button size="mini" circle icon="el-icon-refresh" @click="handleQuery" />

        </el-tooltip>

        <el-tooltip class="item" effect="dark" :content="showSearch ? '隐藏搜索' : '显示搜索'" placement="top">

          <el-button size="mini" circle icon="el-icon-search" @click="showSearch=!showSearch" />

        </el-tooltip>

      </div>

    </el-row>



    <el-table v-loading="loading" :data="configList" @selection-change="handleSelectionChange">

@@ -188,6 +196,8 @@
      single: true,

      // 非多个禁用

      multiple: true,

      // 显示搜索条件

      showSearch: true,

      // 总条数

      total: 0,

      // 参数表格数据


 ruoyi-ui/src/views/system/dept/index.vue

@@ -1,7 +1,7 @@
<template>

  <div class="app-container">

    <el-form :inline="true">

      <el-form-item label="部门名称">

    <el-form :model="queryParams" ref="queryForm" :inline="true" v-show="showSearch">

      <el-form-item label="部门名称" prop="deptName">

        <el-input

          v-model="queryParams.deptName"

          placeholder="请输入部门名称"

@@ -10,7 +10,7 @@
          @keyup.enter.native="handleQuery"

        />

      </el-form-item>

      <el-form-item label="状态">

      <el-form-item label="状态" prop="status">

        <el-select v-model="queryParams.status" placeholder="部门状态" clearable size="small">

          <el-option

            v-for="dict in statusOptions"

@@ -21,23 +21,30 @@
        </el-select>

      </el-form-item>

      <el-form-item>

        <el-button type="cyan" icon="el-icon-search" size="mini" @click="handleQuery">搜索</el-button>

        <el-button icon="el-icon-refresh" size="mini" @click="resetQuery">重置</el-button>

      </el-form-item>

    </el-form>



    <el-row :gutter="10" class="mb8">

      <el-col :span="1.5">

        <el-button

          class="filter-item"

          type="primary"

          icon="el-icon-search"

          size="mini"

          @click="handleQuery"

        >搜索</el-button>

        <el-button

          class="filter-item"

          type="primary"

          icon="el-icon-plus"

          size="mini"

          @click="handleAdd"

          v-hasPermi="['system:dept:add']"

        >新增</el-button>

      </el-form-item>

    </el-form>

      </el-col>

      <div class="top-right-btn">

        <el-tooltip class="item" effect="dark" content="刷新" placement="top">

          <el-button size="mini" circle icon="el-icon-refresh" @click="handleQuery" />

        </el-tooltip>

        <el-tooltip class="item" effect="dark" :content="showSearch ? '隐藏搜索' : '显示搜索'" placement="top">

          <el-button size="mini" circle icon="el-icon-search" @click="showSearch=!showSearch" />

        </el-tooltip>

      </div>

    </el-row>



    <el-table

      v-loading="loading"

@@ -149,6 +156,8 @@
    return {

      // 遮罩层

      loading: true,

      // 显示搜索条件

      showSearch: true,

      // 表格树数据

      deptList: [],

      // 部门树选项

@@ -247,6 +256,11 @@
    handleQuery() {

      this.getList();

    },

    /** 重置按钮操作 */

    resetQuery() {

      this.resetForm("queryForm");

      this.handleQuery();

    },

    /** 新增按钮操作 */

    handleAdd(row) {

      this.reset();


 ruoyi-ui/src/views/system/dict/data.vue

@@ -1,6 +1,6 @@
<template>

  <div class="app-container">

    <el-form :model="queryParams" ref="queryForm" :inline="true">

    <el-form :model="queryParams" ref="queryForm" v-show="showSearch" :inline="true">

      <el-form-item label="字典名称" prop="dictType">

        <el-select v-model="queryParams.dictType" size="small">

          <el-option

@@ -31,7 +31,7 @@
        </el-select>

      </el-form-item>

      <el-form-item>

        <el-button type="primary" icon="el-icon-search" size="mini" @click="handleQuery">搜索</el-button>

        <el-button type="cyan" icon="el-icon-search" size="mini" @click="handleQuery">搜索</el-button>

        <el-button icon="el-icon-refresh" size="mini" @click="resetQuery">重置</el-button>

      </el-form-item>

    </el-form>

@@ -75,6 +75,14 @@
          v-hasPermi="['system:dict:export']"

        >导出</el-button>

      </el-col>

      <div class="top-right-btn">

        <el-tooltip class="item" effect="dark" content="刷新" placement="top">

          <el-button size="mini" circle icon="el-icon-refresh" @click="handleQuery" />

        </el-tooltip>

        <el-tooltip class="item" effect="dark" :content="showSearch ? '隐藏搜索' : '显示搜索'" placement="top">

          <el-button size="mini" circle icon="el-icon-search" @click="showSearch=!showSearch" />

        </el-tooltip>

      </div>

    </el-row>



    <el-table v-loading="loading" :data="dataList" @selection-change="handleSelectionChange">

@@ -170,6 +178,8 @@
      single: true,

      // 非多个禁用

      multiple: true,

      // 显示搜索条件

      showSearch: true,

      // 总条数

      total: 0,

      // 字典表格数据


 ruoyi-ui/src/views/system/dict/index.vue

@@ -1,6 +1,6 @@
<template>

  <div class="app-container">

    <el-form :model="queryParams" ref="queryForm" :inline="true" label-width="68px">

    <el-form :model="queryParams" ref="queryForm" :inline="true" v-show="showSearch" label-width="68px">

      <el-form-item label="字典名称" prop="dictName">

        <el-input

          v-model="queryParams.dictName"

@@ -50,7 +50,7 @@
        ></el-date-picker>

      </el-form-item>

      <el-form-item>

        <el-button type="primary" icon="el-icon-search" size="mini" @click="handleQuery">搜索</el-button>

        <el-button type="cyan" icon="el-icon-search" size="mini" @click="handleQuery">搜索</el-button>

        <el-button icon="el-icon-refresh" size="mini" @click="resetQuery">重置</el-button>

      </el-form-item>

    </el-form>

@@ -103,6 +103,14 @@
          v-hasPermi="['system:dict:remove']"

        >清理缓存</el-button>

      </el-col>

      <div class="top-right-btn">

        <el-tooltip class="item" effect="dark" content="刷新" placement="top">

          <el-button size="mini" circle icon="el-icon-refresh" @click="handleQuery" />

        </el-tooltip>

        <el-tooltip class="item" effect="dark" :content="showSearch ? '隐藏搜索' : '显示搜索'" placement="top">

          <el-button size="mini" circle icon="el-icon-search" @click="showSearch=!showSearch" />

        </el-tooltip>

      </div>

    </el-row>



    <el-table v-loading="loading" :data="typeList" @selection-change="handleSelectionChange">

@@ -196,6 +204,8 @@
      single: true,

      // 非多个禁用

      multiple: true,

      // 显示搜索条件

      showSearch: true,

      // 总条数

      total: 0,

      // 字典表格数据


 ruoyi-ui/src/views/system/menu/index.vue

@@ -1,7 +1,7 @@
<template>

  <div class="app-container">

    <el-form :inline="true">

      <el-form-item label="菜单名称">

    <el-form :model="queryParams" ref="queryForm" :inline="true" v-show="showSearch">

      <el-form-item label="菜单名称" prop="menuName">

        <el-input

          v-model="queryParams.menuName"

          placeholder="请输入菜单名称"

@@ -10,7 +10,7 @@
          @keyup.enter.native="handleQuery"

        />

      </el-form-item>

      <el-form-item label="状态">

      <el-form-item label="状态" prop="status">

        <el-select v-model="queryParams.status" placeholder="菜单状态" clearable size="small">

          <el-option

            v-for="dict in statusOptions"

@@ -21,10 +21,30 @@
        </el-select>

      </el-form-item>

      <el-form-item>

        <el-button type="primary" icon="el-icon-search" size="mini" @click="handleQuery">搜索</el-button>

        <el-button type="primary" icon="el-icon-plus" size="mini" @click="handleAdd" v-hasPermi="['system:menu:add']">新增</el-button>

        <el-button type="cyan" icon="el-icon-search" size="mini" @click="handleQuery">搜索</el-button>

        <el-button icon="el-icon-refresh" size="mini" @click="resetQuery">重置</el-button>

      </el-form-item>

    </el-form>



    <el-row :gutter="10" class="mb8">

      <el-col :span="1.5">

        <el-button

          type="primary"

          icon="el-icon-plus"

          size="mini"

          @click="handleAdd"

          v-hasPermi="['system:menu:add']"

        >新增</el-button>

      </el-col>

      <div class="top-right-btn">

        <el-tooltip class="item" effect="dark" content="刷新" placement="top">

          <el-button size="mini" circle icon="el-icon-refresh" @click="handleQuery" />

        </el-tooltip>

        <el-tooltip class="item" effect="dark" :content="showSearch ? '隐藏搜索' : '显示搜索'" placement="top">

          <el-button size="mini" circle icon="el-icon-search" @click="showSearch=!showSearch" />

        </el-tooltip>

      </div>

    </el-row>



    <el-table

      v-loading="loading"

@@ -197,6 +217,8 @@
    return {

      // 遮罩层

      loading: true,

      // 显示搜索条件

      showSearch: true,

      // 菜单表格树数据

      menuList: [],

      // 菜单树选项

@@ -310,6 +332,11 @@
    handleQuery() {

      this.getList();

    },

    /** 重置按钮操作 */

    resetQuery() {

      this.resetForm("queryForm");

      this.handleQuery();

    },

    /** 新增按钮操作 */

    handleAdd(row) {

      this.reset();


 ruoyi-ui/src/views/system/notice/index.vue

@@ -1,6 +1,6 @@
<template>

  <div class="app-container">

    <el-form :model="queryParams" ref="queryForm" :inline="true" label-width="68px">

    <el-form :model="queryParams" ref="queryForm" :inline="true" v-show="showSearch" label-width="68px">

      <el-form-item label="公告标题" prop="noticeTitle">

        <el-input

          v-model="queryParams.noticeTitle"

@@ -30,7 +30,7 @@
        </el-select>

      </el-form-item>

      <el-form-item>

        <el-button type="primary" icon="el-icon-search" size="mini" @click="handleQuery">搜索</el-button>

        <el-button type="cyan" icon="el-icon-search" size="mini" @click="handleQuery">搜索</el-button>

        <el-button icon="el-icon-refresh" size="mini" @click="resetQuery">重置</el-button>

      </el-form-item>

    </el-form>

@@ -65,6 +65,14 @@
          v-hasPermi="['system:notice:remove']"

        >删除</el-button>

      </el-col>

      <div class="top-right-btn">

        <el-tooltip class="item" effect="dark" content="刷新" placement="top">

          <el-button size="mini" circle icon="el-icon-refresh" @click="handleQuery" />

        </el-tooltip>

        <el-tooltip class="item" effect="dark" :content="showSearch ? '隐藏搜索' : '显示搜索'" placement="top">

          <el-button size="mini" circle icon="el-icon-search" @click="showSearch=!showSearch" />

        </el-tooltip>

      </div>

    </el-row>



    <el-table v-loading="loading" :data="noticeList" @selection-change="handleSelectionChange">

@@ -190,6 +198,8 @@
      single: true,

      // 非多个禁用

      multiple: true,

      // 显示搜索条件

      showSearch: true,

      // 总条数

      total: 0,

      // 公告表格数据


 ruoyi-ui/src/views/system/post/index.vue

@@ -1,6 +1,6 @@
<template>

  <div class="app-container">

    <el-form :model="queryParams" ref="queryForm" :inline="true" label-width="68px">

    <el-form :model="queryParams" ref="queryForm" :inline="true" v-show="showSearch" label-width="68px">

      <el-form-item label="岗位编码" prop="postCode">

        <el-input

          v-model="queryParams.postCode"

@@ -30,7 +30,7 @@
        </el-select>

      </el-form-item>

      <el-form-item>

        <el-button type="primary" icon="el-icon-search" size="mini" @click="handleQuery">搜索</el-button>

        <el-button type="cyan" icon="el-icon-search" size="mini" @click="handleQuery">搜索</el-button>

        <el-button icon="el-icon-refresh" size="mini" @click="resetQuery">重置</el-button>

      </el-form-item>

    </el-form>

@@ -74,6 +74,14 @@
          v-hasPermi="['system:post:export']"

        >导出</el-button>

      </el-col>

      <div class="top-right-btn">

        <el-tooltip class="item" effect="dark" content="刷新" placement="top">

          <el-button size="mini" circle icon="el-icon-refresh" @click="handleQuery" />

        </el-tooltip>

        <el-tooltip class="item" effect="dark" :content="showSearch ? '隐藏搜索' : '显示搜索'" placement="top">

          <el-button size="mini" circle icon="el-icon-search" @click="showSearch=!showSearch" />

        </el-tooltip>

      </div>

    </el-row>



    <el-table v-loading="loading" :data="postList" @selection-change="handleSelectionChange">

@@ -164,6 +172,8 @@
      single: true,

      // 非多个禁用

      multiple: true,

      // 显示搜索条件

      showSearch: true,

      // 总条数

      total: 0,

      // 岗位表格数据


 ruoyi-ui/src/views/system/role/index.vue

@@ -1,6 +1,6 @@
<template>

  <div class="app-container">

    <el-form :model="queryParams" ref="queryForm" :inline="true">

    <el-form :model="queryParams" ref="queryForm" v-show="showSearch" :inline="true">

      <el-form-item label="角色名称" prop="roleName">

        <el-input

          v-model="queryParams.roleName"

@@ -50,7 +50,7 @@
        ></el-date-picker>

      </el-form-item>

      <el-form-item>

        <el-button type="primary" icon="el-icon-search" size="mini" @click="handleQuery">搜索</el-button>

        <el-button type="cyan" icon="el-icon-search" size="mini" @click="handleQuery">搜索</el-button>

        <el-button icon="el-icon-refresh" size="mini" @click="resetQuery">重置</el-button>

      </el-form-item>

    </el-form>

@@ -94,6 +94,14 @@
          v-hasPermi="['system:role:export']"

        >导出</el-button>

      </el-col>

      <div class="top-right-btn">

        <el-tooltip class="item" effect="dark" content="刷新" placement="top">

          <el-button size="mini" circle icon="el-icon-refresh" @click="handleQuery" />

        </el-tooltip>

        <el-tooltip class="item" effect="dark" :content="showSearch ? '隐藏搜索' : '显示搜索'" placement="top">

          <el-button size="mini" circle icon="el-icon-search" @click="showSearch=!showSearch" />

        </el-tooltip>

      </div>

    </el-row>



    <el-table v-loading="loading" :data="roleList" @selection-change="handleSelectionChange">

@@ -249,6 +257,8 @@
      single: true,

      // 非多个禁用

      multiple: true,

      // 显示搜索条件

      showSearch: true,

      // 总条数

      total: 0,

      // 角色表格数据


 ruoyi-ui/src/views/system/user/index.vue

@@ -27,7 +27,7 @@
      </el-col>

      <!--用户数据-->

      <el-col :span="20" :xs="24">

        <el-form :model="queryParams" ref="queryForm" :inline="true" label-width="68px">

        <el-form :model="queryParams" ref="queryForm" :inline="true" v-show="showSearch" label-width="68px">

          <el-form-item label="用户名称" prop="userName">

            <el-input

              v-model="queryParams.userName"

@@ -77,7 +77,7 @@
            ></el-date-picker>

          </el-form-item>

          <el-form-item>

            <el-button type="primary" icon="el-icon-search" size="mini" @click="handleQuery">搜索</el-button>

            <el-button type="cyan" icon="el-icon-search" size="mini" @click="handleQuery">搜索</el-button>

            <el-button icon="el-icon-refresh" size="mini" @click="resetQuery">重置</el-button>

          </el-form-item>

        </el-form>

@@ -130,6 +130,14 @@
              v-hasPermi="['system:user:export']"

            >导出</el-button>

          </el-col>

          <div class="top-right-btn">

            <el-tooltip class="item" effect="dark" content="刷新" placement="top">

              <el-button size="mini" circle icon="el-icon-refresh" @click="handleQuery" />

            </el-tooltip>

            <el-tooltip class="item" effect="dark" :content="showSearch ? '隐藏搜索' : '显示搜索'" placement="top">

              <el-button size="mini" circle icon="el-icon-search" @click="showSearch=!showSearch" />

            </el-tooltip>

          </div>

        </el-row>



        <el-table v-loading="loading" :data="userList" @selection-change="handleSelectionChange">

@@ -356,6 +364,8 @@
      single: true,

      // 非多个禁用

      multiple: true,

      // 显示搜索条件

      showSearch: true,

      // 总条数

      total: 0,

      // 用户表格数据


 ruoyi-ui/src/views/tool/gen/index.vue

@@ -1,6 +1,6 @@
<template>

  <div class="app-container">

    <el-form :model="queryParams" ref="queryForm" :inline="true" label-width="68px">

    <el-form :model="queryParams" ref="queryForm" :inline="true" v-show="showSearch" label-width="68px">

      <el-form-item label="表名称" prop="tableName">

        <el-input

          v-model="queryParams.tableName"

@@ -32,7 +32,7 @@
        ></el-date-picker>

      </el-form-item>

      <el-form-item>

        <el-button type="primary" icon="el-icon-search" size="mini" @click="handleQuery">搜索</el-button>

        <el-button type="cyan" icon="el-icon-search" size="mini" @click="handleQuery">搜索</el-button>

        <el-button icon="el-icon-refresh" size="mini" @click="resetQuery">重置</el-button>

      </el-form-item>

    </el-form>

@@ -76,6 +76,14 @@
          v-hasPermi="['tool:gen:remove']"

        >删除</el-button>

      </el-col>

      <div class="top-right-btn">

        <el-tooltip class="item" effect="dark" content="刷新" placement="top">

          <el-button size="mini" circle icon="el-icon-refresh" @click="handleQuery" />

        </el-tooltip>

        <el-tooltip class="item" effect="dark" :content="showSearch ? '隐藏搜索' : '显示搜索'" placement="top">

          <el-button size="mini" circle icon="el-icon-search" @click="showSearch=!showSearch" />

        </el-tooltip>

      </div>

    </el-row>



    <el-table v-loading="loading" :data="tableList" @selection-change="handleSelectionChange">

@@ -186,6 +194,8 @@
      single: true,

      // 非多个禁用

      multiple: true,

      // 显示搜索条件

      showSearch: true,

      // 总条数

      total: 0,

      // 表数据


 ruoyi-ui/vue.config.js

@@ -30,6 +30,7 @@
  devServer: {

    host: '0.0.0.0',

    port: port,

    open: true,

    proxy: {

      // detail: https://cli.vuejs.org/config/#devserver-proxy

      [process.env.VUE_APP_BASE_API]: {

@@ -68,17 +69,6 @@
      .loader('svg-sprite-loader')

      .options({

        symbolId: 'icon-[name]'

      })

      .end()



    // set preserveWhitespace

    config.module

      .rule('vue')

      .use('vue-loader')

      .loader('vue-loader')

      .tap(options => {

        options.compilerOptions.preserveWhitespace = true

        return options

      })

      .end()