add 人工呼叫套轴顺序

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" : {

pages.json

@@ -623,6 +623,14 @@
             }
             
         }
+        ,{
+            "path" : "pages/SecondPhase/slitting/CallAxisSeq",
+            "style" :                                                                                    
+            {
+                "navigationStyle": "custom"
+            }
+            
+        }
     ],
 	"globalStyle": {
 		// "pageOrientation": "landscape",

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

pages/SecondPhase/slitting/CallAxisSeq.vue

@@ -0,0 +1,87 @@
+<template>
+	<view class="zd_container">
+		<!-- <nav-bar title="人工呼叫套轴顺序"></nav-bar> -->
+		<nav-bar :title="title"></nav-bar>
+		<view class="zd_content">
+			<view class="zd_wrapper grid-wraper">
+				<view class="slide_new">
+					<table>
+						<thead>
+							<tr>
+								<th>序号</th>
+								<th class="th_2">设备</th>
+								<th>位置</th>
+								<th>尺寸</th>
+								<th>状态</th>
+								<th>代数</th>
+								<th>呼叫时间</th>
+							</tr>
+						</thead>
+						<tbody>
+							<tr v-for="(e, i) in dataList" :key="i">
+								<td>{{Number(i) + 1}}</td>
+								<td class="td_2">{{e.resource_name}}</td>
+								<td>{{['上轴', '下轴'][Number(e.up_or_down) - 1]}}</td>
+								<td>{{e.qzz_size}}</td>
+								<td>{{getStatusText(e.status)}}</td>
+								<td>{{e.qzz_generation}}</td>
+								<td>{{e.start_time}}</td>
+							</tr>
+						</tbody>
+					</table>
+				</view>
+			</view>
+		</view>
+		<up-top ref="UT" :scrollTop="top"></up-top>
+	</view>
+</template>
+
+<script>
+	import NavBar from '@/components/NavBar.vue'
+	import UpTop from '@/components/upTop.vue'
+	import {showManualView} from '@/utils/getData2.js'
+	export default {
+		components: {
+			NavBar,
+			UpTop
+		},
+		data() {
+			return {
+				title: '',
+				top: 0,
+				dataList: []
+			};
+		},
+		onLoad (options) {
+			this.title = options.title
+		},
+		onPageScroll(e) {
+			this.$refs.UT.topData(e.scrollTop)
+		},
+		created () {
+			this._showManualView()
+		},
+		methods: {
+			getStatusText(status) {
+				const statusMap = {
+					'01': '准备套轴',
+					'02': '正在配送',
+					'03': '配送完成'
+				}
+				return statusMap[status] || '已完成'
+			},
+			async _showManualView () {
+				let res = await showManualView()
+				if (res) {
+					this.dataList = [...res.data]
+				}
+			}
+		}
+	}
+</script>
+
+<style scoped>
+.zd_content {
+	padding-bottom: 30rpx;
+}
+</style>

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: {}
+})

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
 }