Browse Source

数据导出条件重置

xuzhiheng 6 năm trước cách đây
mục cha
commit
ba74ccac72

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

@@ -168,7 +168,7 @@ html .page .elseChoose .elseChooseList ul li a i {
   float: right;
   color: #707070;
 }
-html .page button {
+.confirm .saveData {
   width: 100%;
   height: 0.94rem;
   background: #2cb7ca;

+ 88 - 5
src/jfw/modules/app/src/web/templates/dataExport/dataExport.html

@@ -8,7 +8,7 @@
     <title>数据导出</title>
     <link rel="stylesheet" href="{{Msg "seo" "cdn"}}/jyapp/dataExport/css/base.css?v={{Msg "seo" "version"}}">
     <link rel="stylesheet" href="{{Msg "seo" "cdn"}}/jyapp/dataExport/iconfont/iconfont.css?v={{Msg "seo" "version"}}">
-    <link rel="stylesheet" href="{{Msg "seo" "cdn"}}/jyapp/dataExport/css/dataExport.css?v={{Msg "seo" "version"}}">
+    <link rel="stylesheet" href="{{Msg "seo" "cdn"}}/jyapp/dataExport/css/dataExport.css?v={{Msg "seo" "version"}}3">
     <link rel="stylesheet" type="text/css" href="/jyapp/css/font.css?v={{Msg "seo" "version"}}" />
     <script src="{{Msg "seo" "cdn"}}/jyapp/dataExport/js/rem.js?v={{Msg "seo" "version"}}"></script>
     <script src="{{Msg "seo" "cdn"}}/jyapp/js/jquery.js"></script>
@@ -139,7 +139,26 @@
         top: 18px;
         color: #444444;
     }
-
+    .resetOne {
+        position: fixed;
+        left: 0;
+        bottom: 0;
+        width: 100%;
+        border-top: 1px solid #F4F4F9;
+        display: none;
+    }
+    .resetOne button:first-child {
+        background: #fff;
+        color: #2cb7ca;
+    }
+    .resetOne button {
+        width: 50%;
+        height: 0.94rem;
+        background: #2cb7ca;
+        font-size: .36rem;
+        color: #fff;
+        float: left;
+    }
 </style>
 <body>
     <div class="app-layout-header">
@@ -240,7 +259,13 @@
         <!-- elseChooseEnd -->
 
         <!-- btn -->
-        <button class="saveData">确认</button>
+        <div class="confirm">
+            <button class="saveData">确认</button>
+        </div>
+        <div class="resetOne">
+            <button class="reset">重置</button>
+            <button class="saveData">确认</button>
+        </div>
 
     </div>
 
@@ -339,7 +364,8 @@
                     $(".dateMake").css({"color":"#24C0D7"});
                     $(".chooseTime ul li").removeClass('active');
                 }
-
+                $(".confirm").hide();
+                $(".resetOne").show();
             },
             onClear: function (inst) {
                 localStorage.removeItem("export_starttime");
@@ -408,6 +434,9 @@
                     $(".dateMake").css({"color":"#24C0D7"});
                     $(".chooseTime ul li").removeClass('active');
                 }
+                //
+                $(".confirm").hide();
+                $(".resetOne").show();
             },
             onClear: function (inst) {
                 localStorage.removeItem("export_endtime");
@@ -442,11 +471,15 @@
 				price="大于"+priceArr[0]+"万元"
 			}
             $("#price").text(price);
+            $(".confirm").hide();
+            $(".resetOne").show();
         }
         //区域
         if(localStorage.area!==undefined && localStorage.area!==""){
             var area = localStorage.area;
             $("#area").text(area);
+            $(".confirm").hide();
+            $(".resetOne").show();
         }
         //行业
         if(localStorage.industry!==undefined && localStorage.industry!==""){
@@ -461,6 +494,8 @@
                 arr.push(str)
             }
             $("#industry").text(arr.toString().replace(/,/g," "));
+            $(".confirm").hide();
+            $(".resetOne").show();
         }
         //关键词
         if(localStorage.keyWord!==undefined && localStorage.keyWord!==""){
@@ -468,22 +503,30 @@
             for(var i in keyWord){
                 $("#keyWord").append(keyWord[i].keyWord + " ");
             }
+            $(".confirm").hide();
+            $(".resetOne").show();
         }
         //信息类型
         if(localStorage.subType!==undefined && localStorage.subType!==""){
             var subType = localStorage.subType;
             $("#subType").text(subType);
+            $(".confirm").hide();
+            $(".resetOne").show();
         }
         if(localStorage.buyer!==undefined && localStorage.buyer!==""){
             var buyer = localStorage.buyer;
             var buyers = buyer.replace(/,/g," ");
             $("#buyer").text(buyers);
+            $(".confirm").hide();
+            $(".resetOne").show();
         }
         //中标单位
         if(localStorage.winner!==undefined && localStorage.winner!==""){
             var winner = localStorage.winner;
             var winners = winner.replace(/,/g," ");
             $("#winner").text(winners);
+            $(".confirm").hide();
+            $(".resetOne").show();
         }
         //时间
         if(localStorage.export_starttime!==undefined && localStorage.export_starttime!==""){
@@ -500,6 +543,8 @@
             $("#endtime").addClass("timeSelect");
             $(".dateMake").css({"color":"#24C0D7"});
             $(".chooseTime ul li").removeClass('active');
+            $(".confirm").hide();
+            $(".resetOne").show();
         }
         if(localStorage.export_endtime!==undefined && localStorage.export_endtime!==""){
             let end = new Date(Number(localStorage.export_endtime));
@@ -515,6 +560,8 @@
             $("#endtime").addClass("timeSelect");
             $(".dateMake").css({"color":"#24C0D7"});
             $(".chooseTime ul li").removeClass('active');
+            $(".confirm").hide();
+            $(".resetOne").show();
         }
         if(localStorage.date!==undefined && localStorage.date!==""){
             if(localStorage.index !== "-1"){
@@ -556,7 +603,8 @@
                     $(".chooseTime ul li").removeClass('active');
                 }
             }
-
+            $(".confirm").hide();
+            $(".resetOne").show();
         }
 
         //筛选条件发送
@@ -629,6 +677,41 @@
             })
         });
         //
+        $(".reset").on('click', function () {
+            localStorage.removeItem("date");
+            localStorage.removeItem("province");
+            localStorage.removeItem("city");
+            localStorage.removeItem("area");
+            localStorage.removeItem("industry");
+            localStorage.removeItem("keyWord");
+            localStorage.removeItem("price");
+            localStorage.removeItem("subType");
+            localStorage.removeItem("buyer");
+            localStorage.removeItem("winner");
+            localStorage.removeItem("export_starttime");
+            localStorage.removeItem("export_endtime");
+            //
+            $("#area").text("");
+            $("#industry").text("");
+            $("#keyWord").text("");
+            $("#price").text("");
+            $("#subType").text("");
+            $("#winner").text("");
+            $("#buyer").text("");
+            //
+            $(".chooseTime ul li").removeClass('active');
+            $(".chooseTime ul li:eq(0)").addClass('active');
+            //
+            $("#starttime").removeClass("timeSelect");
+            $("#endtime").removeClass("timeSelect");
+            $(".dateMake").css({"color":"#888"});
+            $("#starttime").val("");
+            $("#endtime").val("");
+            //
+            $(".confirm").show();
+            $(".resetOne").hide();
+        });
+        //
         function getDate() {
             var start;
             var end;

+ 1 - 1
src/web/staticres/wx_dataExport/css/dataExport.css

@@ -168,7 +168,7 @@ html .page .elseChoose .elseChooseList ul li a i {
   float: right;
   color: #707070;
 }
-html .page button {
+.confirm .saveData {
   width: 100%;
   height: 0.94rem;
   background: #2cb7ca;

+ 89 - 4
src/web/templates/weixin/dataExport/dataExport.html

@@ -8,7 +8,7 @@
     <title>数据导出</title>
     <link rel="stylesheet" href="{{Msg "seo" "cdn"}}/wx_dataExport/css/base.css?v={{Msg "seo" "version"}}">
     <link rel="stylesheet" href="{{Msg "seo" "cdn"}}/wx_dataExport/iconfont/iconfont.css?v={{Msg "seo" "version"}}">
-    <link rel="stylesheet" href="{{Msg "seo" "cdn"}}/wx_dataExport/css/dataExport.css?v={{Msg "seo" "version"}}">
+    <link rel="stylesheet" href="{{Msg "seo" "cdn"}}/wx_dataExport/css/dataExport.css?v={{Msg "seo" "version"}}3">
     <script src="{{Msg "seo" "cdn"}}/wx_dataExport/js/rem.js?v={{Msg "seo" "version"}}"></script>
     {{include "/common/weixin.html"}}
     <script src="/js/jquery.js"></script>
@@ -90,6 +90,26 @@
 	.dateMake input:-ms-input-placeholder {
 		color: #999;
 	}
+    .resetOne {
+        position: fixed;
+        left: 0;
+        bottom: 0;
+        width: 100%;
+        border-top: 1px solid #F4F4F9;
+        display: none;
+    }
+    .resetOne button:first-child {
+        background: #fff;
+        color: #2cb7ca;
+    }
+    .resetOne button {
+        width: 50%;
+        height: 0.94rem;
+        background: #2cb7ca;
+        font-size: .36rem;
+        color: #fff;
+        float: left;
+    }
 </style>
 <body>
     <div class="page">
@@ -186,7 +206,13 @@
         <!-- elseChooseEnd -->
 
         <!-- btn -->
-        <button class="saveData">确认</button>
+        <div class="confirm">
+            <button class="saveData">确认</button>
+        </div>
+        <div class="resetOne">
+            <button class="reset">重置</button>
+            <button class="saveData">确认</button>
+        </div>
 
     </div>
 
@@ -286,7 +312,9 @@
                     $(".dateMake").css({"color":"#24C0D7"});
                     $(".chooseTime ul li").removeClass('active');
                 }
-
+                //
+                $(".confirm").hide();
+                $(".resetOne").show();
             },
             onClear: function (inst) {
                 localStorage.removeItem("export_starttime");
@@ -355,6 +383,9 @@
                     $(".dateMake").css({"color":"#24C0D7"});
                     $(".chooseTime ul li").removeClass('active');
                 }
+                //
+                $(".confirm").hide();
+                $(".resetOne").show();
             },
             onClear: function (inst) {
                 localStorage.removeItem("export_endtime");
@@ -388,11 +419,15 @@
 				price="大于"+priceArr[0]+"万元"
 			}
             $("#price").text(price);
+            $(".confirm").hide();
+            $(".resetOne").show();
         }
         //区域
         if(localStorage.area!==undefined && localStorage.area!==""){
             var area = localStorage.area;
             $("#area").text(area);
+            $(".confirm").hide();
+            $(".resetOne").show();
         }
         //行业
         if(localStorage.industry!==undefined && localStorage.industry!==""){
@@ -407,6 +442,8 @@
                 arr.push(str)
             }
             $("#industry").text(arr.toString().replace(/,/g," "));
+            $(".confirm").hide();
+            $(".resetOne").show();
         }
         //关键词
         if(localStorage.keyWord!==undefined && localStorage.keyWord!==""){
@@ -414,22 +451,30 @@
             for(var i in keyWord){
                 $("#keyWord").append(keyWord[i].keyWord + " ");
             }
+            $(".confirm").hide();
+            $(".resetOne").show();
         }
         //信息类型
         if(localStorage.subType!==undefined && localStorage.subType!==""){
             var subType = localStorage.subType;
             $("#subType").text(subType);
+            $(".confirm").hide();
+            $(".resetOne").show();
         }
         if(localStorage.buyer!==undefined && localStorage.buyer!==""){
             var buyer = localStorage.buyer;
             var buyers = buyer.replace(/,/g," ");
             $("#buyer").text(buyers);
+            $(".confirm").hide();
+            $(".resetOne").show();
         }
         //中标单位
         if(localStorage.winner!==undefined && localStorage.winner!==""){
             var winner = localStorage.winner;
             var winners = winner.replace(/,/g," ");
             $("#winner").text(winners);
+            $(".confirm").hide();
+            $(".resetOne").show();
         }
         //时间
         if(localStorage.export_starttime!==undefined && localStorage.export_starttime!==""){
@@ -446,6 +491,8 @@
             $("#endtime").addClass("timeSelect");
             $(".dateMake").css({"color":"#24C0D7"});
             $(".chooseTime ul li").removeClass('active');
+            $(".confirm").hide();
+            $(".resetOne").show();
         }
         if(localStorage.export_endtime!==undefined && localStorage.export_endtime!==""){
             let end = new Date(Number(localStorage.export_endtime));
@@ -461,6 +508,8 @@
             $("#endtime").addClass("timeSelect");
             $(".dateMake").css({"color":"#24C0D7"});
             $(".chooseTime ul li").removeClass('active');
+            $(".confirm").hide();
+            $(".resetOne").show();
         }
         if(localStorage.date!==undefined && localStorage.date!==""){
             if(localStorage.index !== "-1"){
@@ -502,7 +551,8 @@
                     $(".chooseTime ul li").removeClass('active');
                 }
             }
-
+            $(".confirm").hide();
+            $(".resetOne").show();
         }
 
         //筛选条件发送
@@ -576,6 +626,41 @@
             })
         });
         //
+        $(".reset").on('click', function () {
+            localStorage.removeItem("date");
+            localStorage.removeItem("province");
+            localStorage.removeItem("city");
+            localStorage.removeItem("area");
+            localStorage.removeItem("industry");
+            localStorage.removeItem("keyWord");
+            localStorage.removeItem("price");
+            localStorage.removeItem("subType");
+            localStorage.removeItem("buyer");
+            localStorage.removeItem("winner");
+            localStorage.removeItem("export_starttime");
+            localStorage.removeItem("export_endtime");
+            //
+            $("#area").text("");
+            $("#industry").text("");
+            $("#keyWord").text("");
+            $("#price").text("");
+            $("#subType").text("");
+            $("#winner").text("");
+            $("#buyer").text("");
+            //
+            $(".chooseTime ul li").removeClass('active');
+            $(".chooseTime ul li:eq(0)").addClass('active');
+            //
+            $("#starttime").removeClass("timeSelect");
+            $("#endtime").removeClass("timeSelect");
+            $(".dateMake").css({"color":"#888"});
+            $("#starttime").val("");
+            $("#endtime").val("");
+            //
+            $(".confirm").show();
+            $(".resetOne").hide();
+        });
+        //
         function getDate() {
             var start;
             var end;