Domů Procházet Nápověda
Registrovat se Přihlásit se
dzx
/
daping
1
0
Rozštěpit 0
Soubory Úkoly 0 Pull Requesty 0 Wiki
Procházet zdrojové kódy

4

dzx před 4 roky
rodič
3189dcd9c3
revize
30ef80c1d3
4 změnil soubory, kde provedl 87 přidání a 34 odebrání
Rozdělené zobrazení Ukázat statistiku rozdílových dat
  1. 7 0
      css/common.css
  2. 53 0
      js/scroll_ul.js
  3. 7 2
      js/visual.js
  4. 20 32
      root.html

+ 7 - 0
css/common.css
Zobrazit soubor 

@@ -361,3 +361,10 @@ a:hover {
 
 .str_wrap img {

     max-width: none !important

 }

+

+.inputx{

+    outline-style: none ; border: 1px solid #ccc; border-radius: 3px; padding: 3px 3px; margin:8px 8px;width: 60px; font-size: 14px; background-color: transparent;

+  }

+  .inputx:focus{

+    border:1px solid #1229a7;

+  }

+ 53 - 0
js/scroll_ul.js
Zobrazit soubor 

@@ -0,0 +1,53 @@
 
+(function ($) {

+    $.fn.myScroll = function (options) {

+        //默认配置

+        var defaults = {

+            speed: 40, //滚动速度,值越大速度越慢

+            rowHeight: 24 //每行的高度

+        };

+

+        var opts = $.extend({}, defaults, options),

+            intId = [];

+

+        function marquee(obj, step) {

+

+            obj.find("ul").animate({

+                marginTop: '-=1'

+            }, 0, function () {

+                var s = Math.abs(parseInt($(this).css("margin-top")));

+                if (s >= step) {

+                    $(this).find("li").slice(0, 1).appendTo($(this));

+                    $(this).css("margin-top", 0);

+                }

+            });

+        }

+

+        this.each(function (i) {

+            var sh = opts["rowHeight"],

+                speed = opts["speed"],

+                _this = $(this);

+            intId[i] = setInterval(function () {

+                if (_this.find("ul").height() <= _this.height()) {

+                    clearInterval(intId[i]);

+                } else {

+                    marquee(_this, sh);

+                }

+            }, speed);

+

+            _this.hover(function () {

+                clearInterval(intId[i]);

+            }, function () {

+                intId[i] = setInterval(function () {

+                    if (_this.find("ul").height() <= _this.height()) {

+                        clearInterval(intId[i]);

+                    } else {

+                        marquee(_this, sh);

+                    }

+                }, speed);

+            });

+

+        });

+

+    }

+

+})(jQuery);

+ 7 - 2
js/visual.js
Zobrazit soubor 

@@ -19,7 +19,6 @@ $(function () {
 
     init();
 
 })
 
 function init() {
 
-    
     map = new SuperMap.Map("map", {
 
         controls: [
 
             new SuperMap.Control.Zoom(),
 
@@ -158,6 +157,7 @@ function changeDate(dateT) {
 
 
 function echarts_1(zc, yc) {
 
     var myChart = echarts.init(document.getElementById('echart1'));
 
+
 
     var datajs = [
 
         { value: zc, name: '体温正常' },
 
         { value: yc, name: '体温异常' },
 
@@ -309,6 +309,9 @@ function echarts_3(dtLisT, zyrList, zycList, ybcList, xwcList, jdList) {
 
             }
 
         },
 
         color: ['#1921ff', '#01c3dd', '#008198', '#2ef4ab', '#ffe074'],
 
+        textStyle: {
 
+            color: 'rgba(255, 255, 255, 1)'
 
+        },
 
         tooltip: {
 
             textStyle: {
 
                 align: 'left'
 
@@ -542,6 +545,9 @@ function echarts_5(dtLisT, fkrList) {
 
 
     var option = {
 
         color: ['#ffe074'],
 
+        textStyle: {
 
+            color: 'rgba(255, 255, 255, 1)'
 
+        },
 
         tooltip: {
 
             textStyle: {
 
                 align: 'left'
 
@@ -596,5 +602,4 @@ function table1(t1, t2) {
 
     $("#td25").html(t2[0]);
 
     $("#td26").html(t2[1]);
 
     $("#td27").html(t2[2]);
 
-
 
 }

+ 20 - 32
root.html
Zobrazit soubor 

@@ -4,21 +4,14 @@
 
 <head>

     <meta charset="UTF-8" name="viewport" content="width=device-width,initial-scale=1.0,user-scalable=no">

     <title>松北区1.3事件应急抢险工程现场信息采集系统</title>

-    <script src="js/jquery.min.js"></script>

+    <script type="text/javascript" src="js/jquery.min.js"></script>

     <script type="text/javascript" src="js/echarts.min.js"></script>

     <script type="text/javascript" src="js/visual.js"></script>

     <script type="text/javascript" src="js/times.js"></script>

-    <script type="text/javascript" src="js/jquery.liMarquee.js"></script>

+    <script type="text/javascript" src="js/scroll_ul.js"></script>

     <script type="text/javascript" include="bootstrap" src="js/include-web.js"></script>

     <script type="text/javascript" exclude="iclient-classic" src="dist/classic/include-classic.js"></script>

     <link rel="stylesheet" href="css/common.css">

-    <style type="text/css">

-        #map {

-            position: absolute;

-            width: 100%;

-            height: 100%;

-        }

-    </style>

 

 <body>

     <!--主体指标-->

@@ -31,9 +24,7 @@
 
                 </div>

                 <div class="boxall" style="height:230px;">

                     <div class="alltitle">异常体温人数</div>

-                    <div class="navboxall" id="echart1">

-

-                    </div>

+                    <div class="navboxall" id="echart1"></div>

                 </div>

                 <div class="boxall" style="height:380px;">

                     <div class="alltitle">施工进度统计</div>

@@ -91,40 +82,43 @@
 
                         <div class="numtxt"><span id="showTime"></span></div>

                     </div>

                 </div>

-                <div class="boxmap" style="height:500px; width:1142px">

-                    <div class="navboxall" id="echart4"><div id="map"></div></div>

+                <div class="boxmap" style="height:500px;">

+                    <div class="navboxall" id="echart4">

+                        <div id="map"></div>

+                    </div>

                     <div class="boxall" style="height:10px"></div>

-                    <div class="boxsub" style="height:260px;width:1142px">

+                    <div class="boxsub" style="height:260px;">

                         <div class="navboxall" id="echart3"></div>

                     </div>

                 </div>

             </li>

             <li>

-                <div class="boxall" style="height:160px">

+                <div class="boxall" style="height:180px">

                     <div class="alltitle">施工进度日期选择</div>

                     <div class="navboxall">

-                        开始日期：<input type="date" id="datestart" style="width:240px" /></br>

-                        结束日期：<input type="date" id="dateend" style="width:240px" /></br>

-                        查询标段：<select id="biaoduan" style="width:240px">

+                        开始日期：<input type="date" id="datestart" style="width:240px" class="inputx"

+                            onchange="javascript:searchjindu();" /></br>

+                        结束日期：<input type="date" id="dateend" style="width:240px" class="inputx"

+                            onchange="javascript:searchjindu();" /></br>

+                        查询标段：<select id="biaoduan" style="width:240px" class="inputx"

+                            onchange="javascript:searchjindu();">

                             <option value="合计" select>合计</option>

                             <option value="一标段">一标段</option>

                             <option value="二标段">二标段</option>

                         </select></br>

-                        <input type="button" value="查询" style="height:24px;width:40px"

-                            onclick="javascript:searchjindu()" />

                     </div>

                 </div>

                 <div class="boxall" style="height:160px;">

                     <div class="alltitle">防疫日期选择</div>

                     <div class="navboxall">

-                        防疫日期：<input type="date" id="datefy" style="width:240px" /></br>

-                        查询标段：<select id="biaoduanfy" style="width:240px">

+                        防疫日期：<input type="date" id="datefy" style="width:240px" class="inputx"

+                            onchange="javascript:searchfangyi();" /></br>

+                        查询标段：<select id="biaoduanfy" style="width:240px" class="inputx"

+                            onchange="javascript:searchfangyi();">

                             <option value="合计" select>合计</option>

                             <option value="一标段">一标段</option>

                             <option value="二标段">二标段</option>

                         </select></br>

-                        <input type="button" value="查询" style="height:24px;width:40px"

-                            onclick="javascript:searchfangyi()" />

                     </div>

                 </div>

                 <div class="boxall" style="height:420px">

@@ -215,13 +209,7 @@
 
         </div><!-- /.modal -->

     </div>

     <script>

-        $(function () {

-            $('.wrap').liMarquee({

-                direction: 'up',

-                runshort: false,

-                scrollamount: 20

-            });

-        });

+

     </script>

 </body>