Compare commits
32 Commits
zjl
...
ebef126a9e
| Author | SHA1 | Date | |
|---|---|---|---|
| ebef126a9e | |||
| 2304fe94ae | |||
| 8ceb47038d | |||
| ea9fad130c | |||
| 4956f4e0cd | |||
| 42ce5fb67c | |||
| b054cd476a | |||
| dc4e1fd389 | |||
| 6d64016d57 | |||
| 1e06c04ddd | |||
| 37188fe760 | |||
| dead1e5a40 | |||
| 9c6bf70008 | |||
| 194b2f0e0d | |||
| 34d7b8682d | |||
| 6f8f692852 | |||
| c75999ea93 | |||
| 76b88ed75a | |||
| a7b39f3ce1 | |||
| 8dc73bd098 | |||
| 523a9d9767 | |||
| 4aad193bb0 | |||
| 64f4251159 | |||
| 8810012a03 | |||
| c74f27cbf3 | |||
| a9c6dfeb0b | |||
| d775dc7371 | |||
| d3de840af1 | |||
| 6237b3a8f3 | |||
| df8c022982 | |||
| 781877fca5 | |||
| be198b6046 |
7
.dockerignore
Normal file
7
.dockerignore
Normal file
@@ -0,0 +1,7 @@
|
|||||||
|
.vscode/
|
||||||
|
.idea/
|
||||||
|
node_modules/
|
||||||
|
**/*.log
|
||||||
|
LICENSE
|
||||||
|
README.md
|
||||||
|
README.en.md
|
||||||
41
.drone.yml
Normal file
41
.drone.yml
Normal file
@@ -0,0 +1,41 @@
|
|||||||
|
---
|
||||||
|
kind: pipeline
|
||||||
|
type: docker
|
||||||
|
name: default
|
||||||
|
|
||||||
|
steps:
|
||||||
|
- name: build
|
||||||
|
image: docker:dind
|
||||||
|
volumes:
|
||||||
|
- name: dockersock
|
||||||
|
path: /var/run/docker.sock
|
||||||
|
- name: dockerconfig
|
||||||
|
path: /root/.docker
|
||||||
|
commands:
|
||||||
|
- docker build -t harbor.picaiba.com/kszny/mes-ui:1.0.0-tft ./ && docker push harbor.picaiba.com/kszny/mes-ui:1.0.0-tft
|
||||||
|
|
||||||
|
- name: deploy
|
||||||
|
image: harbor.picaiba.com/tools/kubectl:1.19.8
|
||||||
|
commands:
|
||||||
|
- echo "172.27.0.20 lb.kubesphere.local" >> /etc/hosts
|
||||||
|
#- echo "52.74.223.119 github.com" >> /etc/hosts
|
||||||
|
- sleep 1
|
||||||
|
- kubectl scale --replicas=0 deployment/mes-ui -n mes-tft
|
||||||
|
- sleep 3
|
||||||
|
- kubectl scale --replicas=1 deployment/mes-ui -n mes-tft
|
||||||
|
depends_on:
|
||||||
|
- build
|
||||||
|
|
||||||
|
volumes:
|
||||||
|
- name: dockersock
|
||||||
|
host:
|
||||||
|
path: /var/run/docker.sock
|
||||||
|
- name: dockerconfig
|
||||||
|
host:
|
||||||
|
path: /root/.docker
|
||||||
|
|
||||||
|
trigger:
|
||||||
|
branch:
|
||||||
|
- master
|
||||||
|
event:
|
||||||
|
- push
|
||||||
14
Dockerfile
Normal file
14
Dockerfile
Normal file
@@ -0,0 +1,14 @@
|
|||||||
|
#FROM node:12 AS builder
|
||||||
|
#WORKDIR /app
|
||||||
|
#ADD package.json /app/
|
||||||
|
#RUN npm config set registry https://registry.npmmirror.com && npm install
|
||||||
|
#ADD . /app
|
||||||
|
#RUN npm run build
|
||||||
|
#
|
||||||
|
#FROM busybox
|
||||||
|
#LABEL maintainer thomas.hairong@gmail.com
|
||||||
|
#COPY --from=builder /app/dist /html
|
||||||
|
|
||||||
|
FROM busybox
|
||||||
|
LABEL maintainer thomas.hairong@gmail.com
|
||||||
|
COPY dist/ /html
|
||||||
2
dist/index.html
vendored
2
dist/index.html
vendored
@@ -1 +1 @@
|
|||||||
<!doctype html><html lang=""><head><meta charset="utf-8"><meta http-equiv="X-UA-Compatible" content="IE=edge"><meta name="viewport" content="width=device-width,initial-scale=1"><link rel="icon" href="/favicon.ico"><title>tft-mes</title><script defer="defer" src="/js/chunk-vendors.60a1a666.js"></script><script defer="defer" src="/js/app.7970aba0.js"></script><link href="/css/chunk-vendors.330963ff.css" rel="stylesheet"><link href="/css/app.82c5423c.css" rel="stylesheet"></head><body><noscript><strong>We're sorry but tft-mes doesn't work properly without JavaScript enabled. Please enable it to continue.</strong></noscript><div id="app"></div></body></html>
|
<!doctype html><html lang=""><head><meta charset="utf-8"><meta http-equiv="X-UA-Compatible" content="IE=edge"><meta name="viewport" content="width=device-width,initial-scale=1"><link rel="icon" href="/favicon.ico"><title>tft-mes</title><script defer="defer" src="/js/chunk-vendors.60a1a666.js"></script><script defer="defer" src="/js/app.41e2ca26.js"></script><link href="/css/chunk-vendors.330963ff.css" rel="stylesheet"><link href="/css/app.82c5423c.css" rel="stylesheet"></head><body><noscript><strong>We're sorry but tft-mes doesn't work properly without JavaScript enabled. Please enable it to continue.</strong></noscript><div id="app"></div></body></html>
|
||||||
File diff suppressed because one or more lines are too long
File diff suppressed because one or more lines are too long
1
dist/js/4954.5ae1ce52.js
vendored
Normal file
1
dist/js/4954.5ae1ce52.js
vendored
Normal file
File diff suppressed because one or more lines are too long
1
dist/js/6828.3e4b3643.js
vendored
1
dist/js/6828.3e4b3643.js
vendored
File diff suppressed because one or more lines are too long
1
dist/js/6833.635c9e95.js
vendored
1
dist/js/6833.635c9e95.js
vendored
File diff suppressed because one or more lines are too long
File diff suppressed because one or more lines are too long
1
dist/js/8674.4cb564e6.js
vendored
1
dist/js/8674.4cb564e6.js
vendored
File diff suppressed because one or more lines are too long
1
dist/js/8674.7395549d.js
vendored
Normal file
1
dist/js/8674.7395549d.js
vendored
Normal file
File diff suppressed because one or more lines are too long
1
dist/js/app.41e2ca26.js
vendored
Normal file
1
dist/js/app.41e2ca26.js
vendored
Normal file
File diff suppressed because one or more lines are too long
1
dist/js/app.7970aba0.js
vendored
1
dist/js/app.7970aba0.js
vendored
File diff suppressed because one or more lines are too long
@@ -127,14 +127,6 @@ export function unloadPalletUpdate(data) {
|
|||||||
})
|
})
|
||||||
}
|
}
|
||||||
|
|
||||||
export function unloadPalletDelete(data) {
|
|
||||||
return request({
|
|
||||||
url: '/order/unloadPallet/delete',
|
|
||||||
method: 'post',
|
|
||||||
data
|
|
||||||
})
|
|
||||||
}
|
|
||||||
|
|
||||||
// 验证玻璃架id
|
// 验证玻璃架id
|
||||||
export function unloadPalletVerify(data) {
|
export function unloadPalletVerify(data) {
|
||||||
return request({
|
return request({
|
||||||
|
|||||||
@@ -120,6 +120,15 @@ export const routes = [
|
|||||||
},
|
},
|
||||||
component: () => import('../views/productionScheduling/productionData')
|
component: () => import('../views/productionScheduling/productionData')
|
||||||
},
|
},
|
||||||
|
{
|
||||||
|
path: 'offShelfPackaging',
|
||||||
|
name: 'offShelfPackaging',
|
||||||
|
meta: {
|
||||||
|
title: '下架包装'
|
||||||
|
},
|
||||||
|
component: () =>
|
||||||
|
import('../views/productionScheduling/offShelfPackaging')
|
||||||
|
},
|
||||||
{
|
{
|
||||||
path: 'reLaunching',
|
path: 'reLaunching',
|
||||||
name: 'reLaunching',
|
name: 'reLaunching',
|
||||||
@@ -472,16 +481,6 @@ export const routes = [
|
|||||||
},
|
},
|
||||||
component: () =>
|
component: () =>
|
||||||
import('../views/qualityManagement/productTraceability')
|
import('../views/qualityManagement/productTraceability')
|
||||||
},
|
|
||||||
// 2023、8/23要求将下架包装从生成管理换到质量管理
|
|
||||||
{
|
|
||||||
path: 'offShelfPackaging',
|
|
||||||
name: 'offShelfPackaging',
|
|
||||||
meta: {
|
|
||||||
title: '下架包装'
|
|
||||||
},
|
|
||||||
component: () =>
|
|
||||||
import('../views/productionScheduling/offShelfPackaging')
|
|
||||||
}
|
}
|
||||||
]
|
]
|
||||||
},
|
},
|
||||||
|
|||||||
@@ -1,45 +0,0 @@
|
|||||||
<template>
|
|
||||||
<div>
|
|
||||||
<span :style="'color: ' + showColor">{{ injectData.glassRackId }}</span>
|
|
||||||
</div>
|
|
||||||
</template>
|
|
||||||
<script>
|
|
||||||
export default {
|
|
||||||
name: 'innerSpan',
|
|
||||||
props: {
|
|
||||||
injectData: {
|
|
||||||
type: Object,
|
|
||||||
default: () => ({})
|
|
||||||
}
|
|
||||||
},
|
|
||||||
data() {
|
|
||||||
return {
|
|
||||||
showColor: 'green'
|
|
||||||
}
|
|
||||||
},
|
|
||||||
mounted() {
|
|
||||||
this.init()
|
|
||||||
},
|
|
||||||
methods: {
|
|
||||||
init() {
|
|
||||||
switch (this.injectData.status) {
|
|
||||||
case 3:
|
|
||||||
this.showColor = '#37D97F'
|
|
||||||
break
|
|
||||||
case 1:
|
|
||||||
this.showColor = '#FF4E4ED9'
|
|
||||||
break
|
|
||||||
default:
|
|
||||||
this.showColor = '#606266'
|
|
||||||
}
|
|
||||||
}
|
|
||||||
},
|
|
||||||
watch: {
|
|
||||||
injectData(newVal, oldVal) {
|
|
||||||
if (oldVal.enabled !== newVal.enabled) {
|
|
||||||
this.init()
|
|
||||||
}
|
|
||||||
}
|
|
||||||
}
|
|
||||||
}
|
|
||||||
</script>
|
|
||||||
@@ -78,7 +78,6 @@
|
|||||||
<script>
|
<script>
|
||||||
import { tableHeight, timeFormatter } from '@/utils/index'
|
import { tableHeight, timeFormatter } from '@/utils/index'
|
||||||
import { getDetail, glassIdTrace } from '@/api/productionScheduling'
|
import { getDetail, glassIdTrace } from '@/api/productionScheduling'
|
||||||
import InnerSpan from './InnerSpan'
|
|
||||||
const tableProps = [
|
const tableProps = [
|
||||||
{
|
{
|
||||||
prop: 'proLineName',
|
prop: 'proLineName',
|
||||||
@@ -98,8 +97,7 @@ const tableProps = [
|
|||||||
{
|
{
|
||||||
prop: 'glassId',
|
prop: 'glassId',
|
||||||
label: '玻璃ID',
|
label: '玻璃ID',
|
||||||
minWidth: 160,
|
minWidth: 160
|
||||||
subcomponent: InnerSpan
|
|
||||||
},
|
},
|
||||||
{
|
{
|
||||||
prop: 'loadTime',
|
prop: 'loadTime',
|
||||||
|
|||||||
@@ -15,7 +15,7 @@
|
|||||||
<method-btn
|
<method-btn
|
||||||
v-if="tableBtn.length"
|
v-if="tableBtn.length"
|
||||||
slot="handleBtn"
|
slot="handleBtn"
|
||||||
:width="260"
|
:width="220"
|
||||||
label="操作"
|
label="操作"
|
||||||
fixed="right"
|
fixed="right"
|
||||||
:method-list="tableBtn"
|
:method-list="tableBtn"
|
||||||
@@ -68,8 +68,7 @@ import OffShelfPackagingDetail from './components/OffShelfPackagingDetail.vue'
|
|||||||
import OffShelfPackagingContinue from './components/OffShelfPackagingContinue.vue'
|
import OffShelfPackagingContinue from './components/OffShelfPackagingContinue.vue'
|
||||||
import {
|
import {
|
||||||
unloadPalletPage,
|
unloadPalletPage,
|
||||||
unloadPalletFinish,
|
unloadPalletFinish
|
||||||
unloadPalletDelete
|
|
||||||
} from '@/api/productionScheduling'
|
} from '@/api/productionScheduling'
|
||||||
const tableProps = [
|
const tableProps = [
|
||||||
{
|
{
|
||||||
@@ -151,11 +150,6 @@ const tableBtn = [
|
|||||||
type: 'equal',
|
type: 'equal',
|
||||||
name: 'status',
|
name: 'status',
|
||||||
value: 2
|
value: 2
|
||||||
},
|
|
||||||
{
|
|
||||||
type: 'unequal',
|
|
||||||
name: 'num',
|
|
||||||
value: 0
|
|
||||||
}
|
}
|
||||||
]
|
]
|
||||||
}
|
}
|
||||||
@@ -177,25 +171,6 @@ const tableBtn = [
|
|||||||
}
|
}
|
||||||
]
|
]
|
||||||
}
|
}
|
||||||
},
|
|
||||||
{
|
|
||||||
type: 'clean',
|
|
||||||
btnName: '清空',
|
|
||||||
showParam: {
|
|
||||||
type: '&',
|
|
||||||
data: [
|
|
||||||
{
|
|
||||||
type: 'equal',
|
|
||||||
name: 'status',
|
|
||||||
value: 2
|
|
||||||
},
|
|
||||||
{
|
|
||||||
type: 'unequal',
|
|
||||||
name: 'num',
|
|
||||||
value: 0
|
|
||||||
}
|
|
||||||
]
|
|
||||||
}
|
|
||||||
}
|
}
|
||||||
]
|
]
|
||||||
export default {
|
export default {
|
||||||
@@ -334,52 +309,39 @@ export default {
|
|||||||
},
|
},
|
||||||
handleClick(val) {
|
handleClick(val) {
|
||||||
console.log(val)
|
console.log(val)
|
||||||
switch (val.type) {
|
if (val.type === 'edit') {
|
||||||
case 'edit':
|
this.centervisible = true
|
||||||
this.centervisible = true
|
this.addOrEditTitle = '编辑'
|
||||||
this.addOrEditTitle = '编辑'
|
this.$nextTick(() => {
|
||||||
this.$nextTick(() => {
|
this.$refs.offShelfPackagingAdd.init(val.data.id)
|
||||||
this.$refs.offShelfPackagingAdd.init(val.data.id)
|
})
|
||||||
})
|
} else if (val.type === 'end') {
|
||||||
break
|
this.$confirm(
|
||||||
case 'end':
|
'确认结束包装玻璃架ID" ' + val.data.glassRackId + ' "吗？',
|
||||||
this.$confirm(
|
{
|
||||||
'确认结束包装玻璃架ID" ' + val.data.glassRackId + ' "吗？',
|
type: 'warning'
|
||||||
{
|
}
|
||||||
type: 'warning'
|
)
|
||||||
}
|
.then(() => {
|
||||||
)
|
unloadPalletFinish({ id: val.data.id }).then(() => {
|
||||||
.then(() => {
|
this.$message({
|
||||||
unloadPalletFinish({ id: val.data.id }).then(() => {
|
message: '结束包装成功',
|
||||||
this.$message({
|
type: 'success'
|
||||||
message: '结束包装成功',
|
|
||||||
type: 'success'
|
|
||||||
})
|
|
||||||
this.getList()
|
|
||||||
})
|
})
|
||||||
|
this.getList()
|
||||||
})
|
})
|
||||||
.catch(() => {})
|
|
||||||
break
|
|
||||||
case 'continue':
|
|
||||||
this.centervisible2 = true
|
|
||||||
this.$nextTick(() => {
|
|
||||||
this.$refs.offShelfPackagingContinue.init(val.data.id)
|
|
||||||
})
|
|
||||||
break
|
|
||||||
case 'detail':
|
|
||||||
this.detailVisible = true
|
|
||||||
this.$nextTick(() => {
|
|
||||||
this.$refs.packagingDetail.init(val.data.id)
|
|
||||||
})
|
|
||||||
break
|
|
||||||
default:
|
|
||||||
unloadPalletDelete({ id: val.data.id }).then(() => {
|
|
||||||
this.$message({
|
|
||||||
message: '操作成功',
|
|
||||||
type: 'success'
|
|
||||||
})
|
|
||||||
this.getList()
|
|
||||||
})
|
})
|
||||||
|
.catch(() => {})
|
||||||
|
} else if (val.type === 'continue') {
|
||||||
|
this.centervisible2 = true
|
||||||
|
this.$nextTick(() => {
|
||||||
|
this.$refs.offShelfPackagingContinue.init(val.data.id)
|
||||||
|
})
|
||||||
|
} else if (val.type === 'detail') {
|
||||||
|
this.detailVisible = true
|
||||||
|
this.$nextTick(() => {
|
||||||
|
this.$refs.packagingDetail.init(val.data.id)
|
||||||
|
})
|
||||||
}
|
}
|
||||||
},
|
},
|
||||||
handleCancel() {
|
handleCancel() {
|
||||||
|
|||||||
Reference in New Issue
Block a user