压机料盅转移

2024-05-22 14:14:20 +08:00
parent 9e55a4eee5
commit 220fc5454d
6 changed files with 254 additions and 72 deletions
--- a/src/config/getData2.js
+++ b/src/config/getData2.js
@@ -5,50 +5,6 @@ export const loginApi = (user, password) => post('api/pda/login', {
  username: user,
  password: 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': '操作成功！'
-//   }
-//   return res
-// }

 // 手持登陆查询菜单权限
 export const authority = (id) => post('api/pda/authority', {
@@ -59,36 +15,17 @@ export const authority = (id) => post('api/pda/authority', {
 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'}]
-//   }
-//   return res
-// }
+
 // 根据区域查询点位
 export const pdaPoint = (func, code) => post('api/pda/point', {
  func: func,
  region_code: code
 })
-// 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'}]
-//   }
-//   return res
-// }

 // 查询载具类型
 export const pdavehicleType = (func) => post('api/pda/vehicleType', {
@@ -177,10 +114,24 @@ export const ExceptionHandlingTask = (id, point) => post('api/pda/manual/Excepti
 // 混碾位置下拉框
 export const getMixingPointList = () => post('api/pda/manual/getMixingPointList', {})
 // 混碾人工任务列表
-export const getMixingTaskList = () => post('/api/pda/manual/getMixingTaskList', {})
+export const getMixingTaskList = () => post('api/pda/manual/getMixingTaskList', {})
 // 确认
 export const mixingMoveTask = (point, code, weight) => post('api/pda/manual/mixingMoveTask', {
  point_code: point,
  vehicle_code: code,
  weight: weight
 })
+/**
+ * 压机料盅转移
+ */
+// 起点终点下拉框
+export const transferPositionList = () => post('api/pda/manual/transfer/positionList', {})
+// 料盅转移任务列表
+export const transferTaskShow = () => post('api/pda/manual/transfer/taskShow', {})
+// 确认
+export const transferCreateTask = (sp, ep, code, is) => post('api/pda/manual/transfer/createTask', {
+  start_point: sp,
+  end_point: ep,
+  vehicle_code: code,
+  is_age: is
+})
--- a/src/config/mork2.js
+++ b/src/config/mork2.js
@@ -1,3 +1,68 @@
+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': '操作成功！'
+  }
+  return res
+}
+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'}]
+  }
+  return res
+}
+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) => {
+  let res = {
+    code: '1',
+    result: [{device_code: '1', device_name: 'aa'}, {device_code: '2', device_name: 'bb'}, {device_code: '3', device_name: 'cc'}]
+  }
+  return res
+}
 export const ExceptionHandlingRegionList = () => {
  let res = {'result': [{'region_name': '混料区', 'region_code': 'HL'}, {'region_name': '压制区', 'region_code': 'YZ'}, {'region_name': '分拣区', 'region_code': 'FJ'}], 'code': '1', 'desc': '操作成功！'}
  return res
@@ -26,3 +91,15 @@ export const mixingMoveTask = () => {
  let res = {code: '1', desc: 'ok'}
  return res
 }
+export const transferPositionList = () => {
+  let res = {'result': [{'point_name': '压机1下料位1', 'point_code': 'YJ01XL01'}, {'point_name': '压机1下料位2', 'point_code': 'YJ01XL02'}, {'point_name': '压机2下料位1', 'point_code': 'YJ02XL01'}, {'point_name': '压机2下料位2', 'point_code': 'YJ02XL02'}, {'point_name': '压机3下料位1', 'point_code': 'YJ03XL01'}, {'point_name': '压机3下料位2', 'point_code': 'YJ03XL02'}, {'point_name': '压机4下料位1', 'point_code': 'YJ04XL01'}, {'point_name': '压机4下料位2', 'point_code': 'YJ04XL02'}, {'point_name': '压机5下料位1', 'point_code': 'YJ05XL01'}, {'point_name': '压机5下料位2', 'point_code': 'YJ05XL02'}, {'point_name': '压机6下料位1', 'point_code': 'YJ06XL01'}, {'point_name': '压机6下料位2', 'point_code': 'YJ06XL02'}, {'point_name': '压机7下料位1', 'point_code': 'YJ07XL01'}, {'point_name': '压机7下料位2', 'point_code': 'YJ07XL02'}, {'point_name': '压机8下料位1', 'point_code': 'YJ08XL01'}, {'point_name': '压机8下料位2', 'point_code': 'YJ08XL02'}, {'point_name': '压机9下料位1', 'point_code': 'YJ09XL01'}, {'point_name': '压机9下料位2', 'point_code': 'YJ09XL02'}, {'point_name': '压机10下料位1', 'point_code': 'YJ10XL01'}, {'point_name': '压机10下料位2', 'point_code': 'YJ10XL02'}, {'point_name': '压机3上料位', 'point_code': 'YJ03SL01'}, {'point_name': '压机4上料位', 'point_code': 'YJ04SL01'}, {'point_name': '压机5上料位', 'point_code': 'YJ05SL01'}, {'point_name': '压机6上料位', 'point_code': 'YJ06SL01'}, {'point_name': '压机7上料位', 'point_code': 'YJ07SL01'}, {'point_name': '压机8上料位', 'point_code': 'YJ08SL01'}, {'point_name': '压机9上料位', 'point_code': 'YJ09SL01'}, {'point_name': '压机10上料位', 'point_code': 'YJ10SL01'}, {'point_name': '次品料对接位1', 'point_code': 'CPLDJ01'}, {'point_name': '次品料对接位2', 'point_code': 'CPLDJ02'}, {'point_name': '次品料对接位3', 'point_code': 'CPLDJ03'}, {'point_name': '次品料对接位4', 'point_code': 'CPLDJ04'}], 'code': '1', 'desc': '操作成功！'}
+  return res
+}
+export const transferTaskShow = () => {
+  let res = {'result': [{'task_name': '手持点对点任务', 'task_status': '4', 'start_point': '压机9上料位', 'end_point': '压机3上料位', 'task_code': '20240515000005', 'vehicle_type': '1', 'task_id': '1790580639942610944', 'vehicle_code': '1222'}], 'code': '1', 'desc': '操作成功！'}
+  return res
+}
+export const transferCreateTask = () => {
+  let res = {code: '1', desc: 'ok'}
+  return res
+}
--- a/src/main.js
+++ b/src/main.js
@@ -14,7 +14,7 @@ import { Dialog, toast } from '@config/mUtils.js'
 import filter from '@config/filter.js'
 import { baseUrl } from '@config/env.js'
 // import Vconsole from 'vconsole'
-import { Select, Option, RadioGroup, Radio } from 'element-ui'
+import { Select, Option, Switch } from 'element-ui'
 import JSEncrypt from 'jsencrypt'

 Vue.prototype._ = _
@@ -32,8 +32,7 @@ for (let k in filter) {
 }
 Vue.use(Select)
 Vue.use(Option)
-Vue.use(RadioGroup)
-Vue.use(Radio)
+Vue.use(Switch)
 // let VConsole = new Vconsole()
 // Vue.use(VConsole)
 Vue.config.productionTip = false
--- a/src/pages/manual/LzTransfer.vue
+++ b/src/pages/manual/LzTransfer.vue
@@ -0,0 +1,154 @@
+<template>
+  <section>
+    <nav-bar title="压机料盅转移"></nav-bar>
+    <section class="content mgt86">
+      <div class="filter-wraper">
+        <div class="bottom-filter-tip">
+          <div class="filter-label">起点位置</div>
+          <div class="fxcol mgl20 visible" >
+            <el-select v-model="value1" filterable placeholder="请选择">
+              <el-option
+                v-for="item in options"
+                :key="item.point_code"
+                :label="item.point_name"
+                :value="item.point_code">
+              </el-option>
+            </el-select>
+          </div>
+        </div>
+        <div class="bottom-filter-tip">
+          <div class="filter-label">终点位置</div>
+          <div class="fxcol mgl20 visible" >
+            <el-select v-model="value2" filterable placeholder="请选择">
+              <el-option
+                v-for="item in options"
+                :key="item.point_code"
+                :label="item.point_name"
+                :value="item.point_code">
+              </el-option>
+            </el-select>
+          </div>
+        </div>
+        <div class="bottom-filter-tip">
+          <div class="filter-label">料盅编码</div>
+          <div class="fxcol mgl20 visible" >
+            <input class="filter-input" type="text" v-model="code" placeholder="请输入编码">
+          </div>
+        </div>
+        <div class="bottom-filter-tip">
+          <div class="filter-label">是否AGV</div>
+          <div class="fxcol mgl20 visible">
+            <el-switch
+              v-model="isAge"
+              active-color="#ffcb4b"
+              inactive-color="#DCDFE6">
+            </el-switch>
+          </div>
+        </div>
+      </div>
+      <div class="zd-row grid_wraper">
+        <div class="left_fixed">
+          <table class="layout-t left_layout_t">
+            <tr>
+              <th>任务号</th>
+            </tr>
+            <tr v-for="(e, i) in dataList" :key="i">
+              <td>{{e.task_code}}</td>
+            </tr>
+          </table>
+        </div>
+        <div class="slide">
+          <table class="layout-t">
+            <tr>
+              <th>任务名</th>
+              <th>状态</th>
+              <th>起点</th>
+              <th>终点</th>
+              <th>载具类型</th>
+              <th>载具号</th>
+            </tr>
+            <tr v-for="(e, i) in dataList" :key="i">
+              <td>{{ e.task_name }}</td>
+              <td>{{e.task_status}}</td>
+              <td>{{e.start_point}}</td>
+              <td>{{e.end_point}}</td>
+              <td>{{e.vehicle_type}}</td>
+              <td>{{e.vehicle_code}}</td>
+            </tr>
+          </table>
+        </div>
+      </div>
+    </section>
+    <section class="submit-bar">
+      <button class="btn submit-button" @click="_transferTaskShow">查询</button>
+      <button class="btn submit-button" :class="{'btn-disabled' : !value1 || !value2 || !code}" :disabled="disabled" @click="_transferCreateTask">确认</button>
+    </section>
+  </section>
+</template>
+
+<script>
+import NavBar from '@components/NavBar.vue'
+import {transferPositionList, transferTaskShow, transferCreateTask} from '@config/getData2'
+export default {
+  name: 'BindPalletPoint',
+  components: {
+    NavBar
+  },
+  data () {
+    return {
+      value1: '',
+      value2: '',
+      options: [],
+      code: '',
+      isAge: false,
+      dataList: [],
+      disabled: false
+    }
+  },
+  created () {
+    this._transferPositionList()
+    this._transferTaskShow()
+  },
+  methods: {
+    /** 查询下拉框 */
+    async _transferPositionList () {
+      let res = await transferPositionList()
+      if (res.code === '1') {
+        this.options = [...res.result]
+      } else {
+        this.Dialog(res.desc)
+      }
+    },
+    /** grid */
+    async _transferTaskShow () {
+      let res = await transferTaskShow()
+      if (res.code === '1') {
+        this.dataList = [...res.result]
+      } else {
+        this.Dialog(res.desc)
+      }
+    },
+    /** 确认 */
+    async _transferCreateTask () {
+      this.disabled = true
+      if (!this.value1 || !this.code || !this.value2) {
+        this.disabled = false
+        return
+      }
+      try {
+        let isage = this.isAge ? '1' : '0'
+        let res = await transferCreateTask(this.value1, this.value2, this.code, isage)
+        if (res.code === '1') {
+          this.toast(res.desc)
+          this._transferTaskShow()
+        } else {
+          this.Dialog(res.desc)
+        }
+        this.disabled = false
+      } catch (e) {
+        this.disabled = false
+      }
+    }
+  }
+}
+</script>
--- a/src/pages/manual/MixMove.vue
+++ b/src/pages/manual/MixMove.vue
@@ -113,8 +113,7 @@ export default {
    /** 确认 */
    async _mixingMoveTask () {
      this.disabled = true
-      if (this.value1 === '' || this.code === '' || this.weight === '') {
-        debugger
+      if (!this.value1 || !this.code || this.weight === '') {
        this.disabled = false
        return
      }
--- a/src/style/common.styl
+++ b/src/style/common.styl
@@ -143,6 +143,9 @@ html,body
 .jccenter {
 	justify-content: center !important;
 }
+.jcflexend {
+	justify-content: flex-end !important;
+}
 .flexwrap {
  flex-wrap: wrap !important;
 }
@@ -457,7 +460,6 @@ header
  _font(.34rem,.54rem,#323232)
 .tip-h2
  _font(.28rem,.5rem,#464646)
-
 /** 提交栏 **/
 .submit-bar
  _fj()