yunxing 4 年之前
父節點
當前提交
19c63573d9
共有 2 個文件被更改,包括 34 次插入21 次删除
  1. 5 4
      src/views/equipmentFacilities/ElectricWell.vue
  2. 29 17
      src/views/equipmentFacilities/EquipmentList.vue

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

@@ -88,7 +88,6 @@ export default {
     props: {},
     data() {
         return {
-           
             keyword: '',
             page: 1,
             size: 20,
@@ -97,7 +96,7 @@ export default {
             finished: false,
             category_code: '',
             showPopup: false,
-          
+
             //  [
             //     { text: '全部', smsxt: '', active: 'active' },
             //     { text: '供电系统', smsxt: '1001', active: '' },
@@ -123,7 +122,7 @@ export default {
         }
     },
     computed: {
-        ...mapGetters(['plazaId', 'smsxt', 'categoryId','floorsArr']),
+        ...mapGetters(['plazaId', 'smsxt', 'categoryId', 'floorsArr']),
     },
     components: {},
     created() {
@@ -156,9 +155,11 @@ export default {
                 page: this.page,
                 size: this.size,
                 plazaId: this.plazaId,
+            }
+            let postParams = {
+                system_code: this.system_code,
                 category_code: this.category_code,
             }
-            let postParams = { system_code: this.system_code }
             // TODO: keyword
             if (this.keyword) {
                 data.keyword = `${this.keyword}:sbjc,assetnum;`

+ 29 - 17
src/views/equipmentFacilities/EquipmentList.vue

@@ -108,7 +108,7 @@ export default {
             category_code: '',
             showPopup: false,
             systemList: [
-                { text: '全部', smsxt: '', active: 'active' },
+                { text: '全部', smsxt: '全部', active: 'active' },
                 { text: '供电系统', smsxt: '1001', active: '' },
                 { text: '暖通系统', smsxt: '1002', active: '' },
                 { text: '消防系统', smsxt: '1003', active: '' },
@@ -120,17 +120,17 @@ export default {
             ],
             system_code: '', //系统code
             sbss_code: '', //设备设施code
-            sbssList: [{ text: '全部', code: '', active: 'active' }], //设备设施筛选条件
+            sbssList: [{ text: '全部', code: '全部', active: 'active' }], //设备设施筛选条件
             loadMore: false,
             // 弹窗中使用数据
             modalData: {
                 system: '',
-                sbss: '',
+                sbss: '全部',
             },
             // 弹窗中使用备份数据
             modalDataBak: {
                 system: '',
-                sbss: '',
+                sbss: '全部',
             },
         }
     },
@@ -172,19 +172,22 @@ export default {
                 page: this.page,
                 size: this.size,
                 plazaId: this.plazaId,
-                category_code: this.category_code,
                 onlyMainAsset: true,
             }
-            // TODO:  筛选后, 使用classstructureid字段,删除category_code字段
-            if (this.sbss_code) {
-                data.classstructureid = this.sbss_code
-                delete data.category_code
+
+            let postParams = {
+                system_code: this.system_code,
+                category_code: this.category_code,
             }
-            let postParams = { system_code: this.system_code }
             // 筛选后,专业系统选择全部, 删除上传system_code的字段
-            if (!this.system_code) {
+            if (!this.system_code || this.system_code === '全部') {
                 delete postParams.system_code
             }
+            // TODO:  筛选后, 使用classstructureid字段,删除category_code字段
+            if (this.sbss_code) {
+                this.sbss_code !== '全部' && (data.classstructureid = this.sbss_code)
+                delete postParams.category_code
+            }
             // TODO: keyword
             if (this.keyword) {
                 data.keyword = `${this.keyword}:sbjc,assetnum;`
@@ -255,6 +258,7 @@ export default {
             })
             // 弹窗选中的系统
             this.$set(this.modalDataBak, 'system', data.smsxt)
+            this.getSbss(data.smsxt)
         },
         /**
          * popup 更改设备设施
@@ -274,16 +278,20 @@ export default {
         },
         /**
          * 获取设备设施筛选条件
+         * @param smsxt 右弹窗 更改专业系统传递参数
          */
-        async getSbss() {
+        async getSbss(smsxt) {
             console.log(this.smsxt, this.system_code)
             let getParams = {
-                smsxt: this.smsxt,
+                smsxt: smsxt || this.smsxt,
+            }
+            if (smsxt === '全部') {
+                delete getParams.smsxt
             }
             let resData = await queryClassStructure({ getParams })
             console.log(resData)
             if (!resData && !resData?.data) {
-                this.sbssList = [{ text: '全部', code: '', active: 'active' }]
+                this.sbssList = [{ text: '全部', code: '全部', active: 'active' }]
                 return false
             }
             let res_data = resData.data || []
@@ -298,7 +306,7 @@ export default {
                     })
                 })
             })
-            this.sbssList = [{ text: '全部', code: '', active: 'active' }, ...sbssList]
+            this.sbssList = [{ text: '全部', code: '全部', active: 'active' }, ...sbssList]
         },
 
         /**
@@ -307,14 +315,18 @@ export default {
         reset() {
             this.modalDataBak = {
                 system: '',
-                sbss: '',
+                sbss: '全部',
             }
             this.modalData = {
                 system: '',
-                sbss: '',
+                sbss: '全部',
             }
             this.system_code = this.smsxt
+            this.sbss_code = ''
             this.showPopup = false
+            // 初始化数据,查询列表
+            this.initData()
+            this.onLoad()
         },
         /**
          * 弹窗确认