Merge remote-tracking branch 'origin/master'

src/projects/business/router/common.js

@@ -124,9 +124,9 @@ const routesCommon = [
 					},
 					//手表绑定列表
 					{
-						path: 'watchBindList',
-						name: 'CommonDeviceWatchBindList',
-						component: () => import('../views/Common/Device/WatchBindList.vue'),
+						path: 'liveBindList',
+						name: 'CommonDeviceLiveBindList',
+						component: () => import('../views/Common/Device/LiveBindList.vue'),
 						meta: {
 							requireAuth: true,
 							role: [],
@@ -136,9 +136,9 @@ const routesCommon = [
 					},
 					//手表绑定列表
 					{
-						path: 'watchBindListAdmin',
-						name: 'CommonDeviceWatchBindListAdmin',
-						component: () => import('../views/Common/Device/WatchBindListAdmin.vue'),
+						path: 'liveBindListAdmin',
+						name: 'CommonDeviceLiveBindListAdmin',
+						component: () => import('../views/Common/Device/LiveBindListAdmin.vue'),
 						meta: {
 							requireAuth: true,
 							role: [],
@@ -148,9 +148,9 @@ const routesCommon = [
 					},
 					//手表绑定详情
 					{
-						path: 'watchBindInfo',
-						name: 'CommonDeviceWatchBindInfo',
-						component: () => import('../views/Common/Device/WatchBindInfo.vue'),
+						path: 'liveBindInfo',
+						name: 'CommonDeviceLiveBindInfo',
+						component: () => import('../views/Common/Device/LiveBindInfo.vue'),
 						meta: {
 							requireAuth: false,
 							role: [],

src/projects/business/views/Common/Device/List.vue

@@ -75,8 +75,6 @@
 			//获取列表
 			getList() {
 				API_Device.listOfDevice({
-					pageIndex: 1,
-					pageSize: 500,
 					schoolId: this.person_data.companyId
 				}).then(data => {
 					this.devices = data.data;

src/projects/business/views/Common/Device/WatchBindInfo.vue → src/projects/business/views/Common/Device/LiveBindInfo.vue

@@ -41,7 +41,7 @@ import {
     mapMutations
 } from 'vuex'
 export default {
-    name: 'CommonDeviceWatchBindInfo',
+    name: 'CommonDeviceLiveBindInfo',
     components: {
         Common,
         Loading,
@@ -50,7 +50,7 @@ export default {
     data() {
         return {
             pageTitle: '关联新设备',
-            routeName: "CommonDeviceWatchBindList",
+            routeName: "CommonDeviceLiveBindList",
 
             isLoading: false,
             detail: {},

src/projects/business/views/Common/Device/WatchBindList.vue → src/projects/business/views/Common/Device/LiveBindList.vue

@@ -36,7 +36,7 @@ import {
     mapMutations
 } from "vuex";
 export default {
-    name: "CommonDeviceWatchBindList",
+    name: "CommonDeviceLiveBindList",
     components: {
         Common,
         Loading,
@@ -68,13 +68,13 @@ export default {
             }
             //跳转首页
             this.$router.push({
-                name: 'CommonDeviceWatchBindInfo',
+                name: 'CommonDeviceLiveBindInfo',
                 query: {
                     id: mod.id,
                     name: mod.deviceName,
                     onId: mod.deviceSerial,
                     personId: mod.personId,
-                    routeName: 'CommonDeviceWatchBindList',
+                    routeName: 'CommonDeviceLiveBindList',
                 }
             })
         },

src/projects/business/views/Common/Device/WatchBindListAdmin.vue → src/projects/business/views/Common/Device/LiveBindListAdmin.vue

@@ -36,7 +36,7 @@ import {
     mapMutations
 } from "vuex";
 export default {
-    name: "CommonDeviceWatchBindListAdmin",
+    name: "CommonDeviceLiveBindListAdmin",
     components: {
         Common,
         Loading,
@@ -64,13 +64,13 @@ export default {
 
             //跳转首页
             this.$router.push({
-                name: 'CommonDeviceWatchBindInfo',
+                name: 'CommonDeviceLiveBindInfo',
                 query: {
                     id: mod.id,
                     name: mod.deviceName,
                     onId: mod.deviceSerial,
                     personId: mod.personId,
-                    routeName: 'CommonDeviceWatchBindListAdmin',
+                    routeName: 'CommonDeviceLiveBindListAdmin',
                 }
             })
         },