diff --git a/app/Admin/Actions/Tools/DataReportDate.php b/app/Admin/Actions/Tools/DataReportDate.php
index 46b3fe0..71c1b45 100644
--- a/app/Admin/Actions/Tools/DataReportDate.php
+++ b/app/Admin/Actions/Tools/DataReportDate.php
@@ -21,12 +21,22 @@ class DataReportDate extends AbstractTool
 
     protected function script()
     {
+        $url = request()->fullUrl();
+        $path = request()->url();
+        if(!(request()->server('QUERY_STRING'))){
+            $url .= "?type=date&option=0";
+        }
+        $date = request()->input('created_at');
+        $start = $date?$date['start']:'';
+        $end = $date?$date['end']:'';
         return <<<JS
         var app= new Vue({
             el:"#date_time",
             data:{
-                value1: '',
-                value2: '',
+                start: "$start",
+                end: "$end",
+                url:"$url",
+                path:"$path",
                 pickerOptions: {
                   disabledDate(time) {
                     return time.getTime() > Date.now();
@@ -53,6 +63,31 @@ class DataReportDate extends AbstractTool
                   }]
                 },
             },
+            methods:{
+                doSearch(){
+                    var url = this.url;
+                    if (this.start){
+                        url = url+"&created_at[start]="+this.start;
+                    }else {
+                        this.\$message({message:'请选择起始日期',type:'error'});
+                        return false;
+                    }
+                    if (this.end){
+                        url = url+"&created_at[end]="+this.end;
+                    }else {
+                        this.\$message({message:'请选择截止日期',type:'error'});
+                        return false;
+                    }
+                    var market_id = sessionStorage.getItem('market_id');
+                    if (market_id>0){
+                        url = url+"&market_id="+market_id;
+                    }
+                    window.location.href=url;
+                },
+                reset(){
+                    window.location.href=this.path;
+                }
+            }
 
         });
 
diff --git a/app/Admin/Actions/Tools/DataReportOption.php b/app/Admin/Actions/Tools/DataReportOption.php
index 6c4a43b..337daef 100644
--- a/app/Admin/Actions/Tools/DataReportOption.php
+++ b/app/Admin/Actions/Tools/DataReportOption.php
@@ -25,13 +25,17 @@ class DataReportOption extends AbstractTool
         $option = json_encode($this->option);
         return <<<JS
             var options =  JSON.stringify($option)
-          var app= new Vue({
+            var app= new Vue({
                 el:"#option",
                 data:{
                     options: JSON.parse(options),
-                    value: ''
+                    value: 0,
+                },
+                methods:{
+                    doSomething(url){
+                        sessionStorage.setItem('market_id',this.value)
+                    }
                 },
-
                 });
 
 JS;
diff --git a/app/Admin/Common/LinkUrl.php b/app/Admin/Common/LinkUrl.php
index 428bf58..89b2155 100644
--- a/app/Admin/Common/LinkUrl.php
+++ b/app/Admin/Common/LinkUrl.php
@@ -21,5 +21,6 @@ class LinkUrl
      * css
      */
     const ELEMENT_UI_CSS="https://unpkg.com/element-ui/lib/theme-chalk/index.css";
+    //const ELEMENT_UI_CSS="css/element.css";
     const DETAIL_CSS =  'css/detail.css';
 }
diff --git a/app/Admin/Controllers/v3/DataReport.php b/app/Admin/Controllers/v3/DataReport.php
index 4084c2c..5ab205d 100644
--- a/app/Admin/Controllers/v3/DataReport.php
+++ b/app/Admin/Controllers/v3/DataReport.php
@@ -33,7 +33,7 @@ class DataReport
     protected $_count_user;
     public function __construct()
     {
-        $option = request()->get('option');
+        $option = request()->get('option',1);
         $this->_amount = Order::getOrderData([
             'user_type'=>'market_service',//谁取数据  user_type  用户类型
             'data_type'=>'amount',//取什么数据    data_type   数据类型
@@ -67,7 +67,7 @@ class DataReport
                 });
                 $row->column(2,function (Column $column){
                     $markets = ImsCjdcMarket::getMarket();
-                    $data = [];
+                    $data = [['value'=>0,'label'=>'全部市场']];
                     foreach ($markets as $key=>$val){
                         $item = [];
                         $item['value'] = $key;
diff --git a/resources/views/admin/tools/data_report_date.blade.php b/resources/views/admin/tools/data_report_date.blade.php
index f16db19..a9bfc44 100644
--- a/resources/views/admin/tools/data_report_date.blade.php
+++ b/resources/views/admin/tools/data_report_date.blade.php
@@ -2,17 +2,21 @@
     <div class="block">
         <el-date-picker
             class="v1"
-            v-model="value1"
+            v-model="start"
             type="date"
+            value-format="yyyy-MM-dd"
             placeholder="选择日期">
         </el-date-picker>
         -
         <el-date-picker
-            v-model="value2"
+            v-model="end"
             type="date"
+            value-format="yyyy-MM-dd"
             placeholder="选择日期">
         </el-date-picker>
-        <button type="button" class="btn btn-primary">查询</button>
+        <button type="button" class="btn btn-primary" @click="doSearch()">查询</button>
+        &nbsp;
+        <button type="button" class="btn btn-primary" @click="reset()">重置</button>
     </div>
 </div>
 
diff --git a/resources/views/admin/tools/data_report_option.blade.php b/resources/views/admin/tools/data_report_option.blade.php
index e7866cc..aaae3ca 100644
--- a/resources/views/admin/tools/data_report_option.blade.php
+++ b/resources/views/admin/tools/data_report_option.blade.php
@@ -2,6 +2,7 @@
     <el-select v-model="value" filterable placeholder="选择市场">
         <el-option
             v-for="item in options"
+            :change="doSomething()"
             :key="item.value"
             :label="item.label"
             :value="item.value">