From 4b1eaa9625c4b1d34fe44b58daff05e7f12f7160 Mon Sep 17 00:00:00 2001 From: Wenchao Gong Date: Sun, 31 Oct 2021 16:20:54 +0800 Subject: [PATCH] =?UTF-8?q?=E5=8D=87=E7=BA=A73.3.0=E7=89=88=E6=9C=AC=20?= =?UTF-8?q?=E5=89=8D=E7=AB=AF=E8=B0=83=E6=95=B4?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- ruoyi-ui/src/views/isc/application/index.vue | 2 +- ruoyi-ui/src/views/isc/appservice/index.vue | 45 +++++------ ruoyi-ui/src/views/isc/cate/index.vue | 24 +++--- ruoyi-ui/src/views/isc/service/audit.vue | 63 +++++----------- ruoyi-ui/src/views/isc/service/index.vue | 75 +++++++------------ ruoyi-ui/src/views/isc/serviceapply/index.vue | 37 ++++----- 6 files changed, 87 insertions(+), 159 deletions(-) diff --git a/ruoyi-ui/src/views/isc/application/index.vue b/ruoyi-ui/src/views/isc/application/index.vue index c0720ca88..2395d841e 100644 --- a/ruoyi-ui/src/views/isc/application/index.vue +++ b/ruoyi-ui/src/views/isc/application/index.vue @@ -316,7 +316,7 @@ export default { }, /** 导出按钮操作 */ handleExport() { - this.downLoadExcel('/isc/application/export', this.queryParams); + this.$download.excel('/isc/application/export', this.queryParams); } } }; diff --git a/ruoyi-ui/src/views/isc/appservice/index.vue b/ruoyi-ui/src/views/isc/appservice/index.vue index 32e2f6322..6505942c5 100644 --- a/ruoyi-ui/src/views/isc/appservice/index.vue +++ b/ruoyi-ui/src/views/isc/appservice/index.vue @@ -14,20 +14,20 @@ @@ -95,12 +95,12 @@ @@ -176,10 +176,10 @@ {{dict.dictLabel}} + v-for="dict in dict.type.sys_normal_disable" + :key="dict.value" + :label="dict.value" + >{{dict.label}} @@ -228,7 +228,7 @@ 审核状态 - + @@ -238,7 +238,7 @@ 启用状态 - + @@ -291,6 +291,7 @@ import CopyTag from '@/components/CopyTag'; import "@riophae/vue-treeselect/dist/vue-treeselect.css"; export default { name: "Appservice", + dicts: ['sys_normal_disable', 'sys_audit_status'], components: { Treeselect, CopyTag }, data() { return { @@ -318,10 +319,6 @@ export default { open: false, // 是否显示查看弹出层 openView: false, - // 启用状态字典 - enabledOptions: [], - // 审核状态字典 - statusOptions: [], // 应用服务树 appServiceOptions: [], // 查询参数 @@ -358,12 +355,6 @@ export default { this.applicationId = applicationId; this.queryParams.applicationId = applicationId; this.getList(applicationId); - this.getDicts("sys_normal_disable").then(response => { - this.enabledOptions = response.data; - }); - this.getDicts("sys_audit_status").then(response => { - this.statusOptions = response.data; - }); this.getApplicationName(applicationId); this.getTreeselect(applicationId); }, @@ -535,7 +526,7 @@ export default { }, /** 导出按钮操作 */ handleExport() { - this.downLoadExcel('/isc/appservice/export', this.queryParams); + this.$download.excel('/isc/appservice/export', this.queryParams); } } }; diff --git a/ruoyi-ui/src/views/isc/cate/index.vue b/ruoyi-ui/src/views/isc/cate/index.vue index 305161f47..a1a500791 100644 --- a/ruoyi-ui/src/views/isc/cate/index.vue +++ b/ruoyi-ui/src/views/isc/cate/index.vue @@ -13,10 +13,10 @@ @@ -50,7 +50,7 @@ @@ -100,10 +100,10 @@ {{dict.dictLabel}} + v-for="dict in dict.type.sys_normal_disable" + :key="dict.value" + :label="dict.value" + >{{dict.label}} @@ -128,6 +128,7 @@ import "@riophae/vue-treeselect/dist/vue-treeselect.css"; export default { name: "Cate", + dicts:['sys_normal_disable'], components: { Treeselect }, @@ -147,8 +148,6 @@ export default { title: "", // 是否显示弹出层 open: false, - // 启用状态字典 - enabledOptions: [], // 查询参数 queryParams: { cateName: null, @@ -176,9 +175,6 @@ export default { }, created() { this.getList(); - this.getDicts("sys_normal_disable").then(response => { - this.enabledOptions = response.data; - }); }, methods: { /** 查询服务分类列表 */ diff --git a/ruoyi-ui/src/views/isc/service/audit.vue b/ruoyi-ui/src/views/isc/service/audit.vue index 2c924823a..0df771acd 100644 --- a/ruoyi-ui/src/views/isc/service/audit.vue +++ b/ruoyi-ui/src/views/isc/service/audit.vue @@ -13,30 +13,30 @@ @@ -82,17 +82,17 @@ @@ -152,7 +152,7 @@ 请求方式 - + @@ -162,7 +162,7 @@ 跨域标志 - + @@ -193,10 +193,10 @@ import { listService, getService, auditService } from "@/api/isc/service"; import { treeselect } from "@/api/isc/cate"; import Treeselect from "@riophae/vue-treeselect"; import "@riophae/vue-treeselect/dist/vue-treeselect.css"; -import { downLoadExcel } from "@/utils/download"; export default { name: "Service", + dicts: ['sys_yes_no', 'isc_online_status', 'sys_audit_status', 'sys_normal_disable', 'isc_request_method'], components: { Treeselect }, data() { return { @@ -226,16 +226,6 @@ export default { title: "", // 是否显示弹出层 open: false, - // 跨域标志字典 - corsFlagOptions: [], - // 是否在线字典 - onlineStatusOptions: [], - // 审核状态字典 - statusOptions: [], - // 服务状态字典 - enabledOptions: [], - // 服务状态字典 - requestMethodOptions: [], //服务分类 cateOptions:[], // 查询参数 @@ -265,21 +255,6 @@ export default { created() { this.getList(); this.getTreeselect(); - this.getDicts("sys_yes_no").then(response => { - this.corsFlagOptions = response.data; - }); - this.getDicts("isc_online_status").then(response => { - this.onlineStatusOptions = response.data; - }); - this.getDicts("sys_audit_status").then(response => { - this.statusOptions = response.data; - }); - this.getDicts("sys_normal_disable").then(response => { - this.enabledOptions = response.data; - }); - this.getDicts("isc_request_method").then(response => { - this.requestMethodOptions = response.data; - }); }, methods: { /** 查询服务信息列表 */ @@ -418,7 +393,7 @@ export default { }, /** 导出按钮操作 */ handleExport() { - downLoadExcel('/isc/service/export', this.queryParams); + this.$download.excel('/isc/service/export', this.queryParams); } } }; diff --git a/ruoyi-ui/src/views/isc/service/index.vue b/ruoyi-ui/src/views/isc/service/index.vue index 27a9cfcdc..95b785dd8 100644 --- a/ruoyi-ui/src/views/isc/service/index.vue +++ b/ruoyi-ui/src/views/isc/service/index.vue @@ -13,30 +13,30 @@ @@ -103,17 +103,17 @@ @@ -169,10 +169,10 @@ {{dict.dictLabel}} + v-for="dict in dict.type.isc_request_method" + :key="dict.value" + :label="dict.value" + >{{dict.label}} @@ -181,10 +181,10 @@ {{dict.dictLabel}} + v-for="dict in dict.type.sys_yes_no" + :key="dict.value" + :label="dict.value" + >{{dict.label}} @@ -207,10 +207,10 @@ import { listService, getService, delService, addService, updateService } from " import { treeselect } from "@/api/isc/cate"; import Treeselect from "@riophae/vue-treeselect"; import "@riophae/vue-treeselect/dist/vue-treeselect.css"; -import { downLoadExcel } from "@/utils/download"; export default { name: "Service", + dicts: ['sys_yes_no', 'isc_online_status', 'sys_audit_status', 'sys_normal_disable', 'isc_request_method'], components: { Treeselect }, data() { return { @@ -236,16 +236,6 @@ export default { title: "", // 是否显示弹出层 open: false, - // 跨域标志字典 - corsFlagOptions: [], - // 是否在线字典 - onlineStatusOptions: [], - // 审核状态字典 - statusOptions: [], - // 服务状态字典 - enabledOptions: [], - // 服务状态字典 - requestMethodOptions: [], //服务分类 cateOptions:[], // 查询参数 @@ -294,21 +284,6 @@ export default { created() { this.getList(); this.getTreeselect(); - this.getDicts("sys_yes_no").then(response => { - this.corsFlagOptions = response.data; - }); - this.getDicts("isc_online_status").then(response => { - this.onlineStatusOptions = response.data; - }); - this.getDicts("sys_audit_status").then(response => { - this.statusOptions = response.data; - }); - this.getDicts("sys_normal_disable").then(response => { - this.enabledOptions = response.data; - }); - this.getDicts("isc_request_method").then(response => { - this.requestMethodOptions = response.data; - }); }, methods: { /** 查询服务信息列表 */ @@ -443,7 +418,7 @@ export default { }, /** 导出按钮操作 */ handleExport() { - downLoadExcel('/isc/service/export', this.queryParams); + this.$download.excel('/isc/service/export', this.queryParams); } } }; diff --git a/ruoyi-ui/src/views/isc/serviceapply/index.vue b/ruoyi-ui/src/views/isc/serviceapply/index.vue index f6161c8ea..554b76cdc 100644 --- a/ruoyi-ui/src/views/isc/serviceapply/index.vue +++ b/ruoyi-ui/src/views/isc/serviceapply/index.vue @@ -4,20 +4,20 @@ @@ -61,12 +61,12 @@ @@ -123,13 +123,13 @@ 申请类型 - + 审核状态 - + @@ -184,6 +184,7 @@ import { listServiceapply, getServiceapply, auditServiceapply } from "@/api/isc/ export default { name: "Serviceapply", + dicts: ['isc_apply_type', 'sys_audit_status'], data() { return { // 按钮loading @@ -212,10 +213,6 @@ export default { title: "", // 是否显示弹出层 open: false, - // 申请类型(0申请 1续期)字典 - applyTypeOptions: [], - // 审核状态字典 - statusOptions: [], // 查询参数 queryParams: { pageNum: 1, @@ -239,12 +236,6 @@ export default { }, created() { this.getList(); - this.getDicts("isc_apply_type").then(response => { - this.applyTypeOptions = response.data; - }); - this.getDicts("sys_audit_status").then(response => { - this.statusOptions = response.data; - }); }, methods: { /** 查询应用服务申请信息列表 */ @@ -348,7 +339,7 @@ export default { }, /** 导出按钮操作 */ handleExport() { - this.downLoadExcel('/isc/serviceapply/export', this.queryParams); + this.$download.excel('/isc/serviceapply/export', this.queryParams); } } };