From 4b43db12ccff19b194018b4773106f0a0bb1fe5f Mon Sep 17 00:00:00 2001
From: Wenchao Gong <hanyeduxing2012@163.com>
Date: Fri, 10 Sep 2021 11:50:01 +0800
Subject: [PATCH] =?UTF-8?q?=E6=9C=8D=E5=8A=A1=E5=AE=A1=E6=A0=B8=E3=80=81?=
 =?UTF-8?q?=E7=AE=A1=E7=90=86=E5=88=86=E7=A6=BB?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 ruoyi-ui/src/views/isc/service/audit.vue | 429 +++++++++++++++++++++++
 ruoyi-ui/src/views/isc/service/index.vue | 167 +--------
 2 files changed, 432 insertions(+), 164 deletions(-)
 create mode 100644 ruoyi-ui/src/views/isc/service/audit.vue

diff --git a/ruoyi-ui/src/views/isc/service/audit.vue b/ruoyi-ui/src/views/isc/service/audit.vue
new file mode 100644
index 000000000..92a66f0f8
--- /dev/null
+++ b/ruoyi-ui/src/views/isc/service/audit.vue
@@ -0,0 +1,429 @@
+<template>
+  <div class="app-container">
+    <el-form :model="queryParams" ref="queryForm" :inline="true" v-show="showSearch" label-width="68px">
+      <el-form-item label="服务名称" prop="serviceName">
+        <el-input
+          v-model="queryParams.serviceName"
+          placeholder="请输入服务名称"
+          clearable
+          size="small"
+          @keyup.enter.native="handleQuery"
+        />
+      </el-form-item>
+      <el-form-item label="是否在线" prop="onlineStatus">
+        <el-select v-model="queryParams.onlineStatus" placeholder="请选择是否在线" clearable size="small">
+          <el-option
+            v-for="dict in onlineStatusOptions"
+            :key="dict.dictValue"
+            :label="dict.dictLabel"
+            :value="dict.dictValue"
+          />
+        </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"
+            :key="dict.dictValue"
+            :label="dict.dictLabel"
+            :value="dict.dictValue"
+          />
+        </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"
+            :key="dict.dictValue"
+            :label="dict.dictLabel"
+            :value="dict.dictValue"
+          />
+        </el-select>
+      </el-form-item>
+      <el-form-item label="服务分类" prop="cateFullPath">
+        <treeselect v-model="queryParams.cateFullPath" :options="cateOptions" :show-count="true" :normalizer="normalizer" placeholder="请选择服务分类" style="width:215px"/>
+      </el-form-item>
+      <el-form-item>
+        <el-button type="primary" icon="el-icon-search" size="mini" @click="handleQuery">搜索</el-button>
+        <el-button icon="el-icon-refresh" size="mini" @click="resetQuery">重置</el-button>
+      </el-form-item>
+    </el-form>
+
+    <el-row :gutter="10" class="mb8">
+      <el-col :span="1.5">
+        <el-button
+          type="primary"
+          plain
+          icon="el-icon-view"
+          size="mini"
+          :disabled="multiple"
+          @click="handleAudit"
+          v-hasPermi="['isc:service:audit']"
+        >批量审核</el-button>
+      </el-col>
+      <el-col :span="1.5">
+        <el-button
+          type="warning"
+          plain
+          icon="el-icon-download"
+          size="mini"
+          :loading="exportLoading"
+          @click="handleExport"
+          v-hasPermi="['isc:service:export']"
+        >导出</el-button>
+      </el-col>
+      <right-toolbar :showSearch.sync="showSearch" @queryTable="getList"></right-toolbar>
+    </el-row>
+
+    <el-table v-loading="loading" :data="serviceList" @selection-change="handleSelectionChange">
+      <el-table-column type="selection" width="55" align="center" />
+      <el-table-column label="服务ID" align="center" prop="serviceId" width="100"/>
+      <el-table-column label="服务名称" align="left" prop="serviceName" />
+      <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"/>
+        </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"/>
+        </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"/>
+        </template>
+      </el-table-column>
+      <el-table-column label="更新人" align="center" prop="updateBy"  width="150"/>
+      <el-table-column label="更新时间" align="center" prop="updateTime"  width="150">
+        <template slot-scope="scope">
+          <span>{{ parseTime(scope.row.updateTime) }}</span>
+        </template>
+      </el-table-column>
+      <el-table-column label="操作" align="center" class-name="small-padding fixed-width">
+        <template slot-scope="scope">
+          <el-button
+            size="mini"
+            type="text"
+            icon="el-icon-info"
+            @click="handleAuditSingle(scope.row)"
+            v-hasPermi="['isc:service:query']"
+          >查看</el-button>
+          <el-button
+            size="mini"
+            type="text"
+            icon="el-icon-view"
+            @click="handleAuditSingle(scope.row)"
+            v-hasPermi="['isc:service:audit']"
+          >审核</el-button>
+        </template>
+      </el-table-column>
+    </el-table>
+
+    <pagination
+      v-show="total>0"
+      :total="total"
+      :page.sync="queryParams.pageNum"
+      :limit.sync="queryParams.pageSize"
+      @pagination="getList"
+    />
+    
+    <!-- 查看或审核服务信息对话框 -->
+    <el-dialog :title="title" :visible.sync="open" width="500px" append-to-body>
+      <el-card shadow="never" v-if="this.show" style="margin-bottom: 20px">
+        <el-row :gutter="20">
+          <el-col :span="6" class="col-title">服务分类</el-col>
+          <el-col :span="18" class="col-content">{{this.form.cateName}}</el-col>
+        </el-row>
+        <el-row :gutter="20">
+          <el-col :span="6" class="col-title">服务名称</el-col>
+          <el-col :span="18" class="col-content">{{this.form.serviceName}}</el-col>
+        </el-row>
+        <el-row :gutter="20">
+          <el-col :span="6" class="col-title">服务地址</el-col>
+          <el-col :span="18" class="col-content">{{this.form.serviceAddr}}</el-col>
+        </el-row>
+        <el-row :gutter="20">
+          <el-col :span="6" class="col-title">探活地址</el-col>
+          <el-col :span="18" class="col-content">{{this.form.probeActiveAddr}}</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="requestMethodOptions" :value="this.form.requestMethod"/>
+          </el-col>
+        </el-row>
+        <el-row :gutter="20">
+          <el-col :span="6" class="col-title">备注</el-col>
+          <el-col :span="18" class="col-content">{{this.form.remark}}</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="corsFlagOptions" :value="this.form.corsFlag"/>
+          </el-col>
+        </el-row>
+        <el-row :gutter="20">
+          <el-col :span="6" class="col-title">隐藏参数</el-col>
+          <el-col :span="18" class="col-content">{{this.form.hiddenParams}}</el-col>
+        </el-row>
+        <el-row :gutter="20">
+          <el-col :span="6" class="col-title">JSON文档</el-col>
+          <el-col :span="18" class="col-content">{{this.form.apiDoc}}</el-col>
+        </el-row>
+      </el-card>
+      <el-form ref="auditForm" :model="auditForm" :rules="rules" label-width="80px">
+        <el-form-item label="审核意见" prop="remark">
+          <el-input v-model="auditForm.remark" type="textarea" :disabled='this.view' placeholder="请输入审核意见"/>
+        </el-form-item>
+      </el-form>
+      <div slot="footer" class="dialog-footer">
+        <el-button :loading="buttonLoading" type="success" @click="submitForm(1)" icon="el-icon-check" v-if="!this.view">通 过</el-button>
+        <el-button :loading="buttonLoading" type="warning" @click="submitForm(2)" icon="el-icon-close" v-if="!this.view">驳 回</el-button>
+        <el-button @click="cancel">取 消</el-button>
+      </div>
+    </el-dialog>
+  </div>
+</template>
+
+<script>
+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",
+  components: { Treeselect },
+  data() {
+    return {
+      // 按钮loading
+      buttonLoading: false,
+      // 遮罩层
+      loading: true,
+      // 导出遮罩层
+      exportLoading: false,
+      // 选中数组
+      ids: [],
+      // 是否查看
+      view: false,
+      // 是否展示详情
+      show: false,
+      // 非单个禁用
+      single: true,
+      // 非多个禁用
+      multiple: true,
+      // 显示搜索条件
+      showSearch: true,
+      // 总条数
+      total: 0,
+      // 服务信息表格数据
+      serviceList: [],
+      // 弹出层标题
+      title: "",
+      // 是否显示弹出层
+      open: false,
+      // 跨域标志字典
+      corsFlagOptions: [],
+      // 是否在线字典
+      onlineStatusOptions: [],
+      // 审核状态字典
+      statusOptions: [],
+      // 服务状态字典
+      enabledOptions: [],
+      // 服务状态字典
+      requestMethodOptions: [],
+      //服务分类
+      cateOptions:[],
+      // 查询参数
+      queryParams: {
+        pageNum: 1,
+        pageSize: 10,
+        serviceName: undefined,
+        onlineStatus: undefined,
+        status: undefined,
+        enabled: undefined,
+        cateFullPath: undefined
+      },
+      // 表单参数
+      form: {},
+      // 审核表单参数
+      auditForm: {},
+      // 表单校验
+      rules: {
+        remark: [
+          { max: 200, message: '最大长度为200个字符', trigger: 'blur' }
+        ]
+      }
+    };
+  },
+  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: {
+    /** 查询服务信息列表 */
+    getList() {
+      this.loading = true;
+      listService(this.queryParams).then(response => {
+        this.serviceList = response.rows;
+        this.total = response.total;
+        this.loading = false;
+      });
+    },
+    // 取消按钮
+    cancel() {
+      this.open = false;
+      this.reset();
+    },
+    // 表单重置
+    reset() {
+      this.form = {
+        serviceId: undefined,
+        serviceName: undefined,
+        serviceAddr: undefined,
+        probeActiveAddr: undefined,
+        requestMethod: 'GET',
+        remark: undefined,
+        corsFlag: 'Y',
+        hiddenParams: undefined,
+        onlineStatus: undefined,
+        status: undefined,
+        apiDoc: undefined,
+        auditMind: undefined,
+        enabled: "0",
+        cateFullPath: undefined,
+        createBy: undefined,
+        createTime: undefined,
+        updateBy: undefined,
+        updateTime: undefined,
+        delFlag: undefined
+      };
+      this.resetForm("form");
+    },
+    // 审核表单重置
+    resetAudit() {
+      this.auditForm = {
+        ids: [],
+        status: "0",
+        remark: undefined
+      };
+      this.resetForm("auditForm");
+    },
+    /** 搜索按钮操作 */
+    handleQuery() {
+      this.queryParams.pageNum = 1;
+      this.getList();
+    },
+    /** 重置按钮操作 */
+    resetQuery() {
+      this.resetForm("queryForm");
+      this.handleQuery();
+    },
+    // 多选框选中数据
+    handleSelectionChange(selection) {
+      this.ids = selection.map(item => item.serviceId)
+      this.single = selection.length!==1
+      this.multiple = !selection.length
+    },
+    /** 审核按钮操作 */
+    handleAudit(row) {
+      if(this.single) {
+        this.open = true;
+        this.show = false;
+        this.title = "服务审核";
+        this.resetAudit();
+        this.auditForm.ids = this.ids;
+        return;
+      }
+      this.handleAuditSingle(row, false);
+    },
+    handleAuditSingle(row, view) {
+      this.loading = true;
+      this.view = view;
+      this.show = true;
+      this.reset();
+      const serviceId = row.serviceId || this.ids
+      getService(serviceId).then(response => {
+        this.loading = false;
+        this.form = response.data;
+        this.open = true;
+        if(view) {
+          this.title = "服务查看";
+        }else{
+          this.title = "服务审核";
+        }
+        this.auditForm.ids = [serviceId]
+      });
+    },
+    /** 查询服务分类树结构 */
+    getTreeselect() {
+      treeselect().then(response => {
+        this.cateOptions = response.data;
+      });
+    },
+    //树节点转换
+    normalizer(node) {
+      return {
+        id: node.fullPath,
+        label: node.label,
+        children: node.children,
+      }
+    },
+    /** 提交按钮 */
+    submitForm(status) {
+      this.auditForm.status = status;
+      this.$refs["auditForm"].validate(valid => {
+        if (valid) {
+          this.buttonLoading = true;
+          if (this.auditForm.ids.length > 0) {
+            auditService(this.auditForm).then(response => {
+              this.msgSuccess("审核成功");
+              this.open = false;
+              this.getList();
+            }).finally(() => {
+              this.buttonLoading = false;
+            });
+          } else {
+              this.msgError("请选择记录");
+              this.buttonLoading = false;
+          }
+        }
+      });
+    },
+    /** 导出按钮操作 */
+    handleExport() {
+      downLoadExcel('/isc/service/export', this.queryParams);
+    }
+  }
+};
+</script>
+<style lang="scss" scoped>
+     .el-card .el-row {
+       font-size: 14px;
+       line-height: 36px;
+       vertical-align: middle;
+     }
+     .el-card .el-row .col-title {
+       text-align: right;
+       color: #606266;
+       font-weight: bold;
+     }
+</style>
\ No newline at end of file
diff --git a/ruoyi-ui/src/views/isc/service/index.vue b/ruoyi-ui/src/views/isc/service/index.vue
index b191f79a3..50a794f4d 100644
--- a/ruoyi-ui/src/views/isc/service/index.vue
+++ b/ruoyi-ui/src/views/isc/service/index.vue
@@ -71,17 +71,6 @@
           v-hasPermi="['isc:service:edit']"
         >修改</el-button>
       </el-col>
-      <el-col :span="1.5">
-        <el-button
-          type="primary"
-          plain
-          icon="el-icon-view"
-          size="mini"
-          :disabled="multiple"
-          @click="handleAudit"
-          v-hasPermi="['isc:service:audit']"
-        >批量审核</el-button>
-      </el-col>
       <el-col :span="1.5">
         <el-button
           type="danger"
@@ -135,20 +124,6 @@
       </el-table-column>
       <el-table-column label="操作" align="center" class-name="small-padding fixed-width">
         <template slot-scope="scope">
-          <el-button
-            size="mini"
-            type="text"
-            icon="el-icon-info"
-            @click="handleAuditSingle(scope.row)"
-            v-hasPermi="['isc:service:query']"
-          >查看</el-button>
-          <el-button
-            size="mini"
-            type="text"
-            icon="el-icon-view"
-            @click="handleAuditSingle(scope.row)"
-            v-hasPermi="['isc:service:audit']"
-          >审核</el-button>
           <el-button
             size="mini"
             type="text"
@@ -223,67 +198,11 @@
         <el-button @click="cancel">取 消</el-button>
       </div>
     </el-dialog>
-    
-    <!-- 查看或审核服务信息对话框 -->
-    <el-dialog :title="title" :visible.sync="openView" width="500px" append-to-body>
-      <el-card shadow="never" v-if="this.show" style="margin-bottom: 20px">
-        <el-row :gutter="20">
-          <el-col :span="6" class="col-title">服务分类</el-col>
-          <el-col :span="18" class="col-content">{{this.form.cateName}}</el-col>
-        </el-row>
-        <el-row :gutter="20">
-          <el-col :span="6" class="col-title">服务名称</el-col>
-          <el-col :span="18" class="col-content">{{this.form.serviceName}}</el-col>
-        </el-row>
-        <el-row :gutter="20">
-          <el-col :span="6" class="col-title">服务地址</el-col>
-          <el-col :span="18" class="col-content">{{this.form.serviceAddr}}</el-col>
-        </el-row>
-        <el-row :gutter="20">
-          <el-col :span="6" class="col-title">探活地址</el-col>
-          <el-col :span="18" class="col-content">{{this.form.probeActiveAddr}}</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="requestMethodOptions" :value="this.form.requestMethod"/>
-          </el-col>
-        </el-row>
-        <el-row :gutter="20">
-          <el-col :span="6" class="col-title">备注</el-col>
-          <el-col :span="18" class="col-content">{{this.form.remark}}</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="corsFlagOptions" :value="this.form.corsFlag"/>
-          </el-col>
-        </el-row>
-        <el-row :gutter="20">
-          <el-col :span="6" class="col-title">隐藏参数</el-col>
-          <el-col :span="18" class="col-content">{{this.form.hiddenParams}}</el-col>
-        </el-row>
-        <el-row :gutter="20">
-          <el-col :span="6" class="col-title">JSON文档</el-col>
-          <el-col :span="18" class="col-content">{{this.form.apiDoc}}</el-col>
-        </el-row>
-      </el-card>
-      <el-form ref="auditForm" :model="auditForm" :rules="rules" label-width="80px">
-        <el-form-item label="审核意见" prop="remark">
-          <el-input v-model="auditForm.remark" type="textarea" :disabled='this.view' placeholder="请输入审核意见"/>
-        </el-form-item>
-      </el-form>
-      <div slot="footer" class="dialog-footer">
-        <el-button :loading="buttonLoading" type="success" @click="submitAuditForm(1)" icon="el-icon-check" v-if="!this.view">通 过</el-button>
-        <el-button :loading="buttonLoading" type="warning" @click="submitAuditForm(2)" icon="el-icon-close" v-if="!this.view">驳 回</el-button>
-        <el-button @click="cancel">取 消</el-button>
-      </div>
-    </el-dialog>
   </div>
 </template>
 
 <script>
-import { listService, getService, delService, addService, updateService, auditService } from "@/api/isc/service";
+import { listService, getService, delService, addService, updateService } from "@/api/isc/service";
 import { treeselect } from "@/api/isc/cate";
 import Treeselect from "@riophae/vue-treeselect";
 import "@riophae/vue-treeselect/dist/vue-treeselect.css";
@@ -302,10 +221,6 @@ export default {
       exportLoading: false,
       // 选中数组
       ids: [],
-      // 是否查看
-      view: false,
-      // 是否展示详情
-      show: false,
       // 非单个禁用
       single: true,
       // 非多个禁用
@@ -320,8 +235,6 @@ export default {
       title: "",
       // 是否显示弹出层
       open: false,
-      // 是否显示弹出层
-      openView: false,
       // 跨域标志字典
       corsFlagOptions: [],
       // 是否在线字典
@@ -346,8 +259,6 @@ export default {
       },
       // 表单参数
       form: {},
-      // 审核表单参数
-      auditForm: {},
       // 表单校验
       rules: {
         serviceName: [
@@ -408,7 +319,7 @@ export default {
     },
     // 取消按钮
     cancel() {
-      this.open = this.openView = false;
+      this.open = false;
       this.reset();
     },
     // 表单重置
@@ -436,15 +347,6 @@ export default {
       };
       this.resetForm("form");
     },
-    // 审核表单重置
-    resetAudit() {
-      this.auditForm = {
-        ids: [],
-        status: "0",
-        remark: undefined
-      };
-      this.resetForm("auditForm");
-    },
     /** 搜索按钮操作 */
     handleQuery() {
       this.queryParams.pageNum = 1;
@@ -461,36 +363,6 @@ export default {
       this.single = selection.length!==1
       this.multiple = !selection.length
     },
-    /** 审核按钮操作 */
-    handleAudit(row) {
-      if(this.single) {
-        this.openView = true;
-        this.show = false;
-        this.title = "服务审核";
-        this.resetAudit();
-        this.auditForm.ids = this.ids;
-        return;
-      }
-      this.handleAuditSingle(row, false);
-    },
-    handleAuditSingle(row, view) {
-      this.loading = true;
-      this.view = view;
-      this.show = true;
-      this.reset();
-      const serviceId = row.serviceId || this.ids
-      getService(serviceId).then(response => {
-        this.loading = false;
-        this.form = response.data;
-        this.openView = true;
-        if(view) {
-          this.title = "服务查看";
-        }else{
-          this.title = "服务审核";
-        }
-        this.auditForm.ids = [serviceId]
-      });
-    },
     /** 新增按钮操作 */
     handleAdd() {
       this.reset();
@@ -548,27 +420,6 @@ export default {
         }
       });
     },
-    /** 提交按钮 */
-    submitAuditForm(status) {
-      this.auditForm.status = status;
-      this.$refs["auditForm"].validate(valid => {
-        if (valid) {
-          this.buttonLoading = true;
-          if (this.auditForm.ids.length > 0) {
-            auditService(this.auditForm).then(response => {
-              this.msgSuccess("审核成功");
-              this.openView = false;
-              this.getList();
-            }).finally(() => {
-              this.buttonLoading = false;
-            });
-          } else {
-              this.msgError("请选择记录");
-              this.buttonLoading = false;
-          }
-        }
-      });
-    },
     /** 删除按钮操作 */
     handleDelete(row) {
       const serviceIds = row.serviceId || this.ids;
@@ -593,16 +444,4 @@ export default {
     }
   }
 };
-</script>
-<style lang="scss" scoped>
-     .el-card .el-row {
-       font-size: 14px;
-       line-height: 36px;
-       vertical-align: middle;
-     }
-     .el-card .el-row .col-title {
-       text-align: right;
-       color: #606266;
-       font-weight: bold;
-     }
-</style>
\ No newline at end of file
+</script>
\ No newline at end of file