From 87e7e5cd398edae112ea59a5ea1f82a63f8a1852 Mon Sep 17 00:00:00 2001
From: caill <815519168@qq.com>
Date: Sun, 27 Apr 2025 13:23:39 +0800
Subject: [PATCH] =?UTF-8?q?add=E8=A1=A5=E7=A9=BA=E6=A1=86?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 pages.json                  |   8 +++
 pages/home/home.vue         |   3 +-
 pages/login/setup.vue       |  36 +++++-----
 pages/manage/fill-empty.vue | 129 ++++++++++++++++++++++++++++++++++++
 static/image/menu/RF10.png  | Bin 0 -> 2097 bytes
 utils/getData2.js           |   8 +++
 utils/mork2.js              |  11 +++
 7 files changed, 176 insertions(+), 19 deletions(-)
 create mode 100644 pages/manage/fill-empty.vue
 create mode 100644 static/image/menu/RF10.png

diff --git a/pages.json b/pages.json
index 4a7c1a5..0d1611a 100644
--- a/pages.json
+++ b/pages.json
@@ -90,6 +90,14 @@
             }
             
         }
+        ,{
+            "path" : "pages/manage/fill-empty",
+            "style" :                                                                                    
+            {
+                "navigationStyle": "custom"
+            }
+            
+        }
     ],
 	"globalStyle": {
 		// "pageOrientation": "landscape",
diff --git a/pages/home/home.vue b/pages/home/home.vue
index 7f20c79..1261a77 100644
--- a/pages/home/home.vue
+++ b/pages/home/home.vue
@@ -40,7 +40,8 @@
 					{title: '路线锁定', icon: 'RF06', path: '/pages/manage/route-lock'},
 					{title: '呼叫空框', icon: 'RF01', path: '/pages/manage/fill-tray'},
 					{title: '修改订单工序', icon: 'RF07', path: '/pages/manage/modify-process'},
-					{title: '呼叫物料', icon: 'RF09', path: '/pages/manage/call-mater'}
+					{title: '呼叫物料', icon: 'RF09', path: '/pages/manage/call-mater'},
+					{title: '补空框', icon: 'RF10', path: '/pages/manage/fill-empty'}
 				],
 				show: false,
 				secM: []
diff --git a/pages/login/setup.vue b/pages/login/setup.vue
index d1f8abc..d3629f9 100644
--- a/pages/login/setup.vue
+++ b/pages/login/setup.vue
@@ -7,14 +7,14 @@
 					<view class="setup-label">服务器地址</view>
 					<input type="text" class="setup-input" placeholder="请输入服务器地址" v-model="addrip">
 				</view>
-				<view class="setup-item">
+				<!-- <view class="setup-item">
 					<view class="setup-label">ACS地址</view>
 					<input type="text" class="setup-input" placeholder="请输入ACS地址" v-model="acsip">
-				</view>
-				<view class="setup-item">
+				</view> -->
+				<!-- <view class="setup-item">
 					<view class="setup-label">打印地址</view>
 					<input type="text" class="setup-input" placeholder="请输入打印地址" v-model="printip">
-				</view>
+				</view> -->
 				<!-- <view class="setup-item">
 					<view class="setup-label">刷新时间(s)</view>
 					<input type="text" class="setup-input" placeholder="请输入刷新时间" v-model="setTime">
@@ -55,20 +55,20 @@
 					})
 					return
 				}
-				if (this.acsip === '') {
-					uni.showToast({
-						title: '请填写ACS地址',
-						icon: 'none'
-					})
-					return
-				}
-				if (this.printip === '') {
-					uni.showToast({
-						title: '请填写打印地址',
-						icon: 'none'
-					})
-					return
-				}
+				// if (this.acsip === '') {
+				// 	uni.showToast({
+				// 		title: '请填写ACS地址',
+				// 		icon: 'none'
+				// 	})
+				// 	return
+				// }
+				// if (this.printip === '') {
+				// 	uni.showToast({
+				// 		title: '请填写打印地址',
+				// 		icon: 'none'
+				// 	})
+				// 	return
+				// }
 				// if (this.setTime === '') {
 				// 	uni.showToast({
 				// 		title: '请填写刷新时间',
diff --git a/pages/manage/fill-empty.vue b/pages/manage/fill-empty.vue
new file mode 100644
index 0000000..cd1f7a3
--- /dev/null
+++ b/pages/manage/fill-empty.vue
@@ -0,0 +1,129 @@
+<template>
+	<view class="zd_container">
+		<nav-bar :title="title"></nav-bar>
+		<view class="zd_content">
+			<view class="zd_wrapper">
+				<view class="zd-row line_item">
+					<view class="zd-col-20 zd-row jcflexstart">
+						<button class="point_item" v-for="e in pointInfo.S04" :key="e.point_code" :class="['bg_gray', 'bg_green'][Number(e.point_status)]" :disabled="disabled" @tap="toCheck(e)"></button>
+					</view>
+					<view class="zd-col-4 font-size-1">S04</view>
+				</view>
+				<view class="zd-row line_item">
+					<view class="zd-col-20 zd-row jcflexstart">
+						<button class="point_item" v-for="e in pointInfo.S06" :key="e.point_code" :class="['bg_gray', 'bg_green'][Number(e.point_status)]" :disabled="disabled" @tap="toCheck(e)"></button>
+					</view>
+					<view class="zd-col-4 font-size-1">S06</view>
+				</view>
+				<view class="zd-row line_item">
+					<view class="zd-col-20 zd-row jcflexstart">
+						<button class="point_item" v-for="e in pointInfo.R01" :key="e.point_code" :class="['bg_gray', 'bg_green'][Number(e.point_status)]" :disabled="disabled" @tap="toCheck(e)"></button>
+					</view>
+					<view class="zd-col-4 font-size-1">R01</view>
+				</view>
+				<view class="zd-row line_item">
+					<view class="zd-col-20 zd-row jcflexstart">
+						<button class="point_item" v-for="e in pointInfo.R02" :key="e.point_code" :class="['bg_gray', 'bg_green'][Number(e.point_status)]" :disabled="disabled" @tap="toCheck(e)"></button>
+					</view>
+					<view class="zd-col-4 font-size-1">R02</view>
+				</view>
+			</view>
+		</view>
+		<view class="zd-row submit-bar">
+			<button class="zd-col-22 button-primary" @tap="_getLlddw">刷新</button>
+		</view>
+	</view>
+</template>
+
+<script>
+	import NavBar from '@/components/NavBar.vue'
+	import {getLlddw, fillUpEmpty} from '@/utils/getData2.js'
+	export default {
+		components: {
+			NavBar
+		},
+		data() {
+			return {
+				title: '',
+				pointInfo: {S04: [], S06: [], R01: [], R02: []},
+				disabled: false
+			};
+		},
+		onLoad (options) {
+			this.title = options.title
+			this._getLlddw()
+		},
+		methods: {
+			async _getLlddw () {
+				let res = await getLlddw()
+				if (res) {
+					this.pointInfo.S04 = [...res].slice(0, 4)
+					this.pointInfo.S04.reverse()
+					this.pointInfo.S06 = [...res].slice(4, 8)
+					this.pointInfo.S06.reverse()
+					this.pointInfo.R01 = [...res].slice(8, 11)
+					this.pointInfo.R01.reverse()
+					this.pointInfo.R02 = [...res].slice(11, 14)
+					this.pointInfo.R02.reverse()
+				}
+			},
+			toCheck (e) {
+				this.disabled = true
+				if (e.point_status === '1') {
+					this.disabled = false
+					return
+				}
+				uni.showModal({
+					title: '提示',
+					cancelText: '取消',
+					confirmText: '确定',
+					content: `请确认当前点位${e.point_code}补空框？`,
+					success: (res) => {
+						if (res.confirm) {
+							this._fillUpEmpty(e)
+						} else if (res.cancel) {
+							this.disabled = false
+						}
+					}
+				})
+			},
+			async _fillUpEmpty (e) {
+				try {
+					let res = await fillUpEmpty(e)
+					if (res) {
+						this.disabled = false
+						this._getLlddw()
+						uni.showToast({
+							title: res.message,
+							icon: 'none'
+						})
+					}
+				} catch (e) {
+					this.disabled = false
+				}
+			}
+		}
+	}
+</script>
+
+<style lang="stylus" scoped>
+@import '../../common/style/mixin.styl';
+.line_item
+	padding 20rpx 20rpx
+	background-color #f3f3f3
+	margin-bottom 20rpx
+.point_item
+	width 23%
+	height 100rpx
+	padding 0
+	margin-left 0
+	margin-right 2%
+	border-radius 4px
+.bg_gray
+	background #c9c9c9 !important
+.bg_green
+	background #6CBE8B !important
+.font-size-1
+	font-size 40rpx
+	text-align right
+</style>
diff --git a/static/image/menu/RF10.png b/static/image/menu/RF10.png
new file mode 100644
index 0000000000000000000000000000000000000000..1bc47ed7a441d8deaedfa51fffc4d1fe364d72b3
GIT binary patch
literal 2097
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

literal 0
HcmV?d00001

diff --git a/utils/getData2.js b/utils/getData2.js
index 84e1706..b59d1e7 100644
--- a/utils/getData2.js
+++ b/utils/getData2.js
@@ -94,4 +94,12 @@ export const callMater = (mater, code, vcode) => request({
 export const selectPointByRegion = (code) => request({
 	url:'api/handheld/selectPointByRegion?regionCode=' + code,
 	method: 'GET'
+})
+export const getLlddw = () => request({
+	url:'api/handheld/getLlddw',
+	data: {}
+})
+export const fillUpEmpty = (obj) => request({
+	url:'api/handheld/fillUpEmpty',
+	data: obj
 })
\ No newline at end of file
diff --git a/utils/mork2.js b/utils/mork2.js
index 174e8db..84b9c66 100644
--- a/utils/mork2.js
+++ b/utils/mork2.js
@@ -39,4 +39,15 @@ export const fabMaterial = (code, code1) => {
 export const selectPointByRegion = (code) => {
 	let res = [{point_code: '1', point_name: 'Amada 80T冲床07-01-06-01'}, {point_code: '2', point_name: 'Amada 80T冲床07-01-06-01', point_status: '0'}, {point_code: '3', point_name: 'Amada 80T冲床07-01-06-01', point_status: '0'}, {point_code: '4', point_name: 'Amada 80T冲床07-01-06-01', point_status: '0'}, {point_code: '5', point_name: 'Amada 80T冲床07-01-06-01', point_status: '1'}, {point_code: '1', point_name: 'Amada 80T冲床07-01-06-01', point_status: '0'}, {point_code: '2', point_name: 'Amada 80T冲床07-01-06-01', point_status: '0'}, {point_code: '3', point_name: 'Amada 80T冲床07-01-06-01', point_status: '0'}, {point_code: '4', point_name: 'Amada 80T冲床07-01-06-01', point_status: '0'}, {point_code: '5', point_name: 'Amada 80T冲床07-01-06-01', point_status: '1'}]
 	return res
+}
+
+export const getLlddw = () => {
+	let res = [{point_code: 'LLDDW03', point_status: '0'}, {point_code: 'LLDDW02', point_status: '0'}, {point_code: 'LLDDW01', point_status: '0'}, {point_code: 'LLDDW04_1', point_status: '0'}, {point_code: 'LLDDW08', point_status: '0'}, {point_code: 'LLDDW07', point_status: '0'}, {point_code: 'LLDDW06', point_status: '0'}, {point_code: 'LLDDW05', point_status: '0'}, {point_code: 'LLDDW11', point_status: '1'}, {point_code: 'LLDDW10', point_status: '1'}, {point_code: 'LLDDW09', point_status: '0'}, {point_code: 'LLDDW14', point_status: '0'}, {point_code: 'LLDDW13', point_status: '0'}, {point_code: 'LLDDW12', point_status: '0'}]
+	return res
+}
+export const fillUpEmpty = (code) => {
+	let res = {
+		message: 'ok'
+	}
+	return res
 }
\ No newline at end of file