From a0dbcf709a1bd689526c97d410f7c60295883c22 Mon Sep 17 00:00:00 2001
From: GoEdgeLab <goedgecloud@gmail.com>
Date: Mon, 6 Sep 2021 08:53:08 +0800
Subject: [PATCH] =?UTF-8?q?=E5=AE=9E=E7=8E=B0=E5=8C=BA=E5=9F=9F=E7=9B=91?=
 =?UTF-8?q?=E6=8E=A7=E8=8A=82=E7=82=B9=E8=BF=90=E8=A1=8C=E6=97=A5=E5=BF=97?=
 =?UTF-8?q?=E5=92=8C=E8=BF=90=E8=A1=8C=E7=BB=93=E6=9E=9C?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 internal/rpc/rpc_client.go                    |  4 ++
 .../reporters/reporter/@reporter_menu.html    |  1 +
 .../monitors/reporters/reporter/logs.html     | 49 +++++++++++++++++++
 .../monitors/reporters/reporter/logs.js       |  6 +++
 .../monitors/reporters/reporter/results.html  | 47 ++++++++++++++++++
 5 files changed, 107 insertions(+)
 create mode 100644 web/views/@default/clusters/monitors/reporters/reporter/logs.js
 create mode 100644 web/views/@default/clusters/monitors/reporters/reporter/results.html

diff --git a/internal/rpc/rpc_client.go b/internal/rpc/rpc_client.go
index e13bf97e..497a1f20 100644
--- a/internal/rpc/rpc_client.go
+++ b/internal/rpc/rpc_client.go
@@ -304,6 +304,10 @@ func (this *RPCClient) ReportNodeRPC() pb.ReportNodeServiceClient {
 	return pb.NewReportNodeServiceClient(this.pickConn())
 }
 
+func (this *RPCClient) ReportResultRPC() pb.ReportResultServiceClient {
+	return pb.NewReportResultServiceClient(this.pickConn())
+}
+
 func (this *RPCClient) IPItemRPC() pb.IPItemServiceClient {
 	return pb.NewIPItemServiceClient(this.pickConn())
 }
diff --git a/web/views/@default/clusters/monitors/reporters/reporter/@reporter_menu.html b/web/views/@default/clusters/monitors/reporters/reporter/@reporter_menu.html
index 9b28f2c2..501e0ec1 100644
--- a/web/views/@default/clusters/monitors/reporters/reporter/@reporter_menu.html
+++ b/web/views/@default/clusters/monitors/reporters/reporter/@reporter_menu.html
@@ -2,6 +2,7 @@
     <menu-item href="/clusters/monitors/reporters">所有终端</menu-item>
     <span class="disabled item">|</span>
     <menu-item :href="'/clusters/monitors/reporters/reporter?reporterId=' + reporter.id" code="reporter">"{{reporter.name}}"详情</menu-item>
+    <menu-item :href="'/clusters/monitors/reporters/reporter/results?reporterId=' + reporter.id" code="result">监控结果</menu-item>
     <menu-item :href="'/clusters/monitors/reporters/reporter/logs?reporterId=' + reporter.id" code="log">运行日志</menu-item>
     <menu-item :href="'/clusters/monitors/reporters/reporter/update?reporterId=' + reporter.id" code="update">修改</menu-item>
 </first-menu>
\ No newline at end of file
diff --git a/web/views/@default/clusters/monitors/reporters/reporter/logs.html b/web/views/@default/clusters/monitors/reporters/reporter/logs.html
index 6af3bd91..36636f91 100644
--- a/web/views/@default/clusters/monitors/reporters/reporter/logs.html
+++ b/web/views/@default/clusters/monitors/reporters/reporter/logs.html
@@ -1,3 +1,52 @@
 {$layout}
 {$template "reporter_menu"}
+{$template "/datepicker"}
 
+<div class="margin"></div>
+
+<form method="get" :action="Tea.url('$')" class="ui form" autocomplete="off">
+    <input type="hidden" name="reporterId" :value="reporter.id"/>
+    <div class="ui fields inline">
+        <div class="ui field">
+            <input type="text" name="dayFrom" placeholder="开始日期" v-model="dayFrom" value="" style="width:8em" id="day-from-picker"/>
+        </div>
+        <div class="ui field">
+            <input type="text" name="dayTo" placeholder="结束日期" v-model="dayTo" value="" style="width:8em" id="day-to-picker"/>
+        </div>
+        <div class="ui field">
+            <select class="ui dropdown" name="level" v-model="level">
+                <option value="">[级别]</option>
+                <option value="error">错误</option>
+                <option value="warning">警告</option>
+                <option value="info">信息</option>
+                <option value="success">成功</option>
+            </select>
+        </div>
+        <div class="ui field">
+            <input type="text" name="keyword" style="width:10em" v-model="keyword" placeholder="关键词"/>
+        </div>
+        <div class="ui field">
+            <button type="submit" class="ui button">查询</button>
+        </div>
+        <div class="ui field" v-if="dayFrom.length > 0 || dayTo.length > 0 || keyword.length > 0 || level.length > 0">
+            <a :href="Tea.url('.logs', { reporterId:reporter.id })">[清除条件]</a>
+        </div>
+    </div>
+</form>
+
+<p class="comment" v-if="logs.length == 0">暂时还没有日志。</p>
+
+<table class="ui table selectable" v-if="logs.length > 0">
+    <thead>
+        <tr>
+
+        </tr>
+    </thead>
+    <tr v-for="log in logs">
+        <td>
+            <node-log-row :v-log="log" :v-keyword="keyword"></node-log-row>
+        </td>
+    </tr>
+</table>
+
+<div class="page" v-html="page"></div>
\ No newline at end of file
diff --git a/web/views/@default/clusters/monitors/reporters/reporter/logs.js b/web/views/@default/clusters/monitors/reporters/reporter/logs.js
new file mode 100644
index 00000000..29a90420
--- /dev/null
+++ b/web/views/@default/clusters/monitors/reporters/reporter/logs.js
@@ -0,0 +1,6 @@
+Tea.context(function () {
+	this.$delay(function () {
+		teaweb.datepicker("day-from-picker")
+		teaweb.datepicker("day-to-picker")
+	})
+})
\ 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
new file mode 100644
index 00000000..491854b9
--- /dev/null
+++ b/web/views/@default/clusters/monitors/reporters/reporter/results.html
@@ -0,0 +1,47 @@
+{$layout}
+{$template "reporter_menu"}
+
+<div class="ui margin"></div>
+<form class="ui form" action="/clusters/monitors/reporters/reporter/results">
+    <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>
+        </div>
+        <div class="ui field">
+            <button class="ui button" type="submit">搜索</button>
+        </div>
+    </div>
+</form>
+
+<p class="comment" v-if="results.length == 0">暂时还没有监控结果。</p>
+<table class="ui table celled selectable" v-if="results.length > 0">
+    <thead>
+        <tr>
+            <th class="two wide">类型</th>
+            <th class="four wide">对象</th>
+            <th class="one wide">结果</th>
+            <th class="two wide">耗时</th>
+            <th>错误信息</th>
+        </tr>
+    </thead>
+    <tr v-for="result in results">
+        <td>{{result.typeName}}</td>
+        <td>{{result.targetDesc}}</td>
+        <td>
+            <span v-if="result.isOk" class="green">成功</span>
+            <span v-else class="red">失败</span>
+        </td>
+        <td>{{result.costMs}}ms</td>
+        <td>
+            <span v-if="!result.isOk" class="red">{{result.error}}</span>
+            <span v-else class="disabled">-</span>
+        </td>
+    </tr>
+</table>
+
+<div class="page" v-html="page"></div>
\ No newline at end of file