数据同步列表更改

src/views/trials/trials-panel/trial-summary/data-sync/components/FileList.vue

@@ -21,6 +21,17 @@
             </el-option>
           </el-select>
         </el-form-item>
+        <!-- 源可用时间 -->
+        <el-form-item label="源可用时间">
+          <el-date-picker
+            v-model="uploadTimeRange"
+            :default-time="['00:00:00', '23:59:59']"
+            value-format="yyyy-MM-dd HH:mm:ss"
+            @change="handleUploadtimeChange"
+            style="width: 300px"
+            type="datetimerange">
+          </el-date-picker>
+        </el-form-item>
         <!-- 目标区域 -->
         <el-form-item label="目标区域" prop="TargetRegion">
           <el-select v-model="searchData.TargetRegion" style="width: 120px">
@@ -32,6 +43,21 @@
             </el-option>
           </el-select>
         </el-form-item>
+        <!-- 目标可用时间 -->
+        <el-form-item label="目标可用时间">
+          <el-date-picker
+            v-model="SyncTimeRange"
+            :default-time="['00:00:00', '23:59:59']"
+            value-format="yyyy-MM-dd HH:mm:ss"
+            @change="handleSynctimeChange"
+            style="width: 300px"
+            type="datetimerange">
+          </el-date-picker>
+        </el-form-item>
+        <!-- 优先级 -->
+         <el-form-item label="优先级">
+          <el-input v-model="searchData.Priority" clearable style="width: 120px"></el-input>
+        </el-form-item>
         <!-- 是否同步完成 -->
         <el-form-item label="是否同步完成" prop="IsSync">
           <el-select v-model="searchData.IsSync" clearable style="width: 120px">
@@ -201,6 +227,11 @@ const searchDataDefault = () => {
     UploadRegion: null,
     TargetRegion: null,
     IsSync: null,
+    UploadStartTime: null,
+    UploadEndTime: null,
+    SyncFinishedStartTime: null,
+    SyncFinishedEndTime: null,
+    Priority: null,
     Asc: false,
     SortField: 'UpdateTime',
     PageIndex: 1,
@@ -227,7 +258,8 @@ export default {
       list: [],
       total: 0,
       loading: false,
-      datetimerange: [],
+      uploadTimeRange: null,
+      SyncTimeRange: null,
       regionOptions: [
         {
           value: 'CN',
@@ -363,13 +395,22 @@ export default {
       if (!size) return
       return (size / Math.pow(1024, 2)).toFixed(3) + 'MB'
     },
-    handleDatetimeChange(val) {
+    handleUploadtimeChange(val) {
       if (val) {
-        this.searchData.BeginDate = val[0]
+        this.searchData.UploadStartTime = val[0]
-        this.searchData.EndDate = val[1]
+        this.searchData.UploadEndTime = val[1]
       } else {
-        this.searchData.BeginDate = ''
+        this.searchData.UploadStartTime = ''
-        this.searchData.EndDate = ''
+        this.searchData.UploadEndTime = ''
+      }
+    },
+    handleSynctimeChange(val) {
+      if (val) {
+        this.searchData.SyncFinishedStartTime = val[0]
+        this.searchData.SyncFinishedEndTime = val[1]
+      } else {
+        this.searchData.SyncFinishedStartTime = ''
+        this.searchData.SyncFinishedEndTime = ''
       }
     },
     handleSearch() {
@@ -378,7 +419,10 @@ export default {
     },
     // 重置列表查询
     handleReset() {
-      this.datetimerange = null
+      this.uploadTimeRange = null
+      this.handleUploadtimeChange()
+      this.SyncTimeRange = null
+      this.handleSynctimeChange()
       this.searchData = searchDataDefault()
       this.getList()
     },

src/views/trials/trials-panel/trial-summary/data-sync/components/StudyList.vue

@@ -31,6 +31,17 @@
             </el-option>
           </el-select>
         </el-form-item>
+      <!-- 源可用时间 -->
+      <!-- <el-form-item label="源可用时间">
+        <el-date-picker
+          v-model="uploadTimeRange"
+          :default-time="['00:00:00', '23:59:59']"
+          value-format="yyyy-MM-dd HH:mm:ss"
+          @change="handleUploadtimeChange"
+          style="width: 250px"
+          type="datetimerange">
+        </el-date-picker>
+      </el-form-item> -->
         <!-- 目标区域 -->
         <el-form-item label="目标区域" prop="TargetRegion">
           <el-select v-model="searchData.TargetRegion" style="width: 120px">
@@ -42,6 +53,17 @@
             </el-option>
           </el-select>
         </el-form-item>
+        <!-- 目标可用时间 -->
+      <!-- <el-form-item label="目标可用时间">
+        <el-date-picker
+          v-model="SyncTimeRange"
+          :default-time="['00:00:00', '23:59:59']"
+          value-format="yyyy-MM-dd HH:mm:ss"
+          @change="handleSynctimeChange"
+          style="width: 250px"
+          type="datetimerange">
+        </el-date-picker>
+      </el-form-item> -->
         <!-- 是否同步完成 -->
         <el-form-item label="是否同步完成" prop="IsSync">
           <el-select v-model="searchData.IsSync" clearable style="width: 120px">
@@ -146,6 +168,10 @@ const searchDataDefault = () => {
     UploadRegion: '',
     TargetRegion: '',
     IsSync: null,
+    // UploadStartTime: null,
+    // UploadEndTime: null,
+    // SyncFinishedStartTime: null,
+    // SyncFinishedEndTime: null,
     PageIndex: 1,
     PageSize: 20,
     Asc: true,
@@ -179,7 +205,9 @@ export default {
         }
       ],
       fileUploadRecordId: '',
-      path: ''
+      path: '',
+      uploadTimeRange: null,
+      SyncTimeRange: null,
     }
   },
   mounted() {
@@ -231,13 +259,34 @@ export default {
         console.log(e)
       }
     },
+    handleUploadtimeChange(val) {
+      if (val) {
+        this.searchData.UploadStartTime = val[0]
+        this.searchData.UploadEndTime = val[1]
+      } else {
+        this.searchData.UploadStartTime = ''
+        this.searchData.UploadEndTime = ''
+      }
+    },
+    handleSynctimeChange(val) {
+      if (val) {
+        this.searchData.SyncFinishedStartTime = val[0]
+        this.searchData.SyncFinishedEndTime = val[1]
+      } else {
+        this.searchData.SyncFinishedStartTime = ''
+        this.searchData.SyncFinishedEndTime = ''
+      }
+    },
     handleSearch() {
       this.searchData.PageIndex = 1
       this.getList()
     },
     // 重置列表查询
     handleReset() {
-      this.datetimerange = null
+      // this.uploadTimeRange = null
+      // this.handleUploadtimeChange()
+      // this.SyncTimeRange = null
+      // this.handleSynctimeChange()
       this.searchData = searchDataDefault()
       this.getList()
     },

src/views/trials/trials-panel/trial-summary/data-sync/components/TaskList.vue

@@ -21,6 +21,28 @@
             />
           </el-select>
         </el-form-item>
+        <!-- 任务开始日期 -->
+        <el-form-item label="任务开始日期">
+          <el-date-picker
+            v-model="searchData.StartTime"
+            type="date"
+            value-format="yyyy-MM-dd"
+            format="yyyy-MM-dd"
+            :picker-options="beginPickerOption"
+            style="width:140px;"
+          />
+        </el-form-item>
+        <!-- 任务结束日期 -->
+        <el-form-item label="任务结束日期">
+          <el-date-picker
+            v-model="searchData.EndTime"
+            type="date"
+            value-format="yyyy-MM-dd"
+            format="yyyy-MM-dd"
+            :picker-options="endpickerOption"
+            style="width:140px;"
+          />
+        </el-form-item>
         <el-form-item>
           <el-button type="primary" icon="el-icon-search" @click="handleSearch">
             {{ $t('common:button:search') }}
@@ -91,6 +113,8 @@ const searchDataDefault = () => {
     JobState: null,
     FileName: '',
     Path: '',
+    StartTime: '',
+    EndTime: '',
     Asc: false,
     SortField: '',
     PageIndex: 1,
@@ -122,6 +146,24 @@ export default {
       total: 0,
       loading: false,
       datetimerange: [],
+      beginPickerOption: {
+        disabledDate: time => {
+          if (this.searchData.EndTime) {
+            return time.getTime() >= new Date(this.searchData.EndTime).getTime()
+          } else {
+            return time.getTime() > Date.now()
+          }
+        }
+      },
+      endpickerOption: {
+        disabledDate: time => {
+          if (this.searchData.StartTime) {
+            return time.getTime() > Date.now() || time.getTime() <= new Date(this.searchData.StartTime).getTime() - 86400000
+          } else {
+            return time.getTime() > Date.now()
+          }
+        }
+      }
     }
   },
   mounted() {