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

src/apps/AppBroadcast/selectEquipment.vue

@@ -58,7 +58,7 @@ export default {
   methods: {
     areaSelect(e) {
       this.areaId = e
-      // this.getList()
+      this.getList()
     },
     getList() {
       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 => {
             item.isCheck = false
           })
-          if (this.current > 1) {
-            this.list = [...this.list, ...res.data.records]
-          } else {
-            this.list = res.data.records
-          }
+          this.list = res.data.records
+          // if (this.current > 1) {
+          //   this.list = [...this.list, ...res.data.records]
+          // } else {
+          //   this.list = res.data.records
+          // }
         }
       })
     },

src/project/qianxinan/AppPointsRanking/AppPointsRanking.vue

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