From 1ea1ad2c56e95e71e1756cfca73e7183f9795ac9 Mon Sep 17 00:00:00 2001
From: gaoluyang <2820782392@qq.com>
Date: 星期三, 16 四月 2025 15:23:39 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/dev' into dev_test
---
src/views/CNAS/resourceDemand/device/component/fault.vue | 23 ++++++++++++-----------
1 files changed, 12 insertions(+), 11 deletions(-)
diff --git a/src/views/CNAS/resourceDemand/device/component/fault.vue b/src/views/CNAS/resourceDemand/device/component/fault.vue
index ed75e85..743d7f0 100644
--- a/src/views/CNAS/resourceDemand/device/component/fault.vue
+++ b/src/views/CNAS/resourceDemand/device/component/fault.vue
@@ -11,8 +11,8 @@
</div>
</div>
<div class="search_thing" style="padding-left: 30px;">
- <el-button size="small" @click="resetSearch">閲� 缃�</el-button>
- <el-button size="small" type="primary" @click="getTableList(clickNodeVal.value)">鏌� 璇�</el-button>
+ <el-button size="mini" type="primary" @click="getTableList(clickNodeVal.value)">鏌ヨ</el-button>
+ <el-button size="mini" @click="resetSearch">閲嶇疆</el-button>
</div>
<div class="btns">
<el-button size="small" type="primary" @click="dialogVisible = true, addRecode()">鏂板缓</el-button>
@@ -21,7 +21,8 @@
</div>
<div>
<div class="tables" style="margin-top: 16px;">
- <el-table :data="faultParam" style="width: 100%" height="calc(100vh - 20em)">
+ <el-table :data="faultParam" style="width: 100%" height="calc(100vh - 20em)"
+ :header-cell-style="{ background: '#f8f8f9', color: '#515a6e' }" border>
<!-- 琛ㄦ牸鍒� -->
<el-table-column header-align="center" align="center" width="70" prop="prop" label="搴忓彿"
type="index"></el-table-column>
@@ -277,7 +278,7 @@
<script>
import { dateFormat } from '@/utils/date'
-
+import { mapGetters } from "vuex";
export default {
props: {
clickNodeVal: {
@@ -308,6 +309,7 @@
}
},
computed: {
+ ...mapGetters(["nickName"]),
action() {
return this.javaApi + this.$api.personnel.saveCNASFile
}
@@ -351,29 +353,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