升级3.3.0版本 前端调整

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

ruoyi-ui/src/views/isc/appservice/index.vue

@@ -14,20 +14,20 @@
       <el-form-item label="启用状态" prop="enabled">
         <el-select v-model="queryParams.enabled" placeholder="请选择启用状态" clearable size="small">
           <el-option
-            v-for="dict in enabledOptions"
+            v-for="dict in dict.type.sys_normal_disable"
-            :key="dict.dictValue"
+            :key="dict.value"
-            :label="dict.dictLabel"
+            :label="dict.label"
-            :value="dict.dictValue"
+            :value="dict.value"
           />
         </el-select>
       </el-form-item>
       <el-form-item label="审核状态" prop="status">
         <el-select v-model="queryParams.status" placeholder="请选择审核状态" clearable size="small">
           <el-option
-            v-for="dict in statusOptions"
+            v-for="dict in dict.type.sys_audit_status"
-            :key="dict.dictValue"
+            :key="dict.value"
-            :label="dict.dictLabel"
+            :label="dict.label"
-            :value="dict.dictValue"
+            :value="dict.value"
           />
         </el-select>
       </el-form-item>
@@ -95,12 +95,12 @@
       </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_audit_status" :value="scope.row.status"/>
         </template>
       </el-table-column>
       <el-table-column label="启用状态" align="center" prop="enabled" width="100">
         <template slot-scope="scope">
-          <dict-tag :options="enabledOptions" :value="scope.row.enabled"/>
+          <dict-tag :options="dict.type.sys_normal_disable" :value="scope.row.enabled"/>
         </template>
       </el-table-column>
       <el-table-column label="到期时间" align="center" prop="endTime" width="100">
@@ -176,10 +176,10 @@
         <el-form-item label="启用状态" v-if="this.applyType === 0">
           <el-radio-group v-model="form.enabled">
             <el-radio
-              v-for="dict in enabledOptions"
+              v-for="dict in dict.type.sys_normal_disable"
-              :key="dict.dictValue"
+              :key="dict.value"
-              :label="dict.dictValue"
+              :label="dict.value"
-            >{{dict.dictLabel}}</el-radio>
+            >{{dict.label}}</el-radio>
           </el-radio-group>
         </el-form-item>
         <el-form-item label="申请时长" prop="renewalDuration" v-if="!(this.form.status == 1 && this.applyType == 2)">
@@ -228,7 +228,7 @@
         <el-row :gutter="20">
           <el-col :span="6" class="col-title">审核状态</el-col>
           <el-col :span="18" class="col-content">
-            <dict-tag :options="statusOptions" :value="this.form.status"/>
+            <dict-tag :options="dict.type.sys_audit_status" :value="this.form.status"/>
           </el-col>
         </el-row>
         <el-row :gutter="20" v-if="this.form.status == 2">
@@ -238,7 +238,7 @@
         <el-row :gutter="20">
           <el-col :span="6" class="col-title">启用状态</el-col>
           <el-col :span="18" class="col-content">
-            <dict-tag :options="enabledOptions" :value="this.form.enabled"/>
+            <dict-tag :options="dict.type.sys_normal_disable" :value="this.form.enabled"/>
           </el-col>
         </el-row>
         <el-row :gutter="20">
@@ -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);
     }
   }
 };

ruoyi-ui/src/views/isc/cate/index.vue

@@ -13,10 +13,10 @@
       <el-form-item label="启用状态" prop="enabled">
         <el-select v-model="queryParams.enabled" placeholder="请选择启用状态" clearable size="small">
           <el-option
-            v-for="dict in enabledOptions"
+            v-for="dict in dict.type.sys_normal_disable"
-            :key="dict.dictValue"
+            :key="dict.value"
-            :label="dict.dictLabel"
+            :label="dict.label"
-            :value="dict.dictValue"
+            :value="dict.value"
           />
         </el-select>
       </el-form-item>
@@ -50,7 +50,7 @@
       <el-table-column label="分类名称" align="center" prop="cateName"  width="160"/>
       <el-table-column label="启用状态" align="center" prop="enabled" >
         <template slot-scope="scope">
-          <dict-tag :options="enabledOptions" :value="scope.row.enabled"/>
+          <dict-tag :options="dict.type.sys_normal_disable" :value="scope.row.enabled"/>
         </template>
       </el-table-column>
       <el-table-column label="显示顺序" align="center" prop="orderNum" />
@@ -100,10 +100,10 @@
         <el-form-item label="启用状态" prop="enabled">
           <el-radio-group v-model="form.enabled">
             <el-radio
-              v-for="dict in enabledOptions"
+              v-for="dict in dict.type.sys_normal_disable"
-              :key="dict.dictValue"
+              :key="dict.value"
-              :label="dict.dictValue"
+              :label="dict.value"
-            >{{dict.dictLabel}}</el-radio>
+            >{{dict.label}}</el-radio>
           </el-radio-group>
         </el-form-item>
         <el-form-item label="显示顺序" prop="orderNum">
@@ -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: {
     /** 查询服务分类列表 */

ruoyi-ui/src/views/isc/service/audit.vue

@@ -13,30 +13,30 @@
       <el-form-item label="是否在线" prop="onlineStatus">
         <el-select v-model="queryParams.onlineStatus" placeholder="请选择是否在线" clearable size="small">
           <el-option
-            v-for="dict in onlineStatusOptions"
+            v-for="dict in dict.type.isc_online_status"
-            :key="dict.dictValue"
+            :key="dict.value"
-            :label="dict.dictLabel"
+            :label="dict.label"
-            :value="dict.dictValue"
+            :value="dict.value"
           />
         </el-select>
       </el-form-item>
       <el-form-item label="审核状态" prop="status">
         <el-select v-model="queryParams.status" placeholder="请选择审核状态" clearable size="small">
           <el-option
-            v-for="dict in statusOptions"
+            v-for="dict in dict.type.sys_audit_status"
-            :key="dict.dictValue"
+            :key="dict.value"
-            :label="dict.dictLabel"
+            :label="dict.label"
-            :value="dict.dictValue"
+            :value="dict.value"
           />
         </el-select>
       </el-form-item>
       <el-form-item label="服务状态" prop="enabled">
         <el-select v-model="queryParams.enabled" placeholder="请选择服务状态" clearable size="small">
           <el-option
-            v-for="dict in enabledOptions"
+            v-for="dict in dict.type.sys_normal_disable"
-            :key="dict.dictValue"
+            :key="dict.value"
-            :label="dict.dictLabel"
+            :label="dict.label"
-            :value="dict.dictValue"
+            :value="dict.value"
           />
         </el-select>
       </el-form-item>
@@ -82,17 +82,17 @@
       <el-table-column label="服务分类" align="left" prop="cateName" width="150"/>
       <el-table-column label="服务状态" align="center" prop="enabled" width="100">
         <template slot-scope="scope">
-          <dict-tag :options="enabledOptions" :value="scope.row.enabled"/>
+          <dict-tag :options="dict.type.sys_normal_disable" :value="scope.row.enabled"/>
         </template>
       </el-table-column>
       <el-table-column label="是否在线" align="center" prop="onlineStatus" width="100">
         <template slot-scope="scope">
-          <dict-tag :options="onlineStatusOptions" :value="scope.row.onlineStatus"/>
+          <dict-tag :options="dict.type.isc_online_status" :value="scope.row.onlineStatus"/>
         </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_audit_status" :value="scope.row.status"/>
         </template>
       </el-table-column>
       <el-table-column label="更新人" align="center" prop="updateBy"  width="150"/>
@@ -152,7 +152,7 @@
         <el-row :gutter="20">
           <el-col :span="6" class="col-title">请求方式</el-col>
           <el-col :span="18" class="col-content">
-            <dict-tag :options="requestMethodOptions" :value="this.form.requestMethod"/>
+            <dict-tag :options="dict.type.isc_request_method" :value="this.form.requestMethod"/>
           </el-col>
         </el-row>
         <el-row :gutter="20">
@@ -162,7 +162,7 @@
         <el-row :gutter="20">
           <el-col :span="6" class="col-title">跨域标志</el-col>
           <el-col :span="18" class="col-content">
-            <dict-tag :options="corsFlagOptions" :value="this.form.corsFlag"/>
+            <dict-tag :options="dict.type.sys_yes_no" :value="this.form.corsFlag"/>
           </el-col>
         </el-row>
         <el-row :gutter="20">
@@ -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);
     }
   }
 };

ruoyi-ui/src/views/isc/service/index.vue

@@ -13,30 +13,30 @@
       <el-form-item label="是否在线" prop="onlineStatus">
         <el-select v-model="queryParams.onlineStatus" placeholder="请选择是否在线" clearable size="small">
           <el-option
-            v-for="dict in onlineStatusOptions"
+            v-for="dict in dict.type.isc_online_status"
-            :key="dict.dictValue"
+            :key="dict.value"
-            :label="dict.dictLabel"
+            :label="dict.label"
-            :value="dict.dictValue"
+            :value="dict.value"
           />
         </el-select>
       </el-form-item>
       <el-form-item label="审核状态" prop="status">
         <el-select v-model="queryParams.status" placeholder="请选择审核状态" clearable size="small">
           <el-option
-            v-for="dict in statusOptions"
+            v-for="dict in dict.type.sys_audit_status"
-            :key="dict.dictValue"
+            :key="dict.value"
-            :label="dict.dictLabel"
+            :label="dict.label"
-            :value="dict.dictValue"
+            :value="dict.value"
           />
         </el-select>
       </el-form-item>
       <el-form-item label="服务状态" prop="enabled">
         <el-select v-model="queryParams.enabled" placeholder="请选择服务状态" clearable size="small">
           <el-option
-            v-for="dict in enabledOptions"
+            v-for="dict in dict.type.sys_normal_disable"
-            :key="dict.dictValue"
+            :key="dict.value"
-            :label="dict.dictLabel"
+            :label="dict.label"
-            :value="dict.dictValue"
+            :value="dict.value"
           />
         </el-select>
       </el-form-item>
@@ -103,17 +103,17 @@
       <el-table-column label="服务分类" align="left" prop="cateName" width="150"/>
       <el-table-column label="服务状态" align="center" prop="enabled" width="100">
         <template slot-scope="scope">
-          <dict-tag :options="enabledOptions" :value="scope.row.enabled"/>
+          <dict-tag :options="dict.type.sys_normal_disable" :value="scope.row.enabled"/>
         </template>
       </el-table-column>
       <el-table-column label="是否在线" align="center" prop="onlineStatus" width="100">
         <template slot-scope="scope">
-          <dict-tag :options="onlineStatusOptions" :value="scope.row.onlineStatus"/>
+          <dict-tag :options="dict.type.isc_online_status" :value="scope.row.onlineStatus"/>
         </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_audit_status" :value="scope.row.status"/>
         </template>
       </el-table-column>
       <el-table-column label="更新人" align="center" prop="updateBy"  width="150"/>
@@ -169,10 +169,10 @@
         <el-form-item label="请求方式" prop="requestMethod">
           <el-radio-group v-model="form.requestMethod">
             <el-radio
-              v-for="dict in requestMethodOptions"
+              v-for="dict in dict.type.isc_request_method"
-              :key="dict.dictValue"
+              :key="dict.value"
-              :label="dict.dictValue"
+              :label="dict.value"
-            >{{dict.dictLabel}}</el-radio>
+            >{{dict.label}}</el-radio>
           </el-radio-group>
         </el-form-item>
         <el-form-item label="备注" prop="remark">
@@ -181,10 +181,10 @@
         <el-form-item label="跨域标志">
           <el-radio-group v-model="form.corsFlag">
             <el-radio
-              v-for="dict in corsFlagOptions"
+              v-for="dict in dict.type.sys_yes_no"
-              :key="dict.dictValue"
+              :key="dict.value"
-              :label="dict.dictValue"
+              :label="dict.value"
-            >{{dict.dictLabel}}</el-radio>
+            >{{dict.label}}</el-radio>
           </el-radio-group>
         </el-form-item>
         <el-form-item label="隐藏参数" prop="hiddenParams">
@@ -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);
     }
   }
 };

ruoyi-ui/src/views/isc/serviceapply/index.vue

@@ -4,20 +4,20 @@
       <el-form-item label="申请类型" prop="applyType">
         <el-select v-model="queryParams.applyType" placeholder="请选择申请类型" clearable size="small">
           <el-option
-            v-for="dict in applyTypeOptions"
+            v-for="dict in dict.type.isc_apply_type"
-            :key="dict.dictValue"
+            :key="dict.value"
-            :label="dict.dictLabel"
+            :label="dict.label"
-            :value="dict.dictValue"
+            :value="dict.value"
           />
         </el-select>
       </el-form-item>
       <el-form-item label="审核状态" prop="status">
         <el-select v-model="queryParams.status" placeholder="请选择审核状态" clearable size="small">
           <el-option
-            v-for="dict in statusOptions"
+            v-for="dict in dict.type.sys_audit_status"
-            :key="dict.dictValue"
+            :key="dict.value"
-            :label="dict.dictLabel"
+            :label="dict.label"
-            :value="dict.dictValue"
+            :value="dict.value"
           />
         </el-select>
       </el-form-item>
@@ -61,12 +61,12 @@
       <el-table-column label="服务名称" align="left" prop="serviceName" />
       <el-table-column label="申请类型" align="center" prop="applyType" width="80">
         <template slot-scope="scope">
-          <dict-tag :options="applyTypeOptions" :value="scope.row.applyType"/>
+          <dict-tag :options="dict.type.isc_apply_type" :value="scope.row.applyType"/>
         </template>
       </el-table-column>
       <el-table-column label="审核状态" align="center" prop="status" width="80">
         <template slot-scope="scope">
-          <dict-tag :options="statusOptions" :value="scope.row.status"/>
+          <dict-tag :options="dict.type.sys_audit_status" :value="scope.row.status"/>
         </template>
       </el-table-column>
       <el-table-column label="续期时长(月)" align="center" prop="renewalDuration" width="100"/>
@@ -123,13 +123,13 @@
         <el-row :gutter="20">
           <el-col :span="6" class="col-title">申请类型</el-col>
           <el-col :span="18" class="col-content">
-            <dict-tag :options="applyTypeOptions" :value="this.viewData.applyType"/>
+            <dict-tag :options="dict.type.isc_apply_type" :value="this.viewData.applyType"/>
           </el-col>
         </el-row>
         <el-row :gutter="20">
           <el-col :span="6" class="col-title">审核状态</el-col>
           <el-col :span="18" class="col-content">
-            <dict-tag :options="statusOptions" :value="this.viewData.status"/>
+            <dict-tag :options="dict.type.sys_audit_status" :value="this.viewData.status"/>
           </el-col>
         </el-row>
         <el-row :gutter="20">
@@ -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);
     }
   }
 };