2
0

4 Ревизии a6f89cd432 ... 0dd877f9ed

Автор SHA1 Съобщение Дата
  wangrulan 0dd877f9ed 登录 преди 1 година
  wangrulan 9f12f8e227 图片 преди 1 година
  wangrulan b7a27ae646 Merge branch 'master' of http://nokia.tianhaikj.tk:13000/other/hb_nokia_pm_ui преди 1 година
  wangrulan 2c89f53866 前端页面修改 преди 1 година

+ 3 - 0
.vscode/settings.json

@@ -0,0 +1,3 @@
+{
+    "java.compile.nullAnalysis.mode": "automatic"
+}

Файловите разлики са ограничени, защото са твърде много
+ 0 - 0
src/main/resources/static/js/layui/css/layui.css


Файловите разлики са ограничени, защото са твърде много
+ 0 - 0
src/main/resources/static/js/layui/css/modules/admin.css


+ 42 - 0
src/main/resources/static/js/layui/css/modules/index.css

@@ -0,0 +1,42 @@
+body{
+    background-color: #f5f6fa;
+}
+.layui-table-body{
+    background-color: #fff;
+}
+.layui-tree-pack{
+    overflow: hidden;
+}
+.layui-tree-txt{
+    width: 100%;
+    overflow:hidden;
+    text-overflow:ellipsis;
+    /*禁止换行显示*/
+    white-space:nowrap;
+}
+.banner{
+    width: 100%;
+    height: 70px;
+    line-height: 70px;
+    background-color: #fff;
+    box-shadow: 0 2px 4px rgba(0, 0, 0, .12), 0 0 6px rgba(0, 0, 0, .04);
+    /* border-bottom: 1px solid rgba(0, 0, 0, .12); */
+}
+.banner .logo{
+    width: 160px;
+    height: 50px;
+    background-image: url('../modules/layer/default/nokiaLogo.png');
+    background-size: 100% 100%;
+    margin-left: 30px;
+    position: absolute;
+    top: 10px;
+}
+.banner .name {
+    height: 50px;
+    font-size: 30px;
+    color: #0056a3;
+    margin-left: 200px;
+    /* font-family: fantasy; */
+    font-family: 'Franklin Gothic Medium', 'Arial Narrow', Arial, sans-serif;
+    margin-top: 1px;
+}

Файловите разлики са ограничени, защото са твърде много
+ 0 - 0
src/main/resources/static/js/layui/css/modules/laydate/default/laydate.css


BIN
src/main/resources/static/js/layui/css/modules/layer/default/bg.png


BIN
src/main/resources/static/js/layui/css/modules/layer/default/nokiaLogo.png


Файловите разлики са ограничени, защото са твърде много
+ 0 - 0
src/main/resources/static/js/layui/layui.js


+ 32 - 22
src/main/resources/templates/login.html

@@ -10,34 +10,44 @@
     <link rel="stylesheet" href="./js/layui/css/layui.css">
     <link rel="stylesheet" href="./js/layui/css/modules/admin.css">
     <link rel="stylesheet" href="./js/layui/css/modules/login.css">
+    <style>
+        .bg {
+            width: 100%;
+            height: 100%;
+            background: url('../static/js/layui/css/modules/layer/default/bg.png');.
+            background-size: 100% 100%;
+        }
+    </style>
 </head>
 <body>
-<div class="layadmin-user-login layadmin-user-display-show" id="LAY-user-login" style="display: none;">
-    <div class="layadmin-user-login-main">
-        <div class="layadmin-user-login-box layadmin-user-login-header">
-            <h2>登录</h2>
-        </div>
-        <div class="layadmin-user-login-box layadmin-user-login-body layui-form">
-            <form class="layui-form layui-form-pane" action="">
-                <div class="layui-form-item">
-                    <label class="layadmin-user-login-icon layui-icon layui-icon-username"
-                           for="LAY-user-login-username"></label>
-                    <input type="text" name="username" id="LAY-user-login-username" lay-verify="required"
-                           placeholder="用户名" class="layui-input">
-                </div>
-                <div class="layui-form-item">
-                    <label class="layadmin-user-login-icon layui-icon layui-icon-password"
-                           for="LAY-user-login-password"></label>
-                    <input type="password" name="password" id="LAY-user-login-password" lay-verify="required"
-                           placeholder="密码" class="layui-input">
+    <div class="bg">
+        <div class="layadmin-user-login layadmin-user-display-show" id="LAY-user-login" style="display: none;">
+            <div class="layadmin-user-login-main">
+                <div class="layadmin-user-login-box layadmin-user-login-header">
+                    <h2>登录</h2>
                 </div>
-                <div class="layui-form-item">
-                    <button class="layui-btn layui-btn-fluid" lay-submit lay-filter="formData">登 录</button>
+                <div class="layadmin-user-login-box layadmin-user-login-body layui-form">
+                    <form class="layui-form layui-form-pane" action="">
+                        <div class="layui-form-item">
+                            <label class="layadmin-user-login-icon layui-icon layui-icon-username"
+                                   for="LAY-user-login-username"></label>
+                            <input type="text" name="username" id="LAY-user-login-username" lay-verify="required"
+                                   placeholder="用户名" class="layui-input">
+                        </div>
+                        <div class="layui-form-item">
+                            <label class="layadmin-user-login-icon layui-icon layui-icon-password"
+                                   for="LAY-user-login-password"></label>
+                            <input type="password" name="password" id="LAY-user-login-password" lay-verify="required"
+                                   placeholder="密码" class="layui-input">
+                        </div>
+                        <div class="layui-form-item">
+                            <button class="layui-btn layui-btn-fluid" lay-submit lay-filter="formData">登 录</button>
+                        </div>
+                    </form>
                 </div>
-            </form>
+            </div>
         </div>
     </div>
-</div>
 <script src="./js/jquery-3.5.1.min.js"></script>
 <script src="./js/layui/layui.js"></script>
 <script>

+ 68 - 29
src/main/resources/templates/template.html

@@ -7,9 +7,10 @@
     <meta name="viewport" content="width=device-width, initial-scale=1.0">
     <title>Template</title>
     <link rel="stylesheet" href="./js/layui/css/layui.css">
+    <link rel="stylesheet" href="./js/layui/css/modules/index.css">
     <style>
         .all {
-            padding-top: 30px;
+            padding-top: 10px;
             padding-left: 30px;
             padding-right: 30px;
 
@@ -17,23 +18,30 @@
 
         .c {
             float: left;
-
+            background-color: #fff;
+            padding: 10px;
         }
 
         .c1 {
             margin: 10px;
             float: left;
-
-
         }
 
         .t1 {
-            width: 15%;
+            width: 18%;
+            margin-right: 10px;
+            -webkit-box-sizing:border-box; 
+            -moz-box-sizing:border-box; 
+            -ms-box-sizing:border-box; 
+            box-sizing:border-box 
         }
 
         .row {
             height: 50px;
         }
+        .row2 {
+            height: 130px;
+        }
 
         .t2 {
             width: 10%;
@@ -41,7 +49,7 @@
 
         .view {
 
-            width: 75%;
+            width: 79%;
         }
 
         #timeType {
@@ -63,15 +71,22 @@
             height: 50px;
             line-height: 32px;
         }
+        #column{
+            width: 100%;
+        }
     </style>
 </head>
 
 <body>
+    <div class="banner">
+        <!-- <img src="../static/js/layui/css/modules/layer/default/nokiaLogo.png" alt="" width="150px" height="50px"> -->
+        <div class="logo"></div>
+        <div class="name">KPI-Analyser</div>
+    </div>
 <div class="all">
-
     <div class="c t1">
         <button type="button" class="layui-btn layui-btn-sm" onclick="addTemplate()">添加指标模板</button>
-        <button type="button" class="layui-btn layui-btn-sm" onclick="deleteTemplate()">删除指标模板</button>
+        <button type="button" class="layui-btn layui-btn-sm layui-btn-danger" onclick="deleteTemplate()">删除指标模板</button>
         <div id="allArea"></div>
         <div id="indicatorTemplate"></div>
         <div id="add-template" style="display: none;">
@@ -87,7 +102,7 @@
             <div id="allIndicator"></div>
         </div>
     </div>
-    <div class="c t2">
+    <!-- <div class="c t2">
         <form class="layui-form" action="">
             <div class="column" id="searchType">
                 <input type="radio" name="where" value="eci" title="按eci查询" lay-filter="where" checked>
@@ -96,28 +111,40 @@
             <textarea id="condition" cols="14" rows="19"
                       style="border-width:1px;border-style: solid;border-color: #eee;"></textarea>
         </form>
-    </div>
+    </div> -->
     <div class="c view">
-        <div class="row layui-form">
-
-            <div class="c1 label"> 粒度:</div>
-
-            <div class="timeTypeDiv c1" style="width: 10%;">
-                <select name="timeType" id="timeType">
-                    <option value="quater">15分钟</option>
-                    <option value="hour">小时</option>
-                    <option value="day">天</option>
-                    <!--<option value="week">星期</option>-->
-                    <!--<option value="month">月</option>-->
-                </select>
+        <div class="row layui-form row2">
+            <div style="width:100%;float: left;">
+                <div class="c1 label"> 粒度:</div>
+    
+                <div class="timeTypeDiv c1" style="width: 10%;">
+                    <select name="timeType" id="timeType">
+                        <option value="quater">15分钟</option>
+                        <option value="hour">小时</option>
+                        <option value="day">天</option>
+                        <!--<option value="week">星期</option>-->
+                        <!--<option value="month">月</option>-->
+                    </select>
+                </div>
+    
+                <div class="c1 label" style="margin-left: 120px;">时间:</div>
+                <input type="text" class="layui-input c1" style="width: 300px;" id="time1">
+                <button class="layui-btn btn c1" style="margin-left: 20px;" onclick="search()">查询</button>
+                <button class="layui-btn btn c1" style="margin-left: 20px;" onclick="conditionSearch()">条件查询</button>
+            </div>
+        </br>
+            <div style="width:100%;float: left;">
+                <div class="column" id="searchType" style="width:auto;float: left;">
+                    <input type="radio" name="where" value="eci" title="按eci查询" lay-filter="where" checked>
+                    <input type="radio" name="where" value="all" title="全网选择" lay-filter="where">
+                </div>
+                <div style="width:70%;float: left;">
+                    <input id="condition" class="layui-input" placeholder="如多个eci查询请用英文逗号隔开"
+                                style="border-width:1px;border-style: solid;border-color: #eee;"></input>
+                </div>
             </div>
-
-            <div class="c1 label" style="margin-left: 120px;">时间:</div>
-            <input type="text" class="layui-input c1" style="width: 300px;" id="time1">
-            <button class="layui-btn btn c1" style="margin-left: 20px;" onclick="search()">查询</button>
-            <button class="layui-btn btn c1" style="margin-left: 20px;" onclick="conditionSearch()">条件查询</button>
         </div>
-        <div class="row">
+        <div>
             <table id="demo" lay-filter="test" style="width: 200px;"></table>
         </div>
     </div>
@@ -408,7 +435,8 @@
                 alert('请选择时间')
                 return;
             }
-            if (tree.getChecked('Id3').length === 0) {
+
+            if (tree.getChecked('Id3').length == 0) {
                 alert('请选择指标')
                 return;
             }
@@ -527,6 +555,17 @@
                 });
             });
         }
+
+        // 
+        $(document).ready(function(){
+            setTimeout(()=>{
+              $(".layui-tree-txt").mouseenter(function(){
+                    // console.log('this',this)
+                    $(this).attr("title",$(this).text());
+                    // console.log('this.text(): ', $(this).text());
+                });
+            },1000)
+        });
     </script>
 </body>
 

Някои файлове не бяха показани, защото твърде много файлове са промени