Merge branch 'base-modify' of http://113.105.137.151:22280/youjj/cloud-platform-ui into base-modify

src/views/vehicle/vehicleCount/index.vue

@@ -21,7 +21,7 @@
 		        </el-form-item>
 		      </el-col>
 			   <el-col :span="5">
-			     <el-form-item>
+			     <el-form-item label="开始时间">
 			      <el-date-picker
 			        v-model="listQuery.startTime"
 			        type="date"
@@ -32,6 +32,18 @@
 			      </el-date-picker>
 			    </el-form-item>
 			  </el-col>
+				<el-col :span="5" >
+				   <el-form-item label="结束时间">
+				    <el-date-picker
+				      v-model="listQuery.endTime"
+				      type="date"
+				      :editable="false"
+				      format="yyyy-MM-dd"
+				      prop="endTime"
+				      placeholder="请选择日期">
+				    </el-date-picker>
+				  </el-form-item>
+				</el-col>
 		    </el-row>
 			 <el-row>
 				<el-button class="filter-item" type="primary" @click="handlerSearch">
@@ -123,7 +135,8 @@
             return {
 				listQuery: {
 					type: null,
-					startTime: new Date()
+					startTime: new Date(),
+					endTime:new Date()
 				},
 				tableKey: 0,
 				typeList: [
@@ -144,7 +157,8 @@
         },
         methods: {
 			handlerSearch() {
-				this.listQuery.startTime = getYMD_date(this.listQuery.startTime);
+				this.listQuery.startTime = getYMD_date(new Date(this.listQuery.startTime));
+				this.listQuery.endTime = getYMD_date(new Date(this.listQuery.endTime));
 				 get(this.listQuery).then(response => {
 				     if (response.status === 200) {
 						 this.list = response.data
@@ -220,7 +234,6 @@
 					window.location.href="https://"+domain+"/vehicle/vehicleCount/app/unauth/download?path="+fileName;
 				})
         },
-		
 	}
  }
 </script>