From c6e96cdb8b1cfb51e9a45bf86c38d1353e983127 Mon Sep 17 00:00:00 2001
From: 吴羡 <16976746+Xian-TT3@user.noreply.gitee.com>
Date: 星期一, 19 十月 2026 15:19:48 +0800
Subject: [PATCH] 设备模块业务完善及前序页面优化
---
src/views/CNAS/resourceDemand/device/index.vue | 24 +++++++++---------------
1 files changed, 9 insertions(+), 15 deletions(-)
diff --git a/src/views/CNAS/resourceDemand/device/index.vue b/src/views/CNAS/resourceDemand/device/index.vue
index 5832178..fe4cbfd 100644
--- a/src/views/CNAS/resourceDemand/device/index.vue
+++ b/src/views/CNAS/resourceDemand/device/index.vue
@@ -39,7 +39,8 @@
<overview v-if="menuListActiveName == '璁惧鎬昏'" :clickNodeVal="clickNodeVal" @refresh-tree="geList" />
</el-tab-pane>
<el-tab-pane label="璁惧宸ュ叿鏄庣粏" name="璁惧宸ュ叿鏄庣粏">
- <management v-if="menuListActiveName == '璁惧宸ュ叿鏄庣粏'" :clickNodeVal="clickNodeVal" />
+ <management v-if="menuListActiveName == '璁惧宸ュ叿鏄庣粏'" :clickNodeVal="clickNodeVal"
+ @refresh-tree="geList" />
</el-tab-pane>
<el-tab-pane label="璁惧鏍″噯璁″垝" name="璁惧鏍″噯璁″垝">
<equipment-calibration-plan v-if="menuListActiveName == '璁惧鏍″噯璁″垝'"
@@ -52,10 +53,6 @@
<el-tab-pane label="璁惧淇濆吇璁″垝" name="璁惧淇濆吇璁″垝">
<equipment-maintenance-plan v-if="menuListActiveName == '璁惧淇濆吇璁″垝'"
:clickNodeVal="clickNodeVal"></equipment-maintenance-plan>
- </el-tab-pane>
- <el-tab-pane label="閲忓�兼函婧愯鍒�" name="閲忓�兼函婧愯鍒�">
- <quantity-value-traceability-plan v-if="menuListActiveName == '閲忓�兼函婧愯鍒�'"
- :clickNodeVal="clickNodeVal"></quantity-value-traceability-plan>
</el-tab-pane>
<el-tab-pane label="璁惧浣跨敤鎺堟潈" name="璁惧浣跨敤鎺堟潈">
<usage-authorization v-if="menuListActiveName == '璁惧浣跨敤鎺堟潈'"
@@ -72,7 +69,8 @@
<div v-if="!isShowAll" style="height: 100%;">
<el-tabs v-model="tabListActiveName" class="main_right" type="border-card" @tab-click="handleClick">
<el-tab-pane label="璁惧妗ｆ" name="璁惧妗ｆ">
- <files v-if="tabListActiveName == '璁惧妗ｆ'" :clickNodeVal="clickNodeVal" />
+ <files v-if="tabListActiveName == '璁惧妗ｆ'" :clickNodeVal="clickNodeVal"
+ @refresh-tree="geList" />
</el-tab-pane>
<el-tab-pane label="璁惧楠屾敹" name="璁惧楠屾敹">
<equipment-acceptance v-if="tabListActiveName == '璁惧楠屾敹'" :clickNodeVal="clickNodeVal"></equipment-acceptance>
@@ -135,16 +133,15 @@
import EquipmentAccident from "./component/equipmentAccident.vue";
import EquipmentMaintenancePlan from "./component/equipmentMaintenancePlan.vue";
import EquipmentAcceptance from "./component/equipmentAcceptance.vue";
-import QuantityValueTraceabilityPlan from "./component/quantityValueTraceabilityPlan.vue";
import equipmentMaintenance from "./component/equipmentMaintenance.vue";
import usageAuthorization from "./component/usageAuthorization.vue";
import {
treeDevice,
} from '@/api/cnas/resourceDemand/device.js'
+import dayjs from 'dayjs'
export default {
name: 'Device',
components: {
- QuantityValueTraceabilityPlan,
EquipmentAcceptance,
EquipmentMaintenancePlan,
EquipmentAccident,
@@ -211,13 +208,10 @@
// 鍒ゆ柇鏄惁闇�瑕佹爣绾�
shouldHighlight(data) {
if (!data.activationDate) return false;
- const today = new Date();
- const targetDate = new Date(data.activationDate);
- const fiveDaysBeforeTarget = new Date(targetDate);
- // 璁＄畻鍓嶄簲澶╃殑鏃ユ湡
- fiveDaysBeforeTarget.setDate(targetDate.getDate() - 5);
-
- return today > fiveDaysBeforeTarget;
+ const targetDate = dayjs(data.activationDate);
+ if (!targetDate.isValid()) return false;
+ // 鏍″噯鏈夋晥鏈熷墠 1 涓湀寮�濮嬫爣绾�
+ return dayjs().isAfter(targetDate.subtract(1, 'month'));
},
handleNodeClick(val, node, el) {
// 鐐瑰嚮涓存椂缂撳瓨
--
Gitblit v1.9.3