From 5afcef3d0b74b976d19992bc624ae13139f6aa6f Mon Sep 17 00:00:00 2001
From: xiangxy <shione_xxy@163.com>
Date: Fri, 20 Jun 2025 10:13:10 +0800
Subject: [PATCH] =?UTF-8?q?=E5=88=86=E5=88=87=E4=B8=8B=E8=BD=B4?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 pages.json                             |   8 --
 pages/SecondPhase/slitting/Cutaxis.vue |  18 +--
 pages/SecondPhase/slitting/ZjSave.vue  | 161 -------------------------
 utils/mork2.js                         |   2 +-
 4 files changed, 4 insertions(+), 185 deletions(-)
 delete mode 100644 pages/SecondPhase/slitting/ZjSave.vue

diff --git a/pages.json b/pages.json
index 944a5a2..e4a21da 100644
--- a/pages.json
+++ b/pages.json
@@ -208,14 +208,6 @@
                 "navigationStyle": "custom"
             }
             
-        }
-        ,{
-            "path" : "pages/SecondPhase/slitting/ZjSave",
-            "style" :                                                                                    
-            {
-                "navigationStyle": "custom"
-            }
-            
         }
         ,{
             "path" : "pages/SecondPhase/slitting/StockingArea",
diff --git a/pages/SecondPhase/slitting/Cutaxis.vue b/pages/SecondPhase/slitting/Cutaxis.vue
index 3c8aa02..112195a 100644
--- a/pages/SecondPhase/slitting/Cutaxis.vue
+++ b/pages/SecondPhase/slitting/Cutaxis.vue
@@ -47,14 +47,12 @@
 					<table>
 						<thead>
 							<tr>
-								<th width="60%">{{$t('grid.sub-roll-number')}}</th>
-								<th width="20%">{{$t('grid.axisposition')}}</th>
-								<th width="20%">{{$t('grid.operate')}}</th>
+								<th width="50%">{{$t('grid.axisposition')}}</th>
+								<th width="50%">{{$t('grid.operate')}}</th>
 							</tr>
 						</thead>
 						<tbody>
 							<tr v-for="(e, i) in dataList" :key="i">
-								<td>{{e.container_name}}</td>
 								<td>{{ options1 | findByValue(e.site)}}</td>
 								<td><button class="mini-btn" size="mini" type="primary" @tap="handleDelete(i)">{{$t('button.delete')}}</button></td>
 							</tr>
@@ -91,7 +89,6 @@
 				options1: [{value: '1', text: this.$t('select.uppershaft')}, {value: '2', text: this.$t('select.lowershaft')}],
 				index1: '1',
 				current: 0,
-				val1: '',
 				dataList: [],
 				disabled: false
 			};
@@ -127,15 +124,7 @@
 				this.index1 = e.detail.value
 			},
 			handleAdd () {
-				if (!this.val1.trim()) {
-					return
-				}
-				const index = this.dataList.findIndex(item => item === this.val1)
-				if (index !== -1) {
-					this.dataList.splice(index, 1)
-				}
-				this.dataList.push({container_name: this.val1, site: this.index1})
-				this.val1 = ''
+				this.dataList.push({site: this.index1})
 			},
 			handleDelete (index) {
 				this.dataList.splice(index, 1)
@@ -164,7 +153,6 @@
 				this.index = ''
 				this.index2 = ''
 				this.options = []
-				this.val1 = ''
 				this.dataList = []
 			}
 		}
diff --git a/pages/SecondPhase/slitting/ZjSave.vue b/pages/SecondPhase/slitting/ZjSave.vue
deleted file mode 100644
index d531502..0000000
--- a/pages/SecondPhase/slitting/ZjSave.vue
+++ /dev/null
@@ -1,161 +0,0 @@
-<template>
-	<view class="zd_container">
-		<!-- <nav-bar title="分切子卷维护"></nav-bar> -->
-		<nav-bar :title="title"></nav-bar>
-		<view class="zd_content">
-			<view class="zd_wrapper">
-				<view class="filter_item">
-					<view class="filter_label">{{$t('filter.area')}}</view>
-					<view class="filter_input_wraper">
-						<uni-data-select v-model="index1" :localdata="options1" @change="selectChange1"></uni-data-select>
-					</view>
-				</view>
-				<view class="filter_item">
-					<view class="filter_label_wraper">
-						<span class="filter_label">{{$t('filter.device')}}</span>
-					</view>
-					<view class="filter_input_wraper">
-						<uni-data-select v-model="index2" :localdata="options2" @change="selectChange2"></uni-data-select>
-					</view>
-				</view>
-				<view class="filter_item">
-					<view class="filter_label">{{$t('filter.point')}}</view>
-					<view class="filter_input_wraper">
-						<uni-data-select v-model="index3" :localdata="options3" @change="selectChange3"></uni-data-select>
-					</view>
-				</view>
-				<view class="filter_item">
-					<view class="filter_label_wraper">
-						<span class="filter_label">{{$t('grid.sub-roll-number')}}</span>
-					</view>
-					<view class="filter_input_wraper">
-						<search-box
-						v-model="val1"
-						/>
-					</view>
-				</view>
-				<view v-show="msg !== ''" class="msg_item">{{$t('grid.tip')}}：{{msg}}</view>
-			</view>
-		</view>
-		<view class="zd-row submitbar">
-			<button class="zd-col-5 btn-submit btn-default letter-30" @tap="clearUp">{{$t('button.clear')}}</button>
-			<button class="zd-col-6 btn-submit btn-success letter-30" :class="{'btn-info': !index3 || !val1}" @tap="_querySlitterSubVolumeInfo">{{$t('button.search')}}</button>
-			<button class="zd-col-6 btn-submit btn-success letter-30" :class="{'btn-info': !index3}" :disabled="disabled" @tap="_unBindSlitterSubVolumeInfo">{{$t('button.cleanup')}}</button>
-			<button class="zd-col-6 btn-submit btn-success letter-30" :class="{'btn-info': !index3 || !val1}" :disabled="disabled" @tap="_bindSlitterSubVolumeInfo">{{$t('button.bind')}}</button>
-		</view>
-	</view>
-</template>
-
-<script>
-	import NavBar from '@/components/NavBar.vue'
-	import SearchBox from '@/components/SearchBox.vue'
-	import {queryProductArea, queryDeviceByarea, devicePointQuery} from '@/utils/getData2.js'
-	import {querySlitterSubVolumeInfo, unBindSlitterSubVolumeInfo, bindSlitterSubVolumeInfo} from '@/utils/getData3.js'
-	export default {
-		components: {
-			NavBar,
-			SearchBox
-		},
-		data() {
-			return {
-				title: '',
-				options1: [],
-				index1: '',
-				options2: [],
-				index2: '',
-				options3: [],
-				index3: '',
-				val1: '',
-				msg: '',
-				disabled: false
-			};
-		},
-		onLoad (options) {
-			this.title = options.title
-			this._queryProductArea()
-		},
-		methods: {
-			/** 生产区域下拉框查询 */
-			async _queryProductArea () {
-				let res = await queryProductArea()
-				this.options1 = [...res.data]
-			},
-			selectChange1(e) {
-				this.index1 = e
-				if (e) {
-					this._queryDeviceByarea(e)
-				} else {
-					this.index2 = ''
-				}
-			},
-			/** 设备下拉框 */
-			async _queryDeviceByarea (e) {
-				let res = await queryDeviceByarea(e)
-				this.options2 = [...res.data]
-			},
-			selectChange2(e) {
-				this.index2 = e
-				if (e) {
-					this._devicePointQuery(e)
-				} else {
-					this.index3 = ''
-				}
-			},
-			/** 点位下拉框查询 */
-			async _devicePointQuery (e) {
-				let res = await devicePointQuery(e)
-				this.options3 = [...res.data]
-			},
-			selectChange3(e) {
-				this.index3 = e
-			},
-			clearUp () {
-				this.index1 = ''
-				this.index2 = ''
-				this.options2 = []
-				this.index3 = ''
-				this.options3 = []
-				this.val1 = ''
-				this.disabled = false
-			},
-			async _querySlitterSubVolumeInfo () {
-				let res = await querySlitterSubVolumeInfo(this.index3, this.val1)
-				this.msg = res.msg
-			},
-			async _unBindSlitterSubVolumeInfo () {
-				this.disabled = true
-				if (!this.index3) {
-					this.disabled = false
-					return
-				}
-				try {
-					let res = await unBindSlitterSubVolumeInfo(this.index3)
-					this.disabled = false
-					uni.showToast({
-						title: res.message,
-						icon: 'none'
-					})
-				} catch (e) {
-					this.disabled = false
-				}
-			},
-			async _bindSlitterSubVolumeInfo () {
-				this.disabled = true
-				if (!this.index3 || !this.val1) {
-					this.disabled = false
-					return
-				}
-				try {
-					let res = await bindSlitterSubVolumeInfo(this.index3, this.val1)
-					this.disabled = false
-					uni.showToast({
-						title: res.message,
-						icon: 'none'
-					})
-				} catch (e) {
-					this.disabled = false
-				}
-			}
-		}
-	}
-</script>
\ No newline at end of file
diff --git a/utils/mork2.js b/utils/mork2.js
index d882fa3..dc6ed29 100644
--- a/utils/mork2.js
+++ b/utils/mork2.js
@@ -37,7 +37,7 @@ export const allAuthority = () => {
 				{menu_id: '8', title: '分切暂存下料', path: '/pages/SecondPhase/slitting/CacheCut'},
 				{menu_id: '8', title: '分切暂存管理', path: '/pages/SecondPhase/slitting/CacheClean'},
 				{menu_id: '8', title: '气胀轴库维护', path: '/pages/SecondPhase/slitting/ShaftSave'},
-				{menu_id: '8', title: '分切子卷维护', path: '/pages/SecondPhase/slitting/ZjSave'},
+				// {menu_id: '8', title: '分切子卷维护', path: '/pages/SecondPhase/slitting/ZjSave'},
 				{menu_id: '8', title: '备货区管理', path: '/pages/SecondPhase/slitting/StockingArea'},
 				{menu_id: '8', title: 'AGV放行', path: '/pages/SecondPhase/slitting/AGVPass'},
 				{menu_id: '8', title: '子卷管重维护', path: '/pages/SecondPhase/slitting/SubRollWeight'},