1、有道api获取数据解析bug修复

2、细节修改
3、前端依赖调整
pull/254/head
xjs 4 years ago
parent 98e5af2ef2
commit 1a129c561f

@ -37,10 +37,11 @@
}, },
"dependencies": { "dependencies": {
"@riophae/vue-treeselect": "0.4.0", "@riophae/vue-treeselect": "0.4.0",
"@vue/composition-api": "^1.3.0",
"axios": "0.24.0", "axios": "0.24.0",
"clipboard": "2.0.8", "clipboard": "2.0.8",
"core-js": "3.19.1", "core-js": "3.19.1",
"echarts": "^5.1.2", "echarts": "^5.3.0",
"element-ui": "2.15.6", "element-ui": "2.15.6",
"file-saver": "2.0.5", "file-saver": "2.0.5",
"fuse.js": "6.4.3", "fuse.js": "6.4.3",
@ -55,6 +56,7 @@
"vue": "2.6.12", "vue": "2.6.12",
"vue-count-to": "1.0.13", "vue-count-to": "1.0.13",
"vue-cropper": "0.5.5", "vue-cropper": "0.5.5",
"vue-echarts": "^6.0.2",
"vue-json-viewer": "^2.2.21", "vue-json-viewer": "^2.2.21",
"vue-meta": "2.4.0", "vue-meta": "2.4.0",
"vue-router": "3.4.9", "vue-router": "3.4.9",

@ -49,6 +49,7 @@
<el-button type="text" <el-button type="text"
@click="toEdit(article)" @click="toEdit(article)"
v-hasPermi="['english:article:edit']"
icon="el-icon-edit">编辑 icon="el-icon-edit">编辑
</el-button> </el-button>
<el-divider direction="vertical"></el-divider> <el-divider direction="vertical"></el-divider>
@ -109,7 +110,7 @@
<el-col :span="24"> <el-col :span="24">
<el-form-item label="内容" prop="contentChinese"> <el-form-item label="内容" prop="contentChinese">
<el-input v-model="formData.contentChinese" type="textarea" placeholder="请输入内容" :maxlength="1000" <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> style="width: 100%;"></el-input>
</el-form-item> </el-form-item>
</el-col> </el-col>

@ -106,14 +106,14 @@
</div> </div>
</el-card> </el-card>
<div> <!-- <div>
<el-row :gutter="6"> <el-row :gutter="6">
<el-col :xs="24" :sm="24" :md="12" :lg="12" :xl="12" style="margin-bottom: 10px"> <el-col :xs="24" :sm="24" :md="12" :lg="12" :xl="12" style="margin-bottom: 10px">
<el-card class="box-card"> <el-card class="box-card">
<div slot="header" class="clearfix"> <div slot="header" class="clearfix">
<span style="font-weight: bold;color: #666;font-size: 15px">CPU使用率监控</span> <span style="font-weight: bold;color: #666;font-size: 15px">CPU使用率监控</span>
</div> </div>
<div> <div style="height: 400px;width: 400px">
<v-chart :options="cpuInfo" /> <v-chart :options="cpuInfo" />
</div> </div>
</el-card> </el-card>
@ -123,21 +123,19 @@
<div slot="header" class="clearfix"> <div slot="header" class="clearfix">
<span style="font-weight: bold;color: #666;font-size: 15px">内存使用率监控</span> <span style="font-weight: bold;color: #666;font-size: 15px">内存使用率监控</span>
</div> </div>
<div> <div style="height: 400px;width: 400px">
<v-chart :options="memoryInfo" /> <v-chart :options="memoryInfo" />
</div> </div>
</el-card> </el-card>
</el-col> </el-col>
</el-row> </el-row>
</div> </div>-->
</div> </div>
</div> </div>
</template> </template>
<script> <script>
import ECharts from 'vue-echarts' import ECharts from 'vue-echarts'
import 'echarts/lib/chart/line'
import 'echarts/lib/component/polar'
import { getPerformance } from '@/api/business/monitor/performance/performancemonitor' import { getPerformance } from '@/api/business/monitor/performance/performancemonitor'
export default { export default {
name: 'Performance', name: 'Performance',

@ -59,6 +59,7 @@
</div> </div>
<div class="el-table el-table--enable-row-hover el-table--medium"> <div class="el-table el-table--enable-row-hover el-table--medium">
<div ref="usedmemory" style="height: 420px" /> <div ref="usedmemory" style="height: 420px" />
</div> </div>
</el-card> </el-card>
</el-col> </el-col>
@ -68,7 +69,8 @@
<script> <script>
import { getRedisCache } from "@/api/business/monitor/redis/cache"; import { getRedisCache } from "@/api/business/monitor/redis/cache";
import echarts from "echarts"; import * as echarts from 'echarts';
export default { export default {
name: "Redis", name: "Redis",

@ -47,16 +47,18 @@ public class YouDaoTranslationFactory implements TranslationFactory {
long elapsedTime = Long.parseLong(translationApi.getString("elapsedTime")); long elapsedTime = Long.parseLong(translationApi.getString("elapsedTime"));
translationVo.setElapsedTime(elapsedTime); translationVo.setElapsedTime(elapsedTime);
JSONArray translateResult = translationApi.getJSONArray("translateResult"); JSONArray translateResult = translationApi.getJSONArray("translateResult");
JSONArray jsonArray = translateResult.getJSONArray(0);
ArrayList<Map<String, String>> maps = new ArrayList<>(); ArrayList<Map<String, String>> maps = new ArrayList<>();
if (jsonArray.size() > 0) {
for (int i = 0; i < jsonArray.size(); i++) { for (Object o : translateResult) {
Map<String, String> map = new HashMap<String, String>(); JSONArray jsonArrays = (JSONArray) o;
map.put("src", jsonArray.getJSONObject(i).getString("src")); JSONObject jsonObject = jsonArrays.getJSONObject(0);
map.put("dst", jsonArray.getJSONObject(i).getString("tgt")); Map<String, String> map = new HashMap<String, String>();
maps.add(map); map.put("src", jsonObject.getString("src"));
} map.put("dst", jsonObject.getString("tgt"));
maps.add(map);
} }
translationVo.setTransResult(maps); translationVo.setTransResult(maps);
return translationVo; return translationVo;
} }

Loading…
Cancel
Save