决策大屏地图模式先隐藏

app/view/datacollect/index.ejs

@@ -61,7 +61,7 @@
             </div>
         </div>
         <div class="c-body" style="background:#2c3237 !important">
-            <div class="flex-content" data-content="1" <% if (ctx.session.sessionProject.dataCollect !== 1 && ctx.session.sessionProject.dataCollect !== 2) { %>style="display: none"<% } %>>
+            <div class="flex-content" data-content="1" <% if (ctx.session.sessionProject.dataCollect !== 1 && ctx.session.sessionProject.dataCollect !== 3) { %>style="display: none"<% } %>>
                 <div class="row">
                     <div class="col-3 pr-0">
                         <div class="left-content">
@@ -128,15 +128,15 @@
                             <div class="center-chart-content">
                                 <div class="center-di">
                                     <div class="card bg-dark height-100">
-                                        <div class="jlchart" data-chart-num="1" id="jlchart" style="height: 100%; width: 100%; <% if (ctx.session.sessionProject.dataCollect === 1) { %>display:none;<% } %>"></div>
-                                        <div class="di-content mb-2" id="map1" style="background: #343A40; width: 100%; <% if (ctx.session.sessionProject.dataCollect === 2) { %>display:none;<% } %>">
+                                        <div class="jlchart" data-chart-num="1" id="jlchart" style="height: 100%; width: 100%; <% if (ctx.session.sessionProject.dataCollect === 3) { %>display:none;<% } %>"></div>
+                                        <div class="di-content mb-2" id="map1" style="background: #343A40; width: 100%; <% if (ctx.session.sessionProject.dataCollect === 1) { %>display:none;<% } %>">
                                         </div>
                                     </div>
                                 </div>
                                 <div class="center-chart">
                                     <div class="card height-100 bg-dark mt-2">
-                                        <div class="jlchart" data-chart-num="2" id="jlchart" style="height: 100%; width: 100%; <% if (ctx.session.sessionProject.dataCollect === 2) { %>display:none;<% } %>"></div>
-                                        <div class="di-content mb-2" <% if (ctx.session.sessionProject.dataCollect === 1) { %>style="display:none;"<% } %>>
+                                        <div class="jlchart" data-chart-num="2" id="jlchart" style="height: 100%; width: 100%; <% if (ctx.session.sessionProject.dataCollect === 1) { %>display:none;<% } %>"></div>
+                                        <div class="di-content mb-2" <% if (ctx.session.sessionProject.dataCollect === 3) { %>style="display:none;"<% } %>>
                                             <div class="jldbchart" data-chart-num="1" id="jldbchart" style="height: 100%; width: 100%;"></div>
                                         </div>
                                     </div>
@@ -324,7 +324,7 @@
                     </div>
                 </div>
             </div>
-            <div class="flex-content" data-content="2" <% if (ctx.session.sessionProject.dataCollect !== 3 && ctx.session.sessionProject.dataCollect !== 4) { %>style="display: none"<% } %>>
+            <div class="flex-content" data-content="2" <% if (ctx.session.sessionProject.dataCollect !== 2 && ctx.session.sessionProject.dataCollect !== 4) { %>style="display: none"<% } %>>
                 <div class="mx-3">
                     <div class="row">
                         <div class="col-6 pr-1">
@@ -423,8 +423,8 @@
                                 <div class="right-big-chart-content mr-3">
                                     <div class="height-60 mt-2">
                                         <div class="card height-100 bg-dark">
-                                            <div class="jldbchart" data-chart-num="2" id="jldbchart" style="height: 100%; width: 100%; <% if (ctx.session.sessionProject.dataCollect === 3) { %>display:none;<% } %>"></div>
-                                            <div class="di-content mb-2" id="map2" style="height: 100%; width: 100%; <% if (ctx.session.sessionProject.dataCollect === 4) { %>display:none;<% } %>"></div>
+                                            <div class="jldbchart" data-chart-num="2" id="jldbchart" style="height: 100%; width: 100%; <% if (ctx.session.sessionProject.dataCollect === 4) { %>display:none;<% } %>"></div>
+                                            <div class="di-content mb-2" id="map2" style="height: 100%; width: 100%; <% if (ctx.session.sessionProject.dataCollect === 2) { %>display:none;<% } %>"></div>
                                         </div>
                                     </div>
                                     <div class="height-36 mt-2">
@@ -1102,9 +1102,9 @@
         }
     });
 </script>
-<script src="/public/js/map/turf.min.js"></script>
-<script src="/public/js/map/gcoord.js"></script>
-<script type="text/javascript" src="https://api.map.baidu.com/api?v=1.0&type=webgl&ak=C3hLZAjuWTaCdwnwoYY83APrwlPEj4v7"></script>
+<!--<script src="/public/js/map/turf.min.js"></script>-->
+<!--<script src="/public/js/map/gcoord.js"></script>-->
+<!--<script type="text/javascript" src="https://api.map.baidu.com/api?v=1.0&type=webgl&ak=C3hLZAjuWTaCdwnwoYY83APrwlPEj4v7"></script>-->
 <script>
     // let map1, map2;
     // function loadScript() {
@@ -1113,16 +1113,16 @@
     //     document.body.appendChild(script);
     // }
     // window.onload = loadScript;
-    const map1 = new BMapGL.Map("map1");
-    const map2 = new BMapGL.Map("map2");
-    map1.enableScrollWheelZoom(true);
-    map1.setMapStyleV2({styleId: '20d4aea41cf71387395f2dc835f1c4b6'});
-    map2.enableScrollWheelZoom(true);
-    map2.setMapStyleV2({styleId: '20d4aea41cf71387395f2dc835f1c4b6'});
+    // const map1 = new BMapGL.Map("map1");
+    // const map2 = new BMapGL.Map("map2");
+    // map1.enableScrollWheelZoom(true);
+    // map1.setMapStyleV2({styleId: '20d4aea41cf71387395f2dc835f1c4b6'});
+    // map2.enableScrollWheelZoom(true);
+    // map2.setMapStyleV2({styleId: '20d4aea41cf71387395f2dc835f1c4b6'});
 
     const originDataCollect = parseInt('<%- ctx.session.sessionProject.dataCollect %>');
     const category = JSON.parse(unescape('<%- escape(JSON.stringify(categoryData)) %>'));
-    const mapJson = JSON.parse(unescape('<%- escape(JSON.stringify(map_json)) %>'));
+    <!--const mapJson = JSON.parse(unescape('<%- escape(JSON.stringify(map_json)) %>'));-->
     let tenders = '';
     // let noticeList = '';
     $(function () {
@@ -1433,28 +1433,28 @@
 
             // 地图设置
             // const polyLineList = [];
-            const centerPoint = { lng: mapJson.lng, lat: mapJson.lat };
-            let level = mapJson.level;
-            // 初始化地图，设置中心点坐标和地图级别
-            const point = new BMapGL.Point(centerPoint.lng, centerPoint.lat);
-            // 创建地图实例
-            map1.centerAndZoom(point, level);
-            // 创建地图实例
-            map2.centerAndZoom(point, level);
-            map1.reset();
-            map2.reset();
+            // const centerPoint = { lng: mapJson.lng, lat: mapJson.lat };
+            // let level = mapJson.level;
+            // // 初始化地图，设置中心点坐标和地图级别
+            // const point = new BMapGL.Point(centerPoint.lng, centerPoint.lat);
+            // // 创建地图实例
+            // map1.centerAndZoom(point, level);
+            // // 创建地图实例
+            // map2.centerAndZoom(point, level);
+            // map1.reset();
+            // map2.reset();
         }
 
         $('.change-collect').on('click', function () {
             const num = parseInt($(this).data('collect'));
             $('#zhankai span').text(num);
-            if (num === 1 || num === 2) {
+            if (num === 1 || num === 3) {
                 $('.flex-content[data-content="1"]').show();
                 $('.flex-content[data-content="2"]').hide();
-                if (originDataCollect !== 1 && originDataCollect !== 2) {
+                if (originDataCollect !== 1 && originDataCollect !== 3) {
                     tableScroll('tableId', '100%', 30, 7);
                 }
-                if (num === 1) {
+                if (num === 3) {
                     $('.jlchart[data-chart-num="1"]').hide();
                     $('.jlchart[data-chart-num="1"]').siblings().show();
                     $('.jlchart[data-chart-num="2"]').show();
@@ -1470,7 +1470,7 @@
                 $('.flex-content[data-content="2"]').show();
                 $('.flex-content[data-content="1"]').hide();
                 // roll2(50);
-                if (num === 3) {
+                if (num === 4) {
                     $('.jldbchart[data-chart-num="2"]').hide();
                     $('.jldbchart[data-chart-num="2"]').siblings().show();
                 } else {

app/view/setting/datacollect.ejs

@@ -12,7 +12,7 @@
         <div class="c-body">
             <div class="sjs-height-0">
                 <nav class="nav nav-tabs m-3" id="tablist" role="tablist">
-                    <% for (let i = 1; i <= 4; i++) { %>
+                    <% for (let i = 1; i <= 2; i++) { %>
                         <a class="nav-item nav-link<% if ((ctx.session.sessionProject.dataCollect === 0 && i === 1) || ctx.session.sessionProject.dataCollect === i) { %> active<% } %>" data-datacollect="<%- i %>" data-toggle="tab" href="#shujudaping-<%- i %>" role="tab">
                             决策大屏<%- ctx.helper.transFormToChinese(i) %><% if (ctx.helper._.indexOf(projectData.data_collect_pages, i.toString()) !== -1) { %>(已开启<% if (i === ctx.session.sessionProject.dataCollect) { %>、默认<% } %>)<% } %></a>
                     <% } %>
@@ -36,7 +36,7 @@
                     </div>
                 </nav>
                 <div class="tab-content m-3">
-                    <% for (let i = 1; i <= 4; i++) { %>
+                    <% for (let i = 1; i <= 2; i++) { %>
                         <div id="shujudaping-<%- i %>" class="tab-pane<% if ((ctx.session.sessionProject.dataCollect === 0 && i === 1) || ctx.session.sessionProject.dataCollect === i) { %> active<% } %>"><img src="/public/images/juecedaping0<%- i %>.png" width="100%"></div>
                     <% } %>
                 </div>
@@ -107,7 +107,7 @@
         })
 
         function updateTab() {
-            for (let i = 1; i <= 4; i++) {
+            for (let i = 1; i <= 2; i++) {
                 let msg = '';
                 if (_.indexOf(dataCollectPages, i.toString()) !== -1) {
                     msg = '(已开启' + (i=== dataCollect ? '、默认' : '') + ')' ;