From 6d266c82dfd1b6623d805ce8fbafb26a4e0db5c1 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E4=B8=8D=E5=81=9A=E7=A0=81=E5=86=9C?= <599854767@qq.com>
Date: Wed, 21 Sep 2022 09:28:34 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BC=98=E5=8C=96ui?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/components/Editor/index.vue    |  2 +-
 src/views/monitor/job/index.vue    |  7 ++++++-
 src/views/monitor/server/index.vue | 16 ++++++++++------
 3 files changed, 17 insertions(+), 8 deletions(-)

diff --git a/src/components/Editor/index.vue b/src/components/Editor/index.vue
index d6649ef..058ac5a 100644
--- a/src/components/Editor/index.vue
+++ b/src/components/Editor/index.vue
@@ -2,7 +2,7 @@
   <div style="border: 1px solid #ccc">
     <Toolbar style="border-bottom: 1px solid #ccc" :editor="editorRef" :defaultConfig="toolbarConfig" :mode="mode" />
     <Editor
-      style="height: 500px; overflow-y: hidden"
+      style="height: 300px; overflow-y: hidden"
       v-model="valueHtml"
       :defaultConfig="editorConfig"
       :mode="mode"
diff --git a/src/views/monitor/job/index.vue b/src/views/monitor/job/index.vue
index 752b7f3..4946b72 100644
--- a/src/views/monitor/job/index.vue
+++ b/src/views/monitor/job/index.vue
@@ -52,7 +52,7 @@
             <dict-tag :value="scope.row.isStart" :options="isStartOptions"></dict-tag>
           </template>
         </el-table-column>
-        <el-table-column prop="lastRunTime" align="center" label="最后运行时间" :show-overflow-tooltip="true" />
+        <!-- <el-table-column prop="lastRunTime" align="center" label="最后运行时间" :show-overflow-tooltip="true" /> -->
         <el-table-column prop="remark" align="center" label="备注" :show-overflow-tooltip="true" />
         <el-table-column label="操作" align="center" width="250" class-name="small-padding fixed-width">
           <template #default="scope">
@@ -240,6 +240,11 @@
               <el-input type="textarea" v-model="form.remark" />
             </el-form-item>
           </el-col>
+          <el-col :lg="24">
+            <el-form-item label="最后运行时间" prop="lastRunTime">
+              {{ form.lastRunTime }}
+            </el-form-item>
+          </el-col>
         </el-row>
       </el-form>
       <template #footer v-if="btnVisible">
diff --git a/src/views/monitor/server/index.vue b/src/views/monitor/server/index.vue
index af8bee7..56c95cc 100644
--- a/src/views/monitor/server/index.vue
+++ b/src/views/monitor/server/index.vue
@@ -7,15 +7,15 @@
             <span>状态</span>
           </template>
 
-          <el-col :xs="24" :sm="24" :md="8" :lg="8" :xl="8" class="mr20">
+          <div class="col-item">
             <div class="title">CPU使用率</div>
             <div class="content">
               <el-progress type="dashboard" :percentage="parseFloat(server.cpu.cpuRate)" />
             </div>
             <div class="footer" v-if="server.sys">{{ server.sys.cpuNum }} 核心</div>
-          </el-col>
+          </div>
 
-          <el-col :xs="24" :sm="24" :md="8" :lg="8" :xl="8">
+          <div class="col-item">
             <div class="title">内存使用率</div>
             <el-tooltip placement="top-end">
               <template #content>
@@ -31,7 +31,7 @@
               </div>
             </el-tooltip>
             <div class="footer">{{ server.cpu.usedRam }} / {{ server.cpu.totalRAM }}</div>
-          </el-col>
+          </div>
         </el-card>
       </el-col>
 
@@ -40,7 +40,7 @@
           <template #header>
             <span>磁盘状态</span>
           </template>
-          <el-col :xs="24" :sm="24" :md="6" :lg="6" :xl="6" v-for="sysFile in server.disk" :key="sysFile.diskName">
+          <div class="col-item" v-for="sysFile in server.disk" :key="sysFile.diskName">
             <div class="title">{{ sysFile.diskName }}盘使用率</div>
             <div class="content">
               <el-tooltip placement="top-end">
@@ -57,7 +57,7 @@
               </el-tooltip>
             </div>
             <div class="footer">{{ sysFile.availableFreeSpace }}GB可用，共{{ sysFile.totalSize }}GB</div>
-          </el-col>
+          </div>
         </el-card>
       </el-col>
 
@@ -265,4 +265,8 @@ table tr {
   margin-top: 5px;
   margin-bottom: 5px;
 }
+.col-item {
+  width: 200px;
+  display: inline-block;
+}
 </style>