From 32c5fc95afbb2241d80b986e385e17ee553c258c Mon Sep 17 00:00:00 2001
From: 唐耀东 <18861537@qq.com>
Date: 星期五, 13 五月 2022 22:04:32 +0800
Subject: [PATCH] 提交代码
---
src/views/construction/nvr/index.vue | 11 +++++------
1 files changed, 5 insertions(+), 6 deletions(-)
diff --git a/src/views/construction/nvr/index.vue b/src/views/construction/nvr/index.vue
index a148e00..e010a33 100644
--- a/src/views/construction/nvr/index.vue
+++ b/src/views/construction/nvr/index.vue
@@ -81,15 +81,15 @@
</template>
</el-table-column>
<el-table-column label="閮ㄧ讲鍚嶇О" align="center" prop="deploymentName"/>
- <el-table-column label="閫氶亾锛堣矾锛�" align="center" prop="passageway"/>
+ <el-table-column label="閫氶亾锛堣矾锛�" align="center" prop="passageway_dictText"/>
<el-table-column label="LAN1" align="center" prop="lanOne"/>
<el-table-column label="IP" align="center" prop="ipOne"/>
<el-table-column label="LAN2" align="center" prop="lanTwo"/>
<el-table-column label="IP" align="center" prop="ipTwo"/>
<el-table-column label="鐧诲綍璐︽埛" align="center" prop="loginAccount"/>
<el-table-column label="纭洏" align="center" prop="hardDisk"/>
- <el-table-column label="瀹夎浣嶇疆" align="center" prop="buildingId"/>
- <el-table-column label="鎵�灞炲崟浣�" align="center" prop="organizationId"/>
+ <el-table-column label="瀹夎浣嶇疆" align="center" prop="buildingId_dictText"/>
+ <el-table-column label="鎵�灞炲崟浣�" align="center" prop="organizationId_dictText"/>
<!-- <el-table-column label="鏂藉伐鎵规" align="center" prop="constructionBatchId" />-->
<!-- <el-table-column label="搴忓垪鍙�" align="center" prop="serialNumber" />-->
<!-- <el-table-column label="鍨嬪彿" align="center" prop="model" />-->
@@ -446,7 +446,7 @@
this.loading = false;
this.form = response.data;
this.open = true;
- this.title = "淇敼NVR璁惧";
+ this.title = "NVR璁惧璇︽儏";
});
},
/** 淇敼鎸夐挳鎿嶄綔 */
@@ -515,8 +515,7 @@
this.loading = true;
this.disabled = false;
this.reset();
- const id = row.id || this.ids
- getNvr(id).then(response => {
+ getNvr(row.id).then(response => {
this.loading = false;
this.form = response.data;
this.fileOpen = true;
--
Gitblit v1.9.1