合并分支 '1iuzhen' 到 'master'

导出优化



查看合并请求 !20

@@ -129,6 +129,7 @@
         var url2 = url1.split('.',5);
         var channel = $('select[name=channel]').val();
         var keyword = $('input[name=keyword]').val();
+        var is_excel = $('select[name=is_excel]').val();
         var start_time = $('input[name=start_time]').val();
         var end_time = $('input[name=end_time]').val();
         var param = '';
@@ -148,6 +149,9 @@
         if(keyword.length > 0) {
             param += '/keyword/'+keyword;
         }
+        if(is_excel.length > 0) {
+            param += '/is_excel/'+is_excel;
+        }
         if(start_time.length > 0) {
             param += '/start_time/'+start_time;
         }