From 3f847d7c7fa18c9e0d5294244c6fa41e55bca735 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E5=88=98=E7=A5=A5=E8=B6=85?= <iwind.liu@gmail.com>
Date: Thu, 23 Sep 2021 10:02:32 +0800
Subject: [PATCH] =?UTF-8?q?=E5=8C=BA=E5=9F=9F=E7=9B=91=E6=8E=A7=E5=A2=9E?=
 =?UTF-8?q?=E5=8A=A0=E6=A3=80=E6=B5=8B=E6=97=B6=E9=97=B4=E3=80=81=E7=BB=93?=
 =?UTF-8?q?=E6=9E=9C=E9=A1=B5=E5=A2=9E=E5=8A=A0=E7=BA=A7=E5=88=AB=E7=AD=9B?=
 =?UTF-8?q?=E9=80=89?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../clusters/ip-addrs/addr/reports.html        |  2 ++
 .../monitors/reporters/reporter/index.html     | 18 ++++++------------
 .../monitors/reporters/reporter/results.html   | 12 +++++++-----
 3 files changed, 15 insertions(+), 17 deletions(-)

diff --git a/web/views/@default/clusters/ip-addrs/addr/reports.html b/web/views/@default/clusters/ip-addrs/addr/reports.html
index 47f89a73..6f43dc33 100644
--- a/web/views/@default/clusters/ip-addrs/addr/reports.html
+++ b/web/views/@default/clusters/ip-addrs/addr/reports.html
@@ -6,6 +6,7 @@
     <thead>
     <tr>
         <th class="three wide">监控节点</th>
+        <th class="two wide">检测时间</th>
         <th class="four wide">对象</th>
         <th class="one wide">级别</th>
         <th class="two wide">耗时</th>
@@ -19,6 +20,7 @@
                 <span class="grey small">{{result.node.location}}<span v-if="result.node.location.length > 0"> </span> {{result.node.isp}}</span>
             </div>
         </td>
+        <td>{{result.updatedTime}}</td>
         <td>{{result.targetDesc}}</td>
         <td>
             <span :class="result.color">{{result.levelName}}</span>
diff --git a/web/views/@default/clusters/monitors/reporters/reporter/index.html b/web/views/@default/clusters/monitors/reporters/reporter/index.html
index 6b2c8391..7c179d0d 100644
--- a/web/views/@default/clusters/monitors/reporters/reporter/index.html
+++ b/web/views/@default/clusters/monitors/reporters/reporter/index.html
@@ -68,19 +68,13 @@
         <td>{{reporter.secret}}</td>
     </tr>
     <tr>
-        <td>命令行</td>
+        <td>配置文件<em>（configs/api.yaml）</em><br/>
+            <em><download-link :v-element="'rpc-code'" :v-file="'api.yaml'">[下载]</download-link ></em></td>
         <td>
-            <more-options-indicator>查看命令行</more-options-indicator>
-            <div :style="{visibility: moreOptionsVisible ? 'visible' : 'hidden', height: moreOptionsVisible ? 'auto': '0em'}">
-                <div class="ui divider"></div>
-                <h4>Linux、Mac OS X：</h4>
-                <source-code-box type="application/x-sh">edge-reporter run -api=[API HOST] -node-id={{reporter.uniqueId}} -secret={{reporter.secret}}</source-code-box>
-
-                <h4>Windows：</h4>
-                <source-code-box type="application/x-sh">edge-reporter.exe run -api=[API HOST] -node-id={{reporter.uniqueId}} -secret={{reporter.secret}}</source-code-box>
-
-                <p class="comment">把上面命令行中的<code-label>[API_HOST]</code-label>换成你的API节点地址，包括协议、主机名端口。</p>
-            </div>
+            <source-code-box id="rpc-code" type="text/yaml">rpc:
+  endpoints: [ {{apiEndpoints}} ]
+nodeId: "{{reporter.uniqueId}}"
+secret: "{{reporter.secret}}"</source-code-box>
         </td>
     </tr>
 </table>
\ No newline at end of file
diff --git a/web/views/@default/clusters/monitors/reporters/reporter/results.html b/web/views/@default/clusters/monitors/reporters/reporter/results.html
index a5a71650..edcb9509 100644
--- a/web/views/@default/clusters/monitors/reporters/reporter/results.html
+++ b/web/views/@default/clusters/monitors/reporters/reporter/results.html
@@ -6,14 +6,14 @@
     <input type="hidden" name="reporterId" :value="reporter.id"/>
     <div class="ui fields inline">
         <div class="ui field">
-            <select class="ui dropdown" name="okState" v-model="okState">
-                <option value="0">[结果]</option>
-                <option value="1">成功</option>
-                <option value="2">失败</option>
+            <select class="ui dropdown" name="level" v-model="level">
+                <option value="">[级别]</option>
+                <option v-for="level in levels" :value="level.code">{{level.name}}</option>
             </select>
         </div>
         <div class="ui field">
-            <button class="ui button" type="submit">搜索</button>
+            <button class="ui button" type="submit">搜索</button> &nbsp;
+            <a :href="Tea.url('$', {reporterId: reporter.id})" v-if="level.length > 0">[清除条件]</a>
         </div>
     </div>
 </form>
@@ -23,6 +23,7 @@
     <thead>
         <tr>
             <th class="two wide">类型</th>
+            <th class="two wide">检测时间</th>
             <th class="four wide">对象</th>
             <th class="one wide">级别</th>
             <th class="two wide">耗时</th>
@@ -31,6 +32,7 @@
     </thead>
     <tr v-for="result in results">
         <td>{{result.typeName}}</td>
+        <td>{{result.updatedTime}}</td>
         <td>{{result.targetDesc}}
             <span v-if="result.type == 'ipAddr'"><link-icon :href="'/clusters/ip-addrs/addr?addrId=' + result.targetId"></link-icon></span>
         </td>