From fb8e0e2e547d1505be8bced7ad0caf1bf617aec5 Mon Sep 17 00:00:00 2001
From: caill <815519168@qq.com>
Date: Tue, 26 Sep 2023 09:20:10 +0800
Subject: [PATCH] =?UTF-8?q?=E5=BC=BA=E5=88=B6=E9=9D=99=E7=BD=AE?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 pages.json                    |   7 +++
 pages/home/home.vue           |  15 ++++--
 pages/modules/forced-rest.vue |  94 ++++++++++++++++++++++++++++++++++
 static/image/menu/RF07.png    | Bin 0 -> 1970 bytes
 utils/getData2.js             |  17 ++++++
 5 files changed, 128 insertions(+), 5 deletions(-)
 create mode 100644 pages/modules/forced-rest.vue
 create mode 100644 static/image/menu/RF07.png

diff --git a/pages.json b/pages.json
index b45b120..31d0daa 100644
--- a/pages.json
+++ b/pages.json
@@ -65,6 +65,13 @@
             }
             
         }
+        ,{
+            "path" : "pages/modules/forced-rest",
+            "style": {
+            	"navigationStyle": "custom"
+            }
+            
+        }
     ],
 	"globalStyle": {
 		// "pageOrientation": "landscape",
diff --git a/pages/home/home.vue b/pages/home/home.vue
index f993505..ae991a3 100644
--- a/pages/home/home.vue
+++ b/pages/home/home.vue
@@ -39,13 +39,18 @@
 		data() {
 			return {
 				userName: '',
+				// menuList: [
+				// 	{menu_id: '1', icon: 'RF01', name: '设备点检', path: '/pages/modules/equip-inspection', sonTree: []},
+				// 	{menu_id: '2', icon: 'RF02', name: '设备操作', path: '/pages/modules/equip-operate', sonTree: []},
+				// 	{menu_id: '3', icon: 'RF03', name: '人工分拣操作', path: '/pages/modules/man-sort-operate', sonTree: []},
+				// 	{menu_id: '4', icon: 'RF04', name: '人工分拣排产', path: '/pages/modules/man-sort-schedue', sonTree: []},
+				// 	{menu_id: '5', icon: 'RF05', name: '人工组盘', path: '', sonTree: []},
+				// 	{menu_id: '6', icon: 'RF06', name: '混碾搬运', path: '', sonTree: []}
+				// ],
 				menuList: [
 					{menu_id: '1', icon: 'RF01', name: '设备点检', path: '/pages/modules/equip-inspection', sonTree: []},
-					{menu_id: '2', icon: 'RF02', name: '设备操作', path: '/pages/modules/equip-operate', sonTree: []},
-					{menu_id: '3', icon: 'RF03', name: '人工分拣操作', path: '/pages/modules/man-sort-operate', sonTree: []},
-					{menu_id: '4', icon: 'RF04', name: '人工分拣排产', path: '/pages/modules/man-sort-schedue', sonTree: []},
-					{menu_id: '5', icon: 'RF05', name: '人工组盘', path: '', sonTree: []},
-					{menu_id: '6', icon: 'RF06', name: '混碾搬运', path: '', sonTree: []}
+					{menu_id: '2', icon: 'RF05', name: '人工组盘', path: '', sonTree: []},
+					{menu_id: '3', icon: 'RF07', name: '强制静置', path: '/pages/modules/forced-rest', sonTree: []}
 				],
 				show: false,
 				secM: []
diff --git a/pages/modules/forced-rest.vue b/pages/modules/forced-rest.vue
new file mode 100644
index 0000000..42743e6
--- /dev/null
+++ b/pages/modules/forced-rest.vue
@@ -0,0 +1,94 @@
+<template>
+	<view class="zd_container">
+		<nav-bar title="强制静置"></nav-bar>
+		<view class="zd_content">
+			<view class="zd_wrapper grid-wraper">
+				<view class="slide_new">
+					<table>
+						<thead>
+							<tr>
+								<th>困料位置</th>
+								<th>设备号</th>
+								<th>静置时间</th>
+								<th>剩余静置时间</th>
+								<th>预计完成时间</th>
+							</tr>
+						</thead>
+						<tbody>
+							<tr v-for="(e, i) in dataList" :key="i" @tap="toCheck(e)" :class="{'checked': e.group_id === pkId}">
+								<td>{{e.point_code}}</td>
+								<td>{{e.device_code}}</td>
+								<td>{{e.standing_time}}</td>
+								<td>{{e.plan_start_date}}</td>
+								<td>{{e.timeDifferenceMinutes}}</td>
+								<td>{{e.estimatedCompletionTimeString}}></td>
+							</tr>
+						</tbody>
+					</table>
+				</view>
+			</view>
+		</view>
+		<view class="submit-bar">
+			<button class="submit-button" @tap="_forcedRestingShow">刷新</button>
+			<button class="submit-button" :class="{'btn-disabled': !val1 || !pkId}" :disabled="disabled" @tap="toSure">确认</button>
+		</view>
+	</view>
+</template>
+
+<script>
+	import NavBar from '@/components/NavBar.vue'
+	import {forcedRestingShow, forcedRestingSubmit} from '@/utils/getData2.js'
+	export default {
+		components: {
+			NavBar
+		},
+		data() {
+			return {
+				val1: '',
+				dataList: [],
+				pkId: '',
+				pkObj: {},
+				disabled: false
+			};
+		},
+		created () {
+			this._forcedRestingShow()
+		},
+		methods: {
+			/** grid查询 */
+			async _forcedRestingShow () {
+				let res = await forcedRestingShow()
+				this.dataList = [...res]
+			},
+			/** 确认 */
+			async toSure () {
+				this.disabled = true
+				if (!this.val1 || !this.pkId) {
+					this.disabled = false
+					return
+				}
+				try {
+					let res = await forcedRestingSubmit(this.val1, this.pkId)
+					this.disabled = false
+					this.pkId = ''
+					this.pkObj = {}
+					this.val1 = ''
+					this._forcedRestingShow()
+					uni.showToast({
+						title: res.message,
+						icon: 'none'
+					})
+				} catch (e) {
+					this.disabled = false
+				}
+			},
+			toCheck (e) {
+				this.pkId = this.pkId === e.group_id ? '' : e.group_id
+				this.pkObj = this.pkId === e.group_id ? e : {}
+			}
+		}
+	}
+</script>
+
+<style lang="stylus">
+</style>
diff --git a/static/image/menu/RF07.png b/static/image/menu/RF07.png
new file mode 100644
index 0000000000000000000000000000000000000000..ba6628ae6fc661e8487ee66743e3cc455512d23e
GIT binary patch
literal 1970
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
V9V^0nj=l!fqMojPF6*2UngAdJA3gv8

literal 0
HcmV?d00001

diff --git a/utils/getData2.js b/utils/getData2.js
index b2e9c41..ac85f99 100644
--- a/utils/getData2.js
+++ b/utils/getData2.js
@@ -89,3 +89,20 @@ export const virtualprintType = (url) => request1({
 	url: `${url}/` + 'api/pda/virtual/printType',
 	data: {}
 })
+
+/**
+ * 强制静置
+ */
+// 显示静置信息
+export const forcedRestingShow = () => request({
+	url:'api/pda/forcedResting/show',
+	data: {}
+})
+// 强制静置
+export const forcedRestingSubmit = (stime, id) => request({
+	url:'api/pda/forcedResting/submit',
+	data: {
+		stand_time: stime,
+		group_id: id
+	}
+})
\ No newline at end of file