Commit f2cd6b17b078750f55d65238fc9af9e628a6ea3d

Authored by wuxw
1 parent 29e25b46

优化admin 调转物联网功能

src/views/iot/aAccessControlList.vue
@@ -55,7 +55,8 @@ @@ -55,7 +55,8 @@
55 </el-table-column> 55 </el-table-column>
56 <el-table-column prop="direction" :label="$t('aAccessControl.table.direction')" align="center"> 56 <el-table-column prop="direction" :label="$t('aAccessControl.table.direction')" align="center">
57 <template slot-scope="scope"> 57 <template slot-scope="scope">
58 - {{ scope.row.direction === '3306' ? $t('aAccessControl.direction.in') : $t('aAccessControl.direction.out') 58 + {{ scope.row.direction === '3306' ? $t('aAccessControl.direction.in') :
  59 + $t('aAccessControl.direction.out')
59 }} 60 }}
60 </template> 61 </template>
61 </el-table-column> 62 </el-table-column>
@@ -83,6 +84,7 @@ @@ -83,6 +84,7 @@
83 <script> 84 <script>
84 import { listAdminAccessControl } from '@/api/iot/aAccessControlApi' 85 import { listAdminAccessControl } from '@/api/iot/aAccessControlApi'
85 import SelectAdminCommunity from '@/components/community/selectAdminCommunity' 86 import SelectAdminCommunity from '@/components/community/selectAdminCommunity'
  87 +import { jumpToIot } from '@/api/user/menuApi'
86 88
87 export default { 89 export default {
88 name: 'AAccessControlList', 90 name: 'AAccessControlList',
@@ -144,10 +146,7 @@ export default { @@ -144,10 +146,7 @@ export default {
144 this.handleSearch() 146 this.handleSearch()
145 }, 147 },
146 handleDetail(row) { 148 handleDetail(row) {
147 - this.$router.push({  
148 - path: '/iot/aAccessControlDetail',  
149 - query: { machineId: row.machineId }  
150 - }) 149 + jumpToIot('/#/pages/iot/aAccessControlDetail?machineId=' + row.machineId)
151 } 150 }
152 } 151 }
153 } 152 }
src/views/iot/adminChargeMachineList.vue
@@ -73,6 +73,7 @@ @@ -73,6 +73,7 @@
73 <script> 73 <script>
74 import { listAdminChargeMachine } from '@/api/iot/adminChargeMachineApi' 74 import { listAdminChargeMachine } from '@/api/iot/adminChargeMachineApi'
75 import SelectAdminCommunity from '@/components/community/selectAdminCommunity' 75 import SelectAdminCommunity from '@/components/community/selectAdminCommunity'
  76 +import { jumpToIot } from '@/api/user/menuApi'
76 77
77 export default { 78 export default {
78 name: 'AdminChargeMachineList', 79 name: 'AdminChargeMachineList',
@@ -126,7 +127,7 @@ export default { @@ -126,7 +127,7 @@ export default {
126 this.getList() 127 this.getList()
127 }, 128 },
128 handleDetail(row) { 129 handleDetail(row) {
129 - this.$router.push({ path: '/iot/chargeMachineDetail', query: { machineId: row.machineId } }) 130 + jumpToIot('/#/pages/iot/chargeMachineDetail?machineId=' + row.machineId)
130 }, 131 },
131 handleSizeChange(val) { 132 handleSizeChange(val) {
132 this.page.size = val 133 this.page.size = val
src/views/iot/adminMeterList.vue
@@ -97,6 +97,7 @@ @@ -97,6 +97,7 @@
97 <script> 97 <script>
98 import SelectAdminCommunity from '@/components/community/selectAdminCommunity' 98 import SelectAdminCommunity from '@/components/community/selectAdminCommunity'
99 import { listAdminMeterMachine } from '@/api/iot/adminMeterApi' 99 import { listAdminMeterMachine } from '@/api/iot/adminMeterApi'
  100 +import { jumpToIot } from '@/api/user/menuApi'
100 101
101 export default { 102 export default {
102 name: 'AdminMeterList', 103 name: 'AdminMeterList',
@@ -164,13 +165,7 @@ export default { @@ -164,13 +165,7 @@ export default {
164 return type ? type.typeName : '-' 165 return type ? type.typeName : '-'
165 }, 166 },
166 handleDetail(row) { 167 handleDetail(row) {
167 - this.$router.push({  
168 - path: '/iot/meterDetail',  
169 - query: {  
170 - machineId: row.machineId,  
171 - roomId: row.roomId  
172 - }  
173 - }) 168 + jumpToIot('/#/pages/iot/meterDetail?machineId=' + row.machineId + '&roomId=' + row.roomId)
174 } 169 }
175 } 170 }
176 } 171 }