From e423d8afcf5b9666e166565d0509b621ebab17e7 Mon Sep 17 00:00:00 2001 From: 疯狂的狮子Li <15040126243@163.com> Date: 星期一, 13 一月 2025 14:11:00 +0800 Subject: [PATCH] !172 合并 warmflow 功能分支 * update 优化 流程定义页面 点击复制之后跳转到未发布列表 * update 优化 流程定义页面 增加加载loading层 * fix: v-model处理有延迟 需要手动处理 * update 调整流程定义查询 * Merge remote-tracking branch 'origin/dev' into warm-flw-future * update 调整可驳回的节点 * update: 调整文案 * update: 激活/挂起改为switch操作 * update 优化 代码删除无用输出 * update 统一抄送人使用昵称展示 * update 调整分类接口 * update 统一业务id参数 * update 删除默认顶节点 * !168 优化流程分类 * update 恢复误删除代码 * update 优化流程分类 * update 修复 路由跳转未改全 * [update] * fix 修复一些问题 * update 重构流程分类表 * update 流程定义增加表单路径与编辑功能 修复一些其他bug * fix 修复 一些问题 * update 变量统一命名 * add 增加示例 * Merge branch 'warm-flw-future' of https://gitee.com/JavaLionLi/plus-ui… * update 调整办理人 * Merge remote-tracking branch 'origin/dev' into warm-flw-future * add 增加示例 * update 调整审批记录 添加流程导出 * remove 删除无用代码 * remove 删除无用代码 * [update] * [fix] * 流程干预删除委托 * 增加附件 * 附件修改 * 申请人查询修改 * 1.修改查询条件 * !167 fix 修复 import路径修改不全问题 * fix 修复 import路径修改不全问题 * !166 update 清除 ProcessPreview 引用 * update 清除 ProcessPreview 引用 * remove 删除 bpmn.js 设计器 * remove 删除 bpmn.js 设计器 * remove 删除 bpmn.js 设计器 * remove 删除 bpmn.js 设计器 * fix 修复 前端路径修改不全问题 * update 优化接口请求路径 * add 添加作废 * add 添加流程干预 * update 调整加签,减签 * update 调整加签,减签 * add 增加流程查看 * update 调整委托,转办 * update 调整流程变量显示 * update 调整办理人修改 * update 调整流程实例状态页面 * update 调整已办页面 * add 添加流程撤销 * update 调整任务,流程实例 ,流程定义页面 * Merge branch 'dev' into warm-flw-future * update 调整流程定义页面 * add 添加流程变量查看 * update 调整设计器路由名称 * update 调整办理人 * update 调整设计器uri * update 调整设计器请求uri 调整待办状态 * update 调整办理 驳回 终止等状态 * add 添加模型新增 * add 添加warm-ui设计器,删除无用代码 * Merge remote-tracking branch 'origin/dev' into warm-flw-future * add 添加流程设计 * update 调整驳回 * update 调整视图类型错误 * Merge branch 'warm-flw-future' of https://gitee.com/JavaLionLi/plus-ui… * 添加已办,未办 * Merge remote-tracking branch 'origin/dev' into warm-flw-future * update 调整流程实例,待办查询 * add 添加代办人,调整提交按钮校验 * update 调整流程定义查询 * add添加流程定义激活 挂起 * add 添加流程文件部署 调整流程发布 * update 优化 时间搜索组件统一 * Merge remote-tracking branch 'origin/dev' into warm-flw-future * fix 修复 用户管理编辑安全权限错误问题 * Merge remote-tracking branch 'origin/dev' into warm-flw-future * update 优化 类型报错问题 * update 优化 切换租户后刷新首页 * update 优化 实现表格行选中切换 * update 优化 使用 vueuse 重构 websocket 实现 * update 优化 使用 vueuse 重构 websocket 实现 * fix 修复 登出后重新登录 sse推送报错问题 * reset 回滚 代码修改 采用其他方案 * fix 修复 登出后重新登录 sse推送报错问题 * update 优化 删除无用代码 * update element-plus 2.7.5 => 2.7.8 * reset 回滚 错误修复 * update 优化 代码生成器编辑页禁用缓存 防止同步后页面不更新问题 * fix 修复 代码生成同步点击取消报错问题 * 初始化添加warm-flow --- src/views/monitor/cache/index.vue | 137 +++++++++++++++++++++++---------------------- 1 files changed, 70 insertions(+), 67 deletions(-) diff --git a/src/views/monitor/cache/index.vue b/src/views/monitor/cache/index.vue index e413f75..81bbf2d 100644 --- a/src/views/monitor/cache/index.vue +++ b/src/views/monitor/cache/index.vue @@ -4,8 +4,8 @@ <el-col :span="24" class="card-box"> <el-card shadow="hover"> <template #header> - <Monitor style="width: 1em; height: 1em; vertical-align: middle;" /> - <span style="vertical-align: middle;">鍩烘湰淇℃伅</span> + <Monitor style="width: 1em; height: 1em; vertical-align: middle" /> + <span style="vertical-align: middle">鍩烘湰淇℃伅</span> </template> <div class="el-table el-table--enable-row-hover el-table--medium"> @@ -16,25 +16,25 @@ <div class="cell">Redis鐗堟湰</div> </td> <td class="el-table__cell is-leaf"> - <div class="cell" v-if="cache.info">{{ cache.info.redis_version }}</div> + <div v-if="cache.info" class="cell">{{ cache.info.redis_version }}</div> </td> <td class="el-table__cell is-leaf"> <div class="cell">杩愯妯″紡</div> </td> <td class="el-table__cell is-leaf"> - <div class="cell" v-if="cache.info">{{ cache.info.redis_mode === "standalone" ? "鍗曟満" : "闆嗙兢" }}</div> + <div v-if="cache.info" class="cell">{{ cache.info.redis_mode === 'standalone' ? '鍗曟満' : '闆嗙兢' }}</div> </td> <td class="el-table__cell is-leaf"> <div class="cell">绔彛</div> </td> <td class="el-table__cell is-leaf"> - <div class="cell" v-if="cache.info">{{ cache.info.tcp_port }}</div> + <div v-if="cache.info" class="cell">{{ cache.info.tcp_port }}</div> </td> <td class="el-table__cell is-leaf"> <div class="cell">瀹㈡埛绔暟</div> </td> <td class="el-table__cell is-leaf"> - <div class="cell" v-if="cache.info">{{ cache.info.connected_clients }}</div> + <div v-if="cache.info" class="cell">{{ cache.info.connected_clients }}</div> </td> </tr> <tr> @@ -42,25 +42,25 @@ <div class="cell">杩愯鏃堕棿(澶�)</div> </td> <td class="el-table__cell is-leaf"> - <div class="cell" v-if="cache.info">{{ cache.info.uptime_in_days }}</div> + <div v-if="cache.info" class="cell">{{ cache.info.uptime_in_days }}</div> </td> <td class="el-table__cell is-leaf"> <div class="cell">浣跨敤鍐呭瓨</div> </td> <td class="el-table__cell is-leaf"> - <div class="cell" v-if="cache.info">{{ cache.info.used_memory_human }}</div> + <div v-if="cache.info" class="cell">{{ cache.info.used_memory_human }}</div> </td> <td class="el-table__cell is-leaf"> <div class="cell">浣跨敤CPU</div> </td> <td class="el-table__cell is-leaf"> - <div class="cell" v-if="cache.info">{{ parseFloat(cache.info.used_cpu_user_children).toFixed(2) }}</div> + <div v-if="cache.info" class="cell">{{ parseFloat(cache.info.used_cpu_user_children).toFixed(2) }}</div> </td> <td class="el-table__cell is-leaf"> <div class="cell">鍐呭瓨閰嶇疆</div> </td> <td class="el-table__cell is-leaf"> - <div class="cell" v-if="cache.info">{{ cache.info.maxmemory_human }}</div> + <div v-if="cache.info" class="cell">{{ cache.info.maxmemory_human }}</div> </td> </tr> <tr> @@ -68,25 +68,25 @@ <div class="cell">AOF鏄惁寮�鍚�</div> </td> <td class="el-table__cell is-leaf"> - <div class="cell" v-if="cache.info">{{ cache.info.aof_enabled === "0" ? "鍚�" : "鏄�" }}</div> + <div v-if="cache.info" class="cell">{{ cache.info.aof_enabled === '0' ? '鍚�' : '鏄�' }}</div> </td> <td class="el-table__cell is-leaf"> <div class="cell">RDB鏄惁鎴愬姛</div> </td> <td class="el-table__cell is-leaf"> - <div class="cell" v-if="cache.info">{{ cache.info.rdb_last_bgsave_status }}</div> + <div v-if="cache.info" class="cell">{{ cache.info.rdb_last_bgsave_status }}</div> </td> <td class="el-table__cell is-leaf"> <div class="cell">Key鏁伴噺</div> </td> <td class="el-table__cell is-leaf"> - <div class="cell" v-if="cache.dbSize">{{ cache.dbSize }}</div> + <div v-if="cache.dbSize" class="cell">{{ cache.dbSize }}</div> </td> <td class="el-table__cell is-leaf"> <div class="cell">缃戠粶鍏ュ彛/鍑哄彛</div> </td> <td class="el-table__cell is-leaf"> - <div class="cell" v-if="cache.info"> + <div v-if="cache.info" class="cell"> {{ cache.info.instantaneous_input_kbps }}kps/{{ cache.info.instantaneous_output_kbps }}kps </div> </td> @@ -100,8 +100,8 @@ <el-col :span="12" class="card-box"> <el-card shadow="hover"> <template #header> - <PieChart style="width: 1em; height: 1em; vertical-align: middle;" /> - <span style="vertical-align: middle;">鍛戒护缁熻</span> + <PieChart style="width: 1em; height: 1em; vertical-align: middle" /> + <span style="vertical-align: middle">鍛戒护缁熻</span> </template> <div class="el-table el-table--enable-row-hover el-table--medium"> <div ref="commandstats" style="height: 420px" /> @@ -112,7 +112,7 @@ <el-col :span="12" class="card-box"> <el-card shadow="hover"> <template #header> - <Odometer style="width: 1em; height: 1em; vertical-align: middle;" /> <span style="vertical-align: middle;">鍐呭瓨淇℃伅</span> + <Odometer style="width: 1em; height: 1em; vertical-align: middle" /> <span style="vertical-align: middle">鍐呭瓨淇℃伅</span> </template> <div class="el-table el-table--enable-row-hover el-table--medium"> <div ref="usedmemory" style="height: 420px" /> @@ -126,64 +126,67 @@ <script setup name="Cache" lang="ts"> import { getCache } from '@/api/monitor/cache'; import * as echarts from 'echarts'; -import { ComponentInternalInstance } from "vue"; +import { CacheVO } from '@/api/monitor/cache/types'; -const cache = ref<any>({}); +const cache = ref<Partial<CacheVO>>({}); const commandstats = ref(); const usedmemory = ref(); const { proxy } = getCurrentInstance() as ComponentInternalInstance; const getList = async () => { - proxy?.$modal.loading("姝e湪鍔犺浇缂撳瓨鐩戞帶鏁版嵁锛岃绋嶅�欙紒"); - const res = await getCache(); - proxy?.$modal.closeLoading(); - cache.value = res.data; - const commandstatsIntance = echarts.init(commandstats.value, "macarons"); - commandstatsIntance.setOption({ - tooltip: { - trigger: "item", - formatter: "{a} <br/>{b} : {c} ({d}%)" + proxy?.$modal.loading('姝e湪鍔犺浇缂撳瓨鐩戞帶鏁版嵁锛岃绋嶅�欙紒'); + const res = await getCache(); + proxy?.$modal.closeLoading(); + cache.value = res.data; + const commandstatsIntance = echarts.init(commandstats.value, 'macarons'); + commandstatsIntance.setOption({ + tooltip: { + trigger: 'item', + formatter: '{a} <br/>{b} : {c} ({d}%)' + }, + series: [ + { + name: '鍛戒护', + type: 'pie', + roseType: 'radius', + radius: [15, 95], + center: ['50%', '38%'], + data: res.data.commandStats, + animationEasing: 'cubicInOut', + animationDuration: 1000 + } + ] + }); + const usedmemoryInstance = echarts.init(usedmemory.value, 'macarons'); + usedmemoryInstance.setOption({ + tooltip: { + formatter: '{b} <br/>{a} : ' + cache.value.info.used_memory_human + }, + series: [ + { + name: '宄板��', + type: 'gauge', + min: 0, + max: 1000, + detail: { + formatter: cache.value.info.used_memory_human }, - series: [ - { - name: "鍛戒护", - type: "pie", - roseType: "radius", - radius: [15, 95], - center: ["50%", "38%"], - data: res.data.commandStats, - animationEasing: "cubicInOut", - animationDuration: 1000 - } + data: [ + { + value: parseFloat(cache.value.info.used_memory_human), + name: '鍐呭瓨娑堣��' + } ] - }); - - const usedmemoryInstance = echarts.init(usedmemory.value, "macarons"); - usedmemoryInstance.setOption({ - tooltip: { - formatter: "{b} <br/>{a} : " + cache.value.info.used_memory_human - }, - series: [ - { - name: "宄板��", - type: "gauge", - min: 0, - max: 1000, - detail: { - formatter: cache.value.info.used_memory_human - }, - data: [ - { - value: parseFloat(cache.value.info.used_memory_human), - name: "鍐呭瓨娑堣��" - } - ] - } - ] - }) -} + } + ] + }); + window.addEventListener('resize', () => { + commandstatsIntance.resize(); + usedmemoryInstance.resize(); + }); +}; onMounted(() => { - getList(); -}) + getList(); +}); </script> -- Gitblit v1.9.3