新增通用方法简化模态/缓存使用

RuoYi

2021-09-23 258335cc6599dacd6130e1da988a403efe67219d

新增通用方法简化模态/缓存使用

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

@@ -448,13 +448,13 @@
#end

          if (this.form.${pkColumn.javaField} != null) {

            update${BusinessName}(this.form).then(response => {

              this.msgSuccess("修改成功");

              this.$modal.msgSuccess("修改成功");

              this.open = false;

              this.getList();

            });

          } else {

            add${BusinessName}(this.form).then(response => {

              this.msgSuccess("新增成功");

              this.$modal.msgSuccess("新增成功");

              this.open = false;

              this.getList();

            });

@@ -464,16 +464,12 @@
    },

    /** 删除按钮操作 */

    handleDelete(row) {

      this.$confirm('是否确认删除${functionName}编号为"' + row.${pkColumn.javaField} + '"的数据项?', "警告", {

          confirmButtonText: "确定",

          cancelButtonText: "取消",

          type: "warning"

        }).then(function() {

          return del${BusinessName}(row.${pkColumn.javaField});

        }).then(() => {

          this.getList();

          this.msgSuccess("删除成功");

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

      this.$modal.confirm('是否确认删除${functionName}编号为"' + row.${pkColumn.javaField} + '"的数据项？').then(function() {

        return del${BusinessName}(row.${pkColumn.javaField});

      }).then(() => {

        this.getList();

        this.$modal.msgSuccess("删除成功");

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

    }

  }

};


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

@@ -503,13 +503,13 @@
#end

          if (this.form.${pkColumn.javaField} != null) {

            update${BusinessName}(this.form).then(response => {

              this.msgSuccess("修改成功");

              this.$modal.msgSuccess("修改成功");

              this.open = false;

              this.getList();

            });

          } else {

            add${BusinessName}(this.form).then(response => {

              this.msgSuccess("新增成功");

              this.$modal.msgSuccess("新增成功");

              this.open = false;

              this.getList();

            });

@@ -520,16 +520,12 @@
    /** 删除按钮操作 */

    handleDelete(row) {

      const ${pkColumn.javaField}s = row.${pkColumn.javaField} || this.ids;

      this.$confirm('是否确认删除${functionName}编号为"' + ${pkColumn.javaField}s + '"的数据项?', "警告", {

          confirmButtonText: "确定",

          cancelButtonText: "取消",

          type: "warning"

        }).then(function() {

          return del${BusinessName}(${pkColumn.javaField}s);

        }).then(() => {

          this.getList();

          this.msgSuccess("删除成功");

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

      this.$modal.confirm('是否确认删除${functionName}编号为"' + ${pkColumn.javaField}s + '"的数据项？').then(function() {

        return del${BusinessName}(${pkColumn.javaField}s);

      }).then(() => {

        this.getList();

        this.$modal.msgSuccess("删除成功");

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

    },

#if($table.sub)

    /** ${subTable.functionName}序号 */

@@ -567,17 +563,13 @@
    /** 导出按钮操作 */

    handleExport() {

      const queryParams = this.queryParams;

      this.$confirm('是否确认导出所有${functionName}数据项?', "警告", {

          confirmButtonText: "确定",

          cancelButtonText: "取消",

          type: "warning"

        }).then(() => {

          this.exportLoading = true;

          return export${BusinessName}(queryParams);

        }).then(response => {

          this.download(response.msg);

          this.exportLoading = false;

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

      this.$modal.confirm('是否确认导出所有${functionName}数据项？').then(() => {

        this.exportLoading = true;

        return export${BusinessName}(queryParams);

      }).then(response => {

        this.download(response.msg);

        this.exportLoading = false;

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

    }

  }

};


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

@@ -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,12 +11,14 @@
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

import { getDicts } from "@/api/system/dict/data";

import { getConfigKey } from "@/api/system/config";

import { parseTime, resetForm, addDateRange, selectDictLabel, selectDictLabels, download, handleTree } from "@/utils/ruoyi";

// 分页组件

import Pagination from "@/components/Pagination";

// 自定义表格工具组件

import RightToolbar from "@/components/RightToolbar"

@@ -44,18 +46,6 @@
Vue.prototype.download = download

Vue.prototype.handleTree = handleTree



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.component('DictTag', DictTag)

Vue.component('Pagination', Pagination)

@@ -65,6 +55,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,31 +501,23 @@
    /** 删除按钮操作 */
    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() {
      const queryParams = this.queryParams;
      this.$confirm("是否确认导出所有定时任务数据项?", "警告", {
          confirmButtonText: "确定",
          cancelButtonText: "取消",
          type: "warning"
        }).then(() => {
          this.exportLoading = true;
          return exportJob(queryParams);
        }).then(response => {
          this.download(response.msg);
          this.exportLoading = false;
        }).catch(() => {});
      this.$modal.confirm('是否确认导出所有定时任务数据项？').then(() => {
        this.exportLoading = true;
        return exportJob(queryParams);
      }).then(response => {
        this.download(response.msg);
        this.exportLoading = false;
      }).catch(() => {});
    }
  }
};

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

@@ -275,44 +275,32 @@
    /** 删除按钮操作 */
    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() {
      const queryParams = this.queryParams;
      this.$confirm("是否确认导出所有调度日志数据项?", "警告", {
          confirmButtonText: "确定",
          cancelButtonText: "取消",
          type: "warning"
        }).then(() => {
          this.exportLoading = true;
          return exportJobLog(queryParams);
        }).then(response => {
          this.download(response.msg);
          this.exportLoading = false;
        }).catch(() => {});
      this.$modal.confirm('是否确认导出所有调度日志数据项？').then(() => {
        this.exportLoading = true;
        return exportJobLog(queryParams);
      }).then(response => {
        this.download(response.msg);
        this.exportLoading = false;
      }).catch(() => {});
    }
  }
};

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

@@ -198,44 +198,32 @@
    /** 删除按钮操作 */
    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() {
      const queryParams = this.queryParams;
      this.$confirm('是否确认导出所有操作日志数据项?', "警告", {
          confirmButtonText: "确定",
          cancelButtonText: "取消",
          type: "warning"
        }).then(() => {
          this.exportLoading = true;
          return exportLogininfor(queryParams);
        }).then(response => {
          this.download(response.msg);
          this.exportLoading = false;
        }).catch(() => {});
      this.$modal.confirm('是否确认导出所有操作日志数据项？').then(() => {
        this.exportLoading = true;
        return exportLogininfor(queryParams);
      }).then(response => {
        this.download(response.msg);
        this.exportLoading = false;
      }).catch(() => {});
    }
  }
};

 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,44 +285,32 @@
    /** 删除按钮操作 */
    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() {
      const queryParams = this.queryParams;
      this.$confirm('是否确认导出所有操作日志数据项?', "警告", {
          confirmButtonText: "确定",
          cancelButtonText: "取消",
          type: "warning"
        }).then(() => {
          this.exportLoading = true;
          return exportOperlog(queryParams);
        }).then(response => {
          this.download(response.msg);
          this.exportLoading = false;
        }).catch(() => {});
      this.$modal.confirm('是否确认导出所有操作日志数据项？').then(() => {
        this.exportLoading = true;
        return exportOperlog(queryParams);
      }).then(response => {
        this.download(response.msg);
        this.exportLoading = false;
      }).catch(() => {});
    }
  }
};

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

@@ -153,7 +153,7 @@
                </tr>

              </thead>

              <tbody v-if="server.sysFiles">

                <tr v-for="sysFile in server.sysFiles">

                <tr v-for="(sysFile, index) in sysFiles" :key="index">

                  <td><div class="cell">{{ sysFile.dirName }}</div></td>

                  <td><div class="cell">{{ sysFile.sysTypeName }}</div></td>

                  <td><div class="cell">{{ sysFile.typeName }}</div></td>

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

  data() {

    return {

      // 加载层信息

      loading: [],

      // 服务器信息

      server: []

    };

@@ -193,17 +191,12 @@
    getList() {

      getServer().then(response => {

        this.server = response.data;

        this.loading.close();

        this.$modal.closeLoading();

      });

    },

    // 打开加载层

    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/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,36 +325,28 @@
    /** 删除按钮操作 */
    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(() => {});
    },
    /** 导出按钮操作 */
    handleExport() {
      const queryParams = this.queryParams;
      this.$confirm('是否确认导出所有参数数据项?', "警告", {
          confirmButtonText: "确定",
          cancelButtonText: "取消",
          type: "warning"
        }).then(() => {
          this.exportLoading = true;
          return exportConfig(queryParams);
        }).then(response => {
          this.download(response.msg);
          this.exportLoading = false;
        }).catch(() => {});
      this.$modal.confirm('是否确认导出所有参数数据项？').then(() => {
        this.exportLoading = true;
        return exportConfig(queryParams);
      }).then(response => {
        this.download(response.msg);
        this.exportLoading = false;
      }).catch(() => {});
    },
    /** 刷新缓存按钮操作 */
    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,31 +371,23 @@
    /** 删除按钮操作 */

    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() {

      const queryParams = this.queryParams;

      this.$confirm('是否确认导出所有数据项?', "警告", {

          confirmButtonText: "确定",

          cancelButtonText: "取消",

          type: "warning"

        }).then(() => {

          this.exportLoading = true;

          return exportData(queryParams);

        }).then(response => {

          this.download(response.msg);

          this.exportLoading = false;

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

      this.$modal.confirm('是否确认导出所有数据项？').then(() => {

        this.exportLoading = true;

        return exportData(queryParams);

      }).then(response => {

        this.download(response.msg);

        this.exportLoading = false;

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

    }

  }

};


 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,36 +329,28 @@
    /** 删除按钮操作 */

    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() {

      const queryParams = this.queryParams;

      this.$confirm('是否确认导出所有类型数据项?', "警告", {

          confirmButtonText: "确定",

          cancelButtonText: "取消",

          type: "warning"

        }).then(() => {

          this.exportLoading = true;

          return exportType(queryParams);

        }).then(response => {

          this.download(response.msg);

          this.exportLoading = false;

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

      this.$modal.confirm('是否确认导出所有类型数据项？').then(() => {

        this.exportLoading = true;

        return exportType(queryParams);

      }).then(response => {

        this.download(response.msg);

        this.exportLoading = false;

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

    },

    /** 刷新缓存按钮操作 */

    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,31 +296,23 @@
    /** 删除按钮操作 */
    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() {
      const queryParams = this.queryParams;
      this.$confirm('是否确认导出所有岗位数据项?', "警告", {
          confirmButtonText: "确定",
          cancelButtonText: "取消",
          type: "warning"
        }).then(() => {
          this.exportLoading = true;
          return exportPost(queryParams);
        }).then(response => {
          this.download(response.msg);
          this.exportLoading = false;
        }).catch(() => {});
      this.$modal.confirm('是否确认导出所有岗位数据项？').then(() => {
        this.exportLoading = true;
        return exportPost(queryParams);
      }).then(response => {
        this.download(response.msg);
        this.exportLoading = false;
      }).catch(() => {});
    }
  }
};

 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,31 +604,23 @@
    /** 删除按钮操作 */

    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() {

      const queryParams = this.queryParams;

      this.$confirm('是否确认导出所有角色数据项?', "警告", {

          confirmButtonText: "确定",

          cancelButtonText: "取消",

          type: "warning"

        }).then(() => {

          this.exportLoading = true;

          return exportRole(queryParams);

        }).then(response => {

          this.download(response.msg);

          this.exportLoading = false;

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

      this.$modal.confirm('是否确认导出所有用户数据项？').then(() => {

        this.exportLoading = true;

        return exportRole(queryParams);

      }).then(response => {

        this.download(response.msg);

        this.exportLoading = false;

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

    }

  }

};


 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

@@ -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();

      });

    },


 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,31 +634,23 @@
    /** 删除按钮操作 */

    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() {

      const queryParams = this.queryParams;

      this.$confirm('是否确认导出所有用户数据项?', "警告", {

          confirmButtonText: "确定",

          cancelButtonText: "取消",

          type: "warning"

        }).then(() => {

          this.exportLoading = true;

          return exportUser(queryParams);

        }).then(response => {

          this.download(response.msg);

          this.exportLoading = false;

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

      this.$modal.confirm('是否确认导出所有用户数据项？').then(() => {

        this.exportLoading = true;

        return exportUser(queryParams);

      }).then(response => {

        this.download(response.msg);

        this.exportLoading = false;

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

    },

    /** 导入按钮操作 */

    handleImport() {


 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

@@ -110,7 +110,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);

@@ -128,7 +128,7 @@
          this.open = false;

          this.options.img = process.env.VUE_APP_BASE_API + response.imgUrl;

          store.commit('SET_AVATAR', this.options.img);

          this.msgSuccess("修改成功");

          this.$modal.msgSuccess("修改成功");

          this.visible = false;

        });

      });


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

@@ -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(() => {});
    }
  }