Pārlūkot izejas kodu

feat: 数据导出需求开发

tsz 3 gadi atpakaļ
vecāks
revīzija
60668234d7

+ 33 - 0
src/jfw/modules/app/src/web/staticres/jyapp/dataExport/css/dataExport.css

@@ -265,4 +265,37 @@ html .match_way .box .box_bd img {
 
 html .match_way .box .box_bd .weui-check:checked + .weui-icon-checked:before {
   color: #2CB7CA;
+}
+
+.nodata_dialog .weui-dialog{
+  width: 6.06rem;
+  left: .72rem;
+  right: .72rem;
+  border-radius: .16rem;
+  background: #fff;
+}
+.nodata_dialog .weui-dialog__title {
+  font-size: .36rem;
+  font-weight: 500;
+  color: #171826;
+  line-height: .42rem;
+}
+.nodata_dialog .weui-dialog__bd{
+  margin-top: .16rem;
+  padding: 0 .6rem .52rem;
+  font-size: .3rem;
+  font-weight: 500;
+  color: #5F5E64;
+  line-height: .44rem;
+  text-align: left;
+}
+.nodata_dialog .weui-dialog__ft{
+  height: .92rem;
+  display: flex;
+  align-items: center;
+}
+.nodata_dialog .weui-dialog__btn.weui-dialog__btn_primary{
+  font-size: .36rem;
+  font-weight: 500;
+  color: #2ABED1;
 }

+ 92 - 71
src/jfw/modules/app/src/web/templates/dataExport/dataExport.html

@@ -227,73 +227,6 @@
 <div class="app-layout-content-b">
     <div class="page">
         <div class='main' style="">
-          <div class="top-ad" style="=height: auto;">
-            <div class="home_banner">
-              <div class="swiper-container lunbo" id="swiper1">
-                <div class="swiper-wrapper" data-cl-event="c_wx_brand_linkclick">
-                  <!--轮播广告-->
-                  <div class="placeholder-div"></div>
-                </div>
-                <div class="swiper-pagination custorm_dot"></div>
-              </div>
-            </div>
-          </div>
-<!--                  {{$s_top:=(Ad "jy-wxsearch-home-top" -1)}}-->
-          <script>
-          {{$sd:=(Ad "jy-app-dataexport-screen-top" -1)}}
-            var ADTopList={{$sd}}
-            // var ADTopList=[]
-            if(ADTopList.length>0){
-              if(ADTopList[0].s_pic == ""){
-                $(function (){
-                  $(".top-ad").hide()
-                })
-              }
-            }else {
-              $(function (){
-                $(".top-ad").hide()
-              })
-            }
-            if (ADTopList!=null){
-              var adhtml = '';
-              for(var i=0;i<ADTopList.length;i++){
-                var num = i+1;
-                var imgHTML = '<img id="app-dataexport-swiper'+ num +'" src="'+ADTopList[i]["s_pic"]+'" alt="">'
-                if (i === 0 || i === ADTopList.length -1) {
-                  imgHTML = '<img src="'+ADTopList[i]["s_pic"]+'" alt="" style="width: 100%">'
-                }
-                adhtml+='<div class="swiper-slide" onclick="adv_statistics(this)"  adv_name="app端数据导出筛选页面顶部'+ num +'">'
-                  +'<a href="'+ADTopList[i]["s_link"]+'">'
-                  + imgHTML
-                  +'</a></div>'
-              }
-              if(ADTopList.length==1){
-                $(".swiper-pagination").hide();
-              }
-              if(adhtml!=""){
-                $(".home_banner .swiper-wrapper").html(adhtml);
-              }
-            }
-            //dev2.9.7.2
-            if(ADTopList.length >1){
-              window.swiper1 = new Swiper('#swiper1',{
-                slidesPerView: 1,
-                spaceBetween: 20,
-                centeredSlides: true,
-                speed:800,
-                autoplay: {
-                  delay: 4000,
-                  disableOnInteraction: false,
-                },
-                pagination: {
-                  el: '.swiper-pagination',
-                },
-                paginationClickable: true,
-                loop: true,
-              });
-              swiper1.init();
-            }
-          </script>
             <div class="progress" style="margin-top: -4px">
                 <div class="p-item">
                     <p class="p-item-icon" style="background: #2cb7ca;">
@@ -394,7 +327,73 @@
                     </ul>
                 </div>
             </div>
-
+            <div class="top-ad" style="=height: auto;">
+              <div class="home_banner">
+                <div class="swiper-container lunbo" id="swiper1">
+                  <div class="swiper-wrapper" data-cl-event="c_wx_brand_linkclick">
+                    <!--轮播广告-->
+                    <div class="placeholder-div"></div>
+                  </div>
+                  <div class="swiper-pagination custorm_dot"></div>
+                </div>
+              </div>
+            </div>
+  <!--                  {{$s_top:=(Ad "jy-wxsearch-home-top" -1)}}-->
+            <script>
+            {{$sd:=(Ad "jy-app-dataexport-screen-top" -1)}}
+              var ADTopList={{$sd}}
+              // var ADTopList=[]
+              if(ADTopList.length>0){
+                if(ADTopList[0].s_pic == ""){
+                  $(function (){
+                    $(".top-ad").hide()
+                  })
+                }
+              }else {
+                $(function (){
+                  $(".top-ad").hide()
+                })
+              }
+              if (ADTopList!=null){
+                var adhtml = '';
+                for(var i=0;i<ADTopList.length;i++){
+                  var num = i+1;
+                  var imgHTML = '<img id="app-dataexport-swiper'+ num +'" src="'+ADTopList[i]["s_pic"]+'" alt="">'
+                  if (i === 0 || i === ADTopList.length -1) {
+                    imgHTML = '<img src="'+ADTopList[i]["s_pic"]+'" alt="" style="width: 100%">'
+                  }
+                  adhtml+='<div class="swiper-slide" onclick="adv_statistics(this)"  adv_name="app端数据导出筛选页面顶部'+ num +'">'
+                    +'<a href="'+ADTopList[i]["s_link"]+'">'
+                    + imgHTML
+                    +'</a></div>'
+                }
+                if(ADTopList.length==1){
+                  $(".swiper-pagination").hide();
+                }
+                if(adhtml!=""){
+                  $(".home_banner .swiper-wrapper").html(adhtml);
+                }
+              }
+              //dev2.9.7.2
+              if(ADTopList.length >1){
+                window.swiper1 = new Swiper('#swiper1',{
+                  slidesPerView: 1,
+                  spaceBetween: 20,
+                  centeredSlides: true,
+                  speed:800,
+                  autoplay: {
+                    delay: 4000,
+                    disableOnInteraction: false,
+                  },
+                  pagination: {
+                    el: '.swiper-pagination',
+                  },
+                  paginationClickable: true,
+                  loop: true,
+                });
+                swiper1.init();
+              }
+            </script>
             <!-- elseChooseEnd -->
         </div>
         <!-- btn -->
@@ -406,6 +405,20 @@
             <button class="saveData j-button-confirm">确认</button>
         </div>
 
+        <div id="dialogs" wah-hotarea="click">
+          <!--BEGIN dialog1-->
+          <div class="js_dialog nodata_dialog" style="display: none;" role="dialog" aria-hidden="true" aria-modal="true" aria-labelledby="js_title1" id="iosDialog1" style="opacity: 1;" tabindex="0">
+              <div class="weui-mask"></div>
+              <div class="weui-dialog">
+                  <div class="weui-dialog__hd"><strong class="weui-dialog__title" id="js_title1">未匹配到数据</strong></div>
+                  <div class="weui-dialog__bd">对不起,没有匹配到数据,请修改数据导出条件</div>
+                  <div class="weui-dialog__ft">
+                      <a role="button" href="javascript:" class="modifyData weui-dialog__btn weui-dialog__btn_primary">立即修改</a>
+                  </div>
+              </div>
+          </div>
+          <!--END dialog1-->
+        </div>
         <div class="js_dialog match_way" id="match_way" style="display: none;">
             <div class="weui-mask"></div>
             <div class="box">
@@ -1127,13 +1140,21 @@
                 },
                 dataType: 'json',
                 success: function (data) {
-                    if (data._id !== "") {
-                      // window.location.href = "/jyapp/front/dataExport/toCreateOrderPage?id=" + data._id + "&source=d&payway=" + pay_way + "&dataspec=" + data_spec;
-                      window.location.href = "/jy_mobile/common/order/create/dataexport?id=" + data._id + "&source=d&payway=" + pay_way + "&dataspec=" + data_spec;
+                  // 匹配数据为0,弹窗提示修改筛选条件
+                    if (data.total == 0) {
+                      $('.js_dialog.nodata_dialog').attr('aria-hidden', false).show()
+                    } else {
+                      if (data._id !== "") {
+                        // window.location.href = "/jyapp/front/dataExport/toCreateOrderPage?id=" + data._id + "&source=d&payway=" + pay_way + "&dataspec=" + data_spec;
+                        window.location.href = "/jy_mobile/dataexport/limitpreview/" + data._id;
+                      }
                     }
                 }
             })
         });
+        $('.modifyData').click(function() {
+          $('.js_dialog.nodata_dialog').attr('aria-hidden', true).hide()
+        })
         //
         $(".reset").on('click', function () {
             localStorage.removeItem("date");

+ 0 - 0
src/web/staticres/common-module/data-export/css/table-index.css


+ 0 - 0
src/web/staticres/common-module/data-export/js/table-index.js


+ 39 - 0
src/web/staticres/wx_dataExport/css/dataExport.css

@@ -302,4 +302,43 @@ html .match_way .box .box_bd .weui-check:checked + .weui-icon-checked:before {
 .icon-arrow-top {
 	background: url(data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAABwAAAAcCAYAAAByDd+UAAAABHNCSVQICAgIfAhkiAAAAN9JREFUSEvt0rENwjAQBdB/RWoyChugTAAp4hbYADZgA9iAtLkUYQNgg6yQDehTBAURCaHYvpNQaOz628/+Z8LEiyb2EMCfNx4q/X+lVVXFbdseAdyNMbn2RuoZMvMFwPINbbWoCiyKIiei9derVKgYtGC9/QCQGGNqSb0ikJk3AM6OA8WoFxRgwz1EqBNUYANaR1GUpGna46PLCjLzHMAVQCyZzUfGibrAG4CFEnvFiWifZdlpbK8VLMty13XdAcBMiTYAVrZf6/00SswbD6C3Im0gVKptzJsPlXor0gaecJo+HVRwOokAAAAASUVORK5CYII=) no-repeat;
 	background-size: contain;
+}
+
+.nodata_dialog .weui-dialog{
+  width: 6.06rem;
+  max-width: 6.06rem;
+  left: .72rem;
+  right: .72rem;
+  border-radius: .16rem;
+  background: #fff;
+  transform: translate(0%, -50%);
+}
+.nodata_dialog .weui-dialog__hd{
+  padding: .52rem 0 0;
+}
+.nodata_dialog .weui-dialog__title {
+  font-size: .36rem;
+  font-weight: 500;
+  color: #171826;
+  line-height: .42rem;
+}
+.nodata_dialog .weui-dialog__bd{
+  margin-top: .16rem;
+  margin-bottom: 0;
+  padding: 0 .6rem .52rem;
+  font-size: .3rem;
+  font-weight: 500;
+  color: #5F5E64;
+  line-height: .44rem;
+  text-align: left;
+}
+.nodata_dialog .weui-dialog__ft{
+  height: .92rem;
+  display: flex;
+  align-items: center;
+}
+.nodata_dialog .weui-dialog__btn.weui-dialog__btn_primary{
+  font-size: .36rem;
+  font-weight: 500;
+  color: #2ABED1;
 }

+ 70 - 38
src/web/templates/pc/dataExport_sieve.html

@@ -934,17 +934,18 @@
       </div>
       <div class="dataExport_main">
         <div v-if="isfixed && dataType === '1'" class="fixedTr data_fixed">
-          <table class="d_bz" cellspacing="0" cellpadding="0">
+          <div id="previewData_bz" class="previewData_bz"></div>
+          <!-- <table class="d_bz" cellspacing="0" cellpadding="0">
             <tr>
               <td :rowspan="item.rowspan" :colspan="item.colspan" v-for="(item, index) in title" :key="index">
                 <span v-if="index===8&&dataType === '1'">${item.title}<br/>(万元)</span>
                 <span v-else>${item.title}</span>
               </td>
             </tr>
-          </table>
+          </table> -->
         </div>
         <table v-if="dataType === '1'" class="d_bz" cellspacing="0" cellpadding="0">  
-          <tr>
+          <tr id="firstTr">
             <td :rowspan="item.rowspan" :colspan="item.colspan" v-for="(item, index) in title" :key="index">
               <span v-if="index===8&&dataType === '1'">${item.title}<br/>(万元)</span>
               <span v-else>${item.title}</span>
@@ -966,7 +967,8 @@
             </tr>
         </table>
         <div v-if="isfixed && dataType === '2'" class="fixedTr data_fixed">
-          <table class="d_gj" cellspacing="0" cellpadding="0">
+          <div id="previewData_gj" class="previewData_gj"></div>
+          <!-- <table class="d_gj" cellspacing="0" cellpadding="0">
             <tr>
               <td :rowspan="item.rowspan" :colspan="item.colspan" v-for="(item, index) in title" :key="index">
                 <span v-if="index===13&&dataType === '2'||index===12&&dataType === '2'">${item.title}<br/>(万元)</span>
@@ -986,10 +988,10 @@
               <td>联系电话</td>
               <td>电子邮箱</td>
             </tr>
-          </table>
+          </table> -->
         </div>
         <table v-if="dataType === '2'" class="d_gj" cellspacing="0" cellpadding="0">
-          <tr>
+          <tr id="firstTrGj">
             <td :rowspan="item.rowspan" :colspan="item.colspan" v-for="(item, index) in title" :key="index">
               <span v-if="index===13&&dataType === '2'||index===12&&dataType === '2'">${item.title}<br/>(万元)</span>
               <span v-else>${item.title}</span>
@@ -1164,7 +1166,7 @@
     watch: {
       isfixed (newval, oldval) {
         if (newval) {
-          $(function() {
+          setTimeout(() => {
             // 获取表格td宽度
             if(this.dataType === '1') {
               var topTds = $(".d_bz tr:last");
@@ -1172,38 +1174,61 @@
               var topTds = $(".d_gj:nth-child(2) tr:first");
               var topTdsMin = $(".d_gj:nth-child(2) tr:last");
             }
-            // 获取顶部title DOM
-            if(this.dataType === '1') {
-              var fixedTds = $('.fixedTr.data_fixed .d_bz tr').children()
-              topTds = topTds.children();
+            var proNode = document.getElementById('previewData_bz')
+            var node = document.getElementById('firstTr')
+            if(this.dataType ===  '2') {
+              proNode = document.getElementById('previewData_gj')
+              node = document.getElementById('firstTrGj')
+              var height = 54
             } else {
-              debugger
-              let $widthMinArr = []
-              var fixedTds = $('.fixedTr.data_fixed .d_gj tr:nth-child(1)').children()
-              var fixedMinTds = $('.fixedTr.data_fixed .d_gj tr:nth-child(2)').children()
-              topTds = topTds.children();
-              topTdsMin = topTdsMin.children()
-              for(let m = 0; m < topTdsMin.length; m++){
-                const $width = $(topTds.eq(m)).outerWidth()
-                $widthMinArr.push($width)
-              }
-              // 把取到的宽度赋值给顶部title
-              for(var f = 0; f < fixedMinTds.length; f++) {
-                const $Dom = $(fixedMinTds.eq(f))
-                $($Dom).css("width", $widthMinArr[f]+'px')
-              }
+              var height = node.offsetHeight // dom高
             }
-            let $widthArr = []
-            for(let m = 0; m < topTds.length; m++){
-              const $width = $(topTds.eq(m)).outerWidth()
-              $widthArr.push($width)
-            }
-            // 把取到的宽度赋值给顶部title
-            for(var f = 0; f < fixedTds.length; f++) {
-              const $Dom = $(fixedTds.eq(f))
-              $($Dom).css("width", $widthArr[f]+'px')
-            }
-          })
+            var width = node.offsetWidth // dom宽
+            html2canvas(node, {
+              width: width,
+              height: height,
+              backgroundColor: '#EBF5FE',
+              scale: 2,
+              X: 0,
+              Y: 0,
+              // scrollX: -3, // 如果左边多个白边 设置该偏移-3 或者更多
+              // scrollY: -10,
+              useCORS: true, // 是否使用CORS从服务器加载图像 !!!
+              allowTaint: true // 是否允许跨域图像污染画布  !!!
+            }).then(function(canvas){
+              proNode.append(canvas)
+            });
+            // 获取顶部title DOM
+            // if(this.dataType === '1') {
+            //   var fixedTds = $('.fixedTr.data_fixed .d_bz tr').children()
+            //   topTds = topTds.children();
+            // } else {
+            //   let $widthMinArr = []
+            //   var fixedTds = $('.fixedTr.data_fixed .d_gj tr:nth-child(1)').children()
+            //   var fixedMinTds = $('.fixedTr.data_fixed .d_gj tr:nth-child(2)').children()
+            //   topTds = topTds.children();
+            //   topTdsMin = topTdsMin.children()
+            //   for(let m = 0; m < topTdsMin.length; m++){
+            //     const $width = $(topTds.eq(m)).outerWidth()
+            //     $widthMinArr.push($width)
+            //   }
+            //   // 把取到的宽度赋值给顶部title
+            //   for(var f = 0; f < fixedMinTds.length; f++) {
+            //     const $Dom = $(fixedMinTds.eq(f))
+            //     $($Dom).css("width", $widthMinArr[f]+'px')
+            //   }
+            // }
+            // let $widthArr = []
+            // for(let m = 0; m < topTds.length; m++){
+            //   const $width = $(topTds.eq(m)).outerWidth()
+            //   $widthArr.push($width)
+            // }
+            // // 把取到的宽度赋值给顶部title
+            // for(var f = 0; f < fixedTds.length; f++) {
+            //   const $Dom = $(fixedTds.eq(f))
+            //   $($Dom).css("width", $widthArr[f]+'px')
+            // }
+          }, 200)
         }
       }
     },
@@ -1211,8 +1236,12 @@
       renderImg () {
         var w=$(".d_bz").width();
         var h=$(".d_bz").height();
+        var whichDom = document.querySelector(".d_bz")
         $(".sy").width($(".d_bz").width()).height($(".d_bz").height());
-        html2canvas(document.querySelector(".d_bz")).then(function(canvas){
+        if(dataNode._data.dataType === '2') {
+          whichDom = document.querySelector(".d_bz")
+        }
+        html2canvas().then(function(canvas){
           var url=canvas.toDataURL('image/png');
           $(".d_bz").append("<img class=\"fimg\" src=\""+url+"\">")
           $(".d_bz img").width(w);
@@ -1986,6 +2015,9 @@
             if(res.data.list.length > 0) {
               dataNode._data.tableShow = true
               dataNode._data.dataInfo = res.data
+              if(res.data.total == -1) {
+                res.data.total = 20000
+              }
               $('.dataExNum').text(res.data.total)
               $('.dataExport-footer').show()
               if(res.data.total > 20) {

+ 92 - 69
src/web/templates/weixin/dataExport/dataExport.html

@@ -225,72 +225,7 @@
 </style>
 <body class="p13">
     <div class="page j-container">
-      <div class="main j-main" style="">
-        <div class="top-ad" id="ad-top" style="height: auto">
-          <div class="home_banner">
-            <div class="swiper-container lunbo" id="swiper1">
-              <div class="swiper-wrapper" data-cl-event="c_wx_brand_linkclick">
-                <!--轮播广告-->
-                <div class="placeholder-div"></div>
-              </div>
-              <div class="swiper-pagination custorm_dot"></div>
-            </div>
-          </div>
-        </div>
-        {{$s_top:=(Ad "jy-wx-dataexport-screen-top" -1)}}
-        <script>
-          var ADTopList={{$s_top}}
-          if(ADTopList.length>0){
-            if(ADTopList[0].s_pic == ""){
-              $(function (){
-                $(".top-ad").hide()
-              })
-            }
-          }else {
-            $(function (){
-              $(".top-ad").hide()
-            })
-          }
-          if (ADTopList!=null){
-            var adhtml = '';
-            for(var i=0;i<ADTopList.length;i++){
-              var num = i+1;
-              var imgHTML = '<img id="wx-dataexport-swiper'+ num +'" src="'+ADTopList[i]["s_pic"]+'" alt="">'
-              if (i === 0 || i === ADTopList.length -1) {
-                imgHTML = '<img src="'+ADTopList[i]["s_pic"]+'" alt="" style="width: 100%">'
-              }
-              adhtml+='<div class="swiper-slide" onclick="adv_statistics(this)"  adv_name="微信端数据导出筛选页面顶部'+ num +'">'
-                +'<a dataHref="'+ADTopList[i]["s_link"]+'">'
-                + imgHTML
-                +'</a></div>'
-            }
-            if(ADTopList.length==1){
-              $(".swiper-pagination").hide();
-            }
-            if(adhtml!=""){
-              $(".home_banner .swiper-wrapper").html(adhtml);
-            }
-          }
-          //dev2.9.7.2
-          if(ADTopList.length >1){
-          window.swiper1 = new Swiper('#swiper1',{
-            slidesPerView: 1,
-            spaceBetween: 20,
-            centeredSlides: true,
-            speed:800,
-            autoplay: {
-              delay: 4000,
-              disableOnInteraction: false,
-            },
-            pagination: {
-              el: '.swiper-pagination',
-            },
-            paginationClickable: true,
-            loop: true,
-          });
-          swiper1.init();
-          }
-        </script>
+      <div class="main j-main">
        <div>
         <div class="progress">
         	<div class="p-item">
@@ -417,6 +352,71 @@
                </div>
            </div>
         </div>
+        <div class="top-ad" id="ad-top" style="height: auto">
+          <div class="home_banner">
+            <div class="swiper-container lunbo" id="swiper1">
+              <div class="swiper-wrapper" data-cl-event="c_wx_brand_linkclick">
+                <!--轮播广告-->
+                <div class="placeholder-div"></div>
+              </div>
+              <div class="swiper-pagination custorm_dot"></div>
+            </div>
+          </div>
+        </div>
+        {{$s_top:=(Ad "jy-wx-dataexport-screen-top" -1)}}
+        <script>
+          var ADTopList={{$s_top}}
+          if(ADTopList.length>0){
+            if(ADTopList[0].s_pic == ""){
+              $(function (){
+                $(".top-ad").hide()
+              })
+            }
+          }else {
+            $(function (){
+              $(".top-ad").hide()
+            })
+          }
+          if (ADTopList!=null){
+            var adhtml = '';
+            for(var i=0;i<ADTopList.length;i++){
+              var num = i+1;
+              var imgHTML = '<img id="wx-dataexport-swiper'+ num +'" src="'+ADTopList[i]["s_pic"]+'" alt="">'
+              if (i === 0 || i === ADTopList.length -1) {
+                imgHTML = '<img src="'+ADTopList[i]["s_pic"]+'" alt="" style="width: 100%">'
+              }
+              adhtml+='<div class="swiper-slide" onclick="adv_statistics(this)"  adv_name="微信端数据导出筛选页面顶部'+ num +'">'
+                +'<a dataHref="'+ADTopList[i]["s_link"]+'">'
+                + imgHTML
+                +'</a></div>'
+            }
+            if(ADTopList.length==1){
+              $(".swiper-pagination").hide();
+            }
+            if(adhtml!=""){
+              $(".home_banner .swiper-wrapper").html(adhtml);
+            }
+          }
+          //dev2.9.7.2
+          if(ADTopList.length >1){
+          window.swiper1 = new Swiper('#swiper1',{
+            slidesPerView: 1,
+            spaceBetween: 20,
+            centeredSlides: true,
+            speed:800,
+            autoplay: {
+              delay: 4000,
+              disableOnInteraction: false,
+            },
+            pagination: {
+              el: '.swiper-pagination',
+            },
+            paginationClickable: true,
+            loop: true,
+          });
+          swiper1.init();
+          }
+        </script>
         <!-- elseChooseEnd -->
         </div>
       </div>
@@ -429,6 +429,20 @@
           <button data-cl-event="c_wx_confirm_buttonclick" class="saveData j-button-confirm">确认</button>
       </div>
     </div>
+    <div id="dialogs" wah-hotarea="click">
+      <!--BEGIN dialog1-->
+      <div class="js_dialog nodata_dialog" style="display: none;" role="dialog" aria-hidden="true" aria-modal="true" aria-labelledby="js_title1" id="iosDialog1" style="opacity: 1;" tabindex="0">
+          <div class="weui-mask"></div>
+          <div class="weui-dialog">
+              <div class="weui-dialog__hd"><strong class="weui-dialog__title" id="js_title1">未匹配到数据</strong></div>
+              <div class="weui-dialog__bd">对不起,没有匹配到数据,请修改数据导出条件</div>
+              <div class="weui-dialog__ft">
+                  <a role="button" href="javascript:" class="modifyData weui-dialog__btn weui-dialog__btn_primary">立即修改</a>
+              </div>
+          </div>
+      </div>
+      <!--END dialog1-->
+    </div>
     <div class="js_dialog match_way" id="match_way" style="display: none;">
         <div class="weui-mask"></div>
         <div class="box">
@@ -1137,13 +1151,22 @@
                 },
                 dataType: 'json',
                 success: function(data){
-                    if(data._id!==""){
-                      // /front/wx_dataExport/submitOrder
-                      window.location.href="/jy_mobile/common/order/create/dataexport?id="+data._id+"&source=d&dataspec="+data_spec;
+                  // 匹配数据为0,弹窗提示修改筛选条件
+                    if (data.total == 0) {
+                      $('.js_dialog.nodata_dialog').attr('aria-hidden', false).show()
+                    } else {
+                      if(data._id!==""){
+                        // /front/wx_dataExport/submitOrder
+                        // window.location.href="/jy_mobile/common/order/create/dataexport?id="+data._id+"&source=d&dataspec="+data_spec;
+                        window.location.href = "/jy_mobile/dataexport/limitpreview/" + data._id;
+                      }
                     }
                 }
             })
         });
+        $('.modifyData').click(function() {
+          $('.js_dialog.nodata_dialog').attr('aria-hidden', true).hide()
+        })
         //
         $(".reset").on('click', function () {
             localStorage.removeItem("date");