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 | 16 +++++-----------
1 files changed, 5 insertions(+), 11 deletions(-)
diff --git a/src/views/fysp/check/components/CompProRecent.vue b/src/views/fysp/check/components/CompProRecent.vue
index 3dff972..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">
@@ -22,7 +22,7 @@
<el-table-column type="index" width="50" />
<el-table-column prop="problemname" label="闂"/>
<el-table-column prop="_time" label="鏃堕棿" width="250" />
- <el-table-column prop="鎿嶄綔" label="鎿嶄綔" width="180">
+ <el-table-column label="鎿嶄綔" width="180">
<template v-slot="scope">
<el-button link type="primary" @click="info(scope.row)">璇︽儏</el-button>
</template>
@@ -86,7 +86,6 @@
CompProblemAddOrUpd
},
mounted() {
- console.log('subtask', this.subtask);
this.deepCopyPro = useCloned(this.problem).cloned.value;
this.getRecentPros();
@@ -137,10 +136,7 @@
// 璁＄畻涓�骞村墠鐨勬棩鏈�
const oneYearAgo = new Date(today);
oneYearAgo.setFullYear(today.getFullYear() - 1);
- console.log('today', this.$fm.formatYMDH(today));
- console.log('threeMonthsAgo', this.$fm.formatYMDH(threeMonthsAgo));
- console.log('sixMonthsAgo', this.$fm.formatYMDH(sixMonthsAgo));
- console.log('oneYearAgo', this.$fm.formatYMDH(oneYearAgo));
+
return {
startTime:
this.activeName === '杩戜笁涓湀'
@@ -167,11 +163,9 @@
this.getProBySubtask(subtask);
});
}
-
});
// 棰濆澶勭悊
- console.log('curr', this.curProList);
- this.curProList.sort((o1, o2) => o2.getTime() - o1.getTime());
+ this.curProList.sort((o1, o2) => o2.getDate() - o1.getDate());
this.loading = false;
},
// 鏍规嵁瀛愪换鍔¤幏鍙栭噷闈㈢殑闂鍒楄〃
@@ -181,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