人工压制上料

src/config/getData2.js

@@ -135,3 +135,16 @@ export const transferCreateTask = (sp, ep, code, is) => post('api/pda/manual/tra
   vehicle_code: code,
   is_age: is
 })
+/**
+ * 人工压制上料
+ */
+// 起点下拉框
+export const suppressStartPointList = () => post('api/pda/manual/suppress/startPointList', {})
+// 压制送料任务列表
+export const suppressTaskShow = () => post('api/pda/manual/suppress/taskShow', {})
+// 确认
+export const suppressCreateTask = (sp, ep, code) => post('api/pda/manual/suppress/createTask', {
+  start_point: sp,
+  end_point: ep,
+  vehicle_code: code
+})

src/config/mork2.js

@@ -103,3 +103,17 @@ export const transferCreateTask = () => {
   let res = {code: '1', desc: 'ok'}
   return res
 }
+export const suppressStartPointList = () => {
+  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 suppressTaskShow = () => {
+  let res = {'result': [{'task_name': '人工布料机上料', 'task_status': '7', 'start_point': '困料虚拟库', 'end_point': '压机3上料位', 'task_code': '20240515000006', 'vehicle_type': '1', 'task_id': '1790612954789974016', 'vehicle_code': '1222'}, {'task_name': '人工布料机上料'}, {'task_name': '人工布料机上料'}, {'task_name': '人工布料机上料'}, {'task_name': '人工布料机上料'}, {'task_name': '人工布料机上料'}, {'task_name': '人工布料机上料'}, {'task_name': '人工布料机上料'}, {'task_name': '人工布料机上料'}, {'task_name': '人工布料机上料'}, {'task_name': '人工布料机上料'}, {'task_name': '人工布料机上料'}, {'task_name': '人工布料机上料'}, {'task_name': '人工布料机上料'}, {'task_name': '人工布料机上料'}, {'task_name': '人工布料机上料'}, {'task_name': '人工布料机上料'}, {'task_name': '人工布料机上料'}, {'task_name': '人工布料机上料'}, {'task_name': '人工布料机上料'}, {'task_name': '人工布料机上料'}, {'task_name': '人工布料机上料'}, {'task_name': '人工布料机上料'}, {'task_name': 'ffff'}], 'code': '1', 'desc': '操作成功！'}
+  return res
+}
+// 确认
+export const suppressCreateTask = () => {
+  let res = {code: '1', desc: 'ok'}
+  return res
+}

src/pages/manual/ExceptionHand.vue

@@ -1,7 +1,7 @@
 <template>
   <section>
     <nav-bar title="人工异常处理"></nav-bar>
-    <section class="content mgt86">
+    <section class="content mgt86 mgb110">
       <div class="filter-wraper">
         <div class="bottom-filter-tip">
           <div class="filter-label">区域</div>

src/pages/manual/LzTransfer.vue

@@ -1,7 +1,7 @@
 <template>
   <section>
     <nav-bar title="压机料盅转移"></nav-bar>
-    <section class="content mgt86">
+    <section class="content mgt86 mgb110">
       <div class="filter-wraper">
         <div class="bottom-filter-tip">
           <div class="filter-label">起点位置</div>

src/pages/manual/MixMove.vue

@@ -1,7 +1,7 @@
 <template>
   <section>
     <nav-bar title="人工混碾搬运"></nav-bar>
-    <section class="content mgt86">
+    <section class="content mgt86 mgb110">
       <div class="filter-wraper">
         <div class="bottom-filter-tip">
           <div class="filter-label">起点位置</div>

src/pages/manual/Suppress.vue

@@ -0,0 +1,154 @@
+<template>
+  <section>
+    <nav-bar title="人工压制上料"></nav-bar>
+    <section class="content mgt86 mgb110">
+      <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 clearable placeholder="请选择">
+              <el-option
+                v-for="item in options1"
+                :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 clearable placeholder="请选择">
+              <el-option
+                v-for="item in options2"
+                :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>
+      <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="_suppressTaskShow">查询</button>
+      <button class="btn submit-button" :class="{'btn-disabled' : !value1 || !value2 || !code}" :disabled="disabled" @click="_suppressCreateTask">确认</button>
+    </section>
+  </section>
+</template>
+
+<script>
+import NavBar from '@components/NavBar.vue'
+import {suppressStartPointList, transferPositionList, suppressTaskShow, suppressCreateTask} from '@config/mork2'
+export default {
+  name: 'BindPalletPoint',
+  components: {
+    NavBar
+  },
+  data () {
+    return {
+      value1: '',
+      options1: [],
+      value2: '',
+      options2: [],
+      code: '',
+      isAge: false,
+      dataList: [],
+      disabled: false
+    }
+  },
+  created () {
+    this._suppressStartPointList()
+    this._transferPositionList()
+    this._suppressTaskShow()
+  },
+  methods: {
+    /** 查询起点下拉框 */
+    async _suppressStartPointList () {
+      let res = await suppressStartPointList()
+      if (res.code === '1') {
+        this.options1 = [...res.result]
+      } else {
+        this.Dialog(res.desc)
+      }
+    },
+    /** 查询终点下拉框 */
+    async _transferPositionList () {
+      let res = await transferPositionList()
+      if (res.code === '1') {
+        this.options2 = [...res.result]
+      } else {
+        this.Dialog(res.desc)
+      }
+    },
+    /** grid */
+    async _suppressTaskShow () {
+      let res = await suppressTaskShow()
+      if (res.code === '1') {
+        this.dataList = [...res.result]
+      } else {
+        this.Dialog(res.desc)
+      }
+    },
+    /** 确认 */
+    async _suppressCreateTask () {
+      this.disabled = true
+      if (!this.value1 || !this.code || !this.value2) {
+        this.disabled = false
+        return
+      }
+      try {
+        let res = await suppressCreateTask(this.value1, this.value2, this.code)
+        if (res.code === '1') {
+          this.toast(res.desc)
+          this._suppressTaskShow()
+        } else {
+          this.Dialog(res.desc)
+        }
+        this.disabled = false
+      } catch (e) {
+        this.disabled = false
+      }
+    }
+  }
+}
+</script>

src/pages/proj/TaskManage.vue

@@ -1,7 +1,7 @@
 <template>
   <section>
     <nav-bar title="任务管理"></nav-bar>
-    <section class="content mgt86 grid-wraper">
+    <section class="content mgt86 mgb110 grid-wraper">
       <div class="left_fixed">
         <table class="layout-t left_layout_t">
           <tr>