diff --git a/package.json b/package.json index b7be231..7dac52d 100644 --- a/package.json +++ b/package.json @@ -6,6 +6,7 @@ "scripts": { "dev": "vue-cli-service serve", "local": "vue-cli-service serve --mode local", + "server": "vue-cli-service serve --mode server", "lint": "eslint --ext .js,.vue src", "build:test": "vue-cli-service build --mode test", "build:prod": "vue-cli-service build", @@ -68,6 +69,7 @@ "@vue/cli-plugin-eslint": "4.4.4", "@vue/cli-plugin-unit-jest": "4.4.4", "@vue/cli-service": "4.4.4", + "@vue/composition-api": "^1.7.2", "@vue/test-utils": "1.0.0-beta.29", "autoprefixer": "9.5.1", "babel-eslint": "10.1.0", diff --git a/pnpm-lock.yaml b/pnpm-lock.yaml index 435577f..fcc1b3b 100644 --- a/pnpm-lock.yaml +++ b/pnpm-lock.yaml @@ -148,6 +148,9 @@ devDependencies: '@vue/cli-service': specifier: 4.4.4 version: 4.4.4(babel-core@7.0.0-bridge.0)(less-loader@5.0.0)(sass-loader@8.0.2)(vue-template-compiler@2.6.10) + '@vue/composition-api': + specifier: ^1.7.2 + version: 1.7.2(vue@2.6.10) '@vue/test-utils': specifier: 1.0.0-beta.29 version: 1.0.0-beta.29(vue-template-compiler@2.6.10)(vue@2.6.10) @@ -2480,6 +2483,14 @@ packages: - whiskers dev: true + /@vue/composition-api@1.7.2(vue@2.6.10): + resolution: {integrity: sha512-M8jm9J/laYrYT02665HkZ5l2fWTK4dcVg3BsDHm/pfz+MjDYwX+9FUaZyGwEyXEDonQYRCo0H7aLgdklcIELjw==} + peerDependencies: + vue: '>= 2.5 < 2.7' + dependencies: + vue: 2.6.10 + dev: true + /@vue/preload-webpack-plugin@1.1.2(html-webpack-plugin@3.2.0)(webpack@4.46.0): resolution: {integrity: sha512-LIZMuJk38pk9U9Ur4YzHjlIyMuxPlACdBIHH9/nGYVTsaGKOSnSuELiE8vS9wa+dJpIYspYUOqk+L1Q4pgHQHQ==} engines: {node: '>=6.0.0'} diff --git a/src/main.js b/src/main.js index 0d21c8f..7e2803f 100644 --- a/src/main.js +++ b/src/main.js @@ -88,6 +88,10 @@ 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]) diff --git a/src/permission.js b/src/permission.js index eb25bd8..860d610 100644 --- a/src/permission.js +++ b/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','/sczyjh','/zyjh'] // no redirect whitelist export function flatRoutes(routes) { let ret = []; routes.forEach(it => { diff --git a/src/router/index.js b/src/router/index.js index a5f2ee2..89ab62c 100644 --- a/src/router/index.js +++ b/src/router/index.js @@ -43,6 +43,11 @@ export const constantRoutes = [ } ] }, + { + path: '/zyjh', + component: () => import('@/views/jhzxgl/zyjh/index.vue'), + hidden: true + }, { path: '/hbao', component: () => import('@/views/hbao/index'), diff --git a/src/views/jhzxgl/zyjh/comps/head.vue b/src/views/jhzxgl/zyjh/comps/head.vue new file mode 100644 index 0000000..7a79217 --- /dev/null +++ b/src/views/jhzxgl/zyjh/comps/head.vue @@ -0,0 +1,112 @@ + + + diff --git a/src/views/jhzxgl/zyjh/index.js b/src/views/jhzxgl/zyjh/index.js new file mode 100644 index 0000000..a217b4c --- /dev/null +++ b/src/views/jhzxgl/zyjh/index.js @@ -0,0 +1,98 @@ + +export default function () { + const options={ + height:700, + align:'center', + border: true, + resizable: true, + showOverflow: true, + data:[] + } + const columns = [ + { type: 'seq',title:'序号', width: 60 }, + {field: 'dcCh', title: '船号', width: 120}, + {field: 'dcPl', title: '批量', width: 120}, + {field: 'dcFd', title: '分段', width: 120}, + {field: 'zl', title: '组立', width: 120}, + {field: 'kw', title: '跨位', width: 120}, + {field: 'tzbh', title: '套料图号', width: 120}, + {field: '', title: '材质', width: 120}, + {field: '', title: '规格', width: 120}, + {field: '', title: '炉批号', width: 120}, + {field: '', title: '小组需求期', width: 120}, + {field: '', title: '大组需求期', width: 120}, + + {field: '', title: '上料计划日期', width: 120}, + {field: '', title: '预处理垛位', width: 120}, + {field: '', title: '层数', width: 120}, + {field: '', title: '派工人', width: 120}, + {field: '', title: '施工人', width: 120}, + {field: '', title: '派工时间', width: 120}, + {field: '', title: '反馈人', width: 120}, + {field: '', title: '反馈时间', width: 120}, + {field: '', title: '备注', width: 120}, + + {field: '', title: '抛丸计划日期', width: 120}, + {field: '', title: '取自预处理垛位', width: 120}, + {field: '', title: '取自层数', width: 120}, + {field: '', title: '派工人', width: 120}, + {field: '', title: '施工人', width: 120}, + {field: '', title: '派工时间', width: 120}, + {field: '', title: '反馈人', width: 120}, + {field: '', title: '反馈时间', width: 120}, + {field: '', title: '备注', width: 120}, + + {field: '', title: '划线计划日期', width: 120}, + {field: '', title: '取自理料垛位', width: 120}, + {field: '', title: '取自层数', width: 120}, + {field: '', title: '派工人', width: 120}, + {field: '', title: '施工人', width: 120}, + {field: '', title: '派工时间', width: 120}, + {field: '', title: '划线长度', width: 120}, + {field: '', title: '反馈人', width: 120}, + {field: '', title: '反馈时间', width: 120}, + {field: '', title: '备注', width: 120}, + {field: '', title: '是否借用', width: 120}, + {field: '', title: '借用船号', width: 120}, + {field: '', title: '借用批量', width: 120}, + {field: '', title: '借用分段', width: 120}, + {field: '', title: '借用组立', width: 120}, + {field: '', title: '借用跨位', width: 120}, + {field: '', title: '借用套料图号', width: 120}, + + {field: '', title: '切割计划日期', width: 120}, + {field: '', title: '取自理料垛位', width: 120}, + {field: '', title: '取自层数', width: 120}, + {field: '', title: '派工人', width: 120}, + {field: '', title: '施工人', width: 120}, + {field: '', title: '派工时间', width: 120}, + {field: '', title: '切割长度', width: 120}, + {field: '', title: '反馈人', width: 120}, + {field: '', title: '反馈时间', width: 120}, + {field: '', title: '备注', width: 120}, + {field: '', title: '是否借用', width: 120}, + {field: '', title: '借用船号', width: 120}, + {field: '', title: '借用批量', width: 120}, + {field: '', title: '借用分段', width: 120}, + {field: '', title: '借用组立', width: 120}, + {field: '', title: '借用跨位', width: 120}, + {field: '', title: '借用套料图号', width: 120}, + + {field: '', title: '再处理计划日期', width: 120}, + {field: '', title: '曲加工标识', width: 120}, + {field: '', title: '坡口标识', width: 120}, + {field: '', title: '型材标识', width: 120}, + {field: '', title: '备注', width: 120}, + + {field: '', title: '配盘计划日期', width: 120}, + {field: '', title: '托盘表号', width: 120}, + {field: '', title: '预摆放位置', width: 120}, + {field: '', title: '预摆放层数', width: 120}, + {field: '', title: '备注', width: 120}, + ] + + return { + options, + columns, + } +} diff --git a/src/views/jhzxgl/zyjh/index.vue b/src/views/jhzxgl/zyjh/index.vue new file mode 100644 index 0000000..680d8f0 --- /dev/null +++ b/src/views/jhzxgl/zyjh/index.vue @@ -0,0 +1,39 @@ + + + diff --git a/src/views/sliao/_index.vue b/src/views/sliao/_index.vue new file mode 100644 index 0000000..65d2a8c --- /dev/null +++ b/src/views/sliao/_index.vue @@ -0,0 +1,453 @@ + + + + + diff --git a/src/views/sliao/draw.js b/src/views/sliao/draw.js new file mode 100644 index 0000000..093027b --- /dev/null +++ b/src/views/sliao/draw.js @@ -0,0 +1,29 @@ +import Konva from "konva"; + +const sliao=function (options){ + const width=options.width||window.innerWidth + const height=options.width||window.innerHeight + + const slOption={ + title:'上 料 作 业 区' + } + function drawTitle(){ + return new Konva.Text({ + x:15, + y:8, + width:width-30, + height:20, + lineHeight:1, + stroke:'blue', + strokeWidth:2, + text:slOption.title, + align:'center', + fontSize:32, + }) + } + return { + drawTitle + } +} + +export default sliao diff --git a/src/views/sliao/index.vue b/src/views/sliao/index.vue index 65d2a8c..caa0691 100644 --- a/src/views/sliao/index.vue +++ b/src/views/sliao/index.vue @@ -1,444 +1,419 @@ @@ -447,7 +422,7 @@ export default { background: #ddd; overflow: hidden; width: 100%; - height:100vh; + height: 100vh; aspect-ratio: 16/9; } diff --git a/src/views/sliao/sliao.worker.js b/src/views/sliao/sliao.worker.js index 9771e1c..c7a65fe 100644 --- a/src/views/sliao/sliao.worker.js +++ b/src/views/sliao/sliao.worker.js @@ -22,6 +22,7 @@ //*.work.js onmessage = (e)=>{ + console.log(1234) const {data}=e console.log(data) postMessage(data)