From faf90b2db9eec6805387276a607bcee7b82036f7 Mon Sep 17 00:00:00 2001
From: lannoy0523 <935275025@qq.com>
Date: Mon, 4 Nov 2024 10:54:56 +0800
Subject: [PATCH] =?UTF-8?q?feat:=20=E5=A2=9E=E5=8A=A0=E5=88=B6=E5=93=81?=
 =?UTF-8?q?=E9=A2=84=E5=8A=A0=E8=BD=BD=E5=8A=9F=E8=83=BD=E7=AE=A1=E7=90=86?=
 =?UTF-8?q?=E9=A1=B5=E9=9D=A2=20#2683?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../components/editPlanConfigDialog.vue       | 30 ++++++++++++-------
 .../devops-op/src/views/preload/index.vue     | 15 ++++++++--
 2 files changed, 31 insertions(+), 14 deletions(-)

diff --git a/src/frontend/devops-op/src/views/preload/components/editPlanConfigDialog.vue b/src/frontend/devops-op/src/views/preload/components/editPlanConfigDialog.vue
index e71cd6888c..32151f6a4d 100644
--- a/src/frontend/devops-op/src/views/preload/components/editPlanConfigDialog.vue
+++ b/src/frontend/devops-op/src/views/preload/components/editPlanConfigDialog.vue
@@ -35,11 +35,16 @@
           </template>
         </el-autocomplete>
       </el-form-item>
-      <el-form-item label="文件路径" prop="fullPath">
-        <el-input v-model="plan.fullPath" style="height: 40px ; width: 500px;" :rules="[{ required: true, message: '文件路径不能为空'}]" />
+      <el-form-item label="文件路径" prop="fullPath" :rules="[{ required: true, message: '文件路径不能为空'}]">
+        <el-input v-model="plan.fullPath" style="height: 40px ; width: 500px;" />
       </el-form-item>
       <el-form-item label="预加载计划执行毫秒时间戳" prop="executeTime">
-        <el-input-number v-model="plan.executeTime" controls-position="right" :min="1" />
+        <el-date-picker
+          v-model="plan.executeTime"
+          type="datetime"
+          placeholder="选择日期时间"
+          default-time="12:00:00"
+        />
       </el-form-item>
     </el-form>
     <div slot="footer">
@@ -78,7 +83,7 @@ export default {
   watch: {
     visible: function(newVal) {
       if (newVal) {
-        this.resetFileCache()
+        this.resetPlan()
         this.showDialog = true
       } else {
         this.close()
@@ -117,7 +122,7 @@ export default {
         return obj.name.toLowerCase().indexOf(queryStr.toLowerCase()) !== -1
       }) : arr
     },
-    resetFileCache() {
+    resetPlan() {
       this.plan = this.newPlan()
       this.$nextTick(() => {
         this.$refs['form'].clearValidate()
@@ -141,12 +146,15 @@ export default {
       this.$emit('update:visible', false)
     },
     handleUpdate() {
-      if (this.createMode) {
-        createPlan(this.plan).then(() => {
-          this.$message.success('新建配置成功')
-          this.close(true)
-        })
-      }
+      this.$refs['form'].validate((valid) => {
+        if (valid) {
+          this.plan.executeTime = this.plan.executeTime.getTime()
+          createPlan(this.plan).then(() => {
+            this.$message.success('新建配置成功')
+            this.close(true)
+          })
+        }
+      })
     }
   }
 }
diff --git a/src/frontend/devops-op/src/views/preload/index.vue b/src/frontend/devops-op/src/views/preload/index.vue
index 2b596b79a3..26c14d95fb 100644
--- a/src/frontend/devops-op/src/views/preload/index.vue
+++ b/src/frontend/devops-op/src/views/preload/index.vue
@@ -82,7 +82,13 @@
       </el-table-column>
       <el-table-column v-if="clientQuery.type!=='strategy'" key="fullPath" prop="fullPath" label="文件路径" align="center" />
       <el-table-column v-if="clientQuery.type!=='strategy'" key="sha256" prop="sha256" label="SHA256" align="center" />
-      <el-table-column v-if="clientQuery.type!=='strategy'" key="size" prop="size" label="文件大小(B)" align="center" />
+      <el-table-column v-if="clientQuery.type!=='strategy'" key="size" prop="size" label="文件大小" align="center">
+        <template slot-scope="scope">
+          <span>
+            {{ convertFileSize(scope.row.size) }}
+          </span>
+        </template>
+      </el-table-column>
       <el-table-column v-if="clientQuery.type!=='strategy'" key="credentialsKey" prop="credentialsKey" label="CredentialsKey" align="center" />
       <el-table-column v-if="clientQuery.type!=='strategy'" key="executeTime" prop="executeTime" label="预加载计划时间" align="center">
         <template slot-scope="scope">
@@ -193,7 +199,10 @@ export default {
       this.total = 0
       this.clientQuery.pageNumber = 1
       this.clientQuery.currentPage = 1
-      this.$router.push({ name: 'PreloadConfig' })
+      const query = {
+        type: this.clientQuery.type
+      }
+      this.$router.push({ name: 'PreloadConfig', query: query })
     },
     queryProjects(queryStr, cb) {
       searchProjects(queryStr).then(res => {
@@ -242,11 +251,11 @@ export default {
     onRouteUpdate(route) {
       const query = route.query
       const clientQuery = this.clientQuery
+      this.clientQuery.type = query.type ? query.type : this.clientQuery.type
       if (clientQuery.projectId.trim() === '' && (!query.projectId || query.projectId === '' || query.projectId === undefined)) {
         return
       }
       clientQuery.projectId = query.projectId ? query.projectId : ''
-      clientQuery.type = query.type ? query.type : this.clientQuery.type
       clientQuery.repoName = query.repoName ? query.repoName : ''
       clientQuery.pageNumber = query.page ? Number(query.page) : 1
       this.$nextTick(() => {