Selaa lähdekoodia

Merge remote-tracking branch 'origin/master'

weijianghai 2 vuotta sitten
vanhempi
commit
9b030d485f

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


BIN
src/main/resources/static/js/layui/css/modules/layer/default/bg2.jpg


Tiedoston diff-näkymää rajattu, sillä se on liian suuri
+ 0 - 0
src/main/resources/static/js/layui/css/modules/login.css


+ 2 - 2
src/main/resources/templates/login.html

@@ -11,12 +11,12 @@
     <link rel="stylesheet" href="./js/layui/css/modules/admin.css">
     <link rel="stylesheet" href="./js/layui/css/modules/login.css">
     <style>
-        .bg {
+        /* .bg {
             width: 100%;
             height: 100%;
             background: url('../static/js/layui/css/modules/layer/default/bg.png');.
             background-size: 100% 100%;
-        }
+        } */
     </style>
 </head>
 <body>

+ 14 - 2
src/main/resources/templates/template.html

@@ -135,8 +135,8 @@
         </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="area" title="按地市查询" lay-filter="where">
+                    <input type="radio" name="where" value="area" title="按地市查询" lay-filter="where" checked>
+                    <input type="radio" name="where" value="eci" title="按eci查询" lay-filter="where" >
                 </div>
                 <div style="width:70%;float: left;">
                     <input id="condition" class="layui-input" placeholder="如多个eci查询请用英文逗号隔开"
@@ -288,10 +288,18 @@
 
         function renderTable(condition, searchType, table, citys, quxians, indicators, ttype, sdate) {
             console.log('renderTable')
+            // var tishi = layer.load(2, { shade: [0.15, '#ccc'] });
+            var tishi = layer.open({
+                    shadeClose: false
+                    ,type: 2
+                    ,content: '加载中...'
+                });
+            console.log('tishi: ', tishi);
             $.ajax({
                 type: "POST",
                 url: './renderTable',
                 async: false,
+                traditional: true,
                 data: {
                     "condition": condition,
                     "searchType": searchType,
@@ -302,6 +310,7 @@
                     "sdate": sdate
                 },
                 success: function (r) {
+                    layer.close(tishi);
                     dataA = r;
                     // 没有权限提示
                     if (r?.msg && r.msg.length > 0) {
@@ -333,6 +342,9 @@
                         data: r.datas
                     });
                     return false;
+                },
+                error: function(err){
+                    layer.close(tishi);
                 }
             });
         }

Kaikkia tiedostoja ei voida näyttää, sillä liian monta tiedostoa muuttui tässä diffissä