修复问题

js/plan-inner.js

@@ -12,9 +12,9 @@ function getTeamInnerList(queryParam = {}, innerPage = 1) {
         if (result.totalCount > 0) {
             data.forEach(function(item, key) {
                 if (item.pd) {
-                    items += "<tr class='selected'>" + "<td class='status checked' data-id='" + item.id + "'></td>" + "<td>" + item.spot_name + "</td>" + "<td>" + item.spot_address + "</td>" + "<td ><a class='pointDetail' data-id=" + item.dwid + "><img src='../../images/tupianbtn.png'></a></td>" + "</tr>"
+                    items += "<tr class='selected'>" + "<td class='status checked' data-id='" + item.id + "'></td>" + "<td>" + item.spot_name + "</td>" + "<td>" + item.spot_address + "</td>" + "<td ><a class='pointDetail' data-id=" + item.id + "><img src='../../images/tupianbtn.png'></a></td>" + "</tr>"
                 } else {
-                    items += "<tr>" + "<td class='status' data-id='" + item.id + "'></td>" + "<td>" + item.spot_name + "</td>" + "<td>" + item.spot_address + "</td>" + "<td ><a class='pointDetail' data-id=" + item.dwid + "><img src='../../images/tupianbtn.png'></a></td>" + "</tr>"
+                    items += "<tr>" + "<td class='status' data-id='" + item.id + "'></td>" + "<td>" + item.spot_name + "</td>" + "<td>" + item.spot_address + "</td>" + "<td ><a class='pointDetail' data-id=" + item.id + "><img src='../../images/tupianbtn.png'></a></td>" + "</tr>"
                 }
             })
             $('#dataList2').html(items);
@@ -138,7 +138,7 @@ function getSearchParamObj2() {
 
 
 //点位详情弹框
-$(document).on('click', 'a.pointDetail', function() {
+$(document).on('click', 'a.pointDetail', function(event) {
     let dwId = $(this).data('id');
     layerDepartmentIndex = layer.open({
         type: 1,
@@ -165,6 +165,7 @@ $(document).on('click', 'a.pointDetail', function() {
             })
         }
     })
+    event.stopPropagation();
 })
 
 

js/point.js

@@ -385,7 +385,7 @@ function getDataExport(queryParam = {}) {
 
 
 //点位标签弹框
-$(document).on('click', 'a.pointLabel', function() {
+$(document).on('click', 'a.pointLabel', function(event) {
     let dwId = $(this).data('id');
     layerDepartmentIndex = layer.open({
         type: 1,
@@ -420,10 +420,11 @@ $(document).on('click', 'a.pointLabel', function() {
             })
         }
     })
+    event.stopPropagation();
 })
 
 //点位详情点击
-$(document).on('click', 'a.pointDetail', function() {
+$(document).on('click', 'a.pointDetail', function(event) {
     let id = $(this).data('id'); //单位ID
     layerReportIndex = layer.open({
         type: 1,
@@ -448,6 +449,7 @@ $(document).on('click', 'a.pointDetail', function() {
             })
         }
     })
+    event.stopPropagation();
 })
 
 

js/record-inner.js

@@ -30,7 +30,7 @@ $(document).on('click', 'a.view-detail', function() {
 // 获取列表 ajax请求
 function getPointDetailAjax(queryParam = {}, innerPage = 1) {
     queryParam.page = innerPage;
-    queryParam.limit = 1; // 每页显示条数
+    queryParam.limit = 5; // 每页显示条数
     queryParam.start = (queryParam.page - 1) * queryParam.limit;
     ajaxRequest(RECORD_AND_POINT, "POST", queryParam, function(result) {
         let data = result.RESULT;
@@ -38,7 +38,7 @@ function getPointDetailAjax(queryParam = {}, innerPage = 1) {
         if (result.totalCount > 0) {
             data.forEach(function(item, key) {
                 items += "<tr>" + "<td class='status'></td>" + "<td>" + item.spot_name + "</td>" + "<td>" + item.spot_address + "</td>" + "<td>" + item.wcqk +
-                    "</td>" + "<td>" + item.wcqk + "</td>" + "<td>" + item.wcqk + "</td>" +
+                    "</td>" + "<td>" + item.wbr + "</td>" + "<td>" + item.wc_time + "</td>" +
                     "<td ><a class='pointDetail' data-id=" + item.dwid + "><img src='../../images/tupianbtn.png'></a></td>" + "<td ><a class='weibaoReport' data-id=" + item.jlid + "><img src='../../images/tupianbtn.png'></a></td>" + "</tr>"
             })
             $('#dataList2').html(items);
@@ -129,7 +129,7 @@ function resetForm() {
 
 
 //点位详情弹框
-$(document).on('click', 'a.pointDetail', function() {
+$(document).on('click', 'a.pointDetail', function(event) {
     let dwId = $(this).data('id');
     layerDepartmentIndex = layer.open({
         type: 1,
@@ -156,10 +156,11 @@ $(document).on('click', 'a.pointDetail', function() {
             })
         }
     })
+    event.stopPropagation();
 })
 
 //维保报告点击
-$(document).on('click', 'a.weibaoReport', function() {
+$(document).on('click', 'a.weibaoReport', function(event) {
     let jlId = $(this).data('id'); //单位ID
     layerReportIndex = layer.open({
         type: 1,
@@ -190,4 +191,5 @@ $(document).on('click', 'a.weibaoReport', function() {
             })
         }
     })
+    event.stopPropagation();
 })

operate-manage.html

@@ -30,7 +30,7 @@
                 </ul>
             </div>
             <div class="column3 flex10">
-                <iframe name="iframe" width="100%" height="100%" frameborder="0" src="pages/operation/plan.html"></iframe>
+                <iframe name="iframe" width="100%" height="100%" frameborder="0" src="pages/operation/record.html"></iframe>
             </div>
         </div>
     </section>