Merge branch 'nacyy' of http://116.63.33.55/git/nazw into nacyy

nngkxxdp/src/main/resources/static/naxsb/mobile/dqfwNewMobile.html

@@ -21,7 +21,7 @@
   <script src="https://www.cqna.gov.cn/syygapi/naxsb/js/jquery-3.5.1.min.js"></script>
   <script type="text/javascript"
     src="https://api.map.baidu.com/api?type=webgl&v=3.0&ak=7XivTux4H2e1ifKLjvEhxfuayDYxAluq">
-    </script>
+  </script>
   <script type="text/javascript" src="https://api.map.baidu.com/api?v=2.0&ak=7XivTux4H2e1ifKLjvEhxfuayDYxAluq">
   </script>
   <script src="https://www.cqna.gov.cn/syygapi/naxsb/js/jquery-3.5.1.min.js"></script>
@@ -200,7 +200,8 @@
       padding: 5px 0;
       overflow: hidden;
       word-break: break-all;
-      white-space: nowrap;
+      /* white-space: nowrap; */
+      border-bottom: 1px solid rgba(245, 250, 255, .2);
       width: 100%;
     }
 
@@ -269,11 +270,6 @@
 
     .tdgyTitle {
       font-size: 14px;
-      overflow: hidden;
-      word-break: break-all;
-      white-space: nowrap;
-      text-overflow: ellipsis !important;
-      -o-text-overflow: ellipsis;
     }
 
     .mxqyList {
@@ -501,9 +497,7 @@
             <div class="main">
               <div class="liList" v-for="(tab, index)  in str" :key="index">
                 <img src="https://www.cqna.gov.cn/syygapi/naxsb/image/listcricle.png" />
-                <div class="tdgyContent">
-                  <div :title="tab" class="tdgyTitle">{{tab}}</div>
-                </div>
+                <div :title="tab" class="tdgyTitle">{{tab}}</div>
               </div>
             </div>
           </div>

nngkxxdp/src/main/resources/static/naxsb/mobile/qjtMobile.html

@@ -64,10 +64,10 @@
 
         .finger {
             position: absolute;
-            top: -60px;
+            top: -35px;
             right: 20px;
             color: #FF8000;
-            font-size: 16px;
+            font-size: 14px;
         }
 
         #loading {
@@ -512,7 +512,7 @@
         autoClear: true,
         logarithmicDepthBuffer: true
     });
-    renderer.setSize(mwidth, 724);
+    renderer.setSize(mwidth, 1.4*mwidth);
     renderer.shadowMap.enabled = true;
 
     // 2D 文字渲染
@@ -573,17 +573,17 @@
                     const div = document.createElement('div');
                     div.id = child.uuid;
                     let html = '';
-                    html += '<div class="building-box" style="width: 100px; top: 70px; left: -48px;">';
+                    html += '<div class="building-box" style="width: 100px; top: 20px; left: -48px;">';
                     html += '<div class="building-text" style="background: #1D96E9;" onclick="handleClick()">';
                     html += '<span>1号楼</span><span style="font-size: 10px;">社保大厅、医保大厅</span>';
                     html += '</div>';
                     html += '<svg width="10" height="10"><polygon id="triangle" points="0,0 10,0 5,10" fill="#1D96E9"/></svg>';
                     html += '</div>';
-                    html += '<div class="building-line" style="border-left: 1px dashed #1D96E9; height: 100px; top: 110px;"></div>';
-                    html += `<div style="font-size: 12px;background: #18A65A;width: 100px;top: 326px;left: 48px;position: absolute;display: flex;flex-direction: column;align-items: flex-start;color: #fff;">
+                    html += '<div class="building-line" style="border-left: 1px dashed #1D96E9; height: 100px; top: 50px;"></div>';
+                    html += `<div style="font-size: 12px;background: #18A65A;width: 100px;top: 166px;left: 38px;position: absolute;display: flex;flex-direction: column;align-items: flex-start;color: #fff;">
                                 <span>地下停车场入口⬇</span>
                             </div>`
-                    html += '<div class="building-line" style="border-left: 1px dashed #1D96E9; height: 100px; top: 326px;left: 48px;"></div>';
+                    html += '<div class="building-line" style="border-left: 1px dashed #1D96E9; height: 100px; top: 166px;left: 38px;"></div>';
                     div.innerHTML = html;
                     let tag = new THREE.CSS2DObject(div);
                     child.add(tag);
@@ -600,7 +600,7 @@
                     div.id = child.uuid;
                     let html = '';
                     html += '<div class="building-box" style="width: 100px; top: 28px; left: -48px;">';
-                    html += '<div class="finger" style="animation:blink 1s infinite;"><img src="https://www.cqna.gov.cn/syygapi/naxsb/images/finger.png">点我</div>';
+                    html += '<div class="finger" style="animation:blink 1s infinite;"><img src="images/finger.png">点我</div>';
                     html += '<div class="building-text" style="background: #1D96E9;">';
                     html += '<span>2号楼</span></span></span><span style="font-size: 10px;">南岸区政务服务中心</span>';
                     html += '</div>';
@@ -637,7 +637,7 @@
                     const div = document.createElement('div');
                     div.id = child.uuid;
                     let html = '';
-                    html += '<div class="building-box">';
+                    html += '<div class="building-box" style="top: 73px;">';
                     html += `<div class="text" style="top: -51px;left: 146px;position: absolute;display: flex;flex-direction: column;align-items: flex-start;color: #1A95EB;">
                                 <span style="font-size: 16px;font-weight: bold;margin-bottom: 5px;">地铁6号线</span>
                                 <span>邱家湾站2B出口</span>
@@ -649,7 +649,7 @@
                     html += '</div>';
                     html += '<svg width="10" height="10"><polygon id="triangle" points="0,0 10,0 5,10" fill="#18A65A"/></svg>';
                     html += '</div>';
-                    html += '<div class="building-line"></div>';
+                    html += '<div class="building-line" style="top: 110px;"></div>';
                     div.innerHTML = html;
                     let tag = new THREE.CSS2DObject(div);
                     child.add(tag);

nngkxxdp/src/main/resources/static/naxsb/mobile/tdcrlistMobile.html

@@ -12,7 +12,6 @@
     <meta name="ColumnKeywords" content="土地供应" />
     <meta name="ColumnType" content="土地供应" />
     <title>土地供应-重庆市南岸区人民政府网</title>
-    <link rel="stylesheet" href="css/mapcon.css">
     <!-- 引入 Vue -->
     <script src="https://www.cqna.gov.cn/syygapi/naxsb/js/vue.min.js"></script>
     <!-- 引入样式 -->

nngkxxdp/src/main/resources/static/naxsb/mobile/znxzMobile.html

@@ -12,7 +12,6 @@
     <meta name="ColumnKeywords" content="智能选址" />
     <meta name="ColumnType" content="智能选址" />
     <title>智能选址-重庆市南岸区人民政府网</title>
-    <link rel="stylesheet" href="css/mapcon.css">
     <!-- 引入 Vue -->
     <script src="https://www.cqna.gov.cn/syygapi/naxsb/js/vue.min.js"></script>
     <!-- 引入样式 -->

nngkxxdp/src/main/resources/static/naxsb/mobile/ztcrlistMobile.html

@@ -12,7 +12,6 @@
     <meta name="ColumnKeywords" content="载体服务" />
     <meta name="ColumnType" content="载体服务" />
     <title>载体服务-重庆市南岸区人民政府网</title>
-    <link rel="stylesheet" href="css/mapcon.css">
     <!-- 引入 Vue -->
     <script src="https://www.cqna.gov.cn/syygapi/naxsb/js/vue.min.js"></script>
     <!-- 引入样式 -->