Merge branch 'master' of https://gitee.com/y_project/RuoYi-Vue into dev

疯狂的狮子li

2021-09-23 03b31652a2179f812a63af77077d826fdf05bc12

Merge branch 'master' of https://gitee.com/y_project/RuoYi-Vue into dev


 Conflicts:

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

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

	ruoyi-ui/src/layout/components/Settings/index.vue

	ruoyi-ui/src/main.js

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

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

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

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

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

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

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

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

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

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

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

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

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

	ruoyi-ui/src/views/system/user/profile/resetPwd.vue

	ruoyi-ui/src/views/system/user/profile/userAvatar.vue

	ruoyi-ui/src/views/system/user/profile/userInfo.vue

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

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

@@ -451,7 +451,7 @@
#end
          if (this.form.${pkColumn.javaField} != null) {
            update${BusinessName}(this.form).then(response => {
              this.msgSuccess("修改成功");
              this.#[[$modal]]#.msgSuccess("修改成功");
              this.open = false;
              this.getList();
            }).finally(() => {
@@ -459,7 +459,7 @@
            });
          } else {
            add${BusinessName}(this.form).then(response => {
              this.msgSuccess("新增成功");
              this.#[[$modal]]#.msgSuccess("新增成功");
              this.open = false;
              this.getList();
            }).finally(() => {
@@ -471,19 +471,15 @@
    },
    /** åˆ é™¤æŒ‰é’®æ“ä½œ */
    handleDelete(row) {
      this.$confirm('是否确认删除${functionName}编号为"' + row.${pkColumn.javaField} + '"的数据项?', "警告", {
          confirmButtonText: "确定",
          cancelButtonText: "取消",
          type: "warning"
        }).then(() => {
          this.loading = true;
          return del${BusinessName}(row.${pkColumn.javaField});
        }).then(() => {
          this.loading = false;
          this.getList();
          this.msgSuccess("删除成功");
      this.#[[$modal]]#.confirm('是否确认删除${functionName}编号为"' + row.${pkColumn.javaField} + '"的数据项？').then(() => {
        this.loading = true;
        return del${BusinessName}(row.${pkColumn.javaField});
      }).then(() => {
        this.loading = false;
        this.getList();
        this.#[[$modal]]#.msgSuccess("删除成功");
      }).finally(() => {
              this.loading = false;
        this.loading = false;
      });
    }
  }

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

@@ -506,7 +506,7 @@
#end
          if (this.form.${pkColumn.javaField} != null) {
            update${BusinessName}(this.form).then(response => {
              this.msgSuccess("修改成功");
              this.#[[$modal]]#.msgSuccess("修改成功");
              this.open = false;
              this.getList();
            }).finally(() => {
@@ -514,7 +514,7 @@
            });
          } else {
            add${BusinessName}(this.form).then(response => {
              this.msgSuccess("新增成功");
              this.#[[$modal]]#.msgSuccess("新增成功");
              this.open = false;
              this.getList();
            }).finally(() => {
@@ -527,19 +527,15 @@
    /** åˆ é™¤æŒ‰é’®æ“ä½œ */
    handleDelete(row) {
      const ${pkColumn.javaField}s = row.${pkColumn.javaField} || this.ids;
      this.$confirm('是否确认删除${functionName}编号为"' + ${pkColumn.javaField}s + '"的数据项?', "警告", {
          confirmButtonText: "确定",
          cancelButtonText: "取消",
          type: "warning"
        }).then(() => {
          this.loading = true;
          return del${BusinessName}(${pkColumn.javaField}s);
        }).then(() => {
          this.loading = false;
          this.getList();
          this.msgSuccess("删除成功");
      this.#[[$modal]]#.confirm('是否确认删除${functionName}编号为"' + ${pkColumn.javaField}s + '"的数据项？').then(() => {
        this.loading = true;
        return del${BusinessName}(${pkColumn.javaField}s);
      }).then(() => {
        this.loading = false;
        this.getList();
        this.#[[$modal]]#.msgSuccess("删除成功");
      }).finally(() => {
          this.loading = false;
        this.loading = false;
      });
    },
#if($table.sub)

 ruoyi-ui/src/layout/components/Settings/index.vue

@@ -41,7 +41,7 @@
      <el-divider/>

      <h3 class="drawer-title">系统布局配置</h3>

      
      <div class="drawer-item">
        <span>开启 TopNav</span>
        <el-switch v-model="topNav" class="drawer-switch" />
@@ -162,14 +162,8 @@
      this.sideTheme = val;
    },
    saveSetting() {
      const loading = this.$loading({
        lock: true,
        fullscreen: false,
        text: "正在保存到本地，请稍后...",
        spinner: "el-icon-loading",
        background: "rgba(0, 0, 0, 0.7)"
      });
      localStorage.setItem(
      this.$modal.loading("正在保存到本地，请稍后...");
      this.$cache.local.set(
        "layout-setting",
        `{
            "topNav":${this.topNav},
@@ -181,17 +175,11 @@
            "theme":"${this.theme}"
          }`
      );
      setTimeout(loading.close(), 1000)
      setTimeout(this.$modal.closeLoading(), 1000)
    },
    resetSetting() {
      this.$loading({
        lock: true,
        fullscreen: false,
        text: "正在清除设置缓存并刷新，请稍后...",
        spinner: "el-icon-loading",
        background: "rgba(0, 0, 0, 0.7)"
      });
      localStorage.removeItem("layout-setting")
      this.$modal.loading("正在清除设置缓存并刷新，请稍后...");
      this.$cache.local.remove("layout-setting")
      setTimeout("window.location.reload()", 1000)
    }
  }

 ruoyi-ui/src/main.js

@@ -11,6 +11,7 @@
import store from './store'
import router from './router'
import directive from './directive' //directive
import plugins from './plugins' // plugins

import './assets/icons' // icon
import './permission' // permission control
@@ -18,6 +19,7 @@
import { getConfigKey } from "@/api/system/config";
import { downLoadExcel } from "@/utils/download";
import { parseTime, resetForm, addDateRange, selectDictLabel, selectDictLabels, handleTree } from "@/utils/ruoyi";
// åˆ†é¡µç»„件
import Pagination from "@/components/Pagination";
// è‡ªå®šä¹‰è¡¨æ ¼å·¥å…·ç»„件
import RightToolbar from "@/components/RightToolbar"
@@ -42,20 +44,8 @@
Vue.prototype.addDateRange = addDateRange
Vue.prototype.selectDictLabel = selectDictLabel
Vue.prototype.selectDictLabels = selectDictLabels
Vue.prototype.handleTree = handleTree
Vue.prototype.downLoadExcel = downLoadExcel

Vue.prototype.msgSuccess = function (msg) {
  this.$message({ showClose: true, message: msg, type: "success" });
}

Vue.prototype.msgError = function (msg) {
  this.$message({ showClose: true, message: msg, type: "error" });
}

Vue.prototype.msgInfo = function (msg) {
  this.$message.info(msg);
}
Vue.prototype.handleTree = handleTree

// å…¨å±€ç»„件挂载
Vue.component('DictTag', DictTag)
@@ -66,6 +56,7 @@
Vue.component('ImageUpload', ImageUpload)

Vue.use(directive)
Vue.use(plugins)
Vue.use(VueMeta)
DictData.install()


 ruoyi-ui/src/plugins/cache.js

¶Ô±ÈÐÂÎļþ
@@ -0,0 +1,77 @@
const sessionCache = {

  set (key, value) {

    if (!sessionStorage) {

      return

    }

    if (key != null && value != null) {

      sessionStorage.setItem(key, value)

    }

  },

  get (key) {

    if (!sessionStorage) {

      return null

    }

    if (key == null) {

      return null

    }

    return sessionStorage.getItem(key)

  },

  setJSON (key, jsonValue) {

    if (jsonValue != null) {

      this.set(key, JSON.stringify(jsonValue))

    }

  },

  getJSON (key) {

    const value = this.get(key)

    if (value != null) {

      return JSON.parse(value)

    }

  },

  remove (key) {

    sessionStorage.removeItem(key);

  }

}

const localCache = {

  set (key, value) {

    if (!localStorage) {

      return

    }

    if (key != null && value != null) {

      localStorage.setItem(key, value)

    }

  },

  get (key) {

    if (!localStorage) {

      return null

    }

    if (key == null) {

      return null

    }

    return localStorage.getItem(key)

  },

  setJSON (key, jsonValue) {

    if (jsonValue != null) {

      this.set(key, JSON.stringify(jsonValue))

    }

  },

  getJSON (key) {

    const value = this.get(key)

    if (value != null) {

      return JSON.parse(value)

    }

  },

  remove (key) {

    localStorage.removeItem(key);

  }

}



export default {

  /**

   * ä¼šè¯çº§ç¼“å­˜

   */

  session: sessionCache,

  /**

   * æœ¬åœ°ç¼“å­˜

   */

  local: localCache

}


 ruoyi-ui/src/plugins/index.js

¶Ô±ÈÐÂÎļþ
@@ -0,0 +1,11 @@
import cache from './cache'

import modal from './modal'



export default {

  install(Vue) {

    // ç¼“存对象

    Vue.prototype.$cache = cache

    // æ¨¡æ€æ¡†å¯¹è±¡

    Vue.prototype.$modal = modal

  }

}


 ruoyi-ui/src/plugins/modal.js

¶Ô±ÈÐÂÎļþ
@@ -0,0 +1,75 @@
import { Message, MessageBox, Notification, Loading } from 'element-ui'



let loadingInstance;



export default {

  // æ¶ˆæ¯æç¤º

  msg(content) {

    Message.info(content)

  },

  // é”™è¯¯æ¶ˆæ¯

  msgError(content) {

    Message.error(content)

  },

  // æˆåŠŸæ¶ˆæ¯

  msgSuccess(content) {

    Message.success(content)

  },

  // è­¦å‘Šæ¶ˆæ¯

  msgWarning(content) {

    Message.warning(content)

  },

  // å¼¹å‡ºæç¤º

  alert(content) {

    MessageBox.alert(content, "系统提示")

  },

  // é”™è¯¯æç¤º

  alertError(content) {

    MessageBox.alert(content, "系统提示", { type: 'error' })

  },

  // æˆåŠŸæç¤º

  alertSuccess(content) {

    MessageBox.alert(content, "系统提示", { type: 'success' })

  },

  // è­¦å‘Šæç¤º

  alertWarning(content) {

    MessageBox.alert(content, "系统提示", { type: 'warning' })

  },

  // é€šçŸ¥æç¤º

  notify(content) {

    Notification.info(content)

  },

  // é”™è¯¯é€šçŸ¥

  notifyError(content) {

    Notification.error(content);

  },

  // æˆåŠŸé€šçŸ¥

  notifySuccess(content) {

    Notification.success(content)

  },

  // è­¦å‘Šé€šçŸ¥

  notifyWarning(content) {

    Notification.warning(content)

  },

  // ç¡®è®¤çª—体

  confirm(content) {

    return MessageBox.confirm(content, "系统提示", {

      confirmButtonText: '确定',

      cancelButtonText: '取消',

      type: "warning",

    })

  },

  // æ‰“开遮罩层

  loading(content) {

    loadingInstance = Loading.service({

      lock: true,

      text: content,

      spinner: "el-icon-loading",

      background: "rgba(0, 0, 0, 0.7)",

    })

  },

  // å…³é—­é®ç½©å±‚

  closeLoading() {

    loadingInstance.close();

  }

}


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

@@ -74,8 +74,6 @@
  name: "Server",

  data() {

    return {

      // åŠ è½½å±‚信息

      loading: [],

      // ç»Ÿè®¡å‘½ä»¤ä¿¡æ¯

      commandstats: null,

      // ä½¿ç”¨å†…å­˜

@@ -93,7 +91,7 @@
    getList() {

      getCache().then((response) => {

        this.cache = response.data;

        this.loading.close();

        this.$modal.closeLoading();



        this.commandstats = echarts.init(this.$refs.commandstats, "macarons");

        this.commandstats.setOption({

@@ -141,12 +139,7 @@
    },

    // æ‰“开加载层

    openLoading() {

      this.loading = this.$loading({

        lock: true,

        text: "拼命读取中",

        spinner: "el-icon-loading",

        background: "rgba(0, 0, 0, 0.7)",

      });

      this.$modal.loading("正在加载缓存监控数据，请稍后！");

    },

  },

};


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

@@ -240,7 +240,7 @@
      </div>
    </el-dialog>

    <el-dialog title="Cron表达式生成器" :visible.sync="openCron" append-to-body class="scrollbar"  destroy-on-close >
    <el-dialog title="Cron表达式生成器" :visible.sync="openCron" append-to-body destroy-on-close class="scrollbar">
      <crontab @hide="openCron=false" @fill="crontabFill" :expression="expression"></crontab>
    </el-dialog>

@@ -425,29 +425,21 @@
    // ä»»åŠ¡çŠ¶æ€ä¿®æ”¹
    handleStatusChange(row) {
      let text = row.status === "0" ? "启用" : "停用";
      this.$confirm('确认要"' + text + '""' + row.jobName + '"任务吗?', "警告", {
          confirmButtonText: "确定",
          cancelButtonText: "取消",
          type: "warning"
        }).then(function() {
          return changeJobStatus(row.jobId, row.status);
        }).then(() => {
          this.msgSuccess(text + "成功");
        }).catch(function() {
          row.status = row.status === "0" ? "1" : "0";
        });
      this.$modal.confirm('确认要"' + text + '""' + row.jobName + '"任务吗？').then(function() {
        return changeJobStatus(row.jobId, row.status);
      }).then(() => {
        this.$modal.msgSuccess(text + "成功");
      }).catch(function() {
        row.status = row.status === "0" ? "1" : "0";
      });
    },
    /* ç«‹å³æ‰§è¡Œä¸€æ¬¡ */
    handleRun(row) {
      this.$confirm('确认要立即执行一次"' + row.jobName + '"任务吗?', "警告", {
          confirmButtonText: "确定",
          cancelButtonText: "取消",
          type: "warning"
        }).then(function() {
          return runJob(row.jobId, row.jobGroup);
        }).then(() => {
          this.msgSuccess("执行成功");
        }).catch(() => {});
      this.$modal.confirm('确认要立即执行一次"' + row.jobName + '"任务吗？').then(function() {
        return runJob(row.jobId, row.jobGroup);
      }).then(() => {
        this.$modal.msgSuccess("执行成功");
      }).catch(() => {});
    },
    /** ä»»åŠ¡è¯¦ç»†ä¿¡æ¯ */
    handleView(row) {
@@ -492,13 +484,13 @@
        if (valid) {
          if (this.form.jobId != undefined) {
            updateJob(this.form).then(response => {
              this.msgSuccess("修改成功");
              this.$modal.msgSuccess("修改成功");
              this.open = false;
              this.getList();
            });
          } else {
            addJob(this.form).then(response => {
              this.msgSuccess("新增成功");
              this.$modal.msgSuccess("新增成功");
              this.open = false;
              this.getList();
            });
@@ -509,16 +501,12 @@
    /** åˆ é™¤æŒ‰é’®æ“ä½œ */
    handleDelete(row) {
      const jobIds = row.jobId || this.ids;
      this.$confirm('是否确认删除定时任务编号为"' + jobIds + '"的数据项?', "警告", {
          confirmButtonText: "确定",
          cancelButtonText: "取消",
          type: "warning"
        }).then(function() {
          return delJob(jobIds);
        }).then(() => {
          this.getList();
          this.msgSuccess("删除成功");
        }).catch(() => {});
      this.$modal.confirm('是否确认删除定时任务编号为"' + jobIds + '"的数据项？').then(function() {
        return delJob(jobIds);
      }).then(() => {
        this.getList();
        this.$modal.msgSuccess("删除成功");
      }).catch(() => {});
    },
    /** å¯¼å‡ºæŒ‰é’®æ“ä½œ */
    handleExport() {

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

@@ -275,29 +275,21 @@
    /** åˆ é™¤æŒ‰é’®æ“ä½œ */
    handleDelete(row) {
      const jobLogIds = this.ids;
      this.$confirm('是否确认删除调度日志编号为"' + jobLogIds + '"的数据项?', "警告", {
          confirmButtonText: "确定",
          cancelButtonText: "取消",
          type: "warning"
        }).then(function() {
          return delJobLog(jobLogIds);
        }).then(() => {
          this.getList();
          this.msgSuccess("删除成功");
        }).catch(() => {});
      this.$modal.confirm('是否确认删除调度日志编号为"' + jobLogIds + '"的数据项？').then(function() {
        return delJobLog(jobLogIds);
      }).then(() => {
        this.getList();
        this.$modal.msgSuccess("删除成功");
      }).catch(() => {});
    },
    /** æ¸…空按钮操作 */
    handleClean() {
      this.$confirm("是否确认清空所有调度日志数据项?", "警告", {
          confirmButtonText: "确定",
          cancelButtonText: "取消",
          type: "warning"
        }).then(function() {
          return cleanJobLog();
        }).then(() => {
          this.getList();
          this.msgSuccess("清空成功");
        }).catch(() => {});
      this.$modal.confirm('是否确认清空所有调度日志数据项？').then(function() {
        return cleanJobLog();
      }).then(() => {
        this.getList();
        this.$modal.msgSuccess("清空成功");
      }).catch(() => {});
    },
    /** å¯¼å‡ºæŒ‰é’®æ“ä½œ */
    handleExport() {

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

@@ -198,29 +198,21 @@
    /** åˆ é™¤æŒ‰é’®æ“ä½œ */
    handleDelete(row) {
      const infoIds = row.infoId || this.ids;
      this.$confirm('是否确认删除访问编号为"' + infoIds + '"的数据项?', "警告", {
          confirmButtonText: "确定",
          cancelButtonText: "取消",
          type: "warning"
        }).then(function() {
          return delLogininfor(infoIds);
        }).then(() => {
          this.getList();
          this.msgSuccess("删除成功");
        }).catch(() => {});
      this.$modal.confirm('是否确认删除访问编号为"' + infoIds + '"的数据项？').then(function() {
        return delLogininfor(infoIds);
      }).then(() => {
        this.getList();
        this.$modal.msgSuccess("删除成功");
      }).catch(() => {});
    },
    /** æ¸…空按钮操作 */
    handleClean() {
        this.$confirm('是否确认清空所有登录日志数据项?', "警告", {
          confirmButtonText: "确定",
          cancelButtonText: "取消",
          type: "warning"
        }).then(function() {
          return cleanLogininfor();
        }).then(() => {
          this.getList();
          this.msgSuccess("清空成功");
        }).catch(() => {});
      this.$modal.confirm('是否确认清空所有登录日志数据项？').then(function() {
        return cleanLogininfor();
      }).then(() => {
        this.getList();
        this.$modal.msgSuccess("清空成功");
      }).catch(() => {});
    },
    /** å¯¼å‡ºæŒ‰é’®æ“ä½œ */
    handleExport() {

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

@@ -111,16 +111,12 @@
    },
    /** å¼ºé€€æŒ‰é’®æ“ä½œ */
    handleForceLogout(row) {
      this.$confirm('是否确认强退名称为"' + row.userName + '"的数据项?', "警告", {
          confirmButtonText: "确定",
          cancelButtonText: "取消",
          type: "warning"
        }).then(function() {
          return forceLogout(row.tokenId);
        }).then(() => {
          this.getList();
          this.msgSuccess("强退成功");
        }).catch(() => {});
      this.$modal.confirm('是否确认强退名称为"' + row.userName + '"的数据项？').then(function() {
        return forceLogout(row.tokenId);
      }).then(() => {
        this.getList();
        this.$modal.msgSuccess("强退成功");
      }).catch(() => {});
    }
  }
};

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

@@ -285,29 +285,21 @@
    /** åˆ é™¤æŒ‰é’®æ“ä½œ */
    handleDelete(row) {
      const operIds = row.operId || this.ids;
      this.$confirm('是否确认删除日志编号为"' + operIds + '"的数据项?', "警告", {
          confirmButtonText: "确定",
          cancelButtonText: "取消",
          type: "warning"
        }).then(function() {
          return delOperlog(operIds);
        }).then(() => {
          this.getList();
          this.msgSuccess("删除成功");
        }).catch(() => {});
      this.$modal.confirm('是否确认删除日志编号为"' + operIds + '"的数据项？').then(function() {
        return delOperlog(operIds);
      }).then(() => {
        this.getList();
        this.$modal.msgSuccess("删除成功");
      }).catch(() => {});
    },
    /** æ¸…空按钮操作 */
    handleClean() {
        this.$confirm('是否确认清空所有操作日志数据项?', "警告", {
          confirmButtonText: "确定",
          cancelButtonText: "取消",
          type: "warning"
        }).then(function() {
          return cleanOperlog();
        }).then(() => {
          this.getList();
          this.msgSuccess("清空成功");
        }).catch(() => {});
      this.$modal.confirm('是否确认清空所有操作日志数据项？').then(function() {
        return cleanOperlog();
      }).then(() => {
        this.getList();
        this.$modal.msgSuccess("清空成功");
      }).catch(() => {});
    },
    /** å¯¼å‡ºæŒ‰é’®æ“ä½œ */
    handleExport() {

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

@@ -308,13 +308,13 @@
        if (valid) {
          if (this.form.configId != undefined) {
            updateConfig(this.form).then(response => {
              this.msgSuccess("修改成功");
              this.$modal.msgSuccess("修改成功");
              this.open = false;
              this.getList();
            });
          } else {
            addConfig(this.form).then(response => {
              this.msgSuccess("新增成功");
              this.$modal.msgSuccess("新增成功");
              this.open = false;
              this.getList();
            });
@@ -325,15 +325,11 @@
    /** åˆ é™¤æŒ‰é’®æ“ä½œ */
    handleDelete(row) {
      const configIds = row.configId || this.ids;
      this.$confirm('是否确认删除参数编号为"' + configIds + '"的数据项?', "警告", {
          confirmButtonText: "确定",
          cancelButtonText: "取消",
          type: "warning"
        }).then(function() {
      this.$modal.confirm('是否确认删除参数编号为"' + configIds + '"的数据项？').then(function() {
          return delConfig(configIds);
        }).then(() => {
          this.getList();
          this.msgSuccess("删除成功");
          this.$modal.msgSuccess("删除成功");
        }).catch(() => {});
    },
    /** å¯¼å‡ºæŒ‰é’®æ“ä½œ */
@@ -343,7 +339,7 @@
    /** åˆ·æ–°ç¼“存按钮操作 */
    handleRefreshCache() {
      refreshCache().then(() => {
        this.msgSuccess("刷新成功");
        this.$modal.msgSuccess("刷新成功");
      });
    }
  }

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

@@ -305,13 +305,13 @@
        if (valid) {
          if (this.form.deptId != undefined) {
            updateDept(this.form).then(response => {
              this.msgSuccess("修改成功");
              this.$modal.msgSuccess("修改成功");
              this.open = false;
              this.getList();
            });
          } else {
            addDept(this.form).then(response => {
              this.msgSuccess("新增成功");
              this.$modal.msgSuccess("新增成功");
              this.open = false;
              this.getList();
            });
@@ -321,16 +321,12 @@
    },
    /** åˆ é™¤æŒ‰é’®æ“ä½œ */
    handleDelete(row) {
      this.$confirm('是否确认删除名称为"' + row.deptName + '"的数据项?', "警告", {
          confirmButtonText: "确定",
          cancelButtonText: "取消",
          type: "warning"
        }).then(function() {
          return delDept(row.deptId);
        }).then(() => {
          this.getList();
          this.msgSuccess("删除成功");
        }).catch(() => {});
      this.$modal.confirm('是否确认删除名称为"' + row.deptName + '"的数据项？').then(function() {
        return delDept(row.deptId);
      }).then(() => {
        this.getList();
        this.$modal.msgSuccess("删除成功");
      }).catch(() => {});
    }
  }
};

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

@@ -354,13 +354,13 @@
        if (valid) {
          if (this.form.dictCode != undefined) {
            updateData(this.form).then(response => {
              this.msgSuccess("修改成功");
              this.$modal.msgSuccess("修改成功");
              this.open = false;
              this.getList();
            });
          } else {
            addData(this.form).then(response => {
              this.msgSuccess("新增成功");
              this.$modal.msgSuccess("新增成功");
              this.open = false;
              this.getList();
            });
@@ -371,16 +371,12 @@
    /** åˆ é™¤æŒ‰é’®æ“ä½œ */
    handleDelete(row) {
      const dictCodes = row.dictCode || this.ids;
      this.$confirm('是否确认删除字典编码为"' + dictCodes + '"的数据项?', "警告", {
          confirmButtonText: "确定",
          cancelButtonText: "取消",
          type: "warning"
        }).then(function() {
          return delData(dictCodes);
        }).then(() => {
          this.getList();
          this.msgSuccess("删除成功");
        }).catch(() => {});
      this.$modal.confirm('是否确认删除字典编码为"' + dictCodes + '"的数据项？').then(function() {
        return delData(dictCodes);
      }).then(() => {
        this.getList();
        this.$modal.msgSuccess("删除成功");
      }).catch(() => {});
    },
    /** å¯¼å‡ºæŒ‰é’®æ“ä½œ */
    handleExport() {

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

@@ -312,13 +312,13 @@
        if (valid) {
          if (this.form.dictId != undefined) {
            updateType(this.form).then(response => {
              this.msgSuccess("修改成功");
              this.$modal.msgSuccess("修改成功");
              this.open = false;
              this.getList();
            });
          } else {
            addType(this.form).then(response => {
              this.msgSuccess("新增成功");
              this.$modal.msgSuccess("新增成功");
              this.open = false;
              this.getList();
            });
@@ -329,16 +329,12 @@
    /** åˆ é™¤æŒ‰é’®æ“ä½œ */
    handleDelete(row) {
      const dictIds = row.dictId || this.ids;
      this.$confirm('是否确认删除字典编号为"' + dictIds + '"的数据项?', "警告", {
          confirmButtonText: "确定",
          cancelButtonText: "取消",
          type: "warning"
        }).then(function() {
          return delType(dictIds);
        }).then(() => {
          this.getList();
          this.msgSuccess("删除成功");
        }).catch(() => {});
      this.$modal.confirm('是否确认删除字典编号为"' + dictIds + '"的数据项？').then(function() {
        return delType(dictIds);
      }).then(() => {
        this.getList();
        this.$modal.msgSuccess("删除成功");
      }).catch(() => {});
    },
    /** å¯¼å‡ºæŒ‰é’®æ“ä½œ */
    handleExport() {
@@ -347,7 +343,7 @@
    /** åˆ·æ–°ç¼“存按钮操作 */
    handleRefreshCache() {
      refreshCache().then(() => {
        this.msgSuccess("刷新成功");
        this.$modal.msgSuccess("刷新成功");
      });
    }
  }

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

@@ -425,13 +425,13 @@
        if (valid) {
          if (this.form.menuId != undefined) {
            updateMenu(this.form).then(response => {
              this.msgSuccess("修改成功");
              this.$modal.msgSuccess("修改成功");
              this.open = false;
              this.getList();
            });
          } else {
            addMenu(this.form).then(response => {
              this.msgSuccess("新增成功");
              this.$modal.msgSuccess("新增成功");
              this.open = false;
              this.getList();
            });
@@ -441,16 +441,12 @@
    },
    /** åˆ é™¤æŒ‰é’®æ“ä½œ */
    handleDelete(row) {
      this.$confirm('是否确认删除名称为"' + row.menuName + '"的数据项?', "警告", {
          confirmButtonText: "确定",
          cancelButtonText: "取消",
          type: "warning"
        }).then(function() {
          return delMenu(row.menuId);
        }).then(() => {
          this.getList();
          this.msgSuccess("删除成功");
        }).catch(() => {});
      this.$modal.confirm('是否确认删除名称为"' + row.menuName + '"的数据项？').then(function() {
        return delMenu(row.menuId);
      }).then(() => {
        this.getList();
        this.$modal.msgSuccess("删除成功");
      }).catch(() => {});
    }
  }
};

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

@@ -285,13 +285,13 @@
        if (valid) {
          if (this.form.noticeId != undefined) {
            updateNotice(this.form).then(response => {
              this.msgSuccess("修改成功");
              this.$modal.msgSuccess("修改成功");
              this.open = false;
              this.getList();
            });
          } else {
            addNotice(this.form).then(response => {
              this.msgSuccess("新增成功");
              this.$modal.msgSuccess("新增成功");
              this.open = false;
              this.getList();
            });
@@ -302,16 +302,12 @@
    /** åˆ é™¤æŒ‰é’®æ“ä½œ */
    handleDelete(row) {
      const noticeIds = row.noticeId || this.ids
      this.$confirm('是否确认删除公告编号为"' + noticeIds + '"的数据项?', "警告", {
          confirmButtonText: "确定",
          cancelButtonText: "取消",
          type: "warning"
        }).then(function() {
          return delNotice(noticeIds);
        }).then(() => {
          this.getList();
          this.msgSuccess("删除成功");
        }).catch(() => {});
      this.$modal.confirm('是否确认删除公告编号为"' + noticeIds + '"的数据项？').then(function() {
        return delNotice(noticeIds);
      }).then(() => {
        this.getList();
        this.$modal.msgSuccess("删除成功");
      }).catch(() => {});
    }
  }
};

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

@@ -279,13 +279,13 @@
        if (valid) {
          if (this.form.postId != undefined) {
            updatePost(this.form).then(response => {
              this.msgSuccess("修改成功");
              this.$modal.msgSuccess("修改成功");
              this.open = false;
              this.getList();
            });
          } else {
            addPost(this.form).then(response => {
              this.msgSuccess("新增成功");
              this.$modal.msgSuccess("新增成功");
              this.open = false;
              this.getList();
            });
@@ -296,16 +296,12 @@
    /** åˆ é™¤æŒ‰é’®æ“ä½œ */
    handleDelete(row) {
      const postIds = row.postId || this.ids;
      this.$confirm('是否确认删除岗位编号为"' + postIds + '"的数据项?', "警告", {
          confirmButtonText: "确定",
          cancelButtonText: "取消",
          type: "warning"
        }).then(function() {
          return delPost(postIds);
        }).then(() => {
          this.getList();
          this.msgSuccess("删除成功");
        }).catch(() => {});
      this.$modal.confirm('是否确认删除岗位编号为"' + postIds + '"的数据项？').then(function() {
        return delPost(postIds);
      }).then(() => {
        this.getList();
        this.$modal.msgSuccess("删除成功");
      }).catch(() => {});
    },
    /** å¯¼å‡ºæŒ‰é’®æ“ä½œ */
    handleExport() {

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

@@ -178,30 +178,22 @@
    /** å–消授权按钮操作 */

    cancelAuthUser(row) {

      const roleId = this.queryParams.roleId;

      this.$confirm('确认要取消该用户"' + row.userName + '"角色吗？', "警告", {

        confirmButtonText: "确定",

        cancelButtonText: "取消",

        type: "warning"

      }).then(function() {

      this.$modal.confirm('确认要取消该用户"' + row.userName + '"角色吗？').then(function() {

        return authUserCancel({ userId: row.userId, roleId: roleId });

      }).then(() => {

        this.getList();

        this.msgSuccess("取消授权成功");

        this.$modal.msgSuccess("取消授权成功");

      }).catch(() => {});

    },

    /** æ‰¹é‡å–消授权按钮操作 */

    cancelAuthUserAll(row) {

      const roleId = this.queryParams.roleId;

      const userIds = this.userIds.join(",");

      this.$confirm('是否取消选中用户授权数据项?', "警告", {

          confirmButtonText: "确定",

          cancelButtonText: "取消",

          type: "warning"

      }).then(() => {

          return authUserCancelAll({ roleId: roleId, userIds: userIds });

      this.$modal.confirm('是否取消选中用户授权数据项？').then(function() {

        return authUserCancelAll({ roleId: roleId, userIds: userIds });

      }).then(() => {

        this.getList();

        this.msgSuccess("取消授权成功");

        this.$modal.msgSuccess("取消授权成功");

      }).catch(() => {});

    }

  }


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

@@ -413,17 +413,13 @@
    // è§’色状态修改
    handleStatusChange(row) {
      let text = row.status === "0" ? "启用" : "停用";
      this.$confirm('确认要"' + text + '""' + row.roleName + '"角色吗?', "警告", {
          confirmButtonText: "确定",
          cancelButtonText: "取消",
          type: "warning"
        }).then(function() {
          return changeRoleStatus(row.roleId, row.status);
        }).then(() => {
          this.msgSuccess(text + "成功");
        }).catch(function() {
          row.status = row.status === "0" ? "1" : "0";
        });
      this.$modal.confirm('确认要"' + text + '""' + row.roleName + '"角色吗？').then(function() {
        return changeRoleStatus(row.roleId, row.status);
      }).then(() => {
        this.$modal.msgSuccess(text + "成功");
      }).catch(function() {
        row.status = row.status === "0" ? "1" : "0";
      });
    },
    // å–消按钮
    cancel() {
@@ -579,14 +575,14 @@
          if (this.form.roleId != undefined) {
            this.form.menuIds = this.getMenuAllCheckedKeys();
            updateRole(this.form).then(response => {
              this.msgSuccess("修改成功");
              this.$modal.msgSuccess("修改成功");
              this.open = false;
              this.getList();
            });
          } else {
            this.form.menuIds = this.getMenuAllCheckedKeys();
            addRole(this.form).then(response => {
              this.msgSuccess("新增成功");
              this.$modal.msgSuccess("新增成功");
              this.open = false;
              this.getList();
            });
@@ -599,7 +595,7 @@
      if (this.form.roleId != undefined) {
        this.form.deptIds = this.getDeptAllCheckedKeys();
        dataScope(this.form).then(response => {
          this.msgSuccess("修改成功");
          this.$modal.msgSuccess("修改成功");
          this.openDataScope = false;
          this.getList();
        });
@@ -608,16 +604,12 @@
    /** åˆ é™¤æŒ‰é’®æ“ä½œ */
    handleDelete(row) {
      const roleIds = row.roleId || this.ids;
      this.$confirm('是否确认删除角色编号为"' + roleIds + '"的数据项?', "警告", {
          confirmButtonText: "确定",
          cancelButtonText: "取消",
          type: "warning"
        }).then(function() {
          return delRole(roleIds);
        }).then(() => {
          this.getList();
          this.msgSuccess("删除成功");
        }).catch(() => {});
      this.$modal.confirm('是否确认删除角色编号为"' + roleIds + '"的数据项？').then(function() {
        return delRole(roleIds);
      }).then(() => {
        this.getList();
        this.$modal.msgSuccess("删除成功");
      }).catch(() => {});
    },
    /** å¯¼å‡ºæŒ‰é’®æ“ä½œ */
    handleExport() {

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

@@ -124,7 +124,7 @@
      const roleId = this.queryParams.roleId;

      const userIds = this.userIds.join(",");

      authUserSelectAll({ roleId: roleId, userIds: userIds }).then(res => {

        this.msgSuccess(res.msg);

        this.$modal.msgSuccess(res.msg);

        if (res.code === 200) {

          this.visible = false;

          this.$emit("ok");


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

@@ -33,7 +33,7 @@
        </template>
      </el-table-column>
    </el-table>

    
    <pagination v-show="total>0" :total="total" :page.sync="pageNum" :limit.sync="pageSize" />

    <el-form label-width="100px">
@@ -103,7 +103,7 @@
      const userId = this.form.userId;
      const roleIds = this.roleIds.join(",");
      updateAuthRole({ userId: userId, roleIds: roleIds }).then((response) => {
        this.msgSuccess("授权成功");
        this.$modal.msgSuccess("授权成功");
        this.close();
      });
    },
@@ -114,4 +114,4 @@
    },
  },
};
</script>
</script>

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

@@ -503,17 +503,13 @@
    // ç”¨æˆ·çŠ¶æ€ä¿®æ”¹
    handleStatusChange(row) {
      let text = row.status === "0" ? "启用" : "停用";
      this.$confirm('确认要"' + text + '""' + row.userName + '"用户吗?', "警告", {
          confirmButtonText: "确定",
          cancelButtonText: "取消",
          type: "warning"
        }).then(function() {
          return changeUserStatus(row.userId, row.status);
        }).then(() => {
          this.msgSuccess(text + "成功");
        }).catch(function() {
          row.status = row.status === "0" ? "1" : "0";
        });
      this.$modal.confirm('确认要"' + text + '""' + row.userName + '"用户吗？').then(function() {
        return changeUserStatus(row.userId, row.status);
      }).then(() => {
        this.$modal.msgSuccess(text + "成功");
      }).catch(function() {
        row.status = row.status === "0" ? "1" : "0";
      });
    },
    // å–消按钮
    cancel() {
@@ -606,7 +602,7 @@
        inputErrorMessage: "用户密码长度必须介于 5 å’Œ 20 ä¹‹é—´",
      }).then(({ value }) => {
          resetUserPwd(row.userId, value).then(response => {
            this.msgSuccess("修改成功，新密码是：" + value);
            this.$modal.msgSuccess("修改成功，新密码是：" + value);
          });
        }).catch(() => {});
    },
@@ -621,13 +617,13 @@
        if (valid) {
          if (this.form.userId != undefined) {
            updateUser(this.form).then(response => {
              this.msgSuccess("修改成功");
              this.$modal.msgSuccess("修改成功");
              this.open = false;
              this.getList();
            });
          } else {
            addUser(this.form).then(response => {
              this.msgSuccess("新增成功");
              this.$modal.msgSuccess("新增成功");
              this.open = false;
              this.getList();
            });
@@ -638,16 +634,12 @@
    /** åˆ é™¤æŒ‰é’®æ“ä½œ */
    handleDelete(row) {
      const userIds = row.userId || this.ids;
      this.$confirm('是否确认删除用户编号为"' + userIds + '"的数据项?', "警告", {
          confirmButtonText: "确定",
          cancelButtonText: "取消",
          type: "warning"
        }).then(function() {
          return delUser(userIds);
        }).then(() => {
          this.getList();
          this.msgSuccess("删除成功");
        }).catch(() => {});
      this.$modal.confirm('是否确认删除用户编号为"' + userIds + '"的数据项？').then(function() {
        return delUser(userIds);
      }).then(() => {
        this.getList();
        this.$modal.msgSuccess("删除成功");
      }).catch(() => {});
    },
    /** å¯¼å‡ºæŒ‰é’®æ“ä½œ */
    handleExport() {

 ruoyi-ui/src/views/system/user/profile/resetPwd.vue

@@ -57,7 +57,7 @@
        if (valid) {
          updateUserPwd(this.user.oldPassword, this.user.newPassword).then(
            response => {
              this.msgSuccess("修改成功");
              this.$modal.msgSuccess("修改成功");
            }
          );
        }

 ruoyi-ui/src/views/system/user/profile/userAvatar.vue

@@ -111,7 +111,7 @@
    // ä¸Šä¼ é¢„处理
    beforeUpload(file) {
      if (file.type.indexOf("image/") == -1) {
        this.msgError("文件格式错误，请上传图片类型,如：JPG，PNG后缀的文件。");
        this.$modal.msgError("文件格式错误，请上传图片类型,如：JPG，PNG后缀的文件。");
      } else {
        const reader = new FileReader();
        reader.readAsDataURL(file);
@@ -131,7 +131,7 @@
          this.open = false;
          this.options.img = response.data.imgUrl;
          store.commit('SET_AVATAR', this.options.img);
          this.msgSuccess("修改成功");
          this.$modal.msgSuccess("修改成功");
          this.visible = false;
        });
      });
@@ -172,4 +172,4 @@
  line-height: 110px;
  border-radius: 50%;
}
</style>
</style>

 ruoyi-ui/src/views/system/user/profile/userInfo.vue

@@ -2,7 +2,7 @@
  <el-form ref="form" :model="user" :rules="rules" label-width="80px">
    <el-form-item label="用户昵称" prop="nickName">
      <el-input v-model="user.nickName" maxlength="30" />
    </el-form-item>
    </el-form-item> 
    <el-form-item label="手机号码" prop="phonenumber">
      <el-input v-model="user.phonenumber" maxlength="11" />
    </el-form-item>
@@ -62,7 +62,7 @@
      this.$refs["form"].validate(valid => {
        if (valid) {
          updateUserProfile(this.user).then(response => {
            this.msgSuccess("修改成功");
            this.$modal.msgSuccess("修改成功");
          });
        }
      });

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

@@ -192,13 +192,13 @@
            parentMenuId: genTable.parentMenuId
          };
          updateGenTable(genTable).then(res => {
            this.msgSuccess(res.msg);
            this.$modal.msgSuccess(res.msg);
            if (res.code === 200) {
              this.close();
            }
          });
        } else {
          this.msgError("表单校验未通过，请重新检查提交内容");
          this.$modal.msgError("表单校验未通过，请重新检查提交内容");
        }
      });
    },

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

@@ -104,8 +104,13 @@
    },
    /** å¯¼å…¥æŒ‰é’®æ“ä½œ */
    handleImportTable() {
      importTable({ tables: this.tables.join(",") }).then(res => {
        this.msgSuccess(res.msg);
      const tableNames = this.tables.join(",");
      if (tableNames == "") {
        this.$modal.msgError("请选择要导入的表");
        return;
      }
      importTable({ tables: tableNames }).then(res => {
        this.$modal.msgSuccess(res.msg);
        if (res.code === 200) {
          this.visible = false;
          this.$emit("ok");

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

@@ -262,12 +262,12 @@
    handleGenTable(row) {
      const tableNames = row.tableName || this.tableNames;
      if (tableNames == "") {
        this.msgError("请选择要生成的数据");
        this.$modal.msgError("请选择要生成的数据");
        return;
      }
      if(row.genType === "1") {
        genCode(row.tableName).then(response => {
          this.msgSuccess("成功生成到自定义路径：" + row.genPath);
          this.$modal.msgSuccess("成功生成到自定义路径：" + row.genPath);
        });
      } else {
        downLoadZip("/tool/gen/batchGenCode?tables=" + tableNames, "ruoyi");
@@ -276,14 +276,10 @@
    /** åŒæ­¥æ•°æ®åº“操作 */
    handleSynchDb(row) {
      const tableName = row.tableName;
      this.$confirm('确认要强制同步"' + tableName + '"表结构吗？', "警告", {
        confirmButtonText: "确定",
        cancelButtonText: "取消",
        type: "warning"
      }).then(function() {
          return synchDb(tableName);
      this.$modal.confirm('确认要强制同步"' + tableName + '"表结构吗？').then(function() {
        return synchDb(tableName);
      }).then(() => {
          this.msgSuccess("同步成功");
        this.$modal.msgSuccess("同步成功");
      }).catch(() => {});
    },
    /** æ‰“开导入表弹窗 */
@@ -326,15 +322,11 @@
    /** åˆ é™¤æŒ‰é’®æ“ä½œ */
    handleDelete(row) {
      const tableIds = row.tableId || this.ids;
      this.$confirm('是否确认删除表编号为"' + tableIds + '"的数据项?', "警告", {
        confirmButtonText: "确定",
        cancelButtonText: "取消",
        type: "warning"
      }).then(function() {
          return delTable(tableIds);
      this.$modal.confirm('是否确认删除表编号为"' + tableIds + '"的数据项？').then(function() {
        return delTable(tableIds);
      }).then(() => {
          this.getList();
          this.msgSuccess("删除成功");
        this.getList();
        this.$modal.msgSuccess("删除成功");
      }).catch(() => {});
    }
  }