登录配置首页

src/config/getData2.js

@@ -1,156 +1,84 @@
 import {post} from '@config/http.js'
 
 // 手持登录
-export const loginApi = (user, password) => post('api/pda/login', {
-  username: user,
-  password: password
+export const rfLogin = (user, password) => post('RF_Login', {
+  UserID: user,
+  UserPassWord: password
 })
-// export const loginApi = (user, password) => {
-//   let res = {
-//     'result': {
-//       'user': {
-//         'user': {
-//           'createBy': null,
-//           'updatedBy': 'System',
-//           'createTime': 1534986716000,
-//           'updateTime': 1683368236000,
-//           'id': '1',
-//           'roles': [
-//             {
-//               'id': 1,
-//               'name': '超级管理员',
-//               'level': 1,
-//               'dataScope': '全部'
-//             }
-//           ],
-//           'dept': {
-//             'id': 18,
-//             'code': null,
-//             'name': '系统'
-//           },
-//           'deptId': null,
-//           'username': 'admin',
-//           'nickName': '管理员',
-//           'email': '',
-//           'phone': '',
-//           'gender': '男',
-//           'avatarName': 'avatar-20200806032259161.png',
-//           'avatarPath': '/Users/jie/Documents/work/me/admin/eladmin/~/avatar/avatar-20200806032259161.png',
-//           'extId': null,
-//           'extuserId': null,
-//           'enabled': true,
-//           'pwdResetTime': 1588495111000
-//         }
-//       },
-//       'token': 'Bearer eyJ0eXAiOiJKV1QiLCJhbGciOiJIUzI1NiJ9.eyJsb2dpblR5cGUiOiJsb2dpbiIsImxvZ2luSWQiOjEsInJuU3RyIjoiMWoyOXdreHUyVkQzcnlNb2lZaWFDaDNCYUM5TU5pOXQiLCJsb2dpbkluZm8iOnsiaWQiOjEsInVzZXJuYW1lIjoiYWRtaW4iLCJuaWNrTmFtZSI6IueuoeeQhuWRmCIsInVzZXIiOnsiaWQiOjEsInJvbGVzIjpbeyJpZCI6MSwibmFtZSI6Iui2hee6p-euoeeQhuWRmCIsImxldmVsIjoxLCJkYXRhU2NvcGUiOiLlhajpg6gifV0sImRlcHQiOnsiaWQiOjE4LCJuYW1lIjoi57O757ufIn0sInVzZXJuYW1lIjoiYWRtaW4iLCJuaWNrTmFtZSI6IueuoeeQhuWRmCIsImVtYWlsIjoiIiwicGhvbmUiOiIiLCJnZW5kZXIiOiLnlLciLCJhdmF0YXJOYW1lIjoiYXZhdGFyLTIwMjAwODA2MDMyMjU5MTYxLnBuZyIsImF2YXRhclBhdGgiOiIvVXNlcnMvamllL0RvY3VtZW50cy93b3JrL21lL2FkbWluL2VsYWRtaW4vfi9hdmF0YXIvYXZhdGFyLTIwMjAwODA2MDMyMjU5MTYxLnBuZyIsInBhc3N3b3JkIjoiZjUyMDIwZGNhNzY1ZmQzOTQzZWQ0MGE2MTVkYzJjNWMiLCJlbmFibGVkIjp0cnVlLCJpc0FkbWluIjp0cnVlLCJwd2RSZXNldFRpbWUiOjE1ODg0OTUxMTEsInVwZGF0ZWRCeSI6IlN5c3RlbSIsImNyZWF0ZVRpbWUiOjE1MzQ5ODY3MTYsInVwZGF0ZVRpbWUiOjE2ODMzNjgyMzZ9LCJwZXJtaXNzaW9ucyI6WyJhZG1pbiIsInVzZXI6bGlzdCIsInJvbGVzOmxpc3QiLCJtZW51Omxpc3QiLCJ0aW1pbmc6bGlzdCIsImRlcHQ6bGlzdCIsImRpY3Q6bGlzdCIsInVzZXI6YWRkIiwidXNlcjplZGl0IiwidXNlcjpkZWwiLCJyb2xlczphZGQiLCJyb2xlczplZGl0Iiwicm9sZXM6ZGVsIiwibWVudTphZGQiLCJtZW51OmVkaXQiLCJtZW51OmRlbCIsImRlcHQ6YWRkIiwiZGVwdDplZGl0IiwiZGVwdDpkZWwiLCJkaWN0OmFkZCIsImRpY3Q6ZWRpdCIsImRpY3Q6ZGVsIiwidGltaW5nOmFkZCIsInRpbWluZzplZGl0IiwidGltaW5nOmRlbCIsIm1vbml0b3I6bGlzdCIsImdlbkNvZGU6bGlzdCIsImdlbkNvZGU6YWRkIiwiZ2VuQ29kZTpkZWwiLCJnZW5Db2RlOmVkaXQiLCI5OTkiLCJzdG9yYWdlOmxpc3QiLCJzdG9yYWdlOmFkZCIsInN0b3JhZ2U6ZWRpdCIsInN0b3JhZ2U6ZGVsIl19fQ.q7PzhQbg_3FY-4TkL4S6Iy_Qx05YBGz2BI5mSkRl2AU'
-//     },
-//     'code': '1',
-//     'desc': '操作成功！'
-//   }
+// export const rfLogin = (user, password) => {
+//   let res = {'ErrNO': '1', 'ErrMsg': '登录成功', 'UserName': '张三', 'UserPID': '1001'}
 //   return res
 // }
 
-// 手持登陆查询菜单权限
-export const authority = (id) => post('api/pda/authority', {
-  accountId: id
+/**
+ * 组盘
+ */
+// 读取托盘码
+export const rfReadTrayStatePackage = (id) => post('RF_ReadTrayState_Package', {
+  TrayID: id
 })
-
-// 查询区域
-export const pdaRegion = (func) => post('api/pda/region', {
-  func: func
-})
-// export const pdaRegion = (func) => {
-//   let res = {
-//     code: '1',
-//     result: [{region_code: '1', region_name: 'aa'}, {region_code: '2', region_name: 'bb'}, {region_code: '3', region_name: 'cc'}]
-//   }
+// export const rfReadTrayStatePackage = (id) => {
+//   let res = {'ErrNO': '1', 'ErrMsg': '读取成功'}
 //   return res
 // }
-// 根据区域查询点位
-export const pdaPoint = (func, code) => post('api/pda/point', {
-  func: func,
-  region_code: code
+// 托盘库存信息
+export const rfReadTrayStoragePackage = (id) => post('RF_ReadTrayStorage_Package', {
+  TrayID: id
 })
-// export const pdaPoint = (func, code) => {
-//   let res = {
-//     code: '1',
-//     result: [{point_code: '1', point_name: 'aa'}, {point_code: '2', point_name: 'bb'}, {point_code: '3', point_name: 'cc'}]
-//   }
-//   return res
-// }
-// 查询设备
-export const pdaDevice = (func) => post('api/pda/device', {
-  func: func
-})
-// export const pdaDevice = (func) => {
-//   let res = {
-//     code: '1',
-//     result: [{device_code: '1', device_name: 'aa'}, {device_code: '2', device_name: 'bb'}, {device_code: '3', device_name: 'cc'}]
-//   }
+// export const rfReadTrayStoragePackage = (id) => {
+//   let res = {'ErrNO': '1', 'ErrMsg': '读取成功！', 'StorageList': [{'BillID': '000001', 'MatCode': '物料编码001', 'MatName': '物料名称001', 'BatchNumber': '批次001', 'MatNum': '1'}, {'BillID': '000002', 'MatCode': '物料编码002', 'MatName': '物料名称002', 'BatchNumber': '批次002', 'MatNum': '1'}]}
 //   return res
 // }
 
-// 查询载具类型
-export const pdavehicleType = (func) => post('api/pda/vehicleType', {
-  func: func
+// 读取物料条码
+export const rfReadMatBarCodeStatePackage = (id, code) => post('RF_ReadMatBarCodeState_Package', {
+  TrayID: id,
+  MatBarCode: code
 })
+// export const rfReadMatBarCodeStatePackage = (id, code) => {
+//   let res = {'ErrNO': '1', 'ErrMsg': '读取成功'}
+//   return res
+// }
 
-// 不合格品上报
-export const pdaReport = (code, qty) => post('api/pda/report', {
-  device_code: code,
-  unqualified_qty: qty
+// 组盘
+export const rfTrayPackage = (id, code, size, uid) => post('RF_Tray_Package', {
+  TrayID: id,
+  MatBarCode: code,
+  MatSize: size,
+  UserPID: uid
 })
+// export const rfTrayPackage = (id, code, size, uid) => {
+//   let res = {'ErrNO': '1', 'ErrMsg': '组盘成功'}
+//   return res
+// }
 
-// 送料
-export const sendMaterial = (code, vcode, qty, weight, is) => post('api/pda/sendMaterial', {
-  point_code: code,
-  vehicle_code: vcode,
-  qty: qty,
-  weight: weight,
-  is_full: is
+/**
+ *解盘
+ */
+// 读取托盘码
+export const rfReadTrayStateUnPackage = (id) => post('RF_ReadTrayState_UnPackage', {
+  TrayID: id
 })
+// export const rfReadTrayStateUnPackage = (id) => {
+//   let res = {'ErrNO': '1', 'ErrMsg': '读取成功'}
+//   return res
+// }
 
-// 叫料
-export const callMaterial = (code) => post('api/pda/callMaterial', {
-  point_code: code
+// 托盘库存信息
+export const rfReadTrayStorageUnPackage = (id) => post('RF_ReadTrayStorage_UnPackage', {
+  TrayID: id
 })
+// export const rfReadTrayStorageUnPackage = (id) => {
+//   let res = {'ErrNO': '1', 'ErrMsg': '读取成功！', 'StorageList': [{'BillID': '000001', 'MatCode': '物料编码001', 'MatName': '物料名称001', 'BatchNumber': '批次001', 'MatNum': '1'}, {'BillID': '000002', 'MatCode': '物料编码002', 'MatName': '物料名称002', 'BatchNumber': '批次002', 'MatNum': '1'}, {'BillID': '000003', 'MatCode': '物料编码002', 'MatName': '物料名称002', 'BatchNumber': '批次002', 'MatNum': '1'}]}
+//   return res
+// }
 
-// 送空
-export const sendEmpty = (code, vcode) => post('api/pda/sendEmpty', {
-  point_code: code,
-  vehicle_code: vcode
-})
-
-// 叫空
-export const callEmpty = (code) => post('api/pda/callEmpty', {
-  point_code: code
-})
-
-// 困料管理
-export const standStatus = (vcode, type) => post('api/pda/standStatus', {
-  vehicle_code: vcode,
-  type: type
-})
-
-// 入窑管理
-export const inKiln = (vcode, type) => post('api/pda/inKiln', {
-  vehicle_code: vcode,
-  type: type
-})
-
-// 载具绑定
-export const vehicleBind = (code, vtype, vcode) => post('api/pda/vehicleBind', {
-  point_code: code,
-  vehicle_type: vtype,
-  vehicle_code: vcode
-})
-
-// 载具解绑
-export const vehicleUnbind = (code) => post('api/pda/vehicleUnbind', {
-  point_code: code
-})
-
-// 呼叫次品料
-export const callDefective = (code) => post('api/pda/callDefective', {
-  device_code: code
+// 解盘
+export const rfTrayUnPackage = (id, uid) => post('RF_Tray_UnPackage', {
+  TrayID: id,
+  UserPID: uid
 })
+// export const rfTrayUnPackage = (id, uid) => {
+//   let res = {'ErrNO': '1', 'ErrMsg': '组盘成功'}
+//   return res
+// }

src/config/http.js

@@ -8,11 +8,11 @@ axios.defaults.headers.post['Content-Type'] = 'application/json;charset=UTF-8'
 
 axios.interceptors.request.use(
   config => {
-    let token = ''
-    if (store.getters.userInfo !== '') {
-      token = JSON.parse(store.getters.userInfo).token
-    }
-    token && (config.headers.Authorization = token)
+    // let token = ''
+    // if (store.getters.userInfo !== '') {
+    //   token = JSON.parse(store.getters.userInfo).token
+    // }
+    // token && (config.headers.Authorization = token)
     if (config.method === 'post') {
       if (!config.data.flag) {
         config.data = config.data

src/pages/login/Home.vue

@@ -4,38 +4,25 @@
     <section class="content" style="margin-bottom: 0">
       <div class="userInfo">
         <div class="fxcol">
-          <p class="p1">{{$store.getters.userInfo !== '' ? JSON.parse($store.getters.userInfo).nickName : ''}}</p>
-          <p class="p2">欢迎进入晟华手持系统！</p>
+          <p class="p1">{{$store.getters.userInfo !== '' ? JSON.parse($store.getters.userInfo).UserName : ''}}</p>
+          <p class="p2">欢迎进入讯博手持系统！</p>
         </div>
         <div class="exit" @click="Quit">
           <i class="icon-exit"></i>
           <span class="exit-text">退出</span>
         </div>
       </div>
+      <div class="con">
+        <ul>
+          <li @click="goInner('/groupdisk')">组盘</li>
+          <li @click="goInner('/opendisk')">解盘</li>
+        </ul>
+      </div>
     </section>
-    <div class="con">
-      <ul>
-        <!-- <li v-for="e in menuList" :key="e.menu_id" @click="toPage(e)">{{e.name}}</li> -->
-        <li @click="goInner('/zlmanage')">指令管理</li>
-        <li @click="goInner('/taskmanage')">任务管理</li>
-        <li @click="goInner('/belowgradereport')">不合格品上报</li>
-        <li @click="goInner('/sendmater')">送料</li>
-        <li @click="goInner('/callmater')">叫料</li>
-        <li @click="goInner('/sendempty')">送空</li>
-        <li @click="goInner('/callempty')">叫空</li>
-        <li @click="goInner('/KunliaoManage')">困料管理</li>
-        <li @click="goInner('/RuyaoManage')">入窑管理</li>
-        <li @click="goInner('/VehicleBind')">载具绑定</li>
-        <li @click="goInner('/VehicleUnbind')">载具解绑</li>
-        <li @click="goInner('/CallDefective')">呼叫次品料</li>
-        <li @click="goInner('/CreateChargingTask')">AGV充电</li>
-      </ul>
-    </div>
   </section>
 </template>
 
 <script>
-import {authority} from '@config/getData2.js'
 export default {
   name: 'Home',
   data () {
@@ -49,9 +36,6 @@ export default {
     document.getElementsByTagName('body')[0].className = 'bgwhite'
     this.$store.dispatch('receiveMaterObj', {})
   },
-  created () {
-    // this._authority()
-  },
   methods: {
     toPage (e) {
       let name = e.path.substr(2)
@@ -60,16 +44,6 @@ export default {
       }
       this.$router.push(e.path.substr(2))
     },
-    /** 获取菜单 */
-    async _authority () {
-      let accountId = this.$store.getters.userInfo !== '' ? JSON.parse(this.$store.getters.userInfo).account_id : ''
-      let res = await authority(accountId)
-      if (res.code === '1') {
-        this.menuList = [...res.result.sonTree]
-      } else {
-        this.Dialog(res.desc)
-      }
-    },
     Quit () {
       this.$store.dispatch('setSignOut')
       this.$router.push('/login')

src/pages/login/Login.vue

@@ -2,7 +2,7 @@
   <section>
     <section class="content">
       <p class="p1">欢迎来到</p>
-      <p class="p2">晟华手持系统！</p>
+      <p class="p2">讯博手持系统！</p>
       <div class="input-box">
         <input type="text" class="allwidth" placeholder="请输入用户名" v-model="loginname">
       </div>
@@ -21,7 +21,7 @@
 </template>
 
 <script>
-import {loginApi} from '@config/getData2'
+import {rfLogin} from '@config/getData2'
 import {encrypt} from '../../main.js'
 export default {
   name: 'Login',
@@ -50,15 +50,15 @@ export default {
     Remember () {
       this.memberName = !this.memberName
     },
-    async loginApi () {
+    async rfLogin () {
       try {
-        let res = await loginApi(this.loginname, encrypt(this.password))
-        if (res.code === '1') {
+        let res = await rfLogin(this.loginname, encrypt(this.password))
+        if (res.ErrNO === '1') {
           let obj = {}
           if (this.memberName) {
-            obj = Object.assign({}, res.result.user.user, {token: res.result.token, loginname: this.loginname})
+            obj = Object.assign({}, {UserName: res.UserName, UserPID: res.UserPID, loginname: this.loginname})
           } else {
-            obj = Object.assign({}, res.result.user.user, {token: res.result.token, loginname: ''})
+            obj = Object.assign({}, {UserName: res.UserName, UserPID: res.UserPID, loginname: ''})
           }
           this.$store.dispatch('setUserInfo', JSON.stringify(obj))
           this.$router.push('/home')
@@ -83,7 +83,7 @@ export default {
         return
       }
       this.logintype = '01'
-      this.loginApi()
+      this.rfLogin()
     }
   }
 }

src/pages/login/Setup.vue

@@ -4,14 +4,14 @@
     <section class="content">
       <ul class="pwd-manage-content">
         <li>
-          <span>lms地址:</span>
+          <span>服务器地址:</span>
           <input type="text" v-model.trim="addrip">
         </li>
-        <li>
+        <!-- <li>
           <span>acs地址:</span>
           <input type="text" v-model.trim="acsip">
         </li>
-        <!-- <li>
+        <li>
           <span>打印地址:</span>
           <input type="text" v-model="printip">
         </li>
@@ -41,13 +41,13 @@ export default {
   methods: {
     _submit () {
       if (this.addrip === '') {
-        this.toast('请填写wms地址')
-        return
-      }
-      if (this.acsip === '') {
-        this.toast('请填写acs地址')
+        this.toast('请填写服务器地址')
         return
       }
+      // if (this.acsip === '') {
+      //   this.toast('请填写acs地址')
+      //   return
+      // }
       // if (this.printip === '') {
       //   this.toast('请填写打印地址')
       //   return
@@ -58,7 +58,7 @@ export default {
       // }
       // 存值
       this.$store.dispatch('setBaseUrl', this.addrip)
-      this.$store.dispatch('setAcsIp', this.acsip)
+      // this.$store.dispatch('setAcsIp', this.acsip)
       // this.$store.dispatch('setPrintUrl', this.printip)
       // this.$store.dispatch('setRefreshTime', this.setTime)
       this.$router.push('/login')