From e04a4526ceed8f05876be883cd419945c4527c40 Mon Sep 17 00:00:00 2001
From: Wenchao Gong <hanyedxing2012@163.com>
Date: Thu, 9 Sep 2021 23:42:56 +0800
Subject: [PATCH] =?UTF-8?q?=E6=8C=89=E9=92=AE=E6=B7=BB=E5=8A=A0(=E6=9C=AA?=
 =?UTF-8?q?=E5=AE=9E=E7=8E=B0)?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../service/impl/IscServiceServiceImpl.java   |  9 ++--
 ruoyi-ui/src/views/isc/appservice/index.vue   |  7 ++++
 ruoyi-ui/src/views/isc/service/index.vue      | 41 +++++++++++--------
 3 files changed, 36 insertions(+), 21 deletions(-)

diff --git a/ruoyi-isc/src/main/java/com/ruoyi/isc/service/impl/IscServiceServiceImpl.java b/ruoyi-isc/src/main/java/com/ruoyi/isc/service/impl/IscServiceServiceImpl.java
index 49ec72bcc..2b0895d11 100644
--- a/ruoyi-isc/src/main/java/com/ruoyi/isc/service/impl/IscServiceServiceImpl.java
+++ b/ruoyi-isc/src/main/java/com/ruoyi/isc/service/impl/IscServiceServiceImpl.java
@@ -25,10 +25,7 @@ import com.ruoyi.isc.service.IIscServiceService;
 import org.springframework.stereotype.Service;
 
 import javax.annotation.Resource;
-import java.util.Collection;
-import java.util.List;
-import java.util.Map;
-import java.util.Set;
+import java.util.*;
 import java.util.stream.Collectors;
 
 /**
@@ -46,7 +43,9 @@ public class IscServiceServiceImpl extends ServicePlusImpl<IscServiceMapper, Isc
     @Override
     public IscServiceVo queryById(Long serviceId)
     {
-        return getVoById(serviceId);
+        final IscServiceVo vo = getVoById(serviceId);
+        genVoInfo(Arrays.asList(vo));
+        return vo;
     }
 
     @Override
diff --git a/ruoyi-ui/src/views/isc/appservice/index.vue b/ruoyi-ui/src/views/isc/appservice/index.vue
index 0f188cc32..daad3d48d 100644
--- a/ruoyi-ui/src/views/isc/appservice/index.vue
+++ b/ruoyi-ui/src/views/isc/appservice/index.vue
@@ -123,6 +123,13 @@
       </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="handleRenewal(scope.row)"
+            v-hasPermi="['isc:appservice:query']"
+          >查看</el-button>
           <el-button
             size="mini"
             type="text"
diff --git a/ruoyi-ui/src/views/isc/service/index.vue b/ruoyi-ui/src/views/isc/service/index.vue
index b2f5407fa..9e613b17d 100644
--- a/ruoyi-ui/src/views/isc/service/index.vue
+++ b/ruoyi-ui/src/views/isc/service/index.vue
@@ -71,6 +71,17 @@
           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="handleUpdate"
+          v-hasPermi="['isc:service:audit']"
+        >批量审核</el-button>
+      </el-col>
       <el-col :span="1.5">
         <el-button
           type="danger"
@@ -124,6 +135,20 @@
       </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="handleUpdate(scope.row)"
+            v-hasPermi="['isc:service:query']"
+          >查看</el-button>
+          <el-button
+            size="mini"
+            type="text"
+            icon="el-icon-view"
+            @click="handleUpdate(scope.row)"
+            v-hasPermi="['isc:service:audit']"
+          >审核</el-button>
           <el-button
             size="mini"
             type="text"
@@ -317,22 +342,6 @@ export default {
         this.loading = false;
       });
     },
-    // 跨域标志字典翻译
-    corsFlagFormat(row, column) {
-      return this.selectDictLabel(this.corsFlagOptions, row.corsFlag);
-    },
-    // 是否在线字典翻译
-    onlineStatusFormat(row, column) {
-      return this.selectDictLabel(this.onlineStatusOptions, row.onlineStatus);
-    },
-    // 审核状态字典翻译
-    statusFormat(row, column) {
-      return this.selectDictLabel(this.statusOptions, row.status);
-    },
-    // 服务状态字典翻译
-    enabledFormat(row, column) {
-      return this.selectDictLabel(this.enabledOptions, row.enabled);
-    },
     // 取消按钮
     cancel() {
       this.open = false;