likang 2 years ago
parent
commit
b60e2d7d82

+ 1 - 1
src/views/device/hyd_equipment/hydraulic_detail.vue

@@ -72,7 +72,7 @@
           </div>
           </div>
         </el-row>
         </el-row>
         <el-divider content-position="left">设备信息</el-divider>
         <el-divider content-position="left">设备信息</el-divider>
-        <el-row>
+        <el-row v-if="record.list">
           <div style="margin-bottom: 30px; margin-left: 50px">
           <div style="margin-bottom: 30px; margin-left: 50px">
             <el-col :span="8" style="margin-top: 10px; font-size: 14px; color: #a0a0a0">
             <el-col :span="8" style="margin-top: 10px; font-size: 14px; color: #a0a0a0">
               <div class="detail-item">
               <div class="detail-item">

+ 12 - 22
src/views/device/storage_equipment/detail.vue

@@ -1,19 +1,11 @@
 <template>
 <template>
-  <el-drawer
-    title="设备信息"
-    :visible.sync="drawerVisible"
-    :direction="direction"
-    size="45%"
-  >
+  <el-drawer title="设备信息" :visible.sync="drawerVisible" :direction="direction" size="45%">
     <el-tabs v-model="activeName" type="card" @tab-click="handleClick">
     <el-tabs v-model="activeName" type="card" @tab-click="handleClick">
       <el-tab-pane label="设备信息" name="first">
       <el-tab-pane label="设备信息" name="first">
         <el-divider content-position="left">基础信息</el-divider>
         <el-divider content-position="left">基础信息</el-divider>
         <el-row>
         <el-row>
           <div style="margin-bottom: 30px; margin-left: 50px">
           <div style="margin-bottom: 30px; margin-left: 50px">
-            <el-col
-              :span="6"
-              style="margin-top: 10px; font-size: 14px; color: #a0a0a0"
-            >
+            <el-col :span="6" style="margin-top: 10px; font-size: 14px; color: #a0a0a0">
               <div class="detail-item">
               <div class="detail-item">
                 <pre style="display: inline">设备分类:</pre>
                 <pre style="display: inline">设备分类:</pre>
                 <span class="item">{{ record.classification }}</span>
                 <span class="item">{{ record.classification }}</span>
@@ -30,15 +22,12 @@
                 <span>序列号:</span>
                 <span>序列号:</span>
                 <span class="item">{{ record.serial_number }}</span>
                 <span class="item">{{ record.serial_number }}</span>
               </div>
               </div>
-               <div class="detail-item">
+              <div class="detail-item">
                 <span>检验状态:</span>
                 <span>检验状态:</span>
                 <span class="item">{{ record.check_status1}}</span>
                 <span class="item">{{ record.check_status1}}</span>
               </div>
               </div>
             </el-col>
             </el-col>
-            <el-col
-              :span="6"
-              style="margin-top: 10px; font-size: 14px; color: #a0a0a0"
-            >
+            <el-col :span="6" style="margin-top: 10px; font-size: 14px; color: #a0a0a0">
               <div class="detail-item">
               <div class="detail-item">
                 <pre style="display: inline">设备类别:</pre>
                 <pre style="display: inline">设备类别:</pre>
                 <span class="item">{{ record.equ_type_name }}</span>
                 <span class="item">{{ record.equ_type_name }}</span>
@@ -55,15 +44,12 @@
                 <span>上次校验时间:</span>
                 <span>上次校验时间:</span>
                 <span class="item">{{ record.check_last_time}}</span>
                 <span class="item">{{ record.check_last_time}}</span>
               </div>
               </div>
-                <div class="detail-item">
+              <div class="detail-item">
                 <span>设备状态:</span>
                 <span>设备状态:</span>
                 <span class="item">{{ record.status1}}</span>
                 <span class="item">{{ record.status1}}</span>
               </div>
               </div>
             </el-col>
             </el-col>
-            <el-col
-              :span="6"
-              style="margin-top: 10px; font-size: 14px; color: #a0a0a0"
-            >
+            <el-col :span="6" style="margin-top: 10px; font-size: 14px; color: #a0a0a0">
               <div class="detail-item">
               <div class="detail-item">
                 <pre style="display: inline">物料号:</pre>
                 <pre style="display: inline">物料号:</pre>
                 <span class="item">{{ record.material_number}}</span>
                 <span class="item">{{ record.material_number}}</span>
@@ -76,17 +62,21 @@
                 <pre style="display: inline">类固资产编号:</pre>
                 <pre style="display: inline">类固资产编号:</pre>
                 <span class="item">{{ record.fixed_asset_number2 }}</span>
                 <span class="item">{{ record.fixed_asset_number2 }}</span>
               </div>
               </div>
-               <div class="detail-item">
+              <div class="detail-item">
                 <span>下次校验时间:</span>
                 <span>下次校验时间:</span>
                 <span class="item">{{ record.check_next_time}}</span>
                 <span class="item">{{ record.check_next_time}}</span>
               </div>
               </div>
+              <div class="detail-item" v-if="record.equipment_type==6">
+                <span>位置:</span>
+                <span class="item">{{ record.address}}</span>
+              </div>
 
 
             </el-col>
             </el-col>
             <el-col :span="6"></el-col>
             <el-col :span="6"></el-col>
           </div>
           </div>
         </el-row>
         </el-row>
       </el-tab-pane>
       </el-tab-pane>
-      
+
     </el-tabs>
     </el-tabs>
   </el-drawer>
   </el-drawer>
 </template>
 </template>