张延森 2 anos atrás
pai
commit
b72a88f3c6

+ 18
- 17
resources/static/css/common.css Ver arquivo

358
   background: rgba(66, 118, 245, 0.2);
358
   background: rgba(66, 118, 245, 0.2);
359
 }
359
 }
360
 .dashboard-page {
360
 .dashboard-page {
361
+  position: relative;
361
   background-color: #081a48;
362
   background-color: #081a48;
363
+  height: 100vh;
364
+  overflow: hidden;
362
   scrollbar-width: none;
365
   scrollbar-width: none;
363
   /* firefox */
366
   /* firefox */
364
   -ms-overflow-style: none;
367
   -ms-overflow-style: none;
367
 .dashboard-page::-webkit-scrollbar {
370
 .dashboard-page::-webkit-scrollbar {
368
   display: none;
371
   display: none;
369
 }
372
 }
373
+.dashboard-page .carousel-container,
374
+.dashboard-page .act-list {
375
+  position: absolute;
376
+  top: 0;
377
+  left: 0;
378
+  width: 100%;
379
+  height: 100%;
380
+}
370
 .dashboard-page .dash-carousel {
381
 .dashboard-page .dash-carousel {
371
   box-sizing: border-box;
382
   box-sizing: border-box;
372
-  height: 100vh;
373
   margin: 0;
383
   margin: 0;
374
   overflow: hidden;
384
   overflow: hidden;
375
 }
385
 }
376
-.dashboard-page .dash-carousel .left {
377
-  background: transparent;
378
-  background-image: linear-gradient(to right, rgba(0, 0, 0, 0.3) 0%, rgba(0, 0, 0, 0.0001) 100%);
379
-  width: 10%;
380
-  box-shadow: none;
381
-}
382
-.dashboard-page .dash-carousel .left,
383
-.dashboard-page .dash-carousel .right {
384
-  height: calc(100% - 100px);
385
-}
386
 .dashboard-page .dash-carousel .item {
386
 .dashboard-page .dash-carousel .item {
387
   height: 100vh;
387
   height: 100vh;
388
 }
388
 }
389
-.dashboard-page .dash-carousel .item.left {
390
-  width: auto;
391
-}
392
 .dashboard-page .dash-carousel .item .item-image {
389
 .dashboard-page .dash-carousel .item .item-image {
393
   height: 100%;
390
   height: 100%;
394
   width: 100%;
391
   width: 100%;
395
   background-repeat: no-repeat;
392
   background-repeat: no-repeat;
396
   background-position: center center;
393
   background-position: center center;
397
   background-origin: border-box;
394
   background-origin: border-box;
398
-  background-size: contain;
395
+  background-size: cover;
399
 }
396
 }
400
 .dashboard-page .dash-carousel .item .item-video {
397
 .dashboard-page .dash-carousel .item .item-video {
401
   height: 100%;
398
   height: 100%;
406
   height: 100%;
403
   height: 100%;
407
 }
404
 }
408
 .dashboard-page .act-list {
405
 .dashboard-page .act-list {
409
-  margin: 96px 0;
406
+  display: flex;
407
+  flex-direction: column;
408
+  justify-content: center;
409
+  align-items: center;
410
 }
410
 }
411
 .dashboard-page .act-list .row {
411
 .dashboard-page .act-list .row {
412
-  height: calc(25vh - 64px);
412
+  width: 100%;
413
+  height: calc(35vh - 64px);
413
   padding: 0 80px;
414
   padding: 0 80px;
414
 }
415
 }
415
 .dashboard-page .act-list .row + .row {
416
 .dashboard-page .act-list .row + .row {

+ 4
- 4
resources/static/css/public.css Ver arquivo

23
 /*主题框架*/
23
 /*主题框架*/
24
 
24
 
25
 /* .header{position:absolute;z-index:100;top:0;left:0;width:100%;}
25
 /* .header{position:absolute;z-index:100;top:0;left:0;width:100%;}
26
-.left{position:absolute;z-index:98;top:98px;bottom:40px;left:0;}
26
+.left1{position:absolute;z-index:98;top:98px;bottom:40px;left:0;}
27
 .layout-content{position:absolute;z-index:97;top:74px;bottom:40px;left:240px;right:0;} */
27
 .layout-content{position:absolute;z-index:97;top:74px;bottom:40px;left:240px;right:0;} */
28
 .header{width:100%; height: 94px;}
28
 .header{width:100%; height: 94px;}
29
 .layout{ display: flex; position: relative; min-height: calc(100% - 94px);}
29
 .layout{ display: flex; position: relative; min-height: calc(100% - 94px);}
30
-.layout .left { flex: none; height: 100%; }
30
+.layout .left1 { flex: none; height: 100%; }
31
 .layout .layout-content { flex: 1; }
31
 .layout .layout-content { flex: 1; }
32
 
32
 
33
 .footer{background:var(--main-bg);text-align:center;height:40px;line-height:40px;color:#FFF;position:absolute;left:0;right:0;bottom:0;}
33
 .footer{background:var(--main-bg);text-align:center;height:40px;line-height:40px;color:#FFF;position:absolute;left:0;right:0;bottom:0;}
71
 
71
 
72
 
72
 
73
 /*左侧*/
73
 /*左侧*/
74
-.left{background:#fff;width: 240px;-moz-box-shadow:2px 0 3px rgba(0,0,0,.3);-webkit-box-shadow:2px 0 3px rgba(0,0,0,.3);box-shadow:2px 0 3px rgba(0,0,0,.3);}
74
+.left1{background:#fff;width: 240px;-moz-box-shadow:2px 0 3px rgba(0,0,0,.3);-webkit-box-shadow:2px 0 3px rgba(0,0,0,.3);box-shadow:2px 0 3px rgba(0,0,0,.3);}
75
 .leftNav{top:10px;right:0;bottom:10px;left:0;overflow-y: auto;padding:10px 0;}
75
 .leftNav{top:10px;right:0;bottom:10px;left:0;overflow-y: auto;padding:10px 0;}
76
 .leftNav::-webkit-scrollbar {display:none}
76
 .leftNav::-webkit-scrollbar {display:none}
77
 
77
 
523
 /* 1280兼容 */
523
 /* 1280兼容 */
524
 @media (max-width: 1280px) {
524
 @media (max-width: 1280px) {
525
 .panel{margin:0 15px 30px 15px}
525
 .panel{margin:0 15px 30px 15px}
526
-.left{width: 180px;}
526
+.left1{width: 180px;}
527
 .layout-content{left:180px;}
527
 .layout-content{left:180px;}
528
 
528
 
529
 .count > dl{margin: 0 10px;}
529
 .count > dl{margin: 0 10px;}

+ 2
- 2
resources/static/js/common.js Ver arquivo

1
 var urlPre = "";
1
 var urlPre = "";
2
 var myModalTrigger;
2
 var myModalTrigger;
3
 const uploadFile = "/uploadFile"
3
 const uploadFile = "/uploadFile"
4
-var TH_DOMAIN = location.host
5
-var TH_SERVER = 'http://' + TH_DOMAIN + '/api'
4
+var TH_DOMAIN = '192.168.89.147' // location.host
5
+var TH_SERVER = 'http://' + TH_DOMAIN + ':8087/api'
6
 var TH_WS_SERVER = 'ws://'+ TH_DOMAIN +':8888/ws'
6
 var TH_WS_SERVER = 'ws://'+ TH_DOMAIN +':8888/ws'
7
 window.onload = function() {
7
 window.onload = function() {
8
 	$('[data-toggle="tooltip"]').tooltip();
8
 	$('[data-toggle="tooltip"]').tooltip();

+ 1
- 0
resources/static/js/slidePage/slidePage.min.css Ver arquivo

1
+.slide-container{width:100%;height:100%;overflow:hidden;position:relative}.slide-container .slide-page{position:absolute;top:0;left:0;width:100%;height:100%;overflow-y:auto;overflow-x:hidden;-webkit-overflow-scrolling:touch;-webkit-tap-highlight-color:rgba(255,255,255,0);-webkit-text-size-adjust:none;-webkit-backface-visibility:hidden;-webkit-transform-style:preserve-3d;background-position:center}.slide-container .slide-page{transform:translate3d(0,100%,0);-webkit-transform:translate3d(0,100%,0)}.slide-container .slide-page.transition{transition:transform .7s cubic-bezier(.55,.085,0,.99);-webkit-transition:transform .7s cubic-bezier(.55,.085,0,.99)}

+ 1
- 0
resources/static/js/slidePage/slidePage.min.js
Diferenças do arquivo suprimidas por serem muito extensas
Ver arquivo


+ 19
- 22
resources/static/less/ext-page.less Ver arquivo

137
 }
137
 }
138
 
138
 
139
 .dashboard-page {
139
 .dashboard-page {
140
+  position: relative;
140
   background-color: #081a48;
141
   background-color: #081a48;
142
+  height: 100vh;
143
+  overflow: hidden;
141
   scrollbar-width: none; /* firefox */
144
   scrollbar-width: none; /* firefox */
142
   -ms-overflow-style: none; /* IE 10+ */
145
   -ms-overflow-style: none; /* IE 10+ */
143
 
146
 
145
     display: none;
148
     display: none;
146
   }
149
   }
147
 
150
 
151
+  .carousel-container, .act-list {
152
+    position: absolute;
153
+    top: 0;
154
+    left: 0;
155
+    width: 100%;
156
+    height: 100%;
157
+  }
158
+
148
   .dash-carousel {
159
   .dash-carousel {
149
     box-sizing: border-box;
160
     box-sizing: border-box;
150
     // 94 = header height
161
     // 94 = header height
151
-    height: 100vh;
162
+    // height: 100vh;
152
     margin: 0;
163
     margin: 0;
153
     overflow: hidden;
164
     overflow: hidden;
154
 
165
 
155
-    .left {
156
-      background: transparent;
157
-      background-image: linear-gradient(
158
-        to right,
159
-        rgba(0, 0, 0, 0.3) 0%,
160
-        rgba(0, 0, 0, 0.0001) 100%
161
-      );
162
-      width: 10%;
163
-      box-shadow: none;
164
-    }
165
-
166
-    .left, .right {
167
-      height: calc(100% - 100px);
168
-    }
169
-
170
     .item {
166
     .item {
171
-      &.left {
172
-        width: auto;
173
-      }
174
-
175
       height: 100vh;
167
       height: 100vh;
176
       .item-image {
168
       .item-image {
177
         height: 100%;
169
         height: 100%;
195
   }
187
   }
196
 
188
 
197
   .act-list {
189
   .act-list {
198
-    margin: 96px 0;
190
+    // height: 100vh;
191
+    display: flex;
192
+    flex-direction: column;
193
+    justify-content: center;
194
+    align-items: center;
199
 
195
 
200
     .row {
196
     .row {
201
-      height: calc(25vh - 64px);
197
+      width: 100%;
198
+      height: calc(35vh - 64px);
202
       padding: 0 80px;
199
       padding: 0 80px;
203
 
200
 
204
       & + .row {
201
       & + .row {

+ 2
- 2
resources/templates/common/common_menu.html Ver arquivo

4
   <script>
4
   <script>
5
     function showSider(visible) {
5
     function showSider(visible) {
6
       if (visible) {
6
       if (visible) {
7
-        $('.layout .left').attr("style","display: block");
7
+        $('.layout .left1').attr("style","display: block");
8
       } else {
8
       } else {
9
-        $('.layout .left').attr("style","display: none");
9
+        $('.layout .left1').attr("style","display: none");
10
       }
10
       }
11
     }
11
     }
12
 
12
 

+ 1
- 1
resources/templates/index.html Ver arquivo

39
 		<div th:replace="common/common_menu::nav-menu"></div>
39
 		<div th:replace="common/common_menu::nav-menu"></div>
40
 	</div>
40
 	</div>
41
 	<div class="layout">
41
 	<div class="layout">
42
-		<div class="left" style="display: none;">
42
+		<div class="left1" style="display: none;">
43
 			<div class="leftNav">
43
 			<div class="leftNav">
44
 				<nav class="menu" data-ride="menu">
44
 				<nav class="menu" data-ride="menu">
45
 					<ul id="treeMenu" class="tree tree-menu nav-menu-submenu nav-menu-report active" data-ride="tree">
45
 					<ul id="treeMenu" class="tree tree-menu nav-menu-submenu nav-menu-report active" data-ride="tree">

+ 3
- 1
resources/templates/main.html Ver arquivo

1
 <!DOCTYPE html>
1
 <!DOCTYPE html>
2
 <html>
2
 <html>
3
 <head
3
 <head
4
-	th:replace="common/common_header::common_header(~{},~{},~{::style},~{::script},'')">
4
+	th:replace="common/common_header::common_header(~{},~{::link},~{::style},~{::script},'')">
5
 <script th:src="@{/js/chart/echarts.min.js}" type="text/javascript"></script>
5
 <script th:src="@{/js/chart/echarts.min.js}" type="text/javascript"></script>
6
 <script th:src="@{/js/chart/chart.js}"></script>
6
 <script th:src="@{/js/chart/chart.js}"></script>
7
 <script th:src="@{/js/chart/pie.js}"></script>
7
 <script th:src="@{/js/chart/pie.js}"></script>
8
 <script th:src="@{/js/chart/bar.js}"></script>
8
 <script th:src="@{/js/chart/bar.js}"></script>
9
 <script th:src="@{/js/chart/line.js}"></script>
9
 <script th:src="@{/js/chart/line.js}"></script>
10
+<link rel="stylesheet" th:href="@{/js/slidePage/slidePage.min.css}">
11
+<script th:src="@{/js/slidePage/slidePage.min.js}"></script>
10
 <style>
12
 <style>
11
 .panel{margin:30px 0 0 30px;}
13
 .panel{margin:30px 0 0 30px;}
12
 .panelGroup .panel>.panel-body{height: 315px;overflow: hidden;}
14
 .panelGroup .panel>.panel-body{height: 315px;overflow: hidden;}

+ 5
- 3
resources/templates/main/dashboard.html Ver arquivo

1
 <!DOCTYPE html>
1
 <!DOCTYPE html>
2
 <html lang="zh-CN" xmlns="http://www.w3.org/1999/xhtml" xmlns:th="http://www.thymeleaf.org" xmlns:sec="http://www.thymeleaf.org/thymeleaf-extras-springsecurity5">
2
 <html lang="zh-CN" xmlns="http://www.w3.org/1999/xhtml" xmlns:th="http://www.thymeleaf.org" xmlns:sec="http://www.thymeleaf.org/thymeleaf-extras-springsecurity5">
3
-<div id="t1" th:fragment="main-dashboard" class="dashboard-page" style="display: none;">
4
-  <div>
3
+<div id="t1" th:fragment="main-dashboard" class="dashboard-page slide-container" style="display: none;">
4
+  <div class="slide-page carousel-container">
5
     <div id="myNiceCarousel" class="dash-carousel carousel slide">
5
     <div id="myNiceCarousel" class="dash-carousel carousel slide">
6
       <!-- 轮播项目 -->
6
       <!-- 轮播项目 -->
7
       <div class="carousel-inner">
7
       <div class="carousel-inner">
17
     </div>
17
     </div>
18
   
18
   
19
   </div>
19
   </div>
20
-  <div class="act-list">
20
+  <div class="slide-page act-list">
21
     <div class="row">
21
     <div class="row">
22
       <div class="col-md-3" onclick="onAction('nav-menu-report','年度任务汇总')">
22
       <div class="col-md-3" onclick="onAction('nav-menu-report','年度任务汇总')">
23
         <div class="act-bg">
23
         <div class="act-bg">
183
     }
183
     }
184
     
184
     
185
     function loadPage2() {
185
     function loadPage2() {
186
+      new slidePage({ slideContainer: '.slide-container' });
187
+
186
       var imageTpl = [
188
       var imageTpl = [
187
         '<div class="item {active}">',
189
         '<div class="item {active}">',
188
         '  <div class="item-image" style="background-image: url({src});"></div>',
190
         '  <div class="item-image" style="background-image: url({src});"></div>',