change structure

src/api/super/config/device.js

@@ -0,0 +1,47 @@
+import utils from '@/utils/lib'
+
+const QueryManager = query => {
+  return new Promise(resolve => {
+    utils.SockEventMap.superConfigDeviceQueryManagerRes = data => {
+      utils.SockEventMap.superConfigDeviceQueryManagerRes = undefined
+      resolve(data)
+    }
+    utils.SendWss('superConfigDeviceQueryManager', query)
+  })
+}
+
+const Query = query => {
+  return new Promise(resolve => {
+    utils.SockEventMap.superConfigDeviceQueryRes = data => {
+      utils.SockEventMap.superConfigDeviceQueryRes = undefined
+      resolve(data)
+    }
+    utils.SendWss('superConfigDeviceQuery', query)
+  })
+}
+
+const Update = info => {
+  return new Promise((resolve, reject) => {
+    utils.SockEventMap.superConfigDeviceUpdateRes = data => {
+      utils.SockEventMap.superConfigDeviceUpdateRes = undefined
+      if (data.status) resolve()
+      else reject(data.msg)
+    }
+    utils.SendWss('superConfigDeviceUpdate', info)
+  })
+}
+
+const Assign = info => {
+  return new Promise((resolve, reject) => {
+    utils.SockEventMap.superConfigDeviceAssignRes = data => {
+      utils.SockEventMap.superConfigDeviceAssignRes = undefined
+      if (data.status) resolve()
+      else reject(data.msg)
+    }
+    utils.SendWss('superConfigDeviceAssign', info)
+  })
+}
+
+export default {
+  QueryManager, Query, Update, Assign
+}

src/api/super/config/wine.js

@@ -0,0 +1,54 @@
+import utils from '@/utils/lib'
+
+const Query = query => {
+  return new Promise(resolve => {
+    utils.SockEventMap.superConfigWineQueryRes = data => {
+      utils.SockEventMap.superConfigWineQueryRes = undefined
+      resolve(data)
+    }
+    utils.SendWss('superConfigWineQuery', query)
+  })
+}
+
+const Update = info => {
+  return new Promise((resolve, reject) => {
+    utils.SockEventMap.superConfigWineUpdateRes = data => {
+      utils.SockEventMap.superConfigWineUpdateRes = undefined
+      if (data.status) {
+        resolve()
+      } else {
+        reject(data.msg)
+      }
+    }
+    utils.SendWss('superConfigWineUpdate', info)
+  })
+}
+
+const Delete = ids => {
+  return new Promise(resolve => {
+    utils.SockEventMap.superConfigWineDeleteRes = data => {
+      utils.SockEventMap.superConfigWineDeleteRes = undefined
+      resolve(data)
+    }
+    utils.SendWss('superConfigWineDelete', ids)
+  })
+}
+
+const Add = info => {
+  console.log(info)
+  return new Promise((resolve, reject) => {
+    utils.SockEventMap.superConfigWineAddRes = data => {
+      utils.SockEventMap.superConfigWineAddRes = undefined
+      if (data.status) {
+        resolve()
+      } else {
+        reject(data.msg)
+      }
+    }
+    utils.SendWss('superConfigWineAdd', info)
+  })
+}
+
+export default {
+  Query, Update, Delete, Add
+}

src/api/super/device-manage.js

@@ -1,48 +0,0 @@
-import utils from '@/utils/lib'
-
-const queryManager = query => {
-  return new Promise(resolve => {
-    utils.SockEventMap.superQueryManagerRes = data => {
-      utils.SockEventMap.superQueryManagerRes = undefined
-      resolve(data)
-    }
-    utils.SendWss('superQueryManager', query)
-  })
-}
-
-const queryDevice = query => {
-  return new Promise(resolve => {
-    utils.SockEventMap.superQueryDeviceRes = data => {
-      utils.SockEventMap.superQueryDeviceRes = undefined
-      resolve(data)
-    }
-    utils.SendWss('superQueryDevice', query)
-  })
-}
-
-const updateDevice = info => {
-  return new Promise((resolve, reject) => {
-    utils.SockEventMap.superUpdateDeviceRes = data => {
-      utils.SockEventMap.superUpdateDeviceRes = undefined
-      if (data.status) resolve()
-      else reject(data.msg)
-    }
-    utils.SendWss('superUpdateDevice', info)
-  })
-}
-
-const batchAssign = info => {
-  console.log(info)
-  return new Promise((resolve, reject) => {
-    utils.SockEventMap.superBatchAssignRes = data => {
-      utils.SockEventMap.superBatchAssignRes = undefined
-      if (data.status) resolve()
-      else reject(data.msg)
-    }
-    utils.SendWss('superBatchAssign', info)
-  })
-}
-
-export default {
-  queryManager, queryDevice, updateDevice, batchAssign
-}

src/api/super/wine-manage.js

@@ -1,54 +0,0 @@
-import utils from '@/utils/lib'
-
-const queryWine = query => {
-  return new Promise(resolve => {
-    utils.SockEventMap.superQueryWineRes = data => {
-      utils.SockEventMap.superQueryWineRes = undefined
-      resolve(data)
-    }
-    utils.SendWss('superQueryWine', query)
-  })
-}
-
-const updateWine = info => {
-  return new Promise((resolve, reject) => {
-    utils.SockEventMap.superUpdateWineRes = data => {
-      utils.SockEventMap.superUpdateWineRes = undefined
-      if (data.status) {
-        resolve()
-      } else {
-        reject(data.msg)
-      }
-    }
-    utils.SendWss('superUpdateWine', info)
-  })
-}
-
-const deleteWine = ids => {
-  return new Promise(resolve => {
-    utils.SockEventMap.superDeleteWineRes = data => {
-      utils.SockEventMap.superDeleteWineRes = undefined
-      resolve(data)
-    }
-    utils.SendWss('superDeleteWine', ids)
-  })
-}
-
-const addWine = info => {
-  console.log(info)
-  return new Promise((resolve, reject) => {
-    utils.SockEventMap.superAddWineRes = data => {
-      utils.SockEventMap.superAddWineRes = undefined
-      if (data.status) {
-        resolve()
-      } else {
-        reject(data.msg)
-      }
-    }
-    utils.SendWss('superAddWine', info)
-  })
-}
-
-export default {
-  queryWine, updateWine, deleteWine, addWine
-}

src/utils/lib.js

@@ -6,7 +6,7 @@ let socketInterval = null
 const EncryptHandler = new JSEncrypt()
 const SockEventMap = { 'pon': undefined }
 
-// wss://wine.ifarmcloud.com/api/admin/socket, ws://192.168.1.6:3080/admin/socket
+// wss://wine.ifarmcloud.com/api/manager/socket, ws://192.168.1.6:3080/admin/manager
 const ServerPrefix = 'ws://192.168.1.6:3080/manager/socket'
 const SendWss = (event, data, ttl) => {
   if (socket !== null) return socket.send(JSON.stringify({ event, data }))

src/views/super/config/device/index.vue

@@ -203,7 +203,7 @@
 </template>
 
 <script>
-import deviceApi from '@/api/super/device-manage'
+import api from '@/api/super/config/device'
 import { parseTime } from '@/utils'
 import Pagination from '@/components/Pagination'
 
@@ -260,14 +260,14 @@ export default {
   methods: {
     handleManagerSearch(value) {
       this.manager.loading = true
-      deviceApi.queryManager(value).then(res => {
+      api.QueryManager(value).then(res => {
         this.manager.groups[1].options = res
         this.manager.loading = false
       })
     },
     handleManagerSearch2(value) {
       this.manager.loading = true
-      deviceApi.queryManager(value).then(res => {
+      api.QueryManager(value).then(res => {
         this.manager.list = res
         this.manager.loading = false
       })
@@ -286,7 +286,7 @@ export default {
     },
     getList() {
       this.device.loading = true
-      deviceApi.queryDevice(this.device.query).then(res => {
+      api.Query(this.device.query).then(res => {
         for (let i = 0; i < res.devices.length; ++i) {
           res.devices[i].first = new Date(res.devices[i].first)
           res.devices[i].last = new Date(res.devices[i].last)
@@ -320,7 +320,7 @@ export default {
       }
     },
     handleBatchAssign() {
-      deviceApi.batchAssign({
+      api.Assign({
         devices: this.batch.ids, manager: this.batch.manager.id
       }).then(() => {
         this.$notify({
@@ -341,7 +341,7 @@ export default {
       })
     },
     handleUpdate() {
-      deviceApi.updateDevice({
+      api.Update({
         did: this.detail.id,
         addr: this.detail.addr,
         mid: this.detail.manager.id,

src/views/super/config/wine/index.vue

@@ -139,7 +139,7 @@
 </template>
 
 <script>
-import wineApi from '@/api/super/wine-manage'
+import api from '@/api/super/config/wine'
 import { parseTime } from '@/utils'
 import Pagination from '@/components/Pagination'
 
@@ -197,7 +197,7 @@ export default {
         cancelButtonText: '取消',
         type: 'warning'
       }).then(() => {
-        wineApi.deleteWine([id]).then(() => {
+        api.Delete([id]).then(() => {
           this.$notify({
             title: '成功',
             message: '删除酒品信息成功',
@@ -222,7 +222,7 @@ export default {
         cancelButtonText: '取消',
         type: 'warning'
       }).then(() => {
-        wineApi.deleteWine(this.batch).then(() => {
+        api.Delete(this.batch).then(() => {
           this.$notify({
             title: '成功',
             message: '删除酒品信息成功',
@@ -253,7 +253,7 @@ export default {
     },
     getList() {
       this.wine.loading = true
-      wineApi.queryWine(this.wine.query).then(res => {
+      api.Query(this.wine.query).then(res => {
         for (let i = 0; i < res.wines.length; ++i) {
           res.wines[i].time = new Date(res.wines[i].time)
         }