From b69ca5e06f8f5c56f8b1270370a81bcecf57bfe7 Mon Sep 17 00:00:00 2001
From: 叶松 <2217086471@qq.com>
Date: 星期四, 30 十一月 2023 14:07:24 +0800
Subject: [PATCH] Merge branch 'master' of http://111.30.93.211:10101/r/supipe
---
web/src/views/ScanInfo/ScanDetail.vue | 24 ++++++++++--------------
1 files changed, 10 insertions(+), 14 deletions(-)
diff --git a/web/src/views/ScanInfo/ScanDetail.vue b/web/src/views/ScanInfo/ScanDetail.vue
index 43e06bc..3d90553 100644
--- a/web/src/views/ScanInfo/ScanDetail.vue
+++ b/web/src/views/ScanInfo/ScanDetail.vue
@@ -15,28 +15,24 @@
<div class="scan_row_data">{{devicesInfo&&devicesInfo.bigNumber}}</div>
</div>
<div class="scan_row">
- <div class="scan_row_text">设备类型：</div>
- <div class="scan_row_data">{{devicesInfo&&devicesInfo.bigTypeName}}</div>
- </div>
- <div class="scan_row">
- <div class="scan_row_text">安装位置：</div>
- <div class="scan_row_data">{{devicesInfo&&devicesInfo.bigPosition}}</div>
+ <div class="scan_row_text">生产厂家：</div>
+ <div class="scan_row_data">{{devicesInfo&&devicesInfo.manufacturer}}</div>
</div>
<div class="scan_row">
<div class="scan_row_text">设备状态：</div>
- <div class="scan_row_data">{{devicesInfo&&devicesInfo.bigState===1?'在线':'离线'}}</div>
+ <div class="scan_row_data">{{devicesInfo&&devicesInfo.useStatus === 1 ? '良好' : '老化'}}</div>
</div>
<div class="scan_row">
<div class="scan_row_text">责任人：</div>
- <div class="scan_row_data">{{devicesInfo&&devicesInfo.realName===null?'':devicesInfo.realName}}</div>
+ <div class="scan_row_data">{{devicesInfo&&devicesInfo.realName ? devicesInfo.realName : ''}}</div>
</div>
<div class="scan_row">
- <div class="scan_row_text">供应商：</div>
- <div class="scan_row_data">{{devicesInfo&&devicesInfo.supplierName}}</div>
+ <div class="scan_row_text">责任人电话：</div>
+ <div class="scan_row_data">{{devicesInfo&&devicesInfo.zrrPhone}}</div>
</div>
<div class="scan_row">
- <div class="scan_row_text">钥匙柜编号：</div>
- <div class="scan_row_data">{{devicesInfo&&devicesInfo.keyCabinet}}</div>
+ <div class="scan_row_text">设备管理员联系方式：</div>
+ <div class="scan_row_data">{{devicesInfo&&devicesInfo.adminPhone}}</div>
</div>
<div class="scan_row">
<div class="scan_row_text">使用年限：</div>
@@ -60,8 +56,8 @@
//获取设备信息
getDeviceInnfo(){
this.url = window.location.href.split('?')[1].split('=')[1]
- window.document.title="大型生产设备"
- this.$api.Device.detailsBigDevice({bigDeviceId:this.url}).then(res=>{
+ window.document.title="设备信息"
+ this.$api.Device.getDeviceDetails({bigDeviceId: this.url}).then(res=>{
if(res.statusMsg === 'ok'){
this.devicesInfo = res.data
}else{
--
Gitblit v1.9.3