改进界面

web/views/@default/ns/clusters/accessLogs/index.html

@@ -1,13 +1,5 @@
 {$layout}
-
-{$var "header"}
-<!-- datepicker -->
-<script type="text/javascript" src="/js/moment.min.js"></script>
-<script type="text/javascript" src="/js/pikaday.js"></script>
-<link rel="stylesheet" href="/js/pikaday.css"/>
-<link rel="stylesheet" href="/js/pikaday.theme.css"/>
-<link rel="stylesheet" href="/js/pikaday.triangle.css"/>
-{$end}
+{$template "/datepicker"}
 
 <first-menu>
     <div class="item right">

web/views/@default/ns/clusters/cluster/node/logs.html

@@ -1,14 +1,6 @@
 {$layout}
 {$template "node_menu"}
-
-{$var "header"}
-<!-- datepicker -->
-<script type="text/javascript" src="/js/moment.min.js"></script>
-<script type="text/javascript" src="/js/pikaday.js"></script>
-<link rel="stylesheet" href="/js/pikaday.css"/>
-<link rel="stylesheet" href="/js/pikaday.theme.css"/>
-<link rel="stylesheet" href="/js/pikaday.triangle.css"/>
-{$end}
+{$template "/datepicker"}
 
 <form method="get" action="/ns/clusters/cluster/node/logs" class="ui form" autocomplete="off">
     <input type="hidden" name="clusterId" :value="clusterId"/>
@@ -50,7 +42,7 @@
     </thead>
     <tr v-for="log in logs">
         <td>
-            <pre class="log-box"><span :class="{red:log.level == 'error', orange:log.level == 'warning'}"><span v-if="!log.isToday">[{{log.createdTime}}]</span><strong v-if="log.isToday">[{{log.createdTime}}]</strong>[{{log.tag}}]{{log.description}}</span> &nbsp; <span v-if="log.count > 0" class="ui label tiny" :class="{red:log.level == 'error', orange:log.level == 'warning'}">共{{log.count}}条</span></pre>
+            <node-log-row :v-log="log" :v-keyword="keyword"></node-log-row>
         </td>
     </tr>
 </table>

web/views/@default/ns/clusters/logs/index.html

@@ -1,13 +1,5 @@
 {$layout}
-
-{$var "header"}
-<!-- datepicker -->
-<script type="text/javascript" src="/js/moment.min.js"></script>
-<script type="text/javascript" src="/js/pikaday.js"></script>
-<link rel="stylesheet" href="/js/pikaday.css"/>
-<link rel="stylesheet" href="/js/pikaday.theme.css"/>
-<link rel="stylesheet" href="/js/pikaday.triangle.css"/>
-{$end}
+{$template "/datepicker"}
 
 
 <div class="margin"></div>
@@ -54,7 +46,7 @@
         <td nowrap=""><link-icon :href="'/ns/clusters/cluster?clusterId=' + log.node.cluster.id">{{log.node.cluster.name}}</link-icon></td>
         <td nowrap=""><link-icon :href="'/ns/clusters/cluster/node?clusterId=' + log.node.cluster.id + '&nodeId=' + log.node.id">{{log.node.name}}</link-icon></td>
         <td>
-            <pre class="log-box"><span :class="{red:log.level == 'error', orange:log.level == 'warning'}"><span v-if="!log.isToday">[{{log.createdTime}}]</span><strong v-if="log.isToday">[{{log.createdTime}}]</strong>[{{log.tag}}]{{log.description}}</span> &nbsp; <span v-if="log.count > 0" class="ui label tiny" :class="{red:log.level == 'error', orange:log.level == 'warning'}">共{{log.count}}条</span></pre>
+            <node-log-row :v-log="log" :v-keyword="keyword"></node-log-row>
         </td>
     </tr>
 </table>

web/views/@default/ns/index.html

@@ -17,7 +17,7 @@
                 <ns-user-selector :v-user-id="userId"></ns-user-selector>
             </div>
             <div class="ui field">
-                <input type="text" name="keyword" v-model="keyword" placeholder="域名、备注..."/>
+                <input type="text" name="keyword" v-model="keyword" placeholder="域名..."/>
             </div>
             <div class="ui field">
                 <button class="ui button" type="submit">搜索</button>
@@ -42,7 +42,7 @@
             </tr>
         </thead>
         <tr v-for="domain in domains">
-            <td>{{domain.name}}</td>
+            <td><keyword :v-word="keyword">{{domain.name}}</keyword></td>
             <td>
                 {{domain.cluster.name}}<link-icon :href="'/ns/clusters/cluster?clusterId=' + domain.cluster.id"></link-icon>
             </td>