dzx 4 år sedan
förälder
incheckning
3189dcd9c3
3 ändrade filer med 101 tillägg och 104 borttagningar
  1. 1 2
      css/common.css
  2. 3 2
      js/visual.js
  3. 97 100
      root.html

+ 1 - 2
css/common.css

@@ -98,7 +98,7 @@ a:hover {
 
 /*主体大屏*/
 .map {
-    padding: 10px 20px 0 20px
+    padding: 0px 20px 0 20px
 }
 
 .mainbox {
@@ -134,7 +134,6 @@ a:hover {
 .boxmap {
     width: 100%;
     position: absolute;
-    top: 200px;
     left: 0;
     right: 0;
     margin: auto;

+ 3 - 2
js/visual.js

@@ -20,18 +20,19 @@ $(function () {
 })
 function init() {
     
-    /**map = new SuperMap.Map("map", {
+    map = new SuperMap.Map("map", {
         controls: [
             new SuperMap.Control.Zoom(),
             new SuperMap.Control.Navigation()
         ]
     });
+    
     layer = new SuperMap.Layer.TiledDynamicRESTLayer("World", url, null, { maxResolution: "auto" });
     markerlayer = new SuperMap.Layer.Markers("markerLayer");
     layer.events.on({ "layerInitialized": addLayer });
 
     searchjindu();
-    searchfangyi();**/
+    searchfangyi();
 }
 
 function addLayer() {

+ 97 - 100
root.html

@@ -1,11 +1,10 @@
 <!doctype html>
 <html>
+
 <head>
     <meta charset="UTF-8" name="viewport" content="width=device-width,initial-scale=1.0,user-scalable=no">
     <title>松北区1.3事件应急抢险工程现场信息采集系统</title>
-    <script src="https://code.jquery.com/jquery-1.12.4.min.js" integrity="sha256-ZosEbRLbNQzLpnKIkEdrPv7lOy9C27hHQ+Xp8a4MxAQ=" crossorigin="anonymous"></script>
-    <link rel="stylesheet" href="https://cdn.staticfile.org/twitter-bootstrap/3.3.7/css/bootstrap.min.css">
-    <script src="https://cdn.staticfile.org/twitter-bootstrap/3.3.7/js/bootstrap.min.js"></script>
+    <script 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>
@@ -22,12 +21,11 @@
     </style>
 
 <body>
-    <div class="map" id="map"></div>
     <!--主体指标-->
     <div class="mainbox">
         <ul class="clearfix">
             <li>
-                <div class="boxall" style="height:200px;">
+                <div class="boxall" style="height:260px;">
                     <div class="alltitle">防控人数</div>
                     <div class="navboxall" id="echart5"></div>
                 </div>
@@ -37,7 +35,7 @@
 
                     </div>
                 </div>
-                <div class="boxall" style="height:410px;">
+                <div class="boxall" style="height:380px;">
                     <div class="alltitle">施工进度统计</div>
                     <div class="navboxall">
                         <div class="wraptit">
@@ -45,30 +43,64 @@
                         </div>
                         <div class="wrap">
                             <ul>
-                                <li><p><span>作业人数</span><span id="td1"></span><span id="td2"></span><span id="td3"></span></p></li>
-                                <li><p><span>作业车数</span><span id="td4"></span><span id="td5"></span><span id="td6"></span></p></li>
-                                <li><p><span>运冰车次</span><span id="td7"></span><span id="td8"></span><span id="td9"></span></p></li>
-                                <li><p><span>吸污车次</span><span id="td10"></span><span id="td11"></span><span id="td12"></span></p></li>
-                                <li><p><span>完成量</span><span id="td25"></span><span id="td26"></span><span id="td27"></span></p></li>
-                                <li><p><span>异常天数</span><span id="td13"></span><span id="td14"></span><span id="td15"></span></p></li>
-                                <li><p><span>天气原因天数</span><span id="td16"></span><span id="td17"></span><span id="td18"></span></p></li>
-                                <li><p><span>人为阻挠施工天数</span><span id="td19"></span><span id="td20"></span><span id="td21"></span></p></li>
-                                <li><p><span>疫情原因天数</span><span id="td22"></span><span id="td23"></span><span id="td24"></span></p></li>
+                                <li>
+                                    <p><span>作业人数</span><span id="td1"></span><span id="td2"></span><span
+                                            id="td3"></span></p>
+                                </li>
+                                <li>
+                                    <p><span>作业车数</span><span id="td4"></span><span id="td5"></span><span
+                                            id="td6"></span></p>
+                                </li>
+                                <li>
+                                    <p><span>运冰车次</span><span id="td7"></span><span id="td8"></span><span
+                                            id="td9"></span></p>
+                                </li>
+                                <li>
+                                    <p><span>吸污车次</span><span id="td10"></span><span id="td11"></span><span
+                                            id="td12"></span></p>
+                                </li>
+                                <li>
+                                    <p><span>完成量</span><span id="td25"></span><span id="td26"></span><span
+                                            id="td27"></span></p>
+                                </li>
+                                <li>
+                                    <p><span>异常天数</span><span id="td13"></span><span id="td14"></span><span
+                                            id="td15"></span></p>
+                                </li>
+                                <li>
+                                    <p><span>天气原因天数</span><span id="td16"></span><span id="td17"></span><span
+                                            id="td18"></span></p>
+                                </li>
+                                <li>
+                                    <p><span>人为阻挠施工天数</span><span id="td19"></span><span id="td20"></span><span
+                                            id="td21"></span></p>
+                                </li>
+                                <li>
+                                    <p><span>疫情原因天数</span><span id="td22"></span><span id="td23"></span><span
+                                            id="td24"></span></p>
+                                </li>
                             </ul>
                         </div>
                     </div>
                 </div>
             </li>
             <li>
-                <div class="boxall" style="height:230px">
+                <div class="boxall" style="height:100px">
                     <div class="norm" style="height: 100%">
                         <h1>松北区1.3事件应急抢险工程现场信息采集系统</h1>
                         <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="boxall" style="height:10px"></div>
+                    <div class="boxsub" style="height:260px;width:1142px">
+                        <div class="navboxall" id="echart3"></div>
+                    </div>
+                </div>
             </li>
             <li>
-                <div class="boxall" style="height:120px">
+                <div class="boxall" style="height:160px">
                     <div class="alltitle">施工进度日期选择</div>
                     <div class="navboxall">
                         开始日期:<input type="date" id="datestart" style="width:240px" /></br>
@@ -82,7 +114,7 @@
                             onclick="javascript:searchjindu()" />
                     </div>
                 </div>
-                <div class="boxall" style="height:120px;">
+                <div class="boxall" style="height:160px;">
                     <div class="alltitle">防疫日期选择</div>
                     <div class="navboxall">
                         防疫日期:<input type="date" id="datefy" style="width:240px" /></br>
@@ -95,90 +127,55 @@
                             onclick="javascript:searchfangyi()" />
                     </div>
                 </div>
-                <div class="boxall" style="height:620px">
+                <div class="boxall" style="height:420px">
                     <div class="alltitle">信息展示</div>
+                    <div class="wraptit">
+                        <span>&nbsp;&nbsp;&nbsp;&nbsp;</span><span>&nbsp;&nbsp;说明</span>
+                    </div>
                     <div class="navboxall">
-                        <table class="table1" width="100%" border="0" cellspacing="0" cellpadding="0">
-                            <tbody>
-                                <tr>
-                                    <th scope="col" style="width:100px">上报日期</th>
-                                    <th scope="col" id="sbrq" style="width:220px"></th>
-                                </tr>
-                                <tr>
-                                    <th scope="col" style="width:100px">防控人数</th>
-                                    <th scope="col" id="fkrs" style="width:220px">
-                                        </>
-                                    </th>
-                                </tr>
-                                <tr>
-                                    <th scope="col" style="width:100px">异常体温</th>
-                                    <th scope="col" id="yctw" style="width:220px">
-                                        </>
-                                    </th>
-                                </tr>
-                                <tr>
-                                    <th scope="col" style="width:100px">作业人数</th>
-                                    <th scope="col" id="zyrs" style="width:220px">
-                                        </>
-                                    </th>
-                                </tr>
-                                <tr>
-                                    <th scope="col" style="width:100px">作业车数</th>
-                                    <th scope="col" id="zycs" style="width:220px">
-                                        </>
-                                    </th>
-                                </tr>
-                                <tr>
-                                    <th scope="col" style="width:100px">运冰车次</th>
-                                    <th scope="col" id="ybcc" style="width:220px">
-                                        </>
-                                    </th>
-                                </tr>
-                                <tr>
-                                    <th scope="col" style="width:100px">吸污车次</th>
-                                    <th scope="col" id="xwcc" style="width:220px">
-                                        </>
-                                    </th>
-                                </tr>
-                                <tr>
-                                    <th scope="col" style="width:100px">完成量</th>
-                                    <th scope="col" id="wcl" style="width:220px">
-                                        </>
-                                    </th>
-                                </tr>
-                                <tr>
-                                    <th scope="col" style="width:100px">补充说明</th>
-                                    <th scope="col" id="bcsm" style="width:220px">
-                                        </>
-                                    </th>
-                                </tr>
-                                <tr>
-                                    <th scope="col" style="width:100px">现场照片</th>
-                                    <th scope="col" id="xczp" style="width:220px">
-                                        </>
-                                    </th>
-                                </tr>
-                                <tr>
-                                    <th scope="col" style="width:100px">是否异常</th>
-                                    <th scope="col" id="sfyc" style="width:220px">
-                                        </>
-                                    </th>
-                                </tr>
-                                <tr>
-                                    <th scope="col" style="width:100px">异常情况</th>
-                                    <th scope="col" id="ycqk" style="width:220px">
-                                        </>
-                                    </th>
-                                </tr>
-                                <tr>
-                                    <th scope="col" style="width:100px">异常现场照片</th>
-                                    <th scope="col" id="yczp" style="width:220px">
-                                        </>
-                                    </th>
-                                </tr>
-
-                            </tbody>
-                        </table>
+                        <div class="wrap">
+                            <ul>
+                                <li>
+                                    <p><span>上报日期</span><span id="sbrq"></span></p>
+                                </li>
+                                <li>
+                                    <p><span>防控人数</span><span id="fkrs"></span></p>
+                                </li>
+                                <li>
+                                    <p><span>异常体温</span><span id="yctw"></span></p>
+                                </li>
+                                <li>
+                                    <p><span>作业人数</span><span id="zyrs"></span></p>
+                                </li>
+                                <li>
+                                    <p><span>作业车数</span><span id="zycs"></span></p>
+                                </li>
+                                <li>
+                                    <p><span>运冰车次</span><span id="ybcc"></span></p>
+                                </li>
+                                <li>
+                                    <p><span>吸污车次</span><span id="xwcc"></span></p>
+                                </li>
+                                <li>
+                                    <p><span>完成量</span><span id="wcl"></span></p>
+                                </li>
+                                <li>
+                                    <p><span>补充说明</span><span id="bcsm"></span></p>
+                                </li>
+                                <li>
+                                    <p><span>现场照片</span><span id="xczp"></span></p>
+                                </li>
+                                <li>
+                                    <p><span>是否异常</span><span id="sfyc"></span></p>
+                                </li>
+                                <li>
+                                    <p><span>异常情况</span><span id="ycqk"></span></p>
+                                </li>
+                                <li>
+                                    <p><span>异常现场照片</span><span id="yczp"></span></p>
+                                </li>
+                            </ul>
+                        </div>
                     </div>
                 </div>
             </li>