analysis

admin/control/refill_analysis.php

@@ -155,6 +155,18 @@ class refill_analysisControl extends SystemControl
         Tpl::showpage('merchant.ratios');
     }
 
+    public function provider_dataOp()
+    {
+        $provider_list = $this->providers();
+        $result = [];
+        foreach ($provider_list as $value) {
+            $data['name'] = $value['store_name'] ?? $value['name'];
+            $data['value'] = $value['name'];
+            $result[] = $data;
+        }
+        echo json_encode($result);
+    }
+
     private function object_array($array)
     {
         if(is_object($array))

admin/templates/default/analysis.new_version.php

@@ -25,18 +25,6 @@
                     <input class="txt date" type="text" value="<?php echo $_GET['query_end_time']; ?>"
                            id="endTime" name="query_end_time" autocomplete="off" style="width:120px" />
                 </td>
-                <th><label>间隔</label></th>
-                <td>
-                    <select name="interval">
-                        <option value=""><?php echo $lang['nc_please_choose']; ?></option>
-                        <option value="3600">一小时</option>
-                        <option value="1800">半小时</option>
-                        <option value="900" >15分钟</option>
-                        <option value="600" >10分钟</option>
-                        <option value="300">5分钟</option>
-                        <option value="60" selected>1分钟</option>
-                    </select>
-                </td>
                 <th><label>通道名称</label></th>
                 <td>
                     <div id="selest_chnames"></div>
@@ -61,6 +49,14 @@
                 <td>
                     <div id="select_cardtype"></div>
                 </td>
+                <th><label>滤波器</label></th>
+                <td>
+                    <select name="filter_wave">
+                        <option value=""><?php echo $lang['nc_please_choose']; ?></option>
+                        <option value="1">开启</option>
+                        <option value="0" selected>关闭</option>
+                    </select>
+                </td>
                 <td>
                     <a href="javascript:void(0);" id="ncsubmit" class="btn-search"
                        title="<?php echo $lang['nc_query']; ?>">&nbsp;
@@ -95,7 +91,7 @@
         });
 
         let selest_chnames
-        $.get('index.php?act=refill_order&op=provider_data', function (data) {
+        $.get('index.php?act=refill_analysis&op=provider_data', function (data) {
             data = JSON.parse(data)
             selest_chnames = xmSelect.render({
                 el: '#selest_chnames',
@@ -130,8 +126,7 @@
             })
         })
 
-        function select_set(e){
-            let selectArr = e.getValue();
+        function select_set(selectArr){
             let selectStr = ''
             for (let i = 0; i < selectArr.length; i++) {
                 selectStr += selectArr[i].value+','
@@ -141,18 +136,33 @@
         }
 
         $('#ncsubmit').click(function () {
-            let start_time = $("select[name=query_start_time]").val()
-            let end_time = $("select[name=query_end_time]").val()
-            let interval = $("select[name=interval]").val()
-            let chnames = select_set('selest_chnames')
-            let card_types = select_set('select_cardtype')
-            let amount = $("select[name=amount]").val()
+            let query_start_time = $("input[name=query_start_time]").val()
+            let start_time = parseInt((new Date(query_start_time)).getTime()/1000);
+            let query_end_time = $("input[name=query_end_time]").val()
+            let end_time = parseInt((new Date(query_end_time)).getTime()/1000);
+
+            let chnames = select_set(selest_chnames.getValue())
+            let card_types = select_set(select_cardtype.getValue())
+            let spec = $("select[name=amount]").val()
+            let filter_wave = $("select[name=filter_wave]").val()
+
             if (!startTime || !endTime) {
                 layer.msg('请选择时间');
                 return
             }
-            let src = window.location.origin + "/plot/index?start_time=" + start_time + "&end_time=" + end_time + "&interval=" + interval + "&chnames=" + chnames  + "&card_types=" + card_types + "&amount=" + amount
-
+            let src = window.location.origin + "/plot/ch_ratio?start_time=" + start_time + "&end_time=" + end_time
+            if (chnames) {
+                src += "&chnames=" + chnames
+            }
+            if (card_types) {
+                src += "&card_types=" + card_types
+            }
+            if (spec) {
+                "&spec=" + spec
+            }
+            if(filter_wave > 0) {
+                src += '&filter_wave=';
+            }
             $.get(src, function (data){
                 if (!data) {
                     return