Browse Source

全局搜索,跳转 低压柜 逻辑处理

yunxing 4 years ago
parent
commit
b44ff1cba7

+ 1 - 2
src/App.vue

@@ -181,8 +181,7 @@ export default {
                 this.SETSSOTOKEN(`admin:${username}`)
             }
             if (plazaId) {
-                // TODO:
-                plazaId = '1000772'
+                // TODO: 设置广场
                 this.SETPLAZAID(plazaId)
             }
         },

+ 12 - 2
src/views/equipmentFacilities/EngineRoomPicture.vue

@@ -108,6 +108,7 @@ export default {
             modalDataBak: {
                 system: '',
             },
+            globalFlag: false, //是否是从全局搜索进入的
         }
     },
     computed: {
@@ -115,8 +116,14 @@ export default {
     },
 
     created() {
-        this.system_code = this.smsxt
-        // debugger
+        const { type } = this.$route.params
+        this.globalFlag = Boolean(type)
+        console.log(this.globalFlag)
+        if (this.globalFlag) {
+            this.system_code = '全部'
+        } else {
+            this.system_code = this.smsxt
+        }
         this.onLoad()
     },
     // TODO: 111
@@ -257,6 +264,9 @@ export default {
                 system: '',
             }
             this.system_code = this.smsxt
+            if (this.globalFlag) {
+                this.system_code = '全部'
+            }
             this.showPopup = false
             // 初始化数据,查询列表
             this.initData()

+ 28 - 5
src/views/equipmentFacilities/LowVoltageCabinet.vue

@@ -21,7 +21,7 @@
             finished-text
         >
             <div class='switch-room' v-for='(item,index) in list' :key='index'>
-                <div class='title'>{{item.wzjc}}</div>
+                <div class='title' v-show='item.data.length'>{{item.wzjc}}</div>
                 <!-- 一个低压柜信息 -->
                 <div class='info-container'>
                     <!-- 第1,2条 -->
@@ -95,6 +95,8 @@
                         </div>
                     </van-list>
                 </div>
+                <!-- 无低压柜信息 -->
+                <!-- <div v-show='!item.data.length'>暂无数据</div> -->
             </div>
             <!-- <div class='switch-room' v-for='ii in 3' :key='ii'>
                 <div class='title'>商业楼/B1层/配电室/3#</div>
@@ -141,7 +143,7 @@
             </div>
         </van-popup>
         <!-- 无数据 -->
-        <van-empty class='m-empty' v-if='finished &&!list.length' description='暂无数据'>
+        <van-empty class='m-empty' v-if='finished &&(!list.length || noDataFlag)' description='暂无数据'>
             <template #image>
                 <img class='no-data' src='../../assets/images/search_null.png' alt />
             </template>
@@ -175,6 +177,7 @@ export default {
             list: [],
             loading: false,
             finished: false,
+            noDataFlag: false,
             showPopup: false,
             systemList: [{ text: '全部', location: '全部', active: 'active' }],
             modalData: {
@@ -261,8 +264,8 @@ export default {
                 return false
             }
             res.data.data.map((item, index, arr) => {
-                console.log(item)
-                if (item?.count > 5 || item?.data.length >= 5) {
+                // console.log(item)
+                if (item?.count > 5 || item?.data?.length >= 5) {
                     // console.log(item)
                     arr[index] = {
                         ...item,
@@ -276,9 +279,18 @@ export default {
                 } else {
                     item.loadMore = false
                 }
+                if (!item.data) {
+                    item.data = []
+                }
             })
             this.list = [...this.list, ...res.data.data]
+            // console.log('%csssss', 'color:blue')
+            // console.log(this.list)
             this.count = res.data.count
+            // 是否显示无数据的标志
+            let noDataFlag = !Boolean(this.list.filter((v) => v.data.length).length)
+            console.log(noDataFlag)
+            this.noDataFlag = noDataFlag
         },
 
         /**
@@ -320,6 +332,12 @@ export default {
          * 查询一个location下的低压柜
          */
         async getLocationList(item) {
+            console.log('=========')
+            console.log('=========')
+            console.log('=========')
+            console.log('=========')
+            console.log('=========')
+            console.log('=========')
             console.log('getLocationList')
             console.log(item)
             const { location, index } = item
@@ -328,7 +346,7 @@ export default {
             console.log('getLocationList')
             let queryData = {
                 data: {
-                    page: 1, // TODO: page
+                    page: Math.ceil((index + 1) / this.size), // 当前出线柜,所在的页码
                     size: currentList.size,
                     plazaId: this.plazaId,
                 },
@@ -341,6 +359,9 @@ export default {
                     },
                 },
             }
+            if (this.keyword) {
+                queryData.data.keyword = `${this.keyword}:drawernum,outspec;`
+            }
             // 筛选 配电室之后, location字段上送
             console.log(queryData)
             let res
@@ -459,6 +480,7 @@ export default {
         initData() {
             // this.finished = false
             // this.loading = false
+            this.noDataFlag = false
             this.page = 1
             this.count = 0
             this.list = []
@@ -586,6 +608,7 @@ export default {
     .one-list {
         height: calc(100% - 100px) !important;
         .switch-room {
+            max-height: 100% !important;
             height: 100% !important;
         }
     }