|
@@ -112,11 +112,35 @@ export default {
|
|
|
}
|
|
}
|
|
|
})
|
|
})
|
|
|
// 对类型进行排序
|
|
// 对类型进行排序
|
|
|
- result.sort((a, b) => {
|
|
|
|
|
- return a.facs_type.localeCompare(b.facs_type, 'zh')
|
|
|
|
|
- })
|
|
|
|
|
- console.log('格式化数据', result)
|
|
|
|
|
- this.cardInfos = result
|
|
|
|
|
|
|
+ const { setting = {} } = this.$store.getters
|
|
|
|
|
+ const yiLanPaixu = setting.facilityEnv?.yiLanPaixu
|
|
|
|
|
+ if (yiLanPaixu && yiLanPaixu.length > 0) {
|
|
|
|
|
+ const orderMap = new Map()
|
|
|
|
|
+ yiLanPaixu.forEach((facs_type, index) => {
|
|
|
|
|
+ orderMap.set(facs_type, index)
|
|
|
|
|
+ })
|
|
|
|
|
+ const sortedArr = [...result].sort((a, b) => {
|
|
|
|
|
+ const idxA = orderMap.has(a.facs_type)
|
|
|
|
|
+ ? orderMap.get(a.facs_type)
|
|
|
|
|
+ : Infinity
|
|
|
|
|
+ const idxB = orderMap.has(b.facs_type)
|
|
|
|
|
+ ? orderMap.get(b.facs_type)
|
|
|
|
|
+ : Infinity
|
|
|
|
|
+ // 权重不同先比权重
|
|
|
|
|
+ if (idxA !== idxB) return idxA - idxB
|
|
|
|
|
+ // 权重相同(都是不在排序队列),再按facs_type字母排序
|
|
|
|
|
+ console.log(a.b)
|
|
|
|
|
+
|
|
|
|
|
+ return a.facs_type.localeCompare(b.facs_type, 'zh')
|
|
|
|
|
+ })
|
|
|
|
|
+ this.cardInfos = sortedArr
|
|
|
|
|
+ console.log(cardInfos)
|
|
|
|
|
+ } else {
|
|
|
|
|
+ result.sort((a, b) => {
|
|
|
|
|
+ return a.facs_type.localeCompare(b.facs_type, 'zh')
|
|
|
|
|
+ })
|
|
|
|
|
+ this.cardInfos = result
|
|
|
|
|
+ }
|
|
|
})
|
|
})
|
|
|
},
|
|
},
|
|
|
methods: {
|
|
methods: {
|