Forráskód Böngészése

'修改时间被转成json后,减去小时bug'

Rorschach 6 éve
szülő
commit
131f08ccca
4 módosított fájl, 10 hozzáadás és 15 törlés
  1. 2 1
      .gitignore
  2. 2 2
      src/pages/manage/cost.vue
  3. 2 2
      src/pages/manage/index.vue
  4. 4 10
      src/pages/manage/query.vue

+ 2 - 1
.gitignore

@@ -1,2 +1,3 @@
 /node_modules/
-/manageWeb/
+/manageWeb/
+.history

+ 2 - 2
src/pages/manage/cost.vue

@@ -6,10 +6,10 @@
         <el-form-item label="发生日期范围" :label-width="formLabelWidth">
           <el-row :gutter="10">
             <el-col :span="4">
-              <el-date-picker placeholder="起始时间" style="width:100%" v-model="searchForm.startTime"></el-date-picker>
+              <el-date-picker placeholder="起始时间" value-format="yyyy-MM-dd" style="width:100%" v-model="searchForm.startTime"></el-date-picker>
             </el-col>
             <el-col :span="4">
-              <el-date-picker placeholder="结束时间" style="width:100%" v-model="searchForm.endTime"></el-date-picker>
+              <el-date-picker placeholder="结束时间" value-format="yyyy-MM-dd" style="width:100%" v-model="searchForm.endTime"></el-date-picker>
             </el-col>
           </el-row>
         </el-form-item>

+ 2 - 2
src/pages/manage/index.vue

@@ -6,10 +6,10 @@
         <el-form-item label="发生日期范围" :label-width="formLabelWidth">
           <el-row :gutter="10">
             <el-col :span="4">
-              <el-date-picker placeholder="起始时间" style="width:100%" v-model="searchForm.startTime"></el-date-picker>
+              <el-date-picker placeholder="起始时间" value-format="yyyy-MM-dd" style="width:100%" v-model="searchForm.startTime"></el-date-picker>
             </el-col>
             <el-col :span="4">
-              <el-date-picker placeholder="结束时间" style="width:100%" v-model="searchForm.endTime"></el-date-picker>
+              <el-date-picker placeholder="结束时间" value-format="yyyy-MM-dd" style="width:100%" v-model="searchForm.endTime"></el-date-picker>
             </el-col>
           </el-row>
         </el-form-item>

+ 4 - 10
src/pages/manage/query.vue

@@ -24,10 +24,10 @@
       <el-form-item label="时间范围" v-if="form.type!==''" :label-width="formLabelWidth">
         <el-row :gutter="10">
           <el-col :span="4">
-            <el-date-picker placeholder="起始时间" style="width:100%" v-model="form.startTime"></el-date-picker>
+            <el-date-picker placeholder="起始时间" style="width:100%" value-format="yyyy-MM-dd" v-model="form.startTime"></el-date-picker>
           </el-col>
           <el-col :span="4">
-            <el-date-picker placeholder="结束时间" style="width:100%" v-model="form.endTime"></el-date-picker>
+            <el-date-picker placeholder="结束时间" style="width:100%" value-format="yyyy-MM-dd" v-model="form.endTime"></el-date-picker>
           </el-col>
         </el-row>
       </el-form-item>
@@ -387,20 +387,14 @@ export default {
     },
     // 下载表格
     onDownload() {
-      console.log(this.form.startTime)
-      console.log(typeof this.form.startTime)
-      this.form.startTime = this.form.startTime === null ? '' : typeof this.form.startTime === 'object'  ? this.form.startTime.toJSON() : this.form.startTime;
-      this.form.endTime = this.form.endTime === null ? '' : typeof this.form.endTime === 'object'  ? this.form.endTime.toJSON() : this.form.endTime;
-      console.log(this.form.startTime);
+      //  this.form.startTime = this.form.startTime === null ? '' : typeof this.form.startTime === 'object'  ? this.form.startTime.toString() : this.form.startTime;
+      // this.form.endTime = this.form.endTime === null ? '' : typeof this.form.endTime === 'object'  ? this.form.endTime.toString() : this.form.endTime;
       let url = "http://manage.ai160.com/manageBase/manage/export?";
       for (let key in this.form) {
         let str = key + "=" + this.form[key] + "&";
         url += str;
       }
       window.open(url.slice(0, -1));
-      // downloadData(this.form).then(res => {
-      //   console.log
-      // })
     },
     // 自定义合计
     tableSummary(param) {