From 71030e1f80635b7332136a488bc2cc8bd36fc04c Mon Sep 17 00:00:00 2001
From: riku <risaku@163.com>
Date: 星期二, 19 十一月 2024 11:40:37 +0800
Subject: [PATCH] Merge branch 'hc-dataproduct-v1112' into lsf-dataproduct-1024
---
src/views/fysp/check/components/CompProRecent.vue | 6 +++---
1 files changed, 3 insertions(+), 3 deletions(-)
diff --git a/src/views/fysp/check/components/CompProRecent.vue b/src/views/fysp/check/components/CompProRecent.vue
index 915b27b..bb037b4 100644
--- a/src/views/fysp/check/components/CompProRecent.vue
+++ b/src/views/fysp/check/components/CompProRecent.vue
@@ -1,7 +1,7 @@
<template>
<div>
<el-tabs v-model="activeName" type="card">
- <el-tab-pane v-for="item in ranges" :label="item" :name="item"> </el-tab-pane>
+ <el-tab-pane v-for="(item, i) in ranges" :key="i" :label="item" :name="item"> </el-tab-pane>
</el-tabs>
<div class="proList">
<el-card class="card-style" shadow="hover">
@@ -165,7 +165,7 @@
}
});
// 棰濆澶勭悊
- this.curProList.sort((o1, o2) => o2.getTime() - o1.getTime());
+ this.curProList.sort((o1, o2) => o2.getDate() - o1.getDate());
this.loading = false;
},
// 鏍规嵁瀛愪换鍔¤幏鍙栭噷闈㈢殑闂鍒楄〃
@@ -175,7 +175,7 @@
pros.forEach((pro) => {
if (pro.ptguid == this.deepCopyPro.ptguid) {
pro._stName = subtask.stName;
- pro._time = this.$fm.formatYM(subtask.stPlanTime)
+ pro._time = this.$fm.formatYMD(subtask.stPlanTime)
this.curProList.push(pro);
}
});
--
Gitblit v1.9.3