新增看板

Merge pull request 'update' (#13 ) from gtz into master
Reviewed-on: #13
2022-07-04 10:51:20 +08:00 · 2022-03-19 11:51:24 +08:00 · 2022-03-19 11:48:15 +08:00 · 2022-03-18 15:18:10 +08:00
51 changed files with 469 additions and 39 deletions
--- a/config/index.js
+++ b/config/index.js
@ -1,8 +1,8 @@
 /*
 * @Author: gtz
 * @Date: 2021-11-19 10:10:51
- * @LastEditors: gtz
- * @LastEditTime: 2022-03-05 16:16:24
+ * @LastEditors: zwq
+ * @LastEditTime: 2022-07-01 11:05:12
 * @Description: file content
 * @FilePath: \mt-qj-wms-ui\config\index.js
 */
@ -22,7 +22,7 @@ module.exports = {
    // 代理列表, 是否开启代理通过[./dev.env.js]配置
    proxyTable: devEnv.OPEN_PROXY === false ? {} : {
      '/proxyApi': {
-        target: 'http://192.168.1.66:8080',
+        target: 'http://192.168.1.7:8080',
        changeOrigin: true,
        pathRewrite: {
          '^/proxyApi': '/api'
@ -31,7 +31,7 @@ module.exports = {
    },

    // Various Dev Server settings
-    host: '0.0.0.0', // can be overwritten by process.env.HOST
+    host: 'localhost', // can be overwritten by process.env.HOST
    port: 8001, // can be overwritten by process.env.PORT, if port is in use, a free one will be determined
    autoOpenBrowser: true,
    errorOverlay: true,
--- a/package-lock.json
+++ b/package-lock.json
@ -5593,12 +5593,14 @@
        "balanced-match": {
          "version": "1.0.0",
          "bundled": true,
-          "dev": true
+          "dev": true,
+          "optional": true
        },
        "brace-expansion": {
          "version": "1.1.11",
          "bundled": true,
          "dev": true,
+          "optional": true,
          "requires": {
            "balanced-match": "^1.0.0",
            "concat-map": "0.0.1"
@ -5613,17 +5615,20 @@
        "code-point-at": {
          "version": "1.1.0",
          "bundled": true,
-          "dev": true
+          "dev": true,
+          "optional": true
        },
        "concat-map": {
          "version": "0.0.1",
          "bundled": true,
-          "dev": true
+          "dev": true,
+          "optional": true
        },
        "console-control-strings": {
          "version": "1.1.0",
          "bundled": true,
-          "dev": true
+          "dev": true,
+          "optional": true
        },
        "core-util-is": {
          "version": "1.0.2",
@ -5740,7 +5745,8 @@
        "inherits": {
          "version": "2.0.3",
          "bundled": true,
-          "dev": true
+          "dev": true,
+          "optional": true
        },
        "ini": {
          "version": "1.3.5",
@ -5752,6 +5758,7 @@
          "version": "1.0.0",
          "bundled": true,
          "dev": true,
+          "optional": true,
          "requires": {
            "number-is-nan": "^1.0.0"
          }
@ -5766,6 +5773,7 @@
          "version": "3.0.4",
          "bundled": true,
          "dev": true,
+          "optional": true,
          "requires": {
            "brace-expansion": "^1.1.7"
          }
@ -5773,12 +5781,14 @@
        "minimist": {
          "version": "0.0.8",
          "bundled": true,
-          "dev": true
+          "dev": true,
+          "optional": true
        },
        "minipass": {
          "version": "2.3.5",
          "bundled": true,
          "dev": true,
+          "optional": true,
          "requires": {
            "safe-buffer": "^5.1.2",
            "yallist": "^3.0.0"
@ -5797,6 +5807,7 @@
          "version": "0.5.1",
          "bundled": true,
          "dev": true,
+          "optional": true,
          "requires": {
            "minimist": "0.0.8"
          }
@ -5877,7 +5888,8 @@
        "number-is-nan": {
          "version": "1.0.1",
          "bundled": true,
-          "dev": true
+          "dev": true,
+          "optional": true
        },
        "object-assign": {
          "version": "4.1.1",
@ -5889,6 +5901,7 @@
          "version": "1.4.0",
          "bundled": true,
          "dev": true,
+          "optional": true,
          "requires": {
            "wrappy": "1"
          }
@ -6010,6 +6023,7 @@
          "version": "1.0.2",
          "bundled": true,
          "dev": true,
+          "optional": true,
          "requires": {
            "code-point-at": "^1.0.0",
            "is-fullwidth-code-point": "^1.0.0",
--- a/src/assets/img/board/1.png
+++ b/src/assets/img/board/1.png
--- a/src/assets/img/board/2.png
+++ b/src/assets/img/board/2.png
--- a/src/assets/img/board/lu/BMA1.png
+++ b/src/assets/img/board/lu/BMA1.png
--- a/src/assets/img/board/lu/BMA2.png
+++ b/src/assets/img/board/lu/BMA2.png
--- a/src/assets/img/board/lu/BMA3.png
+++ b/src/assets/img/board/lu/BMA3.png
--- a/src/assets/img/board/lu/BMA4.png
+++ b/src/assets/img/board/lu/BMA4.png
--- a/src/assets/img/board/lu/BMB1.png
+++ b/src/assets/img/board/lu/BMB1.png
--- a/src/assets/img/board/lu/BMB2.png
+++ b/src/assets/img/board/lu/BMB2.png
--- a/src/assets/img/board/lu/BMB3.png
+++ b/src/assets/img/board/lu/BMB3.png
--- a/src/assets/img/board/lu/BMC1.png
+++ b/src/assets/img/board/lu/BMC1.png
--- a/src/assets/img/board/lu/BMC2.png
+++ b/src/assets/img/board/lu/BMC2.png
--- a/src/assets/img/board/lu/BMC3.png
+++ b/src/assets/img/board/lu/BMC3.png
--- a/src/assets/img/board/lu/BMC4.png
+++ b/src/assets/img/board/lu/BMC4.png
--- a/src/assets/img/board/lu/BMD
+++ b/src/assets/img/board/lu/BMD
--- a/src/icons/svg/icon-侧边收纳.svg
+++ b/src/icons/svg/icon-侧边收纳.svg
@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <svg width="20px" height="18px" viewBox="0 0 20 18" version="1.1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink">
    <!-- Generator: Sketch 60 (88103) - https://sketch.com -->
-    <title>outdent</title>
+    <title></title>
    <desc>Created with Sketch.</desc>
    <g id="登录页面" stroke="none" stroke-width="1" fill="none" fill-rule="evenodd" opacity="0.649999976">
        <g id="进工业炉加工_录入托盘标识卡信息" transform="translate(-370.000000, -23.000000)" fill="#000000" fill-rule="nonzero">
--- a/src/icons/svg/icon-出库.svg
+++ b/src/icons/svg/icon-出库.svg
@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <svg width="18px" height="18px" viewBox="0 0 18 18" version="1.1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink">
    <!-- Generator: Sketch 60 (88103) - https://sketch.com -->
-    <title>出库on</title>
+    <title>出库</title>
    <desc>Created with Sketch.</desc>
    <defs>
        <linearGradient x1="50%" y1="-35.9917859%" x2="50%" y2="100%" id="linearGradient-1">
--- a/src/icons/svg/icon-总电流.svg
+++ b/src/icons/svg/icon-总电流.svg
@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <svg width="22px" height="22px" viewBox="0 0 22 22" version="1.1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink">
    <!-- Generator: Sketch 60 (88103) - https://sketch.com -->
-    <title>编组 13</title>
+    <title>总电流</title>
    <desc>Created with Sketch.</desc>
    <g id="登录页面" stroke="none" stroke-width="1" fill="none" fill-rule="evenodd">
        <g id="能源管理/用能源分析" transform="translate(-385.000000, -370.000000)" fill-rule="nonzero">
--- a/src/icons/svg/icon-总电量.svg
+++ b/src/icons/svg/icon-总电量.svg
@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <svg width="22px" height="22px" viewBox="0 0 22 22" version="1.1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink">
    <!-- Generator: Sketch 60 (88103) - https://sketch.com -->
-    <title>编组 7</title>
+    <title>总电量</title>
    <desc>Created with Sketch.</desc>
    <g id="登录页面" stroke="none" stroke-width="1" fill="none" fill-rule="evenodd">
        <g id="能源管理/用能源分析" transform="translate(-385.000000, -239.000000)">
--- a/src/icons/svg/icon-新建.svg
+++ b/src/icons/svg/icon-新建.svg
@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <svg width="14px" height="14px" viewBox="0 0 14 14" version="1.1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink">
    <!-- Generator: Sketch 60 (88103) - https://sketch.com -->
-    <title>Shape</title>
+    <title>新建</title>
    <desc>Created with Sketch.</desc>
    <g id="登录页面" stroke="none" stroke-width="1" fill="none" fill-rule="evenodd">
        <g id="进工业炉加工_录入托盘标识卡信息" transform="translate(-1840.000000, -90.000000)" fill="#FFFFFF">
--- a/src/icons/svg/icon-日历.svg
+++ b/src/icons/svg/icon-日历.svg
@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <svg width="14px" height="12px" viewBox="0 0 14 12" version="1.1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink">
    <!-- Generator: Sketch 60 (88103) - https://sketch.com -->
-    <title>编组</title>
+    <title>日历</title>
    <desc>Created with Sketch.</desc>
    <g id="组件" stroke="none" stroke-width="1" fill="none" fill-rule="evenodd" fill-opacity="0.5">
        <g id="select/时间_开始" transform="translate(-194.000000, -9.000000)" fill="#000000">
--- a/src/icons/svg/icon-用户名更多.svg
+++ b/src/icons/svg/icon-用户名更多.svg
@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <svg width="11px" height="6px" viewBox="0 0 11 6" version="1.1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink">
    <!-- Generator: Sketch 60 (88103) - https://sketch.com -->
-    <title>箭头 右</title>
+    <title>更多</title>
    <desc>Created with Sketch.</desc>
    <g id="登录页面" stroke="none" stroke-width="1" fill="none" fill-rule="evenodd">
        <g id="进工业炉加工_录入托盘标识卡信息" transform="translate(-1882.000000, -29.000000)" fill="#000000" fill-rule="nonzero">
--- a/src/icons/svg/icon-维护开始.svg
+++ b/src/icons/svg/icon-维护开始.svg
@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <svg width="15px" height="14px" viewBox="0 0 15 14" version="1.1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink">
    <!-- Generator: Sketch 60 (88103) - https://sketch.com -->
-    <title>编组 33</title>
+    <title>维护开始</title>
    <desc>Created with Sketch.</desc>
    <g id="组件" stroke="none" stroke-width="1" fill="none" fill-rule="evenodd">
        <g id="icon/界面内/维护开始" transform="translate(-1.000000, -1.000000)">
--- a/src/icons/svg/icon-维护结束.svg
+++ b/src/icons/svg/icon-维护结束.svg
@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <svg width="15px" height="14px" viewBox="0 0 15 14" version="1.1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink">
    <!-- Generator: Sketch 60 (88103) - https://sketch.com -->
-    <title>编组 32</title>
+    <title>维护结束</title>
    <desc>Created with Sketch.</desc>
    <g id="组件" stroke="none" stroke-width="1" fill="none" fill-rule="evenodd">
        <g id="icon/界面内/维护结束" transform="translate(-1.000000, -1.000000)">
--- a/src/icons/svg/icon-编辑.svg
+++ b/src/icons/svg/icon-编辑.svg
@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <svg width="14px" height="14px" viewBox="0 0 14 14" version="1.1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink">
    <!-- Generator: Sketch 60 (88103) - https://sketch.com -->
-    <title>常用购票人／编辑32</title>
+    <title>修改</title>
    <desc>Created with Sketch.</desc>
    <g id="组件" stroke="none" stroke-width="1" fill="none" fill-rule="evenodd">
        <g id="icon/界面内/编辑" transform="translate(-1.000000, -1.000000)" fill-rule="nonzero">
--- a/src/icons/svg/icon-设置.svg
+++ b/src/icons/svg/icon-设置.svg
@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <svg width="20px" height="20px" viewBox="0 0 20 20" version="1.1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink">
    <!-- Generator: Sketch 60 (88103) - https://sketch.com -->
-    <title>3.1 设置</title>
+    <title>设置</title>
    <desc>Created with Sketch.</desc>
    <g id="登录页面" stroke="none" stroke-width="1" fill="none" fill-rule="evenodd">
        <g id="进工业炉加工_录入托盘标识卡信息" transform="translate(-1744.000000, -22.000000)" fill="#000000" fill-rule="nonzero">
--- a/src/icons/svg/icon-详情.svg
+++ b/src/icons/svg/icon-详情.svg
@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <svg width="14px" height="12px" viewBox="0 0 14 12" version="1.1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink">
    <!-- Generator: Sketch 60 (88103) - https://sketch.com -->
-    <title>详情备份</title>
+    <title>详情</title>
    <desc>Created with Sketch.</desc>
    <g id="组件" stroke="none" stroke-width="1" fill="none" fill-rule="evenodd">
        <g id="icon/界面内/详情" transform="translate(-1.000000, -2.000000)" fill-rule="nonzero">
--- a/src/icons/svg/icon-进工业炉加工.svg
+++ b/src/icons/svg/icon-进工业炉加工.svg
@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <svg width="20px" height="20px" viewBox="0 0 20 20" version="1.1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink">
    <!-- Generator: Sketch 60 (88103) - https://sketch.com -->
-    <title>生产和加工情况</title>
+    <title>进工业炉加工</title>
    <desc>Created with Sketch.</desc>
    <defs>
        <linearGradient x1="50%" y1="0%" x2="50%" y2="100%" id="linearGradient-1">
--- a/src/icons/svg/icon-追加加工.svg
+++ b/src/icons/svg/icon-追加加工.svg
@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <svg width="22px" height="22px" viewBox="0 0 22 22" version="1.1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink">
    <!-- Generator: Sketch 60 (88103) - https://sketch.com -->
-    <title>编组 15</title>
+    <title>追加加工</title>
    <desc>Created with Sketch.</desc>
    <defs>
        <linearGradient x1="50%" y1="0.100295608%" x2="50%" y2="100%" id="linearGradient-1">
--- a/src/router/index.js
+++ b/src/router/index.js
@ -1,8 +1,8 @@
 /*
 * @Author: zwq
 * @Date: 2021-11-15 08:20:28
- * @LastEditors: gtz
- * @LastEditTime: 2022-03-05 16:05:35
+ * @LastEditors: zwq
+ * @LastEditTime: 2022-07-01 11:11:17
 * @Description:
 */
 /**
@ -39,6 +39,7 @@ const mainRoutes = {
    // 2. iframeUrl: 是否通过iframe嵌套展示内容, '以http[s]://开头': 是, '': 否
    // 提示: 如需要通过iframe嵌套展示内容, 但不通过tab打开, 请自行创建组件使用iframe处理!
    { path: '/home', component: _import('common/home'), name: 'home', meta: { title: '首页', isTab: true } },
+    { path: '/board', component: _import('common/board'), name: 'board', meta: { title: '车间生产看板', isTab: false } },
    { path: '/orderProcess', component: _import('common/order-process'), name: 'orderProcess', meta: { title: '订单加工', isTab: true } },
    { path: '/orderAuto', component: _import('common/order-auto'), name: 'orderAuto', meta: { title: '自动任务', isTab: true } },
    { path: '/exWarehouse', component: _import('common/ex-warehouse'), name: 'exWarehouse', meta: { title: '货物出库', isTab: true } },
--- a/src/views/common/board-part-table.vue
+++ b/src/views/common/board-part-table.vue
@ -0,0 +1,53 @@
+<!--
+ * @Author: zwq
+ * @Date: 2022-03-07 15:31:13
+ * @LastEditors: zwq
+ * @LastEditTime: 2022-07-01 16:58:50
+ * @Description:
+-->
+<template>
+  <div class="main-body">
+    <el-table
+      size='mini'
+      :data="tableData"
+      :header-cell-style="{background:'#082c34',color:'#acb9be',padding:'0px'}"
+      :cell-style="{background:'#04222d',color:'#acb9be',padding:'5px 0px'}"
+      style="width: 100%"
+    >
+      <el-table-column type="index" label="序号" width="30" align="center"> </el-table-column>
+      <el-table-column prop="name" label="客户名称" align="center"> </el-table-column>
+      <el-table-column prop="code" label="订单编号" align="center"> </el-table-column>
+      <el-table-column prop="num" label="数量" width="50" align="center"> </el-table-column>
+      <el-table-column prop="productName" label="产品名称" align="center"> </el-table-column>
+      <el-table-column prop="weight" label="重量" width="50" align="center"> </el-table-column>
+      <el-table-column prop="process" label="加工方式" width="60" align="center"> </el-table-column>
+    </el-table>
+  </div>
+</template>
+
+<script>
+export default {
+  name: 'board-part-table',
+  components: {},
+  props: {
+    tableData: {
+      type: Array,
+      default: []
+    }
+  },
+  data () {
+    return {}
+  },
+  created () {},
+  methods: {}
+}
+</script>
+
+<style lang="scss" scoped>
+.main-body{
+  margin: 5px;
+}
+.main-body /deep/ .cell{
+  padding: 0px;
+}
+</style>
--- a/src/views/common/board-part.vue
+++ b/src/views/common/board-part.vue
@ -0,0 +1,226 @@
+<!--
+ * @Author: zwq
+ * @Date: 2022-03-07 15:31:13
+ * @LastEditors: zwq
+ * @LastEditTime: 2022-07-01 16:58:00
+ * @Description:
+-->
+<template>
+  <div class="container">
+    <div class="title">
+      <div class="tipDiv"></div>
+      加工单信息
+    </div>
+    <div class="main-body">
+      <div class="main-header">
+        <el-row :gutter="8">
+          <el-col :span="8">
+            <div class="front">
+              <img
+                :src="'/static/img/lu/'+imgUrl+'.png'"
+                style="display:block;margin:auto"
+              />炉号
+            </div>
+          </el-col>
+          <el-col :span="8">
+            <el-row>
+              <div class="mid top-info">
+                1293803
+                <div style="color: #fff;margin: 5px 0;">加工单编号</div>
+              </div>
+            </el-row>
+            <el-row>
+              <div class="mid bottom-info">
+                129
+                <div style="color: #fff;margin: 5px 0;">工艺号</div>
+              </div>
+            </el-row>
+          </el-col>
+          <el-col :span="8">
+            <div class="back">
+              <el-progress
+                :percentage="80"
+                :stroke-width="8"
+                :show-text="false"
+              ></el-progress>
+              <div style="margin: 5px 0;">{{ hour }}:{{ minute }}:{{ second }}</div>
+                <div style="color: #fff;font-size:14px">剩余时间</div>
+            </div>
+          </el-col>
+        </el-row>
+      </div>
+      <div class="main-table">
+      <div class="tipDiv"></div>
+      标识信息卡
+      </div>
+      <part-table :tableData="tableData"></part-table>
+    </div>
+  </div>
+</template>
+
+<script>
+import partTable from './board-part-table.vue'
+export default {
+  components: {partTable},
+  props: {
+    tableData: {
+      type: Array,
+      default: () => []
+    },
+    countdown: {
+      type: Object,
+      default: () => ({
+        'hours': 1,
+        'minutes': 10,
+        'seconds': 0
+      })
+    },
+    imgUrl: {
+      type: String,
+      default: 'BMA1'
+    }
+  },
+  data () {
+    return {
+      hours: 1,
+      minutes: 12,
+      seconds: 0
+    }
+  },
+  created () {
+    this.hours = this.countdown.hours
+    this.minutes = this.countdown.minutes
+    this.seconds = this.countdown.seconds
+  },
+  mounted () {
+    this.add()
+  },
+  watch: {
+    // 监听数值变化
+    second: {
+      handler (newVal) {
+        this.num(newVal)
+      }
+    },
+    minute: {
+      handler (newVal) {
+        this.num(newVal)
+      }
+    },
+    hour: {
+      handler (newVal) {
+        this.num(newVal)
+      }
+    }
+  },
+  computed: {
+    // 初始化数据
+    second () {
+      return this.num(this.seconds)
+    },
+    minute () {
+      return this.num(this.minutes)
+    },
+    hour () {
+      return this.num(this.hours)
+    }
+  },
+  methods: {
+    num (n) {
+      return n < 10 ? '0' + n : '' + n
+    },
+    // 倒计时函数
+    add () {
+      let time = window.setInterval(() => {
+        if (this.hours !== 0 && this.minutes === 0 && this.seconds === 0) {
+          this.hours -= 1
+          this.minutes = 59
+          this.seconds = 59
+        } else if (
+          this.hours === 0 &&
+          this.minutes !== 0 &&
+          this.seconds === 0
+        ) {
+          this.minutes -= 1
+          this.seconds = 59
+        } else if (
+          this.hours === 0 &&
+          this.minutes === 0 &&
+          this.seconds === 0
+        ) {
+          this.seconds = 0
+          window.clearInterval(time)
+        } else if (
+          this.hours !== 0 &&
+          this.minutes !== 0 &&
+          this.seconds === 0
+        ) {
+          this.minutes -= 1
+          this.seconds = 59
+        } else {
+          this.seconds -= 1
+        }
+      }, 1000)
+    }
+  }
+}
+</script>
+
+<style lang="scss" scoped>
+.title {
+  color: #ffffff;
+  font-size: 22px;
+  margin: 8px 0;
+  .tipDiv {
+    border-radius: 3px;
+    width: 8px;
+    height: 22px;
+    margin-right: 20px;
+    background-color: #54fdef;
+    float: left;
+  }
+}
+.main-body{
+  background-color: #04242d;
+.main-header {
+  .front {
+    min-height: 136px;
+    border-radius: 4px;
+    padding: 6px;
+    color: #ffffff;
+    text-align: center;
+    background: linear-gradient(to bottom, #133e46 0%, #04202c 100%);
+  }
+  .mid {
+    min-height: 64px;
+    border-radius: 4px;
+    margin-bottom: 5px;
+    padding: 6px;
+    color: #48dcd1;
+    text-align: center;
+    background: linear-gradient(to bottom, #0b2c36 0%, #04202c 100%);
+  }
+  .back {
+    min-height: 136px;
+    padding: 25px 5px;
+    text-align: center;
+    font-size: 30px;
+    color: #48dcd1;
+  }
+  .back /deep/ .el-progress-bar__inner {
+    background: linear-gradient(to right, #62fbb9 0%, #fdd64a 100%);
+  }
+}
+.main-table{
+  color: #ffffff;
+  margin: 10px;
+  .tipDiv{
+    width: 8px;
+    height: 8px;
+    margin: 3px 10px 3px 0;
+    background-color: #54fdef;
+    float: left;
+  }
+}
+}
+</style>
--- a/src/views/common/board.vue
+++ b/src/views/common/board.vue
@ -0,0 +1,128 @@
+<!--
+ * @Author: zwq
+ * @Date: 2022-03-07 15:31:13
+ * @LastEditors: zwq
+ * @LastEditTime: 2022-07-04 10:49:38
+ * @Description:
+-->
+<template>
+  <div class="main-body">
+    <div class="container-title">
+      浙江求精科技车间生产看板
+    </div>
+    <el-row :gutter="20" style="margin:20px">
+      <el-col :span="8">
+        <board :tableData="tableData1" imgUrl='BMA1'></board>
+      </el-col>
+      <el-col :span="8">
+        <board :tableData="tableData2" imgUrl='BMA2' :countdown="countdown"></board>
+      </el-col>
+      <el-col :span="8">
+        <board :tableData="tableData2" imgUrl='BMA3'></board>
+      </el-col>
+    </el-row>
+    <el-row :gutter="20" style="margin:20px">
+      <el-col :span="8">
+        <board :tableData="tableData2" imgUrl='BMA4' :countdown="countdown1"></board>
+      </el-col>
+      <el-col :span="8">
+        <board :tableData="tableData2" imgUrl='BMB1'></board>
+      </el-col>
+      <el-col :span="8">
+        <board :tableData="tableData1" imgUrl='BMB2' :countdown="countdown"></board>
+      </el-col>
+    </el-row>
+    <el-row :gutter="20" style="margin:20px">
+      <el-col :span="8">
+        <board :tableData="tableData2" imgUrl='BMB3' :countdown="countdown"></board>
+      </el-col>
+      <el-col :span="8">
+        <board :tableData="tableData1" imgUrl='BMC1'></board>
+      </el-col>
+      <el-col :span="8">
+        <board :tableData="tableData2" imgUrl='BMC2' :countdown="countdown1"></board>
+      </el-col>
+    </el-row>
+  </div>
+</template>
+
+<script>
+import board from './board-part'
+export default {
+  name: 'Board',
+  components: { board },
+  data () {
+    return {
+      tableData1: [
+        {
+          name: '樟子松',
+          code: '1103434',
+          num: 12,
+          productName: '株洲铁',
+          weight: 123,
+          process: '压缩'
+        },
+        {
+          name: '阿斯蒂芬',
+          code: '1103434',
+          num: 122,
+          productName: '株洲铁',
+          weight: 815,
+          process: '压缩'
+        },
+        {
+          name: '风都',
+          code: '1103434',
+          num: 334,
+          productName: '株洲铁',
+          weight: 1223,
+          process: '压缩'
+        }
+      ],
+      tableData2: [
+        {
+          name: '阿斯蒂芬',
+          code: '1103434',
+          num: 122,
+          productName: '株洲铁',
+          weight: 815,
+          process: '压缩'
+        }
+      ],
+      countdown: {
+        'hours': 5,
+        'minutes': 20,
+        'seconds': 12
+      },
+      countdown1: {
+        'hours': 11,
+        'minutes': 43,
+        'seconds': 56
+      }
+    }
+  },
+  created () {},
+  methods: {}
+}
+</script>
+
+<style lang="scss" scoped>
+.main-body {
+  min-height: 100%;
+  width: 100%;
+  background: url(~@/assets/img/board/1.png) center no-repeat;
+  background-size: cover;
+  overflow: hidden;
+
+  .container-title {
+    width: 100%;
+    height: 80px;
+    background: url(~@/assets/img/board/2.png) no-repeat;
+    background-size: 100% 100%;
+    color: #00fff0;
+    font-size: 28px;
+    line-height: 80px;
+    text-align: center;
+  }
+}
+</style>
--- a/src/views/common/order-auto-submit.vue
+++ b/src/views/common/order-auto-submit.vue
@ -246,7 +246,7 @@
              })
            }
            this.$http({
-              url: this.$http.adornUrl(`currTask/createAutoTask`),
+              url: this.$http.adornUrl(`/currTask/createAutoTask`),
              method: 'post',
              data: this.$http.adornData(requestData)
            }).then(({data}) => {
--- a/src/views/common/order-auto.vue
+++ b/src/views/common/order-auto.vue
@ -289,10 +289,14 @@
      },
      // 弹出提交任务弹窗
      handleSubmit () {
-        this.submitFormVisible = true
-        this.$nextTick(() => {
-          this.$refs.submitForm.init(this.dataList)
-        })
+        if (this.dataList.length) {
+          this.submitFormVisible = true
+          this.$nextTick(() => {
+            this.$refs.submitForm.init(this.dataList)
+          })
+        } else {
+          this.$message.warning('请至少添加一条任务！')
+        }
      },
      handleAutoDetail (id) {
        this.autoDetailVisible = true
--- a/src/views/common/order-process-point.vue
+++ b/src/views/common/order-process-point.vue
@ -12,7 +12,7 @@
    :visible.sync="visible"
  >
    <div class="wareBox" v-for="count in 4" v-bind:key="count" @click="setPoint(count)">
-      <div class="plat">提升平台{{count}}</div>
+      <div class="plat">液压台{{count}}</div>
    </div>
    <span slot="footer" class="dialog-footer">
      <el-button @click="visible = false">取消</el-button>
@ -39,7 +39,7 @@ export default {
    setPoint (count) {
      console.log(count, this.pointType)
      this.visible = false
-      this.$emit('refreshPoint', count, this.pointType)
+      this.$emit('refreshPoint', 'YYT00' + count, this.pointType)
    }
  }
 }
--- a/src/views/common/order-process.vue
+++ b/src/views/common/order-process.vue
@ -15,10 +15,10 @@
      </el-form-item>
      <el-form-item style="margin-left:1%">
        <el-select v-model="startPosition" size="small" placeholder="任务起点位置" clearable>
-          <el-option :value="1" label="提升平台1" />
-          <el-option :value="2" label="提升平台2" />
-          <el-option :value="3" label="提升平台3" />
-          <el-option :value="4" label="提升平台4" />
+          <el-option value="YYT001" label="液压台1" />
+          <el-option value="YYT002" label="液压台2" />
+          <el-option value="YYT003" label="液压台3" />
+          <el-option value="YYT004" label="液压台4" />
        </el-select>
        <!-- <el-button style="margin-left:10px" type="primary" @click="getPoint(0)">{{startPosition}}</el-button> -->
      </el-form-item>
@ -208,7 +208,7 @@
            type: 'warning'
          }).then(() => {
            this.$http({
-              url: this.$http.adornUrl(`currTask/createProcessTask`),
+              url: this.$http.adornUrl(`/currTask/createProcessTask`),
              method: 'post',
              data: this.$http.adornData({
                craftCode: '',
--- a/src/views/main-sidebar.vue
+++ b/src/views/main-sidebar.vue
@ -11,6 +11,10 @@
          <icon-svg name="shouye" class="site-sidebar__menu-icon"></icon-svg>
          <span slot="title">首页</span>
        </el-menu-item>
+        <el-menu-item index="board" @click="$router.push({ name: 'board' })">
+          <icon-svg name="shanchu" class="site-sidebar__menu-icon"></icon-svg>
+          <span slot="title">车间生产看板</span>
+        </el-menu-item>
        <el-submenu index="task">
          <template slot="title">
            <icon-svg name="config" class="site-sidebar__menu-icon"></icon-svg>
--- a/static/img/lu/BMA1.png
+++ b/static/img/lu/BMA1.png
--- a/static/img/lu/BMA2.png
+++ b/static/img/lu/BMA2.png
--- a/static/img/lu/BMA3.png
+++ b/static/img/lu/BMA3.png
--- a/static/img/lu/BMA4.png
+++ b/static/img/lu/BMA4.png
--- a/static/img/lu/BMB1.png
+++ b/static/img/lu/BMB1.png
--- a/static/img/lu/BMB2.png
+++ b/static/img/lu/BMB2.png
--- a/static/img/lu/BMB3.png
+++ b/static/img/lu/BMB3.png
--- a/static/img/lu/BMC1.png
+++ b/static/img/lu/BMC1.png
--- a/static/img/lu/BMC2.png
+++ b/static/img/lu/BMC2.png
--- a/static/img/lu/BMC3.png
+++ b/static/img/lu/BMC3.png
--- a/static/img/lu/BMC4.png
+++ b/static/img/lu/BMC4.png
--- a/static/img/lu/BMD
+++ b/static/img/lu/BMD
Author	SHA1	Message	Date
zwq	3a12063529	新增看板	2022-07-04 10:51:20 +08:00
高天泽	73a729da51	Merge pull request 'update' (#13 ) from gtz into master Reviewed-on: #13	2022-03-19 11:51:24 +08:00
gtz217	34311763b1	update	2022-03-19 11:48:15 +08:00
朱文强	4a5d2824d1	Merge pull request '修改bug' (#12 ) from zwq into master Reviewed-on: #12	2022-03-18 15:18:10 +08:00