Browse Source

Merge branch 'dev' of http://39.106.8.246:3003/yunxing/wanda-bm-guide-h5 into dev

yunxing 4 years ago
parent
commit
e96a7b4414

+ 16 - 8
src/components/assetDetail/Information.vue

@@ -4,44 +4,52 @@
       <h2 class="info-title">基本信息</h2>
       <div class='cell'>
         <span class='left'>设备简码:</span>
-        <span class='right'>SY/1F/YLL/DT/1#-HT-1#</span>
+        <span class='right'>{{data.sbjbm || '--'}}</span>
       </div>
       <div class='cell'>
         <span class='left'>设备简称:</span>
-        <span class='right'>商业楼/F1/娱乐楼/电梯间/娱乐楼货梯间-货梯-娱乐楼1#商管货梯</span>
+        <span class='right'>{{data.sbjc || '--'}}</span>
       </div>
     </div>
     <div class='info-box'>
       <h2 class="info-title">详情信息</h2>
       <div class='cell'>
         <span class='left'>设备全码:</span>
-        <span class='right'>WZ-ZC-WDSG-SY/1F/YLL/DT/1#-HT-1#</span>
+        <span class='right'>{{data.sbqm || '--'}}</span>
       </div>
       <div class='cell'>
         <span class='left'>设备全称:</span>
-        <span class='right'>吴忠万达广场(WZ)-自持-商管-商业楼/F1/娱乐楼/电梯间/娱乐楼货梯间-货梯-娱乐楼1#商管货梯</span>
+        <span class='right'>{{data.sbqc || '--'}}</span>
       </div>
       <div class='cell'>
         <span class='left'>详细位置:</span>
-        <span class='right'>吴忠万达广场(WZ)/商业楼/1楼/娱乐楼/电梯间/娱乐楼货梯间</span>
+        <span class='right'>{{data.s_wzqc || '--'}}</span>
       </div>
       <div class='cell'>
         <span class='left'>设备数量:</span>
-        <span class='right'>1</span>
+        <span class='right'>{{data.sl || '--'}}</span>
       </div>
       <div class='cell'>
         <span class='left'>服务区域:</span>
-        <span class='right'>B1-5F</span>
+        <span class='right'>{{data.fwqy || '--'}}</span>
       </div>
       <div class='cell'>
         <span class='left'>负责人:</span>
-        <span class='right'>马伟</span>
+        <span class='right'>{{data.zrr || '--'}}</span>
       </div>
     </div>
   </div>
 </template>
 <script>
 export default {
+  props: {
+    data: {
+      type: Object,
+      default: () => {
+        return {}
+      }
+    },
+  },
   data() {
     return {
     }

+ 3 - 3
src/components/assetDetail/RepairMaintenance.vue

@@ -4,17 +4,17 @@
   <div class='equipment-page'>
     <!-- 搜索框 -->
     <div class='equipment-search-container'>
-      <van-search class='equipment-search' v-model='keyword' placeholder='请输入设备间名称' @search='onSearch'>
+      <van-search class='equipment-search' v-model='keyword' placeholder='请输入重要事项记录' @search='onSearch' />
         <!-- TODO: 空状态 自定义图标 -->
         <!-- <template #action>
                 <div class='search' @click='onSearch'>搜索</div>
                 </template>-->
-      </van-search>
+      <!-- </van-search> -->
     </div>
     <!-- 维保列表 -->
     <div class='equipment-list' v-if='list.length'>
       <!-- 维保 -->
-      <div class='container-1' v-for="data in list" :key="data.wb_gzglid">
+      <div class='container-1' v-for="(data, index) in list" :key="data.wb_gzglid + index">
         <div class='date'>
           <div class='report-date'>
             <span>填报日期:</span>

File diff suppressed because it is too large
+ 226 - 43
src/views/AssetDetail.vue