From 1a129c561f1f10d77902e807c1903a4b152d4e5b Mon Sep 17 00:00:00 2001
From: xjs <1294405880@qq.com>
Date: Fri, 4 Mar 2022 23:51:53 +0800
Subject: [PATCH] =?UTF-8?q?1=E3=80=81=E6=9C=89=E9=81=93api=E8=8E=B7?=
 =?UTF-8?q?=E5=8F=96=E6=95=B0=E6=8D=AE=E8=A7=A3=E6=9E=90bug=E4=BF=AE?=
 =?UTF-8?q?=E5=A4=8D=202=E3=80=81=E7=BB=86=E8=8A=82=E4=BF=AE=E6=94=B9=203?=
 =?UTF-8?q?=E3=80=81=E5=89=8D=E7=AB=AF=E4=BE=9D=E8=B5=96=E8=B0=83=E6=95=B4?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 ruoyi-ui/package.json                          |  4 +++-
 .../views/business/english/article/index.vue   |  3 ++-
 .../business/monitor/performance/index.vue     | 10 ++++------
 .../src/views/business/monitor/redis/index.vue |  4 +++-
 .../factory/impl/YouDaoTranslationFactory.java | 18 ++++++++++--------
 5 files changed, 22 insertions(+), 17 deletions(-)

diff --git a/ruoyi-ui/package.json b/ruoyi-ui/package.json
index 78ba0008..e80eeccb 100644
--- a/ruoyi-ui/package.json
+++ b/ruoyi-ui/package.json
@@ -37,10 +37,11 @@
   },
   "dependencies": {
     "@riophae/vue-treeselect": "0.4.0",
+    "@vue/composition-api": "^1.3.0",
     "axios": "0.24.0",
     "clipboard": "2.0.8",
     "core-js": "3.19.1",
-    "echarts": "^5.1.2",
+    "echarts": "^5.3.0",
     "element-ui": "2.15.6",
     "file-saver": "2.0.5",
     "fuse.js": "6.4.3",
@@ -55,6 +56,7 @@
     "vue": "2.6.12",
     "vue-count-to": "1.0.13",
     "vue-cropper": "0.5.5",
+    "vue-echarts": "^6.0.2",
     "vue-json-viewer": "^2.2.21",
     "vue-meta": "2.4.0",
     "vue-router": "3.4.9",
diff --git a/ruoyi-ui/src/views/business/english/article/index.vue b/ruoyi-ui/src/views/business/english/article/index.vue
index 3de0a586..1db0ecdd 100644
--- a/ruoyi-ui/src/views/business/english/article/index.vue
+++ b/ruoyi-ui/src/views/business/english/article/index.vue
@@ -49,6 +49,7 @@
 
           <el-button type="text"
                      @click="toEdit(article)"
+                     v-hasPermi="['english:article:edit']"
                      icon="el-icon-edit">编辑
           </el-button>
           <el-divider direction="vertical"></el-divider>
@@ -109,7 +110,7 @@
             <el-col :span="24">
               <el-form-item label="内容" prop="contentChinese">
                 <el-input v-model="formData.contentChinese" type="textarea" placeholder="请输入内容" :maxlength="1000"
-                          :autosize="{minRows: 8, maxRows: 12}"
+                          :autosize="{minRows: 8, maxRows: 8}"
                           style="width: 100%;"></el-input>
               </el-form-item>
             </el-col>
diff --git a/ruoyi-ui/src/views/business/monitor/performance/index.vue b/ruoyi-ui/src/views/business/monitor/performance/index.vue
index d95d6897..773a841e 100644
--- a/ruoyi-ui/src/views/business/monitor/performance/index.vue
+++ b/ruoyi-ui/src/views/business/monitor/performance/index.vue
@@ -106,14 +106,14 @@
         </div>
       </el-card>
 
-      <div>
+<!--      <div>
         <el-row :gutter="6">
           <el-col :xs="24" :sm="24" :md="12" :lg="12" :xl="12" style="margin-bottom: 10px">
             <el-card class="box-card">
               <div slot="header" class="clearfix">
                 <span style="font-weight: bold;color: #666;font-size: 15px">CPU使用率监控</span>
               </div>
-              <div>
+              <div style="height: 400px;width: 400px">
                 <v-chart :options="cpuInfo" />
               </div>
             </el-card>
@@ -123,21 +123,19 @@
               <div slot="header" class="clearfix">
                 <span style="font-weight: bold;color: #666;font-size: 15px">内存使用率监控</span>
               </div>
-              <div>
+              <div style="height: 400px;width: 400px">
                 <v-chart :options="memoryInfo" />
               </div>
             </el-card>
           </el-col>
         </el-row>
-      </div>
+      </div>-->
     </div>
   </div>
 </template>
 
 <script>
 import ECharts from 'vue-echarts'
-import 'echarts/lib/chart/line'
-import 'echarts/lib/component/polar'
 import { getPerformance } from '@/api/business/monitor/performance/performancemonitor'
 export default {
   name: 'Performance',
diff --git a/ruoyi-ui/src/views/business/monitor/redis/index.vue b/ruoyi-ui/src/views/business/monitor/redis/index.vue
index fd5a13b9..5ca1c607 100644
--- a/ruoyi-ui/src/views/business/monitor/redis/index.vue
+++ b/ruoyi-ui/src/views/business/monitor/redis/index.vue
@@ -59,6 +59,7 @@
           </div>
           <div class="el-table el-table--enable-row-hover el-table--medium">
             <div ref="usedmemory" style="height: 420px" />
+
           </div>
         </el-card>
       </el-col>
@@ -68,7 +69,8 @@
 
 <script>
 import { getRedisCache } from "@/api/business/monitor/redis/cache";
-import echarts from "echarts";
+import * as echarts from 'echarts';
+
 
 export default {
   name: "Redis",
diff --git a/xjs-business/xjs-business-openapi/src/main/java/com/xjs/translation/factory/impl/YouDaoTranslationFactory.java b/xjs-business/xjs-business-openapi/src/main/java/com/xjs/translation/factory/impl/YouDaoTranslationFactory.java
index 0552b7b9..c7538199 100644
--- a/xjs-business/xjs-business-openapi/src/main/java/com/xjs/translation/factory/impl/YouDaoTranslationFactory.java
+++ b/xjs-business/xjs-business-openapi/src/main/java/com/xjs/translation/factory/impl/YouDaoTranslationFactory.java
@@ -47,16 +47,18 @@ public class YouDaoTranslationFactory implements TranslationFactory {
         long elapsedTime = Long.parseLong(translationApi.getString("elapsedTime"));
         translationVo.setElapsedTime(elapsedTime);
         JSONArray translateResult = translationApi.getJSONArray("translateResult");
-        JSONArray jsonArray = translateResult.getJSONArray(0);
+
         ArrayList<Map<String, String>> maps = new ArrayList<>();
-        if (jsonArray.size() > 0) {
-            for (int i = 0; i < jsonArray.size(); i++) {
-                Map<String, String> map = new HashMap<String, String>();
-                map.put("src", jsonArray.getJSONObject(i).getString("src"));
-                map.put("dst", jsonArray.getJSONObject(i).getString("tgt"));
-                maps.add(map);
-            }
+
+        for (Object o : translateResult) {
+            JSONArray jsonArrays = (JSONArray) o;
+            JSONObject jsonObject = jsonArrays.getJSONObject(0);
+            Map<String, String> map = new HashMap<String, String>();
+            map.put("src", jsonObject.getString("src"));
+            map.put("dst", jsonObject.getString("tgt"));
+            maps.add(map);
         }
+
         translationVo.setTransResult(maps);
         return translationVo;
     }