From b76dcae851544bc375754c3ba964d66ebd34d22b Mon Sep 17 00:00:00 2001
From: liuyg <376836862@qq.com>
Date: Fri, 07 May 2021 11:34:51 +0800
Subject: [PATCH] Merge branch 'master' of http://192.168.0.105:10010/r/jfpt-Vue

---
 public/map/widgets/supervisoryMap/template.html |    9 ++++-----
 1 files changed, 4 insertions(+), 5 deletions(-)

diff --git a/public/map/widgets/supervisoryMap/template.html b/public/map/widgets/supervisoryMap/template.html
index 374ba45..7fdf246 100644
--- a/public/map/widgets/supervisoryMap/template.html
+++ b/public/map/widgets/supervisoryMap/template.html
@@ -22,10 +22,10 @@
                         <div class='select-list'>
                             <ul>
                                 <li>全部</li>
-                                <li>在线</li>
-                                <li>警报</li>
+                                <li>正常</li>
+                                <li>预警</li>
                                 <li>故障</li>
-                                <li>离线</li>
+                                <li>掉线</li>
                             </ul>
                         </div>
                     </li>
@@ -96,8 +96,7 @@
                 </ul>
             </div>
             <div class='analysis-selection-criteria'>
-                <input type="text" id='analysis_select_time_start' readonly> <span>-</span> <input type="text"
-                    id='analysis_select_time_end' readonly>
+                <input type="text" id='analysis_select_time_start' readonly> <span>-</span> <input type="text" id='analysis_select_time_end' readonly>
                 <input type="button" value='查询' id='policeSelectTime'>
             </div>
             <div class='analysis-table-content'>

--
Gitblit v1.9.3