瀏覽代碼

1. 机房平面布置图,改为整行点击
2. 修复 重要维修及重要维保,key值重复问题

yunxing 4 年之前
父節點
當前提交
2bc9bf3556

+ 1 - 1
src/components/equipmentFacilities/RepairMaintenance.vue

@@ -14,7 +14,7 @@
     <!-- 维保列表 -->
     <div class='equipment-list' v-if='list.length'>
       <!-- 维保 -->
-      <div class='info-box' v-for="(data, index) in list" :key="data.workorderid || data.wonum + index" @click="handleClickDetail(data)">
+      <div class='info-box' v-for="(data, index) in list" :key="(data.workorderid || data.wonum) + `__` + index" @click="handleClickDetail(data)">
         <div class="info-box-border">
           <h2 class="info-title">{{data.sbmc || '--'}}</h2>
           <div class='cell'>

+ 3 - 3
src/views/equipmentFacilities/EngineRoomPicture.vue

@@ -16,14 +16,14 @@
         <div class='equipment-list' v-if='list.length'>
             <van-list v-model='loading' :finished='finished' finished-text='没有更多了' :offset='100' :immediate-check='false' @load='onLoad'>
                 <!-- <van-cell v-for='item in list' :key='item' :title='item' /> -->
-                <van-cell is-link v-for='item in list' :key='item.wzjm'>
+                <van-cell is-link v-for='item in list' :key='item.wzjm' @click='showPhoto(item)'>
                     <!-- 使用 title 插槽来自定义标题 -->
                     <template #title>
                         <span class='name'>{{item.wzjc}}</span>
                     </template>
                     <template #right-icon>
-                        <span @click='showPhoto(item)'>{{item.photos_num}}张</span>
-                        <van-icon @click='showPhoto(item)' name='arrow' class='arrow-icon' />
+                        <span>{{item.photos_num}}张</span>
+                        <van-icon name='arrow' class='arrow-icon' />
                     </template>
                 </van-cell>
             </van-list>

+ 5 - 4
src/views/equipmentFacilities/EquipmentList.vue

@@ -13,7 +13,7 @@
             <van-search class='equipment-search' v-model='keyword' placeholder='请输入设备简称或设备内编码' @search='onSearch' @focus='focus'></van-search>
         </div>
         <!-- 设备列表 -->
-        <div class='equipment-list' v-if='list.length'>
+        <div class='equipment-list' v-if='list.length' ref='wrapper'>
             <van-list v-model='loading' :finished='finished' finished-text='没有更多了' :offset='20' :immediate-check='false' @load='onLoad'>
                 <!-- <van-cell v-for='item in list' :key='item' :title='item' /> -->
                 <van-cell is-link v-for='item in list' @click='goToDetail(item)' :key='item.classstructureid'>
@@ -134,8 +134,8 @@ export default {
         ...mapGetters(['plazaId', 'smsxt', 'categoryId']),
     },
     activated() {
-        console.log('----------activated')
-        console.log(this.$route)
+        // TODO: 记录滚动条位置
+        // this.$refs.wrapper && (this.$refs.wrapper.scrollTop = this.scroll)
         if (this.$route.params.from === 'indexPage') {
             this.initPage()
         }
@@ -147,7 +147,6 @@ export default {
         // let { title, category_code } = this.$route.query
         // this.title = title
         // this.category_code = category_code
-        
         // this.onLoad() --会与 activated 中查询重复
     },
     beforeMount() {},
@@ -284,6 +283,8 @@ export default {
          * 跳转设备详情页
          */
         goToDetail(item) {
+            // let wrapperScrollTop = this.$refs.wrapper.scrollTop
+            // this.scroll = wrapperScrollTop
             const { assetid } = item
             assetid && this.$router.push({ name: 'AssetDetail', query: { assetid } })
         },