fix: cron组件中周回显bug

fuzui

2021-12-16 43d76e599091dc6b79b51f89c79514b50e33ea35

 ruoyi-ui/src/views/monitor/server/index.vue

@@ -8,26 +8,26 @@
            <table cellspacing="0" style="width: 100%;">

              <thead>

                <tr>

                  <th class="is-leaf"><div class="cell">属性</div></th>

                  <th class="is-leaf"><div class="cell">值</div></th>

                  <th class="el-table__cell is-leaf"><div class="cell">属性</div></th>

                  <th class="el-table__cell is-leaf"><div class="cell">值</div></th>

                </tr>

              </thead>

              <tbody>

                <tr>

                  <td><div class="cell">核心数</div></td>

                  <td><div class="cell" v-if="server.cpu">{{ server.cpu.cpuNum }}</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="server.cpu">{{ server.cpu.cpuNum }}</div></td>

                </tr>

                <tr>

                  <td><div class="cell">用户使用率</div></td>

                  <td><div class="cell" v-if="server.cpu">{{ server.cpu.used }}%</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="server.cpu">{{ server.cpu.used }}%</div></td>

                </tr>

                <tr>

                  <td><div class="cell">系统使用率</div></td>

                  <td><div class="cell" v-if="server.cpu">{{ server.cpu.sys }}%</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="server.cpu">{{ server.cpu.sys }}%</div></td>

                </tr>

                <tr>

                  <td><div class="cell">当前空闲率</div></td>

                  <td><div class="cell" v-if="server.cpu">{{ server.cpu.free }}%</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="server.cpu">{{ server.cpu.free }}%</div></td>

                </tr>

              </tbody>

            </table>

@@ -42,31 +42,31 @@
            <table cellspacing="0" style="width: 100%;">

              <thead>

                <tr>

                  <th class="is-leaf"><div class="cell">属性</div></th>

                  <th class="is-leaf"><div class="cell">内存</div></th>

                  <th class="is-leaf"><div class="cell">JVM</div></th>

                  <th class="el-table__cell is-leaf"><div class="cell">属性</div></th>

                  <th class="el-table__cell is-leaf"><div class="cell">内存</div></th>

                  <th class="el-table__cell is-leaf"><div class="cell">JVM</div></th>

                </tr>

              </thead>

              <tbody>

                <tr>

                  <td><div class="cell">总内存</div></td>

                  <td><div class="cell" v-if="server.mem">{{ server.mem.total }}G</div></td>

                  <td><div class="cell" v-if="server.jvm">{{ server.jvm.total }}M</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="server.mem">{{ server.mem.total }}G</div></td>

                  <td class="el-table__cell is-leaf"><div class="cell" v-if="server.jvm">{{ server.jvm.total }}M</div></td>

                </tr>

                <tr>

                  <td><div class="cell">已用内存</div></td>

                  <td><div class="cell" v-if="server.mem">{{ server.mem.used}}G</div></td>

                  <td><div class="cell" v-if="server.jvm">{{ server.jvm.used}}M</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="server.mem">{{ server.mem.used}}G</div></td>

                  <td class="el-table__cell is-leaf"><div class="cell" v-if="server.jvm">{{ server.jvm.used}}M</div></td>

                </tr>

                <tr>

                  <td><div class="cell">剩余内存</div></td>

                  <td><div class="cell" v-if="server.mem">{{ server.mem.free }}G</div></td>

                  <td><div class="cell" v-if="server.jvm">{{ server.jvm.free }}M</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="server.mem">{{ server.mem.free }}G</div></td>

                  <td class="el-table__cell is-leaf"><div class="cell" v-if="server.jvm">{{ server.jvm.free }}M</div></td>

                </tr>

                <tr>

                  <td><div class="cell">使用率</div></td>

                  <td><div class="cell" v-if="server.mem" :class="{'text-danger': server.mem.usage > 80}">{{ server.mem.usage }}%</div></td>

                  <td><div class="cell" v-if="server.jvm" :class="{'text-danger': server.jvm.usage > 80}">{{ server.jvm.usage }}%</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="server.mem" :class="{'text-danger': server.mem.usage > 80}">{{ server.mem.usage }}%</div></td>

                  <td class="el-table__cell is-leaf"><div class="cell" v-if="server.jvm" :class="{'text-danger': server.jvm.usage > 80}">{{ server.jvm.usage }}%</div></td>

                </tr>

              </tbody>

            </table>

@@ -83,16 +83,16 @@
            <table cellspacing="0" style="width: 100%;">

              <tbody>

                <tr>

                  <td><div class="cell">服务器名称</div></td>

                  <td><div class="cell" v-if="server.sys">{{ server.sys.computerName }}</div></td>

                  <td><div class="cell">操作系统</div></td>

                  <td><div class="cell" v-if="server.sys">{{ server.sys.osName }}</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="server.sys">{{ server.sys.computerName }}</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="server.sys">{{ server.sys.osName }}</div></td>

                </tr>

                <tr>

                  <td><div class="cell">服务器IP</div></td>

                  <td><div class="cell" v-if="server.sys">{{ server.sys.computerIp }}</div></td>

                  <td><div class="cell">系统架构</div></td>

                  <td><div class="cell" v-if="server.sys">{{ server.sys.osArch }}</div></td>

                  <td class="el-table__cell is-leaf"><div class="cell">服务器IP</div></td>

                  <td class="el-table__cell is-leaf"><div class="cell" v-if="server.sys">{{ server.sys.computerIp }}</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="server.sys">{{ server.sys.osArch }}</div></td>

                </tr>

              </tbody>

            </table>

@@ -109,24 +109,24 @@
            <table cellspacing="0" style="width: 100%;">

              <tbody>

                <tr>

                  <td><div class="cell">Java名称</div></td>

                  <td><div class="cell" v-if="server.jvm">{{ server.jvm.name }}</div></td>

                  <td><div class="cell">Java版本</div></td>

                  <td><div class="cell" v-if="server.jvm">{{ server.jvm.version }}</div></td>

                  <td class="el-table__cell is-leaf"><div class="cell">Java名称</div></td>

                  <td class="el-table__cell is-leaf"><div class="cell" v-if="server.jvm">{{ server.jvm.name }}</div></td>

                  <td class="el-table__cell is-leaf"><div class="cell">Java版本</div></td>

                  <td class="el-table__cell is-leaf"><div class="cell" v-if="server.jvm">{{ server.jvm.version }}</div></td>

                </tr>

                <tr>

                  <td><div class="cell">启动时间</div></td>

                  <td><div class="cell" v-if="server.jvm">{{ server.jvm.startTime }}</div></td>

                  <td><div class="cell">运行时长</div></td>

                  <td><div class="cell" v-if="server.jvm">{{ server.jvm.runTime }}</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="server.jvm">{{ server.jvm.startTime }}</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="server.jvm">{{ server.jvm.runTime }}</div></td>

                </tr>

                <tr>

                  <td colspan="1"><div class="cell">安装路径</div></td>

                  <td colspan="3"><div class="cell" v-if="server.jvm">{{ server.jvm.home }}</div></td>

                  <td colspan="1" class="el-table__cell is-leaf"><div class="cell">安装路径</div></td>

                  <td colspan="3" class="el-table__cell is-leaf"><div class="cell" v-if="server.jvm">{{ server.jvm.home }}</div></td>

                </tr>

                <tr>

                  <td colspan="1"><div class="cell">项目路径</div></td>

                  <td colspan="3"><div class="cell" v-if="server.sys">{{ server.sys.userDir }}</div></td>

                  <td colspan="1" class="el-table__cell is-leaf"><div class="cell">项目路径</div></td>

                  <td colspan="3" class="el-table__cell is-leaf"><div class="cell" v-if="server.sys">{{ server.sys.userDir }}</div></td>

                </tr>

              </tbody>

            </table>

@@ -143,24 +143,24 @@
            <table cellspacing="0" style="width: 100%;">

              <thead>

                <tr>

                  <th class="is-leaf"><div class="cell">盘符路径</div></th>

                  <th class="is-leaf"><div class="cell">文件系统</div></th>

                  <th class="is-leaf"><div class="cell">盘符类型</div></th>

                  <th class="is-leaf"><div class="cell">总大小</div></th>

                  <th class="is-leaf"><div class="cell">可用大小</div></th>

                  <th class="is-leaf"><div class="cell">已用大小</div></th>

                  <th class="is-leaf"><div class="cell">已用百分比</div></th>

                  <th class="el-table__cell el-table__cell is-leaf"><div class="cell">盘符路径</div></th>

                  <th class="el-table__cell is-leaf"><div class="cell">文件系统</div></th>

                  <th class="el-table__cell is-leaf"><div class="cell">盘符类型</div></th>

                  <th class="el-table__cell is-leaf"><div class="cell">总大小</div></th>

                  <th class="el-table__cell is-leaf"><div class="cell">可用大小</div></th>

                  <th class="el-table__cell is-leaf"><div class="cell">已用大小</div></th>

                  <th class="el-table__cell is-leaf"><div class="cell">已用百分比</div></th>

                </tr>

              </thead>

              <tbody v-if="server.sysFiles">

                <tr v-for="(sysFile, index) in sysFiles" :key="index">

                  <td><div class="cell">{{ sysFile.dirName }}</div></td>

                  <td><div class="cell">{{ sysFile.sysTypeName }}</div></td>

                  <td><div class="cell">{{ sysFile.typeName }}</div></td>

                  <td><div class="cell">{{ sysFile.total }}</div></td>

                  <td><div class="cell">{{ sysFile.free }}</div></td>

                  <td><div class="cell">{{ sysFile.used }}</div></td>

                  <td><div class="cell" :class="{'text-danger': sysFile.usage > 80}">{{ sysFile.usage }}%</div></td>

                <tr v-for="(sysFile, index) in server.sysFiles" :key="index">

                  <td class="el-table__cell is-leaf"><div class="cell">{{ sysFile.dirName }}</div></td>

                  <td class="el-table__cell is-leaf"><div class="cell">{{ sysFile.sysTypeName }}</div></td>

                  <td class="el-table__cell is-leaf"><div class="cell">{{ sysFile.typeName }}</div></td>

                  <td class="el-table__cell is-leaf"><div class="cell">{{ sysFile.total }}</div></td>

                  <td class="el-table__cell is-leaf"><div class="cell">{{ sysFile.free }}</div></td>

                  <td class="el-table__cell is-leaf"><div class="cell">{{ sysFile.used }}</div></td>

                  <td class="el-table__cell is-leaf"><div class="cell" :class="{'text-danger': sysFile.usage > 80}">{{ sysFile.usage }}%</div></td>

                </tr>

              </tbody>

            </table>

@@ -196,7 +196,7 @@
    },

    // 打开加载层

    openLoading() {

      this.$modal.loading("正在加载服务监控数据，请稍后！");

      this.$modal.loading("正在加载服务监控数据，请稍候！");

    }

  }

};