From 82f1f5d0cf1b51a5d81915e842e01760f404fa74 Mon Sep 17 00:00:00 2001
From: 疯狂的狮子li <15040126243@163.com>
Date: 星期三, 20 十月 2021 13:07:16 +0800
Subject: [PATCH] update 优化xxl-job-admin相关pr代码 增加格式化日志输出与docker镜像
---
ruoyi-ui/src/views/system/notice/index.vue | 59 +++++++++++++++++++++++------------------------------------
1 files changed, 23 insertions(+), 36 deletions(-)
diff --git a/ruoyi-ui/src/views/system/notice/index.vue b/ruoyi-ui/src/views/system/notice/index.vue
index b90168c..9c793f5 100644
--- a/ruoyi-ui/src/views/system/notice/index.vue
+++ b/ruoyi-ui/src/views/system/notice/index.vue
@@ -22,10 +22,10 @@
<el-form-item label="绫诲瀷" prop="noticeType">
<el-select v-model="queryParams.noticeType" placeholder="鍏憡绫诲瀷" clearable size="small">
<el-option
- v-for="dict in typeOptions"
- :key="dict.dictValue"
- :label="dict.dictLabel"
- :value="dict.dictValue"
+ v-for="dict in dict.type.sys_notice_type"
+ :key="dict.value"
+ :label="dict.label"
+ :value="dict.value"
/>
</el-select>
</el-form-item>
@@ -82,12 +82,12 @@
/>
<el-table-column label="鍏憡绫诲瀷" align="center" prop="noticeType" width="100">
<template slot-scope="scope">
- <dict-tag :options="typeOptions" :value="scope.row.noticeType"/>
+ <dict-tag :options="dict.type.sys_notice_type" :value="scope.row.noticeType"/>
</template>
</el-table-column>
<el-table-column label="鐘舵��" align="center" prop="status" width="100">
<template slot-scope="scope">
- <dict-tag :options="statusOptions" :value="scope.row.status"/>
+ <dict-tag :options="dict.type.sys_notice_status" :value="scope.row.status"/>
</template>
</el-table-column>
<el-table-column label="鍒涘缓鑰�" align="center" prop="createBy" width="100" />
@@ -137,10 +137,10 @@
<el-form-item label="鍏憡绫诲瀷" prop="noticeType">
<el-select v-model="form.noticeType" placeholder="璇烽�夋嫨">
<el-option
- v-for="dict in typeOptions"
- :key="dict.dictValue"
- :label="dict.dictLabel"
- :value="dict.dictValue"
+ v-for="dict in dict.type.sys_notice_type"
+ :key="dict.value"
+ :label="dict.label"
+ :value="dict.value"
></el-option>
</el-select>
</el-form-item>
@@ -149,10 +149,10 @@
<el-form-item label="鐘舵��">
<el-radio-group v-model="form.status">
<el-radio
- v-for="dict in statusOptions"
- :key="dict.dictValue"
- :label="dict.dictValue"
- >{{dict.dictLabel}}</el-radio>
+ v-for="dict in dict.type.sys_notice_status"
+ :key="dict.value"
+ :label="dict.value"
+ >{{dict.label}}</el-radio>
</el-radio-group>
</el-form-item>
</el-col>
@@ -176,6 +176,7 @@
export default {
name: "Notice",
+ dicts: ['sys_notice_status', 'sys_notice_type'],
data() {
return {
// 閬僵灞�
@@ -196,10 +197,6 @@
title: "",
// 鏄惁鏄剧ず寮瑰嚭灞�
open: false,
- // 绫诲瀷鏁版嵁瀛楀吀
- statusOptions: [],
- // 鐘舵�佹暟鎹瓧鍏�
- typeOptions: [],
// 鏌ヨ鍙傛暟
queryParams: {
pageNum: 1,
@@ -223,12 +220,6 @@
},
created() {
this.getList();
- this.getDicts("sys_notice_status").then(response => {
- this.statusOptions = response.data;
- });
- this.getDicts("sys_notice_type").then(response => {
- this.typeOptions = response.data;
- });
},
methods: {
/** 鏌ヨ鍏憡鍒楄〃 */
@@ -294,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();
});
@@ -311,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(() => {});
}
}
};
--
Gitblit v1.9.3