From 7edce9d027ae6b4b17457baa9bbd900db9b32baf Mon Sep 17 00:00:00 2001
From: gaoluyang <2820782392@qq.com>
Date: 星期一, 03 三月 2025 15:01:04 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/dev' into dev

---
 src/views/CNAS/resourceDemand/device/component/fault.vue |   16 ++++++++--------
 1 files changed, 8 insertions(+), 8 deletions(-)

diff --git a/src/views/CNAS/resourceDemand/device/component/fault.vue b/src/views/CNAS/resourceDemand/device/component/fault.vue
index ed75e85..a229fa7 100644
--- a/src/views/CNAS/resourceDemand/device/component/fault.vue
+++ b/src/views/CNAS/resourceDemand/device/component/fault.vue
@@ -277,7 +277,7 @@
 
 <script>
 import { dateFormat } from '@/utils/date'
-
+import { mapGetters } from "vuex";
 export default {
   props: {
     clickNodeVal: {
@@ -308,6 +308,7 @@
     }
   },
   computed: {
+    ...mapGetters(["nickName"]),
     action() {
       return this.javaApi + this.$api.personnel.saveCNASFile
     }
@@ -351,29 +352,28 @@
       this.$refs.form.validate((valid) => {
         if (valid === true || saveState !== '1submit') {
           // 缁欏綋鍓嶇幆鑺傝缃垱寤轰汉涓庢椂闂�
-          let user = JSON.parse(localStorage.getItem('user'))
           const dateTime = dateFormat(new Date())
           // 鑾峰彇褰撳墠鐜妭鎿嶄綔浜轰笌鏃ユ湡
           switch (this.currentStep) {
             case 0:
-              this.form.submitUser = user.name
-              this.form.submitOperatingPersonnel = user.name
+              this.form.submitUser = this.nickName
+              this.form.submitOperatingPersonnel = this.nickName
               this.form.submitDate = dateTime
               break
             case 1:
-              this.form.adminOperatingPersonnel = user.name
+              this.form.adminOperatingPersonnel = this.nickName
               this.form.adminDate = dateTime
               break
             case 2:
-              this.form.technicalOperatingPersonnel = user.name
+              this.form.technicalOperatingPersonnel = this.nickName
               this.form.technicalDate = dateTime
               break
             case 3:
-              this.form.maintainOperatingPersonnel = user.name
+              this.form.maintainOperatingPersonnel = this.nickName
               this.form.maintainDate = dateTime
               break
             case 4:
-              this.form.afterMaintenanceOperatingPersonnel = user.name
+              this.form.afterMaintenanceOperatingPersonnel = this.nickName
               this.form.afterMaintenanceDate = dateTime
               break
             default:

--
Gitblit v1.9.3