kubbo/dvcp_v2_wxcp_app
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge remote-tracking branch 'origin/dev' into dev

Browse Source
This commit is contained in:
aixianling
2022-12-26 17:36:49 +08:00
parent 40722da034 0792277ebd
commit 1bebd1d794
2 changed files with 10 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

13
src/apps/AppBroadcast/selectEquipment.vue
View File

@@ -58,7 +58,7 @@ export default {
methods: { methods: {
areaSelect(e) { areaSelect(e) {
this.areaId = e this.areaId = e
// this.getList() this.getList()
}, },
getList() { getList() {
this.$http.post(`/app/appdlbquipment/list?current=1&size=1000&name=${this.keyword}&devStatus=5&areaId=${this.areaId}`).then((res) => { this.$http.post(`/app/appdlbquipment/list?current=1&size=1000&name=${this.keyword}&devStatus=5&areaId=${this.areaId}`).then((res) => {
@@ -66,11 +66,12 @@ export default {
res.data.records.map(item => { res.data.records.map(item => {
item.isCheck = false item.isCheck = false
}) })
if (this.current > 1) { this.list = res.data.records
this.list = [...this.list, ...res.data.records] // if (this.current > 1) {
} else { // this.list = [...this.list, ...res.data.records]
this.list = res.data.records // } else {
} // this.list = res.data.records
// }
} }
}) })
}, },

6
src/project/qianxinan/AppPointsRanking/AppPointsRanking.vue
View File

@@ -44,13 +44,13 @@
currentTabs: 0, currentTabs: 0,
tabList: [ tabList: [
{ {
name: '待管理', name: '总排行',
}, },
{ {
name: '管理中', name: '县局排行',
}, },
{ {
name: '已解除', name: '派出所排行',
}, },
], ],
barStyle: { barStyle: {