1.上料拖拽

src/main.js

@@ -88,10 +88,6 @@ Vue.use(dataV)
 import VueWorker from 'vue-worker' // Web worker插件
 Vue.use(VueWorker)
 
-//引入composition-api
-// import VueCompositionAPI from '@vue/composition-api'
-// Vue.use(VueCompositionAPI)
-
 // register global utility filters
 Object.keys(filters).forEach(key => {
   Vue.filter(key, filters[key])

src/permission.js

@@ -8,7 +8,7 @@ import getPageTitle from '@/utils/get-page-title'
 
 NProgress.configure({ showSpinner: false }) // NProgress Configuration
 
-const whiteList = ['/menu','/login', '/auth-redirect','/kban','/hbao','/sliao','/sczyjh',] // no redirect whitelist
+const whiteList = ['/menu','/login', '/auth-redirect','/kban','/hbao','/sliao',] // no redirect whitelist
 export function flatRoutes(routes) {
   let ret = [];
   routes.forEach(it => {

src/router/index.js

@@ -53,11 +53,6 @@ export const constantRoutes = [
     component: () => import('@/views/hbao/index'),
     hidden: true
   },
-  {
-    path: '/sczyjh',
-    component: () => import('@/views/sczyjh/index'),
-    hidden: true
-  },
   {
     path: '/kban',
     component: () => import('@/views/kban/index'),

src/views/sczyjh/index.vue

@@ -1,171 +0,0 @@
-<template>
-  <el-container>
-    <el-header style="padding: 15px">
-      <el-form ref="requestForm" :model="request" label-width="85px">
-        <el-row>
-          <el-col :span="3">
-            <el-form-item label="船号:">
-              <vxe-pulldown ref="xDown4" transfer >
-                <template #default>
-                  <vxe-input
-                    v-model="request.dcCh"
-                    placeholder="船号"
-                    style="height: 28px;
-                      line-height: 28px; width: 150px;"
-                    suffix-icon="vxe-icon--search"
-                    @keyup="keyupEvent4"
-                    @focus="focusEvent4"
-                  />
-                </template>
-                <template #dropdown>
-                  <div class="my-dropdown  mytable " style="width: 250px">
-                    <vxe-grid
-                      highlight-hover-row
-                      height="auto"
-                      :data="projectData"
-                      :columns="projectColumns"
-                      @cell-click="cellClickEvent"
-                      show-overflow
-                    >
-                      <template #wgbsEdit="{ row}">
-                        <vxe-checkbox v-model="row.wgbs"  checked-value="Y" unchecked-value="N"   disabled ></vxe-checkbox>
-                      </template>
-                    </vxe-grid>
-                  </div>
-                </template>
-              </vxe-pulldown>
-            </el-form-item>
-          </el-col>
-          <el-col :span="3">
-            <el-form-item label="批量:">
-              <el-input v-model="request.dcPl" type="search" placeholder="批量" ></el-input>
-            </el-form-item>
-          </el-col>
-          <el-col :span="6">
-            <el-col :span="12">
-              <el-form-item label="需求日期:">
-                <el-input v-model="request.form" type="search" placeholder="开始" />
-              </el-form-item>
-            </el-col>
-            <el-col :span="1">
-              <div style="width:100%;text-align:center;line-height: 28px;font-size: 14px">至</div>
-            </el-col>
-            <el-col :span="8">
-              <el-form-item label-width="0px">
-                <el-input v-model="request.to" type="search" placeholder="结束" />
-              </el-form-item>
-            </el-col>
-          </el-col>
-          <el-col :span="12" style="text-align: right">
-            <el-button type="primary" @click="loadData">查询</el-button>
-          </el-col>
-        </el-row>
-      </el-form>
-    </el-header>
-    <el-main>
-      <VxeGrid v-bind="gridOptions" />
-    </el-main>
-  </el-container>
-</template>
-
-<script>
-import {getCzplBase} from "@/api/sjzx/jcsj";
-
-export default {
-  name:'Sczyjh',
-  data(){
-    return{
-      projectData: [],
-      projectColumns:[],
-      request:{
-        dcCh:'',
-        dcPl:'',
-      },
-      gridOptions:{
-        border: true,
-        resizable: true,
-        showOverflow: true,
-        height: 650,
-        align:'center',
-        data:[],
-        columns:[
-          {type: "seq", title: "序号", width: "50"},
-          {field:'dcCh',title:'船号', width: "90",
-            filters: [{ data: { checks: [], sVal: '', sMenu: '', fType1: '', fVal1: '', fMode: 'and', fType2: '', fVal2: '' } }],
-            filterRender: { name: 'FilterCombination', },
-          },
-          {field:'dcPl',title:'批量',width: "90",
-            filters: [{ data: { checks: [], sVal: '', sMenu: '', fType1: '', fVal1: '', fMode: 'and', fType2: '', fVal2: '' } }],
-            filterRender: { name: 'FilterCombination', },
-          },
-          {field:'dcFd',title:'分段',width: "90",
-            filters: [{ data: { checks: [], sVal: '', sMenu: '', fType1: '', fVal1: '', fMode: 'and', fType2: '', fVal2: '' } }],
-            filterRender: { name: 'FilterCombination', },
-          },
-          {field:'kw',title:'跨位',width: "90",
-            filters: [{ data: { checks: [], sVal: '', sMenu: '', fType1: '', fVal1: '', fMode: 'and', fType2: '', fVal2: '' } }],
-            filterRender: { name: 'FilterCombination', },
-          },
-          {field:'zl',title:'组立',width: "90",
-            filters: [{ data: { checks: [], sVal: '', sMenu: '', fType1: '', fVal1: '', fMode: 'and', fType2: '', fVal2: '' } }],
-            filterRender: { name: 'FilterCombination', },
-          },
-          {field:'xzxqrq',title:'小组需求期',width: "90",
-            filters: [{ data: { checks: [], sVal: '', sMenu: '', fType1: '', fVal1: '', fMode: 'and', fType2: '', fVal2: '' } }],
-            filterRender: { name: 'FilterCombination', },
-          },
-          {field:'tlth',title:'套料图号',width: "90",
-            filters: [{ data: { checks: [], sVal: '', sMenu: '', fType1: '', fVal1: '', fMode: 'and', fType2: '', fVal2: '' } }],
-            filterRender: { name: 'FilterCombination', },
-          },
-          {field:'cz',title:'材质',width: "90",
-            filters: [{ data: { checks: [], sVal: '', sMenu: '', fType1: '', fVal1: '', fMode: 'and', fType2: '', fVal2: '' } }],
-            filterRender: { name: 'FilterCombination', },
-          },
-          {field:'wpgg',title:'规格',width: "90",
-            filters: [{ data: { checks: [], sVal: '', sMenu: '', fType1: '', fVal1: '', fMode: 'and', fType2: '', fVal2: '' } }],
-            filterRender: { name: 'FilterCombination', },
-          },
-          {field:'',title:'重量',width: "90",
-            filters: [{ data: { checks: [], sVal: '', sMenu: '', fType1: '', fVal1: '', fMode: 'and', fType2: '', fVal2: '' } }],
-            filterRender: { name: 'FilterCombination', },
-          },
-          {field:'',title:'划线长度',width: "90",
-            filters: [{ data: { checks: [], sVal: '', sMenu: '', fType1: '', fVal1: '', fMode: 'and', fType2: '', fVal2: '' } }],
-            filterRender: { name: 'FilterCombination', },
-          },
-        ]
-      }
-    }
-  },
-  created(){
-    this.initProject()
-  },
-  methods:{
-    loadData(){
-
-    },
-    initProject(){
-      getCzplBase({}).then(res=>{
-        this.projectData=res.data.cbbm
-        this.projectData1=res.data.cbbm
-      })
-    },
-    cellClickEvent({row}){
-      this.request.dcCh = row.cbbm
-      this.$refs.xDown4.hidePanel()
-    },
-    focusEvent4(){
-      this.$refs.xDown4.showPanel()
-    },
-    keyupEvent4(){
-      if (this.request.dcCh) {
-        this.projectData = this.projectData1.filter(row => row.cbbm.indexOf(this.request.dcCh.toUpperCase()) > -1)
-      } else {
-        this.projectData = this.projectData1.slice(0)
-      }
-    },
-  }
-}
-
-</script>

src/views/sliao/draw.js

@@ -9,7 +9,7 @@ const sliao=function (options){
   }
   function drawTitle(){
     return new Konva.Text({
-      x:15,
+      x:0,
       y:8,
       width:width-30,
       height:20,