Song/xkrs_ms
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

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

Browse Source
This commit is contained in:
RuoYi 2021-09-23 09:38:16 +08:00
parent 3b42abef44
commit 258335cc65
32 changed files with 447 additions and 466 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -448,13 +448,13 @@ export default {
#end #end
if (this.form.${pkColumn.javaField} != null) { if (this.form.${pkColumn.javaField} != null) {
update${BusinessName}(this.form).then(response => { update${BusinessName}(this.form).then(response => {
this.msgSuccess("修改成功"); this.$modal.msgSuccess("修改成功");
this.open = false; this.open = false;
this.getList(); this.getList();
}); });
} else { } else {
add${BusinessName}(this.form).then(response => { add${BusinessName}(this.form).then(response => {
this.msgSuccess("新增成功"); this.$modal.msgSuccess("新增成功");
this.open = false; this.open = false;
this.getList(); this.getList();
}); });
@ -464,16 +464,12 @@ export default {
}, },
/** 删除按钮操作 */ /** 删除按钮操作 */
handleDelete(row) { handleDelete(row) {
this.$confirm('是否确认删除${functionName}编号为"' + row.${pkColumn.javaField} + '"的数据项?', "警告", { this.$modal.confirm('是否确认删除${functionName}编号为"' + row.${pkColumn.javaField} + '"的数据项？').then(function() {
confirmButtonText: "确定", return del${BusinessName}(row.${pkColumn.javaField});
cancelButtonText: "取消", }).then(() => {
type: "warning" this.getList();
}).then(function() { this.$modal.msgSuccess("删除成功");
return del${BusinessName}(row.${pkColumn.javaField}); }).catch(() => {});
}).then(() => {
this.getList();
this.msgSuccess("删除成功");
}).catch(() => {});
} }
} }
}; };

38
ruoyi-generator/src/main/resources/vm/vue/index.vue.vm
View File

@ -503,13 +503,13 @@ export default {
#end #end
if (this.form.${pkColumn.javaField} != null) { if (this.form.${pkColumn.javaField} != null) {
update${BusinessName}(this.form).then(response => { update${BusinessName}(this.form).then(response => {
this.msgSuccess("修改成功"); this.$modal.msgSuccess("修改成功");
this.open = false; this.open = false;
this.getList(); this.getList();
}); });
} else { } else {
add${BusinessName}(this.form).then(response => { add${BusinessName}(this.form).then(response => {
this.msgSuccess("新增成功"); this.$modal.msgSuccess("新增成功");
this.open = false; this.open = false;
this.getList(); this.getList();
}); });
@ -520,16 +520,12 @@ export default {
/** 删除按钮操作 */ /** 删除按钮操作 */
handleDelete(row) { handleDelete(row) {
const ${pkColumn.javaField}s = row.${pkColumn.javaField} || this.ids; const ${pkColumn.javaField}s = row.${pkColumn.javaField} || this.ids;
this.$confirm('是否确认删除${functionName}编号为"' + ${pkColumn.javaField}s + '"的数据项?', "警告", { this.$modal.confirm('是否确认删除${functionName}编号为"' + ${pkColumn.javaField}s + '"的数据项？').then(function() {
confirmButtonText: "确定", return del${BusinessName}(${pkColumn.javaField}s);
cancelButtonText: "取消", }).then(() => {
type: "warning" this.getList();
}).then(function() { this.$modal.msgSuccess("删除成功");
return del${BusinessName}(${pkColumn.javaField}s); }).catch(() => {});
}).then(() => {
this.getList();
this.msgSuccess("删除成功");
}).catch(() => {});
}, },
#if($table.sub) #if($table.sub)
/** ${subTable.functionName}序号 */ /** ${subTable.functionName}序号 */
@ -567,17 +563,13 @@ export default {
/** 导出按钮操作 */ /** 导出按钮操作 */
handleExport() { handleExport() {
const queryParams = this.queryParams; const queryParams = this.queryParams;
this.$confirm('是否确认导出所有${functionName}数据项?', "警告", { this.$modal.confirm('是否确认导出所有${functionName}数据项？').then(() => {
confirmButtonText: "确定", this.exportLoading = true;
cancelButtonText: "取消", return export${BusinessName}(queryParams);
type: "warning" }).then(response => {
}).then(() => { this.download(response.msg);
this.exportLoading = true; this.exportLoading = false;
return export${BusinessName}(queryParams); }).catch(() => {});
}).then(response => {
this.download(response.msg);
this.exportLoading = false;
}).catch(() => {});
} }
} }
}; };

22
ruoyi-ui/src/layout/components/Settings/index.vue
View File

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

15
ruoyi-ui/src/main.js
View File

@ -11,12 +11,14 @@ import App from './App'
import store from './store' import store from './store'
import router from './router' import router from './router'
import directive from './directive' //directive import directive from './directive' //directive
import plugins from './plugins' // plugins
import './assets/icons' // icon import './assets/icons' // icon
import './permission' // permission control import './permission' // permission control
import { getDicts } from "@/api/system/dict/data"; import { getDicts } from "@/api/system/dict/data";
import { getConfigKey } from "@/api/system/config"; import { getConfigKey } from "@/api/system/config";
import { parseTime, resetForm, addDateRange, selectDictLabel, selectDictLabels, download, handleTree } from "@/utils/ruoyi"; import { parseTime, resetForm, addDateRange, selectDictLabel, selectDictLabels, download, handleTree } from "@/utils/ruoyi";
// 分页组件
import Pagination from "@/components/Pagination"; import Pagination from "@/components/Pagination";
// 自定义表格工具组件 // 自定义表格工具组件
import RightToolbar from "@/components/RightToolbar" import RightToolbar from "@/components/RightToolbar"
@ -44,18 +46,6 @@ Vue.prototype.selectDictLabels = selectDictLabels
Vue.prototype.download = download Vue.prototype.download = download
Vue.prototype.handleTree = handleTree 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('DictTag', DictTag)
Vue.component('Pagination', Pagination) Vue.component('Pagination', Pagination)
@ -65,6 +55,7 @@ Vue.component('FileUpload', FileUpload)
Vue.component('ImageUpload', ImageUpload) Vue.component('ImageUpload', ImageUpload)
Vue.use(directive) Vue.use(directive)
Vue.use(plugins)
Vue.use(VueMeta) Vue.use(VueMeta)
DictData.install() DictData.install()

77
ruoyi-ui/src/plugins/cache.js Normal file
View File

@ -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
}

11
ruoyi-ui/src/plugins/index.js Normal file
View File

@ -0,0 +1,11 @@
import cache from './cache'
import modal from './modal'
export default {
install(Vue) {
// 缓存对象
Vue.prototype.$cache = cache
// 模态框对象
Vue.prototype.$modal = modal
}
}

75
ruoyi-ui/src/plugins/modal.js Normal file
View File

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

11
ruoyi-ui/src/views/monitor/cache/index.vue vendored
View File

@ -74,8 +74,6 @@ export default {
name: "Server", name: "Server",
data() { data() {
return { return {
// 加载层信息
loading: [],
// 统计命令信息 // 统计命令信息
commandstats: null, commandstats: null,
// 使用内存 // 使用内存
@ -93,7 +91,7 @@ export default {
getList() { getList() {
getCache().then((response) => { getCache().then((response) => {
this.cache = response.data; this.cache = response.data;
this.loading.close(); this.$modal.closeLoading();
this.commandstats = echarts.init(this.$refs.commandstats, "macarons"); this.commandstats = echarts.init(this.$refs.commandstats, "macarons");
this.commandstats.setOption({ this.commandstats.setOption({
@ -141,12 +139,7 @@ export default {
}, },
// 打开加载层 // 打开加载层
openLoading() { openLoading() {
this.loading = this.$loading({ this.$modal.loading("正在加载缓存监控数据，请稍后！");
lock: true,
text: "拼命读取中",
spinner: "el-icon-loading",
background: "rgba(0, 0, 0, 0.7)",
});
}, },
}, },
}; };

72
ruoyi-ui/src/views/monitor/job/index.vue
View File

@ -240,7 +240,7 @@
</div> </div>
</el-dialog> </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> <crontab @hide="openCron=false" @fill="crontabFill" :expression="expression"></crontab>
</el-dialog> </el-dialog>
@ -425,29 +425,21 @@ export default {
// 任务状态修改 // 任务状态修改
handleStatusChange(row) { handleStatusChange(row) {
let text = row.status === "0" ? "启用" : "停用"; let text = row.status === "0" ? "启用" : "停用";
this.$confirm('确认要"' + text + '""' + row.jobName + '"任务吗?', "警告", { this.$modal.confirm('确认要"' + text + '""' + row.jobName + '"任务吗？').then(function() {
confirmButtonText: "确定", return changeJobStatus(row.jobId, row.status);
cancelButtonText: "取消", }).then(() => {
type: "warning" this.$modal.msgSuccess(text + "成功");
}).then(function() { }).catch(function() {
return changeJobStatus(row.jobId, row.status); row.status = row.status === "0" ? "1" : "0";
}).then(() => { });
this.msgSuccess(text + "成功");
}).catch(function() {
row.status = row.status === "0" ? "1" : "0";
});
}, },
/* 立即执行一次 */ /* 立即执行一次 */
handleRun(row) { handleRun(row) {
this.$confirm('确认要立即执行一次"' + row.jobName + '"任务吗?', "警告", { this.$modal.confirm('确认要立即执行一次"' + row.jobName + '"任务吗？').then(function() {
confirmButtonText: "确定", return runJob(row.jobId, row.jobGroup);
cancelButtonText: "取消", }).then(() => {
type: "warning" this.$modal.msgSuccess("执行成功");
}).then(function() { }).catch(() => {});
return runJob(row.jobId, row.jobGroup);
}).then(() => {
this.msgSuccess("执行成功");
}).catch(() => {});
}, },
/** 任务详细信息 */ /** 任务详细信息 */
handleView(row) { handleView(row) {
@ -492,13 +484,13 @@ export default {
if (valid) { if (valid) {
if (this.form.jobId != undefined) { if (this.form.jobId != undefined) {
updateJob(this.form).then(response => { updateJob(this.form).then(response => {
this.msgSuccess("修改成功"); this.$modal.msgSuccess("修改成功");
this.open = false; this.open = false;
this.getList(); this.getList();
}); });
} else { } else {
addJob(this.form).then(response => { addJob(this.form).then(response => {
this.msgSuccess("新增成功"); this.$modal.msgSuccess("新增成功");
this.open = false; this.open = false;
this.getList(); this.getList();
}); });
@ -509,31 +501,23 @@ export default {
/** 删除按钮操作 */ /** 删除按钮操作 */
handleDelete(row) { handleDelete(row) {
const jobIds = row.jobId || this.ids; const jobIds = row.jobId || this.ids;
this.$confirm('是否确认删除定时任务编号为"' + jobIds + '"的数据项?', "警告", { this.$modal.confirm('是否确认删除定时任务编号为"' + jobIds + '"的数据项？').then(function() {
confirmButtonText: "确定", return delJob(jobIds);
cancelButtonText: "取消", }).then(() => {
type: "warning" this.getList();
}).then(function() { this.$modal.msgSuccess("删除成功");
return delJob(jobIds); }).catch(() => {});
}).then(() => {
this.getList();
this.msgSuccess("删除成功");
}).catch(() => {});
}, },
/** 导出按钮操作 */ /** 导出按钮操作 */
handleExport() { handleExport() {
const queryParams = this.queryParams; const queryParams = this.queryParams;
this.$confirm("是否确认导出所有定时任务数据项?", "警告", { this.$modal.confirm('是否确认导出所有定时任务数据项？').then(() => {
confirmButtonText: "确定", this.exportLoading = true;
cancelButtonText: "取消", return exportJob(queryParams);
type: "warning" }).then(response => {
}).then(() => { this.download(response.msg);
this.exportLoading = true; this.exportLoading = false;
return exportJob(queryParams); }).catch(() => {});
}).then(response => {
this.download(response.msg);
this.exportLoading = false;
}).catch(() => {});
} }
} }
}; };

50
ruoyi-ui/src/views/monitor/job/log.vue
View File

@ -275,44 +275,32 @@ export default {
/** 删除按钮操作 */ /** 删除按钮操作 */
handleDelete(row) { handleDelete(row) {
const jobLogIds = this.ids; const jobLogIds = this.ids;
this.$confirm('是否确认删除调度日志编号为"' + jobLogIds + '"的数据项?', "警告", { this.$modal.confirm('是否确认删除调度日志编号为"' + jobLogIds + '"的数据项？').then(function() {
confirmButtonText: "确定", return delJobLog(jobLogIds);
cancelButtonText: "取消", }).then(() => {
type: "warning" this.getList();
}).then(function() { this.$modal.msgSuccess("删除成功");
return delJobLog(jobLogIds); }).catch(() => {});
}).then(() => {
this.getList();
this.msgSuccess("删除成功");
}).catch(() => {});
}, },
/** 清空按钮操作 */ /** 清空按钮操作 */
handleClean() { handleClean() {
this.$confirm("是否确认清空所有调度日志数据项?", "警告", { this.$modal.confirm('是否确认清空所有调度日志数据项？').then(function() {
confirmButtonText: "确定", return cleanJobLog();
cancelButtonText: "取消", }).then(() => {
type: "warning" this.getList();
}).then(function() { this.$modal.msgSuccess("清空成功");
return cleanJobLog(); }).catch(() => {});
}).then(() => {
this.getList();
this.msgSuccess("清空成功");
}).catch(() => {});
}, },
/** 导出按钮操作 */ /** 导出按钮操作 */
handleExport() { handleExport() {
const queryParams = this.queryParams; const queryParams = this.queryParams;
this.$confirm("是否确认导出所有调度日志数据项?", "警告", { this.$modal.confirm('是否确认导出所有调度日志数据项？').then(() => {
confirmButtonText: "确定", this.exportLoading = true;
cancelButtonText: "取消", return exportJobLog(queryParams);
type: "warning" }).then(response => {
}).then(() => { this.download(response.msg);
this.exportLoading = true; this.exportLoading = false;
return exportJobLog(queryParams); }).catch(() => {});
}).then(response => {
this.download(response.msg);
this.exportLoading = false;
}).catch(() => {});
} }
} }
}; };

50
ruoyi-ui/src/views/monitor/logininfor/index.vue
View File

@ -198,44 +198,32 @@ export default {
/** 删除按钮操作 */ /** 删除按钮操作 */
handleDelete(row) { handleDelete(row) {
const infoIds = row.infoId || this.ids; const infoIds = row.infoId || this.ids;
this.$confirm('是否确认删除访问编号为"' + infoIds + '"的数据项?', "警告", { this.$modal.confirm('是否确认删除访问编号为"' + infoIds + '"的数据项？').then(function() {
confirmButtonText: "确定", return delLogininfor(infoIds);
cancelButtonText: "取消", }).then(() => {
type: "warning" this.getList();
}).then(function() { this.$modal.msgSuccess("删除成功");
return delLogininfor(infoIds); }).catch(() => {});
}).then(() => {
this.getList();
this.msgSuccess("删除成功");
}).catch(() => {});
}, },
/** 清空按钮操作 */ /** 清空按钮操作 */
handleClean() { handleClean() {
this.$confirm('是否确认清空所有登录日志数据项?', "警告", { this.$modal.confirm('是否确认清空所有登录日志数据项？').then(function() {
confirmButtonText: "确定", return cleanLogininfor();
cancelButtonText: "取消", }).then(() => {
type: "warning" this.getList();
}).then(function() { this.$modal.msgSuccess("清空成功");
return cleanLogininfor(); }).catch(() => {});
}).then(() => {
this.getList();
this.msgSuccess("清空成功");
}).catch(() => {});
}, },
/** 导出按钮操作 */ /** 导出按钮操作 */
handleExport() { handleExport() {
const queryParams = this.queryParams; const queryParams = this.queryParams;
this.$confirm('是否确认导出所有操作日志数据项?', "警告", { this.$modal.confirm('是否确认导出所有操作日志数据项？').then(() => {
confirmButtonText: "确定", this.exportLoading = true;
cancelButtonText: "取消", return exportLogininfor(queryParams);
type: "warning" }).then(response => {
}).then(() => { this.download(response.msg);
this.exportLoading = true; this.exportLoading = false;
return exportLogininfor(queryParams); }).catch(() => {});
}).then(response => {
this.download(response.msg);
this.exportLoading = false;
}).catch(() => {});
} }
} }
}; };

16
ruoyi-ui/src/views/monitor/online/index.vue
View File

@ -111,16 +111,12 @@ export default {
}, },
/** 强退按钮操作 */ /** 强退按钮操作 */
handleForceLogout(row) { handleForceLogout(row) {
this.$confirm('是否确认强退名称为"' + row.userName + '"的数据项?', "警告", { this.$modal.confirm('是否确认强退名称为"' + row.userName + '"的数据项？').then(function() {
confirmButtonText: "确定", return forceLogout(row.tokenId);
cancelButtonText: "取消", }).then(() => {
type: "warning" this.getList();
}).then(function() { this.$modal.msgSuccess("强退成功");
return forceLogout(row.tokenId); }).catch(() => {});
}).then(() => {
this.getList();
this.msgSuccess("强退成功");
}).catch(() => {});
} }
} }
}; };

50
ruoyi-ui/src/views/monitor/operlog/index.vue
View File

@ -285,44 +285,32 @@ export default {
/** 删除按钮操作 */ /** 删除按钮操作 */
handleDelete(row) { handleDelete(row) {
const operIds = row.operId || this.ids; const operIds = row.operId || this.ids;
this.$confirm('是否确认删除日志编号为"' + operIds + '"的数据项?', "警告", { this.$modal.confirm('是否确认删除日志编号为"' + operIds + '"的数据项？').then(function() {
confirmButtonText: "确定", return delOperlog(operIds);
cancelButtonText: "取消", }).then(() => {
type: "warning" this.getList();
}).then(function() { this.$modal.msgSuccess("删除成功");
return delOperlog(operIds); }).catch(() => {});
}).then(() => {
this.getList();
this.msgSuccess("删除成功");
}).catch(() => {});
}, },
/** 清空按钮操作 */ /** 清空按钮操作 */
handleClean() { handleClean() {
this.$confirm('是否确认清空所有操作日志数据项?', "警告", { this.$modal.confirm('是否确认清空所有操作日志数据项？').then(function() {
confirmButtonText: "确定", return cleanOperlog();
cancelButtonText: "取消", }).then(() => {
type: "warning" this.getList();
}).then(function() { this.$modal.msgSuccess("清空成功");
return cleanOperlog(); }).catch(() => {});
}).then(() => {
this.getList();
this.msgSuccess("清空成功");
}).catch(() => {});
}, },
/** 导出按钮操作 */ /** 导出按钮操作 */
handleExport() { handleExport() {
const queryParams = this.queryParams; const queryParams = this.queryParams;
this.$confirm('是否确认导出所有操作日志数据项?', "警告", { this.$modal.confirm('是否确认导出所有操作日志数据项？').then(() => {
confirmButtonText: "确定", this.exportLoading = true;
cancelButtonText: "取消", return exportOperlog(queryParams);
type: "warning" }).then(response => {
}).then(() => { this.download(response.msg);
this.exportLoading = true; this.exportLoading = false;
return exportOperlog(queryParams); }).catch(() => {});
}).then(response => {
this.download(response.msg);
this.exportLoading = false;
}).catch(() => {});
} }
} }
}; };

13
ruoyi-ui/src/views/monitor/server/index.vue
View File

@ -153,7 +153,7 @@
</tr> </tr>
</thead> </thead>
<tbody v-if="server.sysFiles"> <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.dirName }}</div></td>
<td><div class="cell">{{ sysFile.sysTypeName }}</div></td> <td><div class="cell">{{ sysFile.sysTypeName }}</div></td>
<td><div class="cell">{{ sysFile.typeName }}</div></td> <td><div class="cell">{{ sysFile.typeName }}</div></td>
@ -178,8 +178,6 @@ export default {
name: "Server", name: "Server",
data() { data() {
return { return {
// 加载层信息
loading: [],
// 服务器信息 // 服务器信息
server: [] server: []
}; };
@ -193,17 +191,12 @@ export default {
getList() { getList() {
getServer().then(response => { getServer().then(response => {
this.server = response.data; this.server = response.data;
this.loading.close(); this.$modal.closeLoading();
}); });
}, },
// 打开加载层 // 打开加载层
openLoading() { openLoading() {
this.loading = this.$loading({ this.$modal.loading("正在加载服务监控数据，请稍后！");
lock: true,
text: "拼命读取中",
spinner: "el-icon-loading",
background: "rgba(0, 0, 0, 0.7)"
});
} }
} }
}; };

32
ruoyi-ui/src/views/system/config/index.vue
View File

@ -308,13 +308,13 @@ export default {
if (valid) { if (valid) {
if (this.form.configId != undefined) { if (this.form.configId != undefined) {
updateConfig(this.form).then(response => { updateConfig(this.form).then(response => {
this.msgSuccess("修改成功"); this.$modal.msgSuccess("修改成功");
this.open = false; this.open = false;
this.getList(); this.getList();
}); });
} else { } else {
addConfig(this.form).then(response => { addConfig(this.form).then(response => {
this.msgSuccess("新增成功"); this.$modal.msgSuccess("新增成功");
this.open = false; this.open = false;
this.getList(); this.getList();
}); });
@ -325,36 +325,28 @@ export default {
/** 删除按钮操作 */ /** 删除按钮操作 */
handleDelete(row) { handleDelete(row) {
const configIds = row.configId || this.ids; const configIds = row.configId || this.ids;
this.$confirm('是否确认删除参数编号为"' + configIds + '"的数据项?', "警告", { this.$modal.confirm('是否确认删除参数编号为"' + configIds + '"的数据项？').then(function() {
confirmButtonText: "确定",
cancelButtonText: "取消",
type: "warning"
}).then(function() {
return delConfig(configIds); return delConfig(configIds);
}).then(() => { }).then(() => {
this.getList(); this.getList();
this.msgSuccess("删除成功"); this.$modal.msgSuccess("删除成功");
}).catch(() => {}); }).catch(() => {});
}, },
/** 导出按钮操作 */ /** 导出按钮操作 */
handleExport() { handleExport() {
const queryParams = this.queryParams; const queryParams = this.queryParams;
this.$confirm('是否确认导出所有参数数据项?', "警告", { this.$modal.confirm('是否确认导出所有参数数据项？').then(() => {
confirmButtonText: "确定", this.exportLoading = true;
cancelButtonText: "取消", return exportConfig(queryParams);
type: "warning" }).then(response => {
}).then(() => { this.download(response.msg);
this.exportLoading = true; this.exportLoading = false;
return exportConfig(queryParams); }).catch(() => {});
}).then(response => {
this.download(response.msg);
this.exportLoading = false;
}).catch(() => {});
}, },
/** 刷新缓存按钮操作 */ /** 刷新缓存按钮操作 */
handleRefreshCache() { handleRefreshCache() {
refreshCache().then(() => { refreshCache().then(() => {
this.msgSuccess("刷新成功"); this.$modal.msgSuccess("刷新成功");
}); });
} }
} }

20
ruoyi-ui/src/views/system/dept/index.vue
View File

@ -305,13 +305,13 @@ export default {
if (valid) { if (valid) {
if (this.form.deptId != undefined) { if (this.form.deptId != undefined) {
updateDept(this.form).then(response => { updateDept(this.form).then(response => {
this.msgSuccess("修改成功"); this.$modal.msgSuccess("修改成功");
this.open = false; this.open = false;
this.getList(); this.getList();
}); });
} else { } else {
addDept(this.form).then(response => { addDept(this.form).then(response => {
this.msgSuccess("新增成功"); this.$modal.msgSuccess("新增成功");
this.open = false; this.open = false;
this.getList(); this.getList();
}); });
@ -321,16 +321,12 @@ export default {
}, },
/** 删除按钮操作 */ /** 删除按钮操作 */
handleDelete(row) { handleDelete(row) {
this.$confirm('是否确认删除名称为"' + row.deptName + '"的数据项?', "警告", { this.$modal.confirm('是否确认删除名称为"' + row.deptName + '"的数据项？').then(function() {
confirmButtonText: "确定", return delDept(row.deptId);
cancelButtonText: "取消", }).then(() => {
type: "warning" this.getList();
}).then(function() { this.$modal.msgSuccess("删除成功");
return delDept(row.deptId); }).catch(() => {});
}).then(() => {
this.getList();
this.msgSuccess("删除成功");
}).catch(() => {});
} }
} }
}; };

38
ruoyi-ui/src/views/system/dict/data.vue
View File

@ -354,13 +354,13 @@ export default {
if (valid) { if (valid) {
if (this.form.dictCode != undefined) { if (this.form.dictCode != undefined) {
updateData(this.form).then(response => { updateData(this.form).then(response => {
this.msgSuccess("修改成功"); this.$modal.msgSuccess("修改成功");
this.open = false; this.open = false;
this.getList(); this.getList();
}); });
} else { } else {
addData(this.form).then(response => { addData(this.form).then(response => {
this.msgSuccess("新增成功"); this.$modal.msgSuccess("新增成功");
this.open = false; this.open = false;
this.getList(); this.getList();
}); });
@ -371,31 +371,23 @@ export default {
/** 删除按钮操作 */ /** 删除按钮操作 */
handleDelete(row) { handleDelete(row) {
const dictCodes = row.dictCode || this.ids; const dictCodes = row.dictCode || this.ids;
this.$confirm('是否确认删除字典编码为"' + dictCodes + '"的数据项?', "警告", { this.$modal.confirm('是否确认删除字典编码为"' + dictCodes + '"的数据项？').then(function() {
confirmButtonText: "确定", return delData(dictCodes);
cancelButtonText: "取消", }).then(() => {
type: "warning" this.getList();
}).then(function() { this.$modal.msgSuccess("删除成功");
return delData(dictCodes); }).catch(() => {});
}).then(() => {
this.getList();
this.msgSuccess("删除成功");
}).catch(() => {});
}, },
/** 导出按钮操作 */ /** 导出按钮操作 */
handleExport() { handleExport() {
const queryParams = this.queryParams; const queryParams = this.queryParams;
this.$confirm('是否确认导出所有数据项?', "警告", { this.$modal.confirm('是否确认导出所有数据项？').then(() => {
confirmButtonText: "确定", this.exportLoading = true;
cancelButtonText: "取消", return exportData(queryParams);
type: "warning" }).then(response => {
}).then(() => { this.download(response.msg);
this.exportLoading = true; this.exportLoading = false;
return exportData(queryParams); }).catch(() => {});
}).then(response => {
this.download(response.msg);
this.exportLoading = false;
}).catch(() => {});
} }
} }
}; };

40
ruoyi-ui/src/views/system/dict/index.vue
View File

@ -312,13 +312,13 @@ export default {
if (valid) { if (valid) {
if (this.form.dictId != undefined) { if (this.form.dictId != undefined) {
updateType(this.form).then(response => { updateType(this.form).then(response => {
this.msgSuccess("修改成功"); this.$modal.msgSuccess("修改成功");
this.open = false; this.open = false;
this.getList(); this.getList();
}); });
} else { } else {
addType(this.form).then(response => { addType(this.form).then(response => {
this.msgSuccess("新增成功"); this.$modal.msgSuccess("新增成功");
this.open = false; this.open = false;
this.getList(); this.getList();
}); });
@ -329,36 +329,28 @@ export default {
/** 删除按钮操作 */ /** 删除按钮操作 */
handleDelete(row) { handleDelete(row) {
const dictIds = row.dictId || this.ids; const dictIds = row.dictId || this.ids;
this.$confirm('是否确认删除字典编号为"' + dictIds + '"的数据项?', "警告", { this.$modal.confirm('是否确认删除字典编号为"' + dictIds + '"的数据项？').then(function() {
confirmButtonText: "确定", return delType(dictIds);
cancelButtonText: "取消", }).then(() => {
type: "warning" this.getList();
}).then(function() { this.$modal.msgSuccess("删除成功");
return delType(dictIds); }).catch(() => {});
}).then(() => {
this.getList();
this.msgSuccess("删除成功");
}).catch(() => {});
}, },
/** 导出按钮操作 */ /** 导出按钮操作 */
handleExport() { handleExport() {
const queryParams = this.queryParams; const queryParams = this.queryParams;
this.$confirm('是否确认导出所有类型数据项?', "警告", { this.$modal.confirm('是否确认导出所有类型数据项？').then(() => {
confirmButtonText: "确定", this.exportLoading = true;
cancelButtonText: "取消", return exportType(queryParams);
type: "warning" }).then(response => {
}).then(() => { this.download(response.msg);
this.exportLoading = true; this.exportLoading = false;
return exportType(queryParams); }).catch(() => {});
}).then(response => {
this.download(response.msg);
this.exportLoading = false;
}).catch(() => {});
}, },
/** 刷新缓存按钮操作 */ /** 刷新缓存按钮操作 */
handleRefreshCache() { handleRefreshCache() {
refreshCache().then(() => { refreshCache().then(() => {
this.msgSuccess("刷新成功"); this.$modal.msgSuccess("刷新成功");
}); });
} }
} }

20
ruoyi-ui/src/views/system/menu/index.vue
View File

@ -425,13 +425,13 @@ export default {
if (valid) { if (valid) {
if (this.form.menuId != undefined) { if (this.form.menuId != undefined) {
updateMenu(this.form).then(response => { updateMenu(this.form).then(response => {
this.msgSuccess("修改成功"); this.$modal.msgSuccess("修改成功");
this.open = false; this.open = false;
this.getList(); this.getList();
}); });
} else { } else {
addMenu(this.form).then(response => { addMenu(this.form).then(response => {
this.msgSuccess("新增成功"); this.$modal.msgSuccess("新增成功");
this.open = false; this.open = false;
this.getList(); this.getList();
}); });
@ -441,16 +441,12 @@ export default {
}, },
/** 删除按钮操作 */ /** 删除按钮操作 */
handleDelete(row) { handleDelete(row) {
this.$confirm('是否确认删除名称为"' + row.menuName + '"的数据项?', "警告", { this.$modal.confirm('是否确认删除名称为"' + row.menuName + '"的数据项？').then(function() {
confirmButtonText: "确定", return delMenu(row.menuId);
cancelButtonText: "取消", }).then(() => {
type: "warning" this.getList();
}).then(function() { this.$modal.msgSuccess("删除成功");
return delMenu(row.menuId); }).catch(() => {});
}).then(() => {
this.getList();
this.msgSuccess("删除成功");
}).catch(() => {});
} }
} }
}; };

20
ruoyi-ui/src/views/system/notice/index.vue
View File

@ -285,13 +285,13 @@ export default {
if (valid) { if (valid) {
if (this.form.noticeId != undefined) { if (this.form.noticeId != undefined) {
updateNotice(this.form).then(response => { updateNotice(this.form).then(response => {
this.msgSuccess("修改成功"); this.$modal.msgSuccess("修改成功");
this.open = false; this.open = false;
this.getList(); this.getList();
}); });
} else { } else {
addNotice(this.form).then(response => { addNotice(this.form).then(response => {
this.msgSuccess("新增成功"); this.$modal.msgSuccess("新增成功");
this.open = false; this.open = false;
this.getList(); this.getList();
}); });
@ -302,16 +302,12 @@ export default {
/** 删除按钮操作 */ /** 删除按钮操作 */
handleDelete(row) { handleDelete(row) {
const noticeIds = row.noticeId || this.ids const noticeIds = row.noticeId || this.ids
this.$confirm('是否确认删除公告编号为"' + noticeIds + '"的数据项?', "警告", { this.$modal.confirm('是否确认删除公告编号为"' + noticeIds + '"的数据项？').then(function() {
confirmButtonText: "确定", return delNotice(noticeIds);
cancelButtonText: "取消", }).then(() => {
type: "warning" this.getList();
}).then(function() { this.$modal.msgSuccess("删除成功");
return delNotice(noticeIds); }).catch(() => {});
}).then(() => {
this.getList();
this.msgSuccess("删除成功");
}).catch(() => {});
} }
} }
}; };

38
ruoyi-ui/src/views/system/post/index.vue
View File

@ -279,13 +279,13 @@ export default {
if (valid) { if (valid) {
if (this.form.postId != undefined) { if (this.form.postId != undefined) {
updatePost(this.form).then(response => { updatePost(this.form).then(response => {
this.msgSuccess("修改成功"); this.$modal.msgSuccess("修改成功");
this.open = false; this.open = false;
this.getList(); this.getList();
}); });
} else { } else {
addPost(this.form).then(response => { addPost(this.form).then(response => {
this.msgSuccess("新增成功"); this.$modal.msgSuccess("新增成功");
this.open = false; this.open = false;
this.getList(); this.getList();
}); });
@ -296,31 +296,23 @@ export default {
/** 删除按钮操作 */ /** 删除按钮操作 */
handleDelete(row) { handleDelete(row) {
const postIds = row.postId || this.ids; const postIds = row.postId || this.ids;
this.$confirm('是否确认删除岗位编号为"' + postIds + '"的数据项?', "警告", { this.$modal.confirm('是否确认删除岗位编号为"' + postIds + '"的数据项？').then(function() {
confirmButtonText: "确定", return delPost(postIds);
cancelButtonText: "取消", }).then(() => {
type: "warning" this.getList();
}).then(function() { this.$modal.msgSuccess("删除成功");
return delPost(postIds); }).catch(() => {});
}).then(() => {
this.getList();
this.msgSuccess("删除成功");
}).catch(() => {});
}, },
/** 导出按钮操作 */ /** 导出按钮操作 */
handleExport() { handleExport() {
const queryParams = this.queryParams; const queryParams = this.queryParams;
this.$confirm('是否确认导出所有岗位数据项?', "警告", { this.$modal.confirm('是否确认导出所有岗位数据项？').then(() => {
confirmButtonText: "确定", this.exportLoading = true;
cancelButtonText: "取消", return exportPost(queryParams);
type: "warning" }).then(response => {
}).then(() => { this.download(response.msg);
this.exportLoading = true; this.exportLoading = false;
return exportPost(queryParams); }).catch(() => {});
}).then(response => {
this.download(response.msg);
this.exportLoading = false;
}).catch(() => {});
} }
} }
}; };

18
ruoyi-ui/src/views/system/role/authUser.vue
View File

@ -178,30 +178,22 @@ export default {
/** 取消授权按钮操作 */ /** 取消授权按钮操作 */
cancelAuthUser(row) { cancelAuthUser(row) {
const roleId = this.queryParams.roleId; const roleId = this.queryParams.roleId;
this.$confirm('确认要取消该用户"' + row.userName + '"角色吗？', "警告", { this.$modal.confirm('确认要取消该用户"' + row.userName + '"角色吗？').then(function() {
confirmButtonText: "确定",
cancelButtonText: "取消",
type: "warning"
}).then(function() {
return authUserCancel({ userId: row.userId, roleId: roleId }); return authUserCancel({ userId: row.userId, roleId: roleId });
}).then(() => { }).then(() => {
this.getList(); this.getList();
this.msgSuccess("取消授权成功"); this.$modal.msgSuccess("取消授权成功");
}).catch(() => {}); }).catch(() => {});
}, },
/** 批量取消授权按钮操作 */ /** 批量取消授权按钮操作 */
cancelAuthUserAll(row) { cancelAuthUserAll(row) {
const roleId = this.queryParams.roleId; const roleId = this.queryParams.roleId;
const userIds = this.userIds.join(","); const userIds = this.userIds.join(",");
this.$confirm('是否取消选中用户授权数据项?', "警告", { this.$modal.confirm('是否取消选中用户授权数据项？').then(function() {
confirmButtonText: "确定", return authUserCancelAll({ roleId: roleId, userIds: userIds });
cancelButtonText: "取消",
type: "warning"
}).then(() => {
return authUserCancelAll({ roleId: roleId, userIds: userIds });
}).then(() => { }).then(() => {
this.getList(); this.getList();
this.msgSuccess("取消授权成功"); this.$modal.msgSuccess("取消授权成功");
}).catch(() => {}); }).catch(() => {});
} }
} }

58
ruoyi-ui/src/views/system/role/index.vue
View File

@ -413,17 +413,13 @@ export default {
// 角色状态修改 // 角色状态修改
handleStatusChange(row) { handleStatusChange(row) {
let text = row.status === "0" ? "启用" : "停用"; let text = row.status === "0" ? "启用" : "停用";
this.$confirm('确认要"' + text + '""' + row.roleName + '"角色吗?', "警告", { this.$modal.confirm('确认要"' + text + '""' + row.roleName + '"角色吗？').then(function() {
confirmButtonText: "确定", return changeRoleStatus(row.roleId, row.status);
cancelButtonText: "取消", }).then(() => {
type: "warning" this.$modal.msgSuccess(text + "成功");
}).then(function() { }).catch(function() {
return changeRoleStatus(row.roleId, row.status); row.status = row.status === "0" ? "1" : "0";
}).then(() => { });
this.msgSuccess(text + "成功");
}).catch(function() {
row.status = row.status === "0" ? "1" : "0";
});
}, },
// 取消按钮 // 取消按钮
cancel() { cancel() {
@ -579,14 +575,14 @@ export default {
if (this.form.roleId != undefined) { if (this.form.roleId != undefined) {
this.form.menuIds = this.getMenuAllCheckedKeys(); this.form.menuIds = this.getMenuAllCheckedKeys();
updateRole(this.form).then(response => { updateRole(this.form).then(response => {
this.msgSuccess("修改成功"); this.$modal.msgSuccess("修改成功");
this.open = false; this.open = false;
this.getList(); this.getList();
}); });
} else { } else {
this.form.menuIds = this.getMenuAllCheckedKeys(); this.form.menuIds = this.getMenuAllCheckedKeys();
addRole(this.form).then(response => { addRole(this.form).then(response => {
this.msgSuccess("新增成功"); this.$modal.msgSuccess("新增成功");
this.open = false; this.open = false;
this.getList(); this.getList();
}); });
@ -599,7 +595,7 @@ export default {
if (this.form.roleId != undefined) { if (this.form.roleId != undefined) {
this.form.deptIds = this.getDeptAllCheckedKeys(); this.form.deptIds = this.getDeptAllCheckedKeys();
dataScope(this.form).then(response => { dataScope(this.form).then(response => {
this.msgSuccess("修改成功"); this.$modal.msgSuccess("修改成功");
this.openDataScope = false; this.openDataScope = false;
this.getList(); this.getList();
}); });
@ -608,31 +604,23 @@ export default {
/** 删除按钮操作 */ /** 删除按钮操作 */
handleDelete(row) { handleDelete(row) {
const roleIds = row.roleId || this.ids; const roleIds = row.roleId || this.ids;
this.$confirm('是否确认删除角色编号为"' + roleIds + '"的数据项?', "警告", { this.$modal.confirm('是否确认删除角色编号为"' + roleIds + '"的数据项？').then(function() {
confirmButtonText: "确定", return delRole(roleIds);
cancelButtonText: "取消", }).then(() => {
type: "warning" this.getList();
}).then(function() { this.$modal.msgSuccess("删除成功");
return delRole(roleIds); }).catch(() => {});
}).then(() => {
this.getList();
this.msgSuccess("删除成功");
}).catch(() => {});
}, },
/** 导出按钮操作 */ /** 导出按钮操作 */
handleExport() { handleExport() {
const queryParams = this.queryParams; const queryParams = this.queryParams;
this.$confirm('是否确认导出所有角色数据项?', "警告", { this.$modal.confirm('是否确认导出所有用户数据项？').then(() => {
confirmButtonText: "确定", this.exportLoading = true;
cancelButtonText: "取消", return exportRole(queryParams);
type: "warning" }).then(response => {
}).then(() => { this.download(response.msg);
this.exportLoading = true; this.exportLoading = false;
return exportRole(queryParams); }).catch(() => {});
}).then(response => {
this.download(response.msg);
this.exportLoading = false;
}).catch(() => {});
} }
} }
}; };

2
ruoyi-ui/src/views/system/role/selectUser.vue
View File

@ -124,7 +124,7 @@ export default {
const roleId = this.queryParams.roleId; const roleId = this.queryParams.roleId;
const userIds = this.userIds.join(","); const userIds = this.userIds.join(",");
authUserSelectAll({ roleId: roleId, userIds: userIds }).then(res => { authUserSelectAll({ roleId: roleId, userIds: userIds }).then(res => {
this.msgSuccess(res.msg); this.$modal.msgSuccess(res.msg);
if (res.code === 200) { if (res.code === 200) {
this.visible = false; this.visible = false;
this.$emit("ok"); this.$emit("ok");

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

@ -103,7 +103,7 @@ export default {
const userId = this.form.userId; const userId = this.form.userId;
const roleIds = this.roleIds.join(","); const roleIds = this.roleIds.join(",");
updateAuthRole({ userId: userId, roleIds: roleIds }).then((response) => { updateAuthRole({ userId: userId, roleIds: roleIds }).then((response) => {
this.msgSuccess("授权成功"); this.$modal.msgSuccess("授权成功");
this.close(); this.close();
}); });
}, },

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

@ -503,17 +503,13 @@ export default {
// 用户状态修改 // 用户状态修改
handleStatusChange(row) { handleStatusChange(row) {
let text = row.status === "0" ? "启用" : "停用"; let text = row.status === "0" ? "启用" : "停用";
this.$confirm('确认要"' + text + '""' + row.userName + '"用户吗?', "警告", { this.$modal.confirm('确认要"' + text + '""' + row.userName + '"用户吗？').then(function() {
confirmButtonText: "确定", return changeUserStatus(row.userId, row.status);
cancelButtonText: "取消", }).then(() => {
type: "warning" this.$modal.msgSuccess(text + "成功");
}).then(function() { }).catch(function() {
return changeUserStatus(row.userId, row.status); row.status = row.status === "0" ? "1" : "0";
}).then(() => { });
this.msgSuccess(text + "成功");
}).catch(function() {
row.status = row.status === "0" ? "1" : "0";
});
}, },
// 取消按钮 // 取消按钮
cancel() { cancel() {
@ -606,7 +602,7 @@ export default {
inputErrorMessage: "用户密码长度必须介于 5 和 20 之间", inputErrorMessage: "用户密码长度必须介于 5 和 20 之间",
}).then(({ value }) => { }).then(({ value }) => {
resetUserPwd(row.userId, value).then(response => { resetUserPwd(row.userId, value).then(response => {
this.msgSuccess("修改成功，新密码是：" + value); this.$modal.msgSuccess("修改成功，新密码是：" + value);
}); });
}).catch(() => {}); }).catch(() => {});
}, },
@ -621,13 +617,13 @@ export default {
if (valid) { if (valid) {
if (this.form.userId != undefined) { if (this.form.userId != undefined) {
updateUser(this.form).then(response => { updateUser(this.form).then(response => {
this.msgSuccess("修改成功"); this.$modal.msgSuccess("修改成功");
this.open = false; this.open = false;
this.getList(); this.getList();
}); });
} else { } else {
addUser(this.form).then(response => { addUser(this.form).then(response => {
this.msgSuccess("新增成功"); this.$modal.msgSuccess("新增成功");
this.open = false; this.open = false;
this.getList(); this.getList();
}); });
@ -638,31 +634,23 @@ export default {
/** 删除按钮操作 */ /** 删除按钮操作 */
handleDelete(row) { handleDelete(row) {
const userIds = row.userId || this.ids; const userIds = row.userId || this.ids;
this.$confirm('是否确认删除用户编号为"' + userIds + '"的数据项?', "警告", { this.$modal.confirm('是否确认删除用户编号为"' + userIds + '"的数据项？').then(function() {
confirmButtonText: "确定", return delUser(userIds);
cancelButtonText: "取消", }).then(() => {
type: "warning" this.getList();
}).then(function() { this.$modal.msgSuccess("删除成功");
return delUser(userIds); }).catch(() => {});
}).then(() => {
this.getList();
this.msgSuccess("删除成功");
}).catch(() => {});
}, },
/** 导出按钮操作 */ /** 导出按钮操作 */
handleExport() { handleExport() {
const queryParams = this.queryParams; const queryParams = this.queryParams;
this.$confirm('是否确认导出所有用户数据项?', "警告", { this.$modal.confirm('是否确认导出所有用户数据项？').then(() => {
confirmButtonText: "确定", this.exportLoading = true;
cancelButtonText: "取消", return exportUser(queryParams);
type: "warning" }).then(response => {
}).then(() => { this.download(response.msg);
this.exportLoading = true; this.exportLoading = false;
return exportUser(queryParams); }).catch(() => {});
}).then(response => {
this.download(response.msg);
this.exportLoading = false;
}).catch(() => {});
}, },
/** 导入按钮操作 */ /** 导入按钮操作 */
handleImport() { handleImport() {

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

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

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

@ -110,7 +110,7 @@ export default {
// 上传预处理 // 上传预处理
beforeUpload(file) { beforeUpload(file) {
if (file.type.indexOf("image/") == -1) { if (file.type.indexOf("image/") == -1) {
this.msgError("文件格式错误，请上传图片类型,如：JPG，PNG后缀的文件。"); this.$modal.msgError("文件格式错误，请上传图片类型,如：JPG，PNG后缀的文件。");
} else { } else {
const reader = new FileReader(); const reader = new FileReader();
reader.readAsDataURL(file); reader.readAsDataURL(file);
@ -128,7 +128,7 @@ export default {
this.open = false; this.open = false;
this.options.img = process.env.VUE_APP_BASE_API + response.imgUrl; this.options.img = process.env.VUE_APP_BASE_API + response.imgUrl;
store.commit('SET_AVATAR', this.options.img); store.commit('SET_AVATAR', this.options.img);
this.msgSuccess("修改成功"); this.$modal.msgSuccess("修改成功");
this.visible = false; this.visible = false;
}); });
}); });

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

@ -62,7 +62,7 @@ export default {
this.$refs["form"].validate(valid => { this.$refs["form"].validate(valid => {
if (valid) { if (valid) {
updateUserProfile(this.user).then(response => { updateUserProfile(this.user).then(response => {
this.msgSuccess("修改成功"); this.$modal.msgSuccess("修改成功");
}); });
} }
}); });

4
ruoyi-ui/src/views/tool/gen/editTable.vue
View File

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

9
ruoyi-ui/src/views/tool/gen/importTable.vue
View File

@ -104,8 +104,13 @@ export default {
}, },
/** 导入按钮操作 */ /** 导入按钮操作 */
handleImportTable() { handleImportTable() {
importTable({ tables: this.tables.join(",") }).then(res => { const tableNames = this.tables.join(",");
this.msgSuccess(res.msg); if (tableNames == "") {
this.$modal.msgError("请选择要导入的表");
return;
}
importTable({ tables: tableNames }).then(res => {
this.$modal.msgSuccess(res.msg);
if (res.code === 200) { if (res.code === 200) {
this.visible = false; this.visible = false;
this.$emit("ok"); this.$emit("ok");

26
ruoyi-ui/src/views/tool/gen/index.vue
View File

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