修改 服务器磁盘监控 页面样式

admin/control/arw_monitor.php

@@ -65,7 +65,8 @@ class arw_monitorControl extends SystemControl
                     ksort($item);
                 }
             }
-            $result[$ip . "{$server_name}"] = $item;
+            $item["server_name"] = $server_name;
+            $result[$ip] = $item;
         }
         Tpl::output('data', $result);
         Tpl::output('ago_time', $this->elapse_time($ago_time));

admin/templates/default/arw.monitor.php

@@ -30,43 +30,45 @@
             </tr>
             </tbody>
         </table>
-    <table class="table tb-type2 nobdb" style="min-width:1400px">
+    <table class="table tb-type2 nobdb" style="min-width:100%">
         <thead>
         <tr class="thead">
-            <th class="align-center">服务器ip</th>
-            <th class="align-left">更新时间</th>
-            <th class="align-left">mnt目录</th>
-            <th class="align-left">data目录</th>
-            <th class="align-left">日志</th>
-            <th class="align-left">stdata</th>
-            <th class="align-left">data/mysqlundo</th>
-            <th class="align-left">mysql/xyzshop</th>
+            <th class="align-left">ip</th>
+            <th class="align-center">类型</th>
+            <th class="align-center" style="width: 15%">更新时间</th>
+            <th class="align-center">/mnt</th>
+            <th class="align-center">/data</th>
+            <th class="align-center">logs</th>
+            <th class="align-center">/stdata</th>
+            <th class="align-center">data/mysqlundo</th>
+            <th class="align-center">mysql/xyzshop</th>
         </thead>
         <tbody id="tbody">
         <?php if (count($output['data']) > 0) { ?>
             <?php
             foreach ($output['data'] as $key => $value) { ?>
                 <tr class="hover trFlex">
-                    <td class="align-center"><span style=" font-size: 16px"><?php echo $key; ?></span></td>
-                    <td class="align-left">
+                    <td class="align-left"><span style=" font-size: 16px"><?php echo $key; ?></span></td>
+                    <td class="align-center"><span style=" font-size: 16px"><?php echo $value['server_name']; ?></span></td>
+                    <td class="align-right">
                         <span style=" font-size: 16px"><?php echo $value['cur_time'] ?? ''; ?></span>
                     </td>
-                    <td class="align-left">
-                        <span style=" font-size: 16px"><?php echo $value['dev/vdb1'] ?? ''; ?></span>
+                    <td class="align-center">
+                        <span style="font-size: 16px"><?php echo $value['dev/vdb1'] ?? ''; ?></span>
                     </td>
-                    <td class="align-left">
+                    <td class="align-center">
                         <span style=" font-size: 16px"><?php echo $value['dev/vdc1'] ?? ''; ?></span>
                     </td>
-                    <td class="align-left">
+                    <td class="align-center">
                         <span style=" font-size: 16px"><?php echo $value['mnt/shoplog'] ?? ''; ?></span>
                     </td>
-                    <td class="align-left">
+                    <td class="align-center">
                         <span style=" font-size: 16px"><?php echo $value['mnt/stdata'] ?? ''; ?></span>
                     </td>
-                    <td class="align-left">
+                    <td class="align-center">
                         <span style=" font-size: 16px"><?php echo $value['data/mysqlundo'] ?? ''; ?></span>
                     </td>
-                    <td class="align-left">
+                    <td class="align-center">
                         <span style=" font-size: 16px"><?php echo $value['mnt/mysql/xyzshop'] ?? ''; ?></span>
                     </td>
                 </tr>

docker/compose/dongpeng/acc/docker-compose.yml

@@ -14,7 +14,7 @@ services:
     container_name: "panda-nginx"
     command: [nginx,'-g','daemon off;']
     extra_hosts:
-      - "docker.hostip:172.19.0.2"
+      - "docker.hostip:172.19.0.1"
     deploy:
       resources:
         limits:

docker/compose/dongpeng/admin/docker-compose.yml

@@ -33,7 +33,7 @@ services:
     container_name: "panda-web"
     command: [php-fpm]
     extra_hosts:
-      - "docker.hostip:172.26.0.2"
+      - "docker.hostip:172.26.0.1"
     deploy:
       resources:
         limits: