From af5a8d80bca9b8c08543238a370ea3c70c8c59b1 Mon Sep 17 00:00:00 2001
From: riku <risaku@163.com>
Date: 星期四, 21 十一月 2024 11:09:21 +0800
Subject: [PATCH] Merge branch 'hc-dataproduct-v1112' into lsf-dataproduct-1024
---
src/views/fysp/check/components/CompProRecent.vue | 138 +++++++++++++++++++++++----------------------
1 files changed, 70 insertions(+), 68 deletions(-)
diff --git a/src/views/fysp/check/components/CompProRecent.vue b/src/views/fysp/check/components/CompProRecent.vue
index 3dff972..930bbbb 100644
--- a/src/views/fysp/check/components/CompProRecent.vue
+++ b/src/views/fysp/check/components/CompProRecent.vue
@@ -1,15 +1,24 @@
<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-tabs>
- <div class="proList">
- <el-card class="card-style" shadow="hover">
- <el-descriptions v-loading="loading">
- <el-descriptions-item label="鎬诲嚭鐜版鏁�">{{ curProList.length }}</el-descriptions-item>
- <!-- <el-descriptions-item label="澶嶇幇鐜�">{{ repeteRate }}%</el-descriptions-item> -->
- </el-descriptions>
- <!-- <el-descriptions v-loading="loading" column="3">
+ <CompGenericWrapper type="dialog">
+ <template #content>
+ <el-tabs v-model="activeName" type="card">
+ <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" v-loading="loading">
+ <el-descriptions>
+ <el-descriptions-item label="鎬诲嚭鐜版鏁�">{{
+ curProList.length
+ }}</el-descriptions-item>
+ <!-- <el-descriptions-item label="澶嶇幇鐜�">{{ repeteRate }}%</el-descriptions-item> -->
+ </el-descriptions>
+ <!-- <el-descriptions v-loading="loading" column="3">
<div v-for="pro in curProList">
<el-descriptions-item>{{ pro.problemname }}</el-descriptions-item>
<el-descriptions-item label="浠诲姟鍚嶇О">{{ pro._stName }}</el-descriptions-item>
@@ -18,34 +27,32 @@
</el-descriptions-item>
</div>
</el-descriptions> -->
- <el-table :data="curProList" style="width: 100%">
- <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">
- <template v-slot="scope">
- <el-button link type="primary" @click="info(scope.row)">璇︽儏</el-button>
- </template>
- </el-table-column>
- </el-table>
- </el-card>
- <el-dialog
+ <el-table :data="curProList" style="width: 100%">
+ <el-table-column type="index" width="50" />
+ <el-table-column prop="problemname" label="闂" />
+ <el-table-column prop="_time" label="鏃堕棿" width="250" />
+ <el-table-column label="鎿嶄綔" width="180">
+ <template v-slot="scope">
+ <el-button link type="primary" @click="info(scope.row)"
+ >璇︽儏</el-button
+ >
+ </template>
+ </el-table-column>
+ </el-table>
+ </el-card>
+ </div>
+ <CompProblemAddOrUpd
+ v-model:visible="proAddOrUpdDialogVisible"
title="棰勮"
- v-model="proAddOrUpdDialogVisible"
- :before-close="proAddOrUpdDialogClose"
- width="80%"
- >
- <CompProblemAddOrUpd
- v-if="proAddOrUpdDialogVisible"
- :subtask="subtask"
- :topTask="topTask"
- :problem="previewPro"
- :readonly="true"
- ref="compProblemAddOrUpdRef"
- />
- </el-dialog>
- </div>
- </div>
+ :subtask="subtask"
+ :topTask="topTask"
+ :problem="previewPro"
+ :readonly="true"
+ ref="compProblemAddOrUpdRef"
+ />
+ <el-dialog destroy-on-close> </el-dialog>
+ </template>
+ </CompGenericWrapper>
</template>
<script>
import CompProblemAddOrUpd from './CompProblemAddOrUpd.vue';
@@ -54,7 +61,7 @@
export default {
computed: {
// repeteRate() {
- // return this.curProList.length !== 0 ? (this.curProList.length - 1) / this.subtaskCount * 1.0 : 0
+ // return this.curProList.length !== 0 ? (this.curProList.length - 1) / this.subtaskCount * 1.0 : 0
// },
},
props: {
@@ -80,17 +87,19 @@
handler(newObj, oldObj) {
this.handleClick();
}
+ },
+ problem: {
+ handler(nv, ov) {
+ this.deepCopyPro = useCloned(this.problem).cloned.value;
+ this.getRecentPros();
+ },
+ immediate: true
}
},
components: {
- CompProblemAddOrUpd
+ CompProblemAddOrUpd,
},
- mounted() {
- console.log('subtask', this.subtask);
-
- this.deepCopyPro = useCloned(this.problem).cloned.value;
- this.getRecentPros();
- },
+ mounted() {},
data() {
return {
proAddOrUpdDialogVisible: false,
@@ -116,10 +125,6 @@
this.previewPro = pro;
this.proAddOrUpdDialogVisible = true;
},
- // 鍏抽棴璇︽儏寮圭獥
- proAddOrUpdDialogClose() {
- this.proAddOrUpdDialogVisible = false;
- },
// 鍒囨崲鏃堕棿鑼冨洿
handleClick() {
this.getRecentPros();
@@ -137,10 +142,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 === '杩戜笁涓湀'
@@ -157,21 +159,21 @@
* */
async getRecentPros() {
this.loading = true;
- this.subtaskCount = 0
+ this.subtaskCount = 0;
// 鑾峰彇瀛愪换鍔″垪琛�
- await taskApi.getSubtaskByScene(this.generateQueryParam()).then((subtasks) => {
- this.curProList = [];
- if (subtasks) {
- subtasks.forEach((subtask) => {
- // 鑾峰彇闂鍒楄〃
- this.getProBySubtask(subtask);
- });
- }
-
- });
+ await taskApi
+ .getSubtaskByScene(this.generateQueryParam())
+ .then((subtasks) => {
+ this.curProList = [];
+ if (subtasks) {
+ subtasks.forEach((subtask) => {
+ // 鑾峰彇闂鍒楄〃
+ 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 +183,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