diff --git a/manifest.json b/manifest.json index 0faccdd..dd5906a 100644 --- a/manifest.json +++ b/manifest.json @@ -2,8 +2,8 @@ "name" : "海亮铜箔", "appid" : "__UNI__3A002CD", "description" : "海亮铜箔二期手持系统", - "versionName" : "1.1.8", - "versionCode" : 118, + "versionName" : "1.1.9", + "versionCode" : 119, "transformPx" : false, /* 5+App特有相关 */ "app-plus" : { diff --git a/pages.json b/pages.json index fe0aedb..e42af7f 100644 --- a/pages.json +++ b/pages.json @@ -623,6 +623,14 @@ } } + ,{ + "path" : "pages/SecondPhase/slitting/CallAxisSeq", + "style" : + { + "navigationStyle": "custom" + } + + } ], "globalStyle": { // "pageOrientation": "landscape", diff --git a/pages/ProductManage/UpperShaftCut.vue b/pages/ProductManage/UpperShaftCut.vue index 00b3c9e..68641f2 100644 --- a/pages/ProductManage/UpperShaftCut.vue +++ b/pages/ProductManage/UpperShaftCut.vue @@ -96,9 +96,6 @@ async _queryDeviceByarea (e) { let res = await queryDeviceByarea(e) this.options3 = [...res.data] - this.options3.map(el => { - this.$set(el, 'value', el.text) - }) }, selectChange3(e) { this.index3 = e diff --git a/pages/SecondPhase/slitting/CallAxisSeq.vue b/pages/SecondPhase/slitting/CallAxisSeq.vue new file mode 100644 index 0000000..ef50d83 --- /dev/null +++ b/pages/SecondPhase/slitting/CallAxisSeq.vue @@ -0,0 +1,87 @@ + + + + + + + + + + + 序号 + 设备 + 位置 + 尺寸 + 状态 + 代数 + 呼叫时间 + + + + + {{Number(i) + 1}} + {{e.resource_name}} + {{['上轴', '下轴'][Number(e.up_or_down) - 1]}} + {{e.qzz_size}} + {{getStatusText(e.status)}} + {{e.qzz_generation}} + {{e.start_time}} + + + + + + + + + + + + + \ No newline at end of file diff --git a/utils/getData2.js b/utils/getData2.js index d242b4b..f4f817d 100644 --- a/utils/getData2.js +++ b/utils/getData2.js @@ -523,3 +523,10 @@ export const shaftRecedesL1400 = (area, size, qg, sp) => request({ url:'api/pda/shipping/shaftRecedesL1400', data: {product_area: area, qzz_size: size, qzz_generation: qg, start_point: sp} }) +/** + * 人工呼叫套轴顺序 + */ +export const showManualView = () => request({ + url:'api/pda/slitter/showManualView', + data: {} +}) \ No newline at end of file diff --git a/utils/mork2.js b/utils/mork2.js index 5172648..e55f916 100644 --- a/utils/mork2.js +++ b/utils/mork2.js @@ -100,7 +100,8 @@ export const allAuthority = () => { {menu_id: '8', title: '子卷重量维护', path: '/pages/SecondPhase/slitting/SubRollWeight'}, {menu_id: '8', title: '分切上轴', path: '/pages/SecondPhase/slitting/UpperShaftCut'}, {menu_id: '8', title: '分切上轴2', path: '/pages/SecondPhase/slitting/UpperShaftCut2'}, - {menu_id: '8', title: '分切呼叫送轴', path: '/pages/SecondPhase/slitting/CallShaft'} + {menu_id: '8', title: '分切呼叫送轴', path: '/pages/SecondPhase/slitting/CallShaft'}, + {menu_id: '8', title: '人工呼叫套轴顺序', path: '/pages/SecondPhase/slitting/CallAxisSeq'} ]}, {menu_id: '10', path: 'RF15', title: '打包间管理', sonTree: [ {menu_id: '1', title: '子卷包装解绑', path: '/pages/SecondPhase/SubRollPackUnbind'} @@ -266,4 +267,10 @@ export const twoQueryBoxIvt = (code) => { data: [{box_no: '100010000a' + code}] } return res +} +export const showManualView = (code) => { + let res = { + data: [{resource_name: 'B60FQ00003', up_or_down: '1', qzz_size: '6', status: '01', qzz_generation: '5', start_time: '2025-03-11 15:24:26'}] + } + return res } \ No newline at end of file