diff --git a/package.json b/package.json index 679c8d8..b7be231 100644 --- a/package.json +++ b/package.json @@ -9,6 +9,7 @@ "lint": "eslint --ext .js,.vue src", "build:test": "vue-cli-service build --mode test", "build:prod": "vue-cli-service build", + "build:ws": "vue-cli-service build --mode ws", "build:jt": "vue-cli-service build", "build:stage": "vue-cli-service build --mode staging", "preview": "node build/index.js --preview", diff --git a/src/permission.js b/src/permission.js index 8138394..eb25bd8 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'] // no redirect whitelist +const whiteList = ['/menu','/login', '/auth-redirect','/kban','/hbao','/sliao','/sczyjh'] // 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 d9c9847..a5f2ee2 100644 --- a/src/router/index.js +++ b/src/router/index.js @@ -48,6 +48,11 @@ 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'), diff --git a/src/views/jhzx/components/sygdpc/Sbcn.vue b/src/views/jhzx/components/sygdpc/Sbcn.vue index 19475c5..a97f31e 100644 --- a/src/views/jhzx/components/sygdpc/Sbcn.vue +++ b/src/views/jhzx/components/sygdpc/Sbcn.vue @@ -53,7 +53,20 @@ export default { sbcnColumn:[ { type: 'checkbox', width: 50 }, {type: 'seq', width: 60, title: '序号', }, - { field: '_工序', title: '工序', width: 150, + { field: '跨位', title: '所属跨位', width: 100, + editRender: { name: '$select', options:[ + {label:'1垮',value:'1垮'}, + {label:'2垮',value:'2垮'}, + {label:'3垮',value:'3垮'}, + {label:'4垮',value:'4垮'}, + {label:'5垮',value:'5垮'}, + {label:'6垮',value:'6垮'}, + {label:'光电间',value:'光电间'}, + ], props: {clearable: true}}, + filters: [{ data: { checks: [], sVal: '', sMenu: '', fType1: '', fVal1: '', fMode: 'and', fType2: '', fVal2: '' } }], + filterRender: { name: 'FilterCombination', }, + }, + { field: '_工序', title: '工序', width: 100, editRender: { name: '$select', options:[], props: {clearable: true}}, filters: [{ data: { checks: [], sVal: '', sMenu: '', fType1: '', fVal1: '', fMode: 'and', fType2: '', fVal2: '' } }], filterRender: { name: 'FilterCombination', }, @@ -68,16 +81,21 @@ export default { filters: [{ data: { checks: [], sVal: '', sMenu: '', fType1: '', fVal1: '', fMode: 'and', fType2: '', fVal2: '' } }], filterRender: { name: 'FilterCombination', }, }, - { field: '单台效率', title: '单台效率', width: 150, + { field: '套料图编码', title: '套料图编码', width: 150, editRender: { name: "input" }, filters: [{ data: { checks: [], sVal: '', sMenu: '', fType1: '', fVal1: '', fMode: 'and', fType2: '', fVal2: '' } }], filterRender: { name: 'FilterCombination', }, }, - { field: '单台产能', title: '单台产能', width: 150, + /*{ field: '单台效率', title: '单台效率', width: 100, editRender: { name: "input" }, filters: [{ data: { checks: [], sVal: '', sMenu: '', fType1: '', fVal1: '', fMode: 'and', fType2: '', fVal2: '' } }], filterRender: { name: 'FilterCombination', }, }, + { field: '单台产能', title: '单台产能', width: 100, + editRender: { name: "input" }, + filters: [{ data: { checks: [], sVal: '', sMenu: '', fType1: '', fVal1: '', fMode: 'and', fType2: '', fVal2: '' } }], + filterRender: { name: 'FilterCombination', }, + },*/ { field: '白班设备产能', title: '白班设备产能', width: 150, editRender: { name: "input" }, filters: [{ data: { checks: [], sVal: '', sMenu: '', fType1: '', fVal1: '', fMode: 'and', fType2: '', fVal2: '' } }], @@ -93,7 +111,7 @@ export default { filters: [{ data: { checks: [], sVal: '', sMenu: '', fType1: '', fVal1: '', fMode: 'and', fType2: '', fVal2: '' } }], filterRender: { name: 'FilterCombination', }, }, - { field: '禁用', title: '禁用', width: 150, + { field: '禁用', title: '禁用', editRender: { name: '$select', options:[{ label: '是', value:true}, { label: '否', value:false}], props: {clearable: true}}, formatter:this.formatterJy, filters: [{ data: { checks: [], sVal: '', sMenu: '', fType1: '', fVal1: '', fMode: 'and', fType2: '', fVal2: '' } }], diff --git a/src/views/jhzx/gdxqDR.vue b/src/views/jhzx/gdxqDR.vue index 29d1729..d6608a0 100644 --- a/src/views/jhzx/gdxqDR.vue +++ b/src/views/jhzx/gdxqDR.vue @@ -95,6 +95,7 @@ highlight-current-row highlight-hover-row show-overflow + :scroll-y="{enabled: true}" > diff --git a/src/views/jhzx/symxCX.vue b/src/views/jhzx/symxCX.vue index affdcde..d961540 100644 --- a/src/views/jhzx/symxCX.vue +++ b/src/views/jhzx/symxCX.vue @@ -6,10 +6,10 @@ 小组需求时间范围: - + 至 - + @@ -2767,9 +2767,10 @@ export default { window.addEventListener('resize', this.getHeight) this.getHeight() this.initBase() - if(this.yhdm==='user01'||this.yhdm==='user02'){ - this.isUser=true - } + this.isUser=true + // if(this.yhdm==='user01'||this.yhdm==='user02'){ + // this.isUser=true + // } }, watch: { 'queryParam.beginTime'(newValue, Value){ @@ -3086,47 +3087,44 @@ export default { const zy=res.data.zy const list=[] Object.keys(zy).forEach(key=>{ - if (key>=this.queryParam.beginTime&&key<=this.queryParam.endTime){ - const 工序产能MAP=zy[key].工序产能MAP - for (const 工序 of 工序表) { - const 工序产能=工序产能MAP[工序] - const 设备=工序产能.设备 - Object.keys(设备).forEach(_key=>{ - const _设备=设备[_key] - for (const bom of _设备.资源占用图表) { - if (bom){ - const data={ - day:key, - } - data.白班时长=工序产能.白班时长 - data.二班时长=工序产能.二班时长 - data.工序=工序 - data.产能=工序产能.产能 - data.设备编号=_key - data.设备名称=_key - data.设备产能=_设备.产能 - - data.dcCh=bom.dcch - data.dcPl=bom.pl - data.xzglxq=bom.xzglxq - data.dzglxq=bom.dzglxq - data.zl=bom.zl - data.kw=bom.kw - data._kw=bom.kw - data.tzbh=bom.tzbh - data.wpgg=bom.wpgg - data.wpcz=bom.wpcz - data.ljsl=bom.ljsl - data._degs=bom.degs - data.errors=bom.errors - list.push(data) + const 工序产能MAP=zy[key].工序产能MAP + for (const 工序 of 工序表) { + const 工序产能=工序产能MAP[工序] + const 设备=工序产能.设备 + Object.keys(设备).forEach(_key=>{ + const _设备=设备[_key] + for (const bom of _设备.资源占用图表) { + if (bom){ + const data={ + day:key, } + data.白班时长=工序产能.白班时长 + data.二班时长=工序产能.二班时长 + data.工序=工序 + data.产能=工序产能.产能 + data.设备编号=_key + data.设备名称=_key + data.设备产能=_设备.产能 + + data.dcCh=bom.dcch + data.dcPl=bom.pl + data.xzglxq=bom.xzglxq + data.dzglxq=bom.dzglxq + data.zl=bom.zl + data.kw=bom.kw + data._kw=bom.kw + data.tzbh=bom.tzbh + data.wpgg=bom.wpgg + data.wpcz=bom.wpcz + data.ljsl=bom.ljsl + data._degs=bom.degs + data.errors=bom.errors + list.push(data) } - }) - } + } + }) } }) - this.list9=list }) }, @@ -3146,7 +3144,7 @@ export default { this.activeName = 'first' }, format (val) { - this.queryParam.endTime=XEUtils.toDateString(XEUtils.getWhatMonth(val, 2, 'last'),'yyyy/MM/dd') + this.queryParam.endTime=XEUtils.toDateString(XEUtils.getWhatMonth(val, 0, 'last'),'yyyy/MM/dd') } } } diff --git a/src/views/sczyjh/index.vue b/src/views/sczyjh/index.vue new file mode 100644 index 0000000..3c59d01 --- /dev/null +++ b/src/views/sczyjh/index.vue @@ -0,0 +1,171 @@ + + +