From c0fb3571e12eb8c0aa1bf7b286fa76ab304d7649 Mon Sep 17 00:00:00 2001
From: caill <815519168@qq.com>
Date: Thu, 18 Jul 2024 15:40:32 +0800
Subject: [PATCH] =?UTF-8?q?=E6=8C=87=E4=BB=A4=E3=80=81=E4=BB=BB=E5=8A=A1?=
 =?UTF-8?q?=E7=AE=A1=E7=90=86?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 pages.json                       |  16 +++
 pages/home/home.vue              |   4 +-
 pages/login/setup.vue            |  51 ++++++----
 pages/modules/command-manage.vue | 166 +++++++++++++++++++++++++++++++
 pages/modules/task-manage.vue    | 151 ++++++++++++++++++++++++++++
 static/image/menu/RF02.png       | Bin 2265 -> 2097 bytes
 static/image/menu/RF03.png       | Bin 3110 -> 1846 bytes
 static/image/menu/RF05.png       | Bin 0 -> 2286 bytes
 static/image/menu/RF06.png       | Bin 0 -> 3147 bytes
 utils/getData1.js                |   1 -
 utils/getData2.js                |  46 ++++++++-
 utils/request.js                 |   6 +-
 utils/request1.js                | 126 -----------------------
 vuex/modules/user.js             |   5 +
 14 files changed, 421 insertions(+), 151 deletions(-)
 create mode 100644 pages/modules/command-manage.vue
 create mode 100644 pages/modules/task-manage.vue
 create mode 100644 static/image/menu/RF05.png
 create mode 100644 static/image/menu/RF06.png
 delete mode 100644 utils/getData1.js
 delete mode 100644 utils/request1.js

diff --git a/pages.json b/pages.json
index 277aa7d..f90d8ee 100644
--- a/pages.json
+++ b/pages.json
@@ -56,6 +56,22 @@
             }
             
         }
+        ,{
+            "path" : "pages/modules/command-manage",
+            "style" :                                                                                    
+            {
+                "navigationStyle": "custom"
+            }
+            
+        }
+        ,{
+            "path" : "pages/modules/task-manage",
+            "style" :                                                                                    
+            {
+                "navigationStyle": "custom"
+            }
+            
+        }
     ],
 	"globalStyle": {
 		// "pageOrientation": "landscape",
diff --git a/pages/home/home.vue b/pages/home/home.vue
index 68f7ebb..9ea4e54 100644
--- a/pages/home/home.vue
+++ b/pages/home/home.vue
@@ -35,7 +35,9 @@
 					{id: '1', name: '工单管理', icon: 'RF01', path: '/pages/modules/man-paichan'},
 					{id: '2', name: '涂线板', icon: 'RF02', path: '/pages/modules/wire-board'},
 					{id: '3', name: '物料库存', icon: 'RF03', path: '/pages/modules/mater-inventory'},
-					{id: '4', name: '库存管理', icon: 'RF04', path: '/pages/modules/point-manage'}
+					{id: '4', name: '库存管理', icon: 'RF04', path: '/pages/modules/point-manage'},
+					{id: '5', name: '指令管理', icon: 'RF05', path: '/pages/modules/command-manage'},
+					{id: '6', name: '任务管理', icon: 'RF06', path: '/pages/modules/task-manage'}
 				]
 			};
 		},
diff --git a/pages/login/setup.vue b/pages/login/setup.vue
index 8b88e02..dd828ba 100644
--- a/pages/login/setup.vue
+++ b/pages/login/setup.vue
@@ -3,17 +3,19 @@
 		<nav-bar title="设置" :inner2="true" @goIn="goIn" :show1="false"></nav-bar>
 		<view class="zd_content">
 			<view class="zd_wrapper">
-				<view class="input-wrap">
-					<view class="input-label">服务器地址</view>
+				<view class="setup-item">
+					<view class="setup-label">LMS地址</view>
 					<input type="text" class="setup-input" placeholder="请输入服务器地址" v-model="addrip">
 				</view>
-			</view>
-			<!-- <view class="zd_wrapper">
-				<view class="input-wrap">
-					<view class="input-label">刷新时间(s)</view>
-					<input type="text" class="setup-input" placeholder="请输入刷新时间" v-model="setTime">
+				<view class="setup-item">
+					<view class="setup-label">ACS地址</view>
+					<input type="text" class="setup-input" placeholder="请输入ACS地址" v-model="acsip">
 				</view>
-			</view> -->
+				<!-- <view class="setup-item">
+					<view class="setup-label">刷新时间(s)</view>
+					<input type="text" class="setup-input" placeholder="请输入刷新时间" v-model="setTime">
+				</view> -->
+			</view>
 		</view>
 		<view class="submit-bar">
 		  <button class="submit-button" @click="_submit">确认</button>
@@ -29,9 +31,8 @@
 		},
 		data() {
 			return {
-				options: [],
-				index: '',
 				addrip: this.$store.getters.baseUrl,
+				acsip: this.$store.getters.acsUrl,
 				setTime: this.$store.getters.setTime / 1000
 			};
 		},
@@ -49,15 +50,22 @@
 					})
 					return
 				}
-				if (this.setTime === '') {
+				if (this.acsip === '') {
 					uni.showToast({
-						title: '请填写刷新时间',
+						title: '请填写ACS地址',
 						icon: 'none'
 					})
 					return
 				}
+				// if (this.setTime === '') {
+				// 	uni.showToast({
+				// 		title: '请填写刷新时间',
+				// 		icon: 'none'
+				// 	})
+				// 	return
+				// }
 				// 存值
-				this.$store.dispatch('setConfig',{baseUrl: this.addrip, setTime: this.setTime * 1000, setPrintName: this.index})
+				this.$store.dispatch('setConfig',{baseUrl: this.addrip, acsUrl: this.acsip, setTime: this.setTime * 1000})
 				uni.redirectTo({
 					url: '/pages/login/login'
 				})
@@ -68,15 +76,16 @@
 
 <style lang="stylus">
 @import '../../common/style/mixin.styl';
-.input-wrap
+.setup-item
 	width 100%
-	_fj()
-.input-label
-	wh(200rpx, 58rpx)
-	_font(28rpx,58rpx,#464646)
+	margin-bottom 40rpx
+.setup-label
+	_font(24rpx,40rpx,#000)
 .setup-input
-	_wh(calc(100% - 200rpx), 58rpx)
+	_wh(100%, 80rpx)
 	background #fff
-	_font(28rpx,58rpx,#323232)
-	padding 0 10rpx
+	_font(28rpx,80rpx,#323232)
+	padding 0 28rpx
+	border 2px solid #e9ecf3
+	border-radius 12rpx
 </style>
diff --git a/pages/modules/command-manage.vue b/pages/modules/command-manage.vue
new file mode 100644
index 0000000..22a4307
--- /dev/null
+++ b/pages/modules/command-manage.vue
@@ -0,0 +1,166 @@
+<template>
+	<view class="zd_container">
+		<nav-bar title="指令管理"></nav-bar>
+		<view class="zd_content">
+			<view class="zd_wrapper">
+				<view class="filter_item">
+					<view class="filter_label">关键字</view>
+					<view class="filter_input_wraper">
+						<input type="text" class="filter_input" v-model="val1">
+					</view>
+				</view>
+				<view class="filter_item">
+					<view class="filter_label">起始设备</view>
+					<view class="filter_input_wraper">
+						<search-box
+						v-model="val2"
+						/>
+					</view>
+				</view>
+				<view class="filter_item">
+					<view class="filter_label">目标设备</view>
+					<view class="filter_input_wraper">
+						<search-box
+						v-model="val3"
+						/>
+					</view>
+				</view>
+			</view>
+			<view class="zd_wrapper grid-wraper">
+				<view class="slide_new">
+					<table>
+						<thead>
+							<tr>
+								<th>任务号</th>
+								<th>指令号</th>
+								<th>起点</th>
+								<th>终点</th>
+								<th>状态</th>
+								<th>执行步骤</th>
+								<th>载具号</th>
+								<th>优先级</th>
+								<th>时间</th>
+								<th>agv车号</th>
+							</tr>
+						</thead>
+						<tbody>
+							<tr v-for="(e, i) in dataList" :key="i" @click="toCheck(e)" :class="{'checked': e.inst_uuid === pkId}">
+								<td>{{e.task_no}}</td>
+								<td>{{e.instruction_code}}</td>
+								<td>{{e.start_devicecode}}</td>
+								<td>{{e.next_devicecode}}</td>
+								<td>{{e.inst_status_name}}</td>
+								<td>{{e.inst_step}}</td>
+								<td>{{e.carrier}}</td>
+								<td>{{e.priority}}</td>
+								<td>{{e.create_time}}</td>
+								<td>{{e.carno}}</td>
+							</tr>
+						</tbody>
+					</table>
+				</view>
+			</view>
+		</view>
+		<view class="zd-row submit-bar_new">
+			<button class="zd-col-6 submit-button_new" :class="{'btn-disabled': !pkId}" :disabled="disabled" @tap="toSure1('1')">指令撤销</button>
+			<button class="zd-col-6 submit-button_new" :class="{'btn-disabled': !pkId}" :disabled="disabled" @tap="toSure2('2')">重新下发</button>
+			<button class="zd-col-6 submit-button_new" :class="{'btn-disabled': !pkId}" :disabled="disabled" @tap="toSure3('3')">强制完成</button>
+			<button class="zd-col-5 submit-button_new" :disabled="disabled" @tap="_handInsts">查询</button>
+		</view>
+	</view>
+</template>
+
+<script>
+	import NavBar from '@/components/NavBar.vue'
+	import SearchBox from '@/components/SearchBox.vue'
+	import {handInsts, handInst} from '@/utils/getData2.js'
+	export default {
+		components: {
+			NavBar,
+			SearchBox
+		},
+		data() {
+			return {
+				val1: '',
+				val2: '',
+				val3: '',
+				data: [],
+				dataList: [],
+				disabled: false,
+				pkId: ''
+			};
+		},
+		created () {
+		    this._handInsts(this.val1, this.val2, this.val3)
+		  },
+		methods: {
+			async _handInsts () {
+				this.show = false
+				try {
+					let res = await handInsts(this.val1, this.val2, this.val3)
+					this.data = [...res.data]
+					this.dataList = [...this.data]
+					
+				} catch (e) {
+					uni.showToast({
+						title: res.message,
+						icon: 'none'
+					})
+				}
+			},
+			async _handInst (type) {
+				this.disabled = true
+				if (!this.pkId) {
+					this.disabled = false
+					return
+				}
+				try {
+					let res = await handInst(type, this.pkId)
+					this.disabled = false
+					this.pkId = ''
+					this._handInsts()
+					uni.showToast({
+						title: res.message,
+						icon: 'none'
+					})
+				} catch (e) {
+					this.disabled = false
+				}
+			},
+			toCheck (e) {
+				this.pkId = this.pkId === e.inst_uuid ? '' : e.inst_uuid
+			},
+			toSure1 (type) {
+				this.disabled = true
+				if (!this.pkId) {
+					this.disabled = false
+					return
+				}
+				this._handInst(type)
+			},
+			toSure2 (type) {
+				this.disabled = true
+				if (!this.pkId) {
+					this.disabled = false
+					return
+				}
+				this._handInst(type)
+			},
+			toSure3 (type) {
+				this.disabled = true
+				if (!this.pkId) {
+					this.disabled = false
+					return
+				}
+				this._handInst(type)
+			}
+		}
+	}
+</script>
+
+<style lang="stylus">
+// .submit-bar
+// 	justify-content: space-around;
+// .submit-button
+// 	margin: 0 0px 10px 0;
+</style>
diff --git a/pages/modules/task-manage.vue b/pages/modules/task-manage.vue
new file mode 100644
index 0000000..cf1e1b0
--- /dev/null
+++ b/pages/modules/task-manage.vue
@@ -0,0 +1,151 @@
+<template>
+	<view class="zd_container">
+		<nav-bar title="任务管理"></nav-bar>
+		<view class="zd_content">
+			<view class="zd_wrapper">
+				<view class="filter_item">
+					<view class="filter_label">关键字</view>
+					<view class="filter_input_wraper">
+						<input type="text" class="filter_input" v-model="val1">
+					</view>
+				</view>
+				<view class="filter_item">
+					<view class="filter_label">起始设备</view>
+					<view class="filter_input_wraper">
+						<search-box
+						v-model="val2"
+						/>
+					</view>
+				</view>
+				<view class="filter_item">
+					<view class="filter_label">目标设备</view>
+					<view class="filter_input_wraper">
+						<search-box
+						v-model="val3"
+						/>
+					</view>
+				</view>
+			</view>
+			<view class="zd_wrapper grid-wraper">
+				<view class="slide_new">
+					<table>
+						<thead>
+							<tr>
+								<th>任务号</th>
+								<th>起点</th>
+								<th>终点</th>
+								<th>状态</th>
+								<th>优先级</th>
+								<th>时间</th>
+								<th>载具号</th>
+							</tr>
+						</thead>
+						<tbody>
+							<tr v-for="(e, i) in dataList" :key="i" @click="toCheck(e)" :class="{'checked': e.task_uuid === pkId}">
+								<td>{{e.task_no}}</td>
+								<td>{{e.start_devicecode}}</td>
+								<td>{{e.next_devicecode}}</td>
+								<td>{{e.task_status_name}}</td>
+								<td>{{e.priority}}</td>
+								<td>{{e.create_time}}</td>
+								<td>{{e.carrier}}</td>
+							</tr>
+						</tbody>
+					</table>
+				</view>
+			</view>
+		</view>
+		<view class="zd-row submit-bar_new">
+			<button class="zd-col-8 submit-button_new" :class="{'btn-disabled': !pkId}" :disabled="disabled" @tap="toSure1('1')">重新生成</button>
+			<button class="zd-col-8 submit-button_new" :class="{'btn-disabled': !pkId}" :disabled="disabled" @tap="toSure2('2')">强制完成</button>
+			<button class="zd-col-5 submit-button_new" :disabled="disabled" @tap="_handTasks">查询</button>
+		</view>
+	</view>
+</template>
+
+<script>
+	import NavBar from '@/components/NavBar.vue'
+	import SearchBox from '@/components/SearchBox.vue'
+	import {handTasks, handTaskoperation} from '@/utils/getData2.js'
+	export default {
+		components: {
+			NavBar,
+			SearchBox
+		},
+		data() {
+			return {
+				val1: '',
+				val2: '',
+				val3: '',
+				data: [],
+				dataList: [],
+				disabled: false,
+				pkId: ''
+			};
+		},
+		created () {
+			this._handTasks()
+		  },
+		methods: {
+			async _handTasks () {
+				this.show = false
+				try {
+					let res = await handTasks(this.val1, this.val2, this.val3)
+					this.data = [...res.data]
+					this.dataList = [...this.data]
+					
+				} catch (e) {
+					uni.showToast({
+						title: res.message,
+						icon: 'none'
+					})
+				}
+			},
+			async _handTaskoperation (type) {
+				this.disabled = true
+				if (!this.pkId) {
+					this.disabled = false
+					return
+				}
+				try {
+					let res = await handTaskoperation(type, this.pkId)
+					this.disabled = false
+					this.pkId = ''
+					this._handTasks()
+					uni.showToast({
+						title: res.message,
+						icon: 'none'
+					})
+				} catch (e) {
+					this.disabled = false
+				}
+			},
+			toCheck (e) {
+				this.pkId = this.pkId === e.task_uuid ? '' : e.task_uuid
+			},
+			toSure1 (type) {
+				this.disabled1 = true
+				if (!this.pkId) {
+					this.disabled1 = false
+					return
+				}
+				this._handTaskoperation(type)
+			},
+			toSure2 (type) {
+				this.disabled2 = true
+				if (!this.pkId) {
+					this.disabled2 = false
+					return
+				}
+				this._handTaskoperation(type)
+			}
+		}
+	}
+</script>
+
+<style lang="stylus">
+// .submit-bar
+// 	justify-content: space-around;
+// .submit-button
+// 	margin: 0 0px 10px 0;
+</style>
diff --git a/static/image/menu/RF02.png b/static/image/menu/RF02.png
index ab42ca3b85373546cb4034a8aaffe47af49e9640..1bc47ed7a441d8deaedfa51fffc4d1fe364d72b3 100644
GIT binary patch
delta 1372
zcmca9xKUt(50kv1vyp|Vv5AF=rKyFXp{u2(ft!hirHhlHfuVt$x!dGyCRvyoOI&J}
zGa16vnBh|M9bt|+E;Yu?&h=VMr3DNOEb~2G978H@y_u7l)8i;{{CVy6Rg3y|1gSJx
zHSxCyq;mv@x9oV;W7V|obN3e4r5OV56Et+2OiJBl3cY_gG)+=?wc<5*P^Uo4k&CPT
zU!J?oqx|B&<9n>n+yDH2_ikqTw*52D{XS#7+4Rz-ODw1BX7)5V8fS<#r(NKwpLKMB
zq)9iB%XT*D0uP9{<zCl{EY|49Ngu8XxUy*(_iQ@8Z_{zNldns@N-jNLt9t#?^*V`X
z`l*e_@B3&O2Zj~pc5iaIBK-ZTNpfNDk?*1pw#FpRy17H{@aIRLe$}WtuiyyJ+P&e8
z?TmUG^CNpo-78(3w?5SUP+OsRhp(@GN^0*zL4%3A7|WlnTwEl@Y~Lb&VBh|l{O})Y
zdm_vDn*XtHZ8(3x{ejy5pSv%ts8_J=bYu@SwTSc+c3u_WAAHku`NL;CzskS1y+4rs
zKuYYYWk}z<l$)JV&FlEzH?2SLHh0DTwl_Afj>K6tExV!5SjTd{V1ezcBda$BzkbOy
z%c*|L=?`){8V~0NFMoD8I5oXp^@WCo>^|=Ar61SNuqxND@hq!~XzZJO@ko$po=?!<
zjCbdJq-M{XXrp)P^@7Z=Wde5m+d~Y}`lrmDKYgZ<{Bzd}A@5@<H+O$`IHx|1%{lDU
z4`xYkwIda*CQoJ79gYr-<!irCu`4o7ckYAx+j17Itk=re)xG@CPNVM+LN7iz(QrO5
z+DtRb^a4vI`<|dbwv10iFV3m8(Jn1Ao$9dsfN?C-Cr-UhE8j5|%+gvAeNa1wAx6RR
z%A||Ev66pOdR~QTH7vW5(sFph{*x9zCe{3Nb2DF_lhM8Gkfm0G+?zug%Veh>uiq1<
zvbgQG*%osT)(ac!^&0rLP5RBl-y9!tCoWsmL0YfjoyPO03B~457uiSMh$~(H#Oh6i
zl{^=t0>2!$_^MBBdu!G$=HH|5a;J{bFXh6u43j;YE|#jluCMywrYyo(#$6YBa(*t`
z_lEVXn(<0Z)~`QWHUH!4Z#jSShTBGtoY{hJ@^<;jTIaUKtkVCGR6qCm3mf*^RV$5O
znDK49>Y09F^8-D;Etfgs)_y)~5cNzq!~dh?pTlitQm0ZYW$zxgo*!e>zV*iudtl<#
z=|6XIiu1X~`CQeTa!VgJ7WmI~tQUWpzWA-k+svS*%w6k(-Ip;>@H~2GE^kVzLww<e
zwM=szttIWhUy&?fvN_dQW_6%`cWJ-Xribbu_9{FDnk6*#KFhMD<;8sOTUKz+7iesr
zn6Is|+<EdA^BwcVbwb78*2(Z){3z}6K*FGTo5SCSy^5#A4<47?V!G&jtv`2=oBKYs
z!{;Tply=W}r#S6(I!Gee<G9NQ{yW=&L8a+-sBcw*octQ?7yM>>&AaC7AF4n6^s&m1
zB?Zp|o?44OdQp>j|KOB+m-4jZTLo*qTK4;`W~f@;!*(e2OX3n)t%f>Yeg5PND>sKf
z-4m$#>W0eW`vsTF9PX_Ns&KcKsH@o58`v?q%71^qeeL}FtGL#lxhI(8_2*6d@(zcf
z`F8We?<*H*7JIym`o*7m^WT@h@7J!`<8o@j^Vo{mz%x5tXD$74YJ%ft36thDLttsJ
nAd+Vmgm*y)%)6!dS0sU<`pIRUB@FU93_#%N>gTe~DWM4fRpoib

delta 1541
zcmZ{kZ8Xyh9LGIBXLO|q^AL4CkHr|PO`}mB@^HHw7bVt_-D0d{{>Bm4!%A5mGKQ<>
zF*G}8+(fETY~#w1hg^$)$WB_6irc;CcJ8Zw@4n}J&i9<}@5QH0XF|92m;w~*jdgT%
zaz$g%SU3!ZMWCI$;BIhdXD7J#5id8yjd%s)Zw%&p%pC>THwN)NX5;@Jx9>5|ieA9W
zh|)?qIb|Q*5p>AK$ra}1+>lTsKCnplJuqHigE}ETS(jt@V`g4if+2>-wOfUvFv`77
z`+U=yl*-FHPe?3|YMLL{$m`*+b~dx#=U_D28@(OQK2K}PY$U{tHB5KMNz10Y<_A|i
zR+*Qj6|<1;iX@?DQrv=b9I!|+0XAA3kKY)da?R3pB&rNOVHv=)Vo!^-$_vrX|K+_|
z>-EV=Yo}t-l3f}GHn|wAp3`rg^Avaiw<=hTM#(p^fVS6}=>}U#G)H;hrP|slM|W`o
zP&gbU%pKcRa=}CXqu-k|Z^Segu~H-U)?ELoeaLF_DtOIyh&!ORscl%{&~lm~+`<bF
z-wI7H6}K{#JRjw>v^{iaO$N27@`Mt0U(&dHHl_06m>s<vn(|nNqUG2AFm4Af8~q_f
zfN%Ap{Rs6@yD_e7^0MUNagOQSL|Y#-wW=A$vh0b#Ep4m6*Ov5);`C_?@4{7u$q16y
zPz^11gr^PcC?I@YEIOx!mkL_dQ+wy7JY{PEMbx~f6)uVDxjwiRCGKtMgK1jO(_hRZ
zHetqx52-cJv9tbpkW1ty2vkcww<>E{nQ5xjT^Go0{0lM^yEsDi6On7mqhqvA;yp}S
zWh3&Oz^t3$rD>TxL2Uozo(GsA(V-Z-N5E66kwx{L>YYR)iYCY&u-gH}yr}k5U*a72
zB1cufukE=X8Lz@D#}WOiZMf|^aPN+p^uPenN`?%9M3}}Cq-G6GbNWn7TDRKfpouNU
zkJWBJ^;{@20Z)Ue_Nb=wOT7nT5vRBvwOqlDGP?1$Sm(uHVl;pI%&2GMF9aZ$Y@=Rl
zE1+)+ke`v#4-c|UVvN_Mf8Ji|LaS2I6~Cq;UT0W#5o~;~t)dP6&&Ok(L}5SKJ%X_-
zT*7z@ce6}<gxTv}bGCQi>5&U&tnIWC^GQ#Hyg@T@(ABlz25f-WG``p%V#>DIH$TiN
z-K@_jU>SnwmND`Lf&L3=z*0~0Y9QYi2Y{Npx6GlT(SL<ABlskC(5qR?#n}0V(X09$
zZk)}!diNX(lr7T*&#0P}cx_CY5!SWIC;9qcEXep*yX&LxJ72Sj$LmhwMDJKtqdaxa
z?Ueym2Z+=Naam{BMXpBqkvbR&EWzH1ILw_)rOiCzIYTC#4){;2@XOTP)sEMUQlztx
zOQAT+8ae~^-fG#%hd)zmj%?dqeKuy=x(Fr7d(DWM7VdOV7}h5rB5Y->HI6(m36M|m
zpcJXKbL7$Qh9PBG#l7tnA4-z=iJSMjn$MZTGn+1V52$<!G;+OeFF7oj!67ErUn=Sm
zKjk(%kd?}T5#^O*X4}oR%ekEeNw8Nz;{oGOS4jJA-JD`ufNk81n<;s%RRbdt6{EVc
zBMe{S>=QRAB*p6{iWlZ18iDvoCuSHde~<Ap3@Iq6&;ebQqDzJlxlg6p>3)hSR>O~7
z@Le0+Nc7!|sc>z4OUAQ}ixxOf<jOJAXW)Y8EO3QV^D374vrbXpm}~W%J+E$Y03TF;
z1x3@hqEQu6O^24BG2SY3NVAdt!1=k4Ky!cEP^;=vdRBX!ad`BlLYI}<xhG<+wesjj
zLzug+aewsZMiN@v9R$Gy6^^@Au^(Sz$}V*Yqe>Q3hjONWZ$H?wKmOjw#k1u8#CTdl
zTG;H-$q?%38;C&+lnEA<QHva~6MCb@G|nOVWphCBWB$?Q3*q@PN4j)jsi-V-J3E+E
y;9B#|PFb-^TIJ|_u&=UWP3-wsUg;g%%6sGvmRl!Q8b##DeLWo3|40iaD)VoK-Pgzf

diff --git a/static/image/menu/RF03.png b/static/image/menu/RF03.png
index 796026f592816f4b7081c16a55b2cbb9411a7626..f5ea7534d41a533c4e0077cb53f6538625c3bae2 100644
GIT binary patch
delta 1832
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
W{e}oCMK1aP0000<MNUMnLSTaE0)wUi

literal 3110
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
IxCABq7m*50!vFvP

diff --git a/static/image/menu/RF05.png b/static/image/menu/RF05.png
new file mode 100644
index 0000000000000000000000000000000000000000..4de6e93e4b48fb51315ce22a7555738508bc152b
GIT binary patch
literal 2286
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
Yb?x_SEZ17~E$ttOAIqOv>3ulu-|7j^dH?_b

literal 0
HcmV?d00001

diff --git a/static/image/menu/RF06.png b/static/image/menu/RF06.png
new file mode 100644
index 0000000000000000000000000000000000000000..b48d6dac9a00f4bbec577d5cfc558a3e8b474257
GIT binary patch
literal 3147
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

literal 0
HcmV?d00001

diff --git a/utils/getData1.js b/utils/getData1.js
deleted file mode 100644
index b8e2f24..0000000
--- a/utils/getData1.js
+++ /dev/null
@@ -1 +0,0 @@
-import request from './request.js'
diff --git a/utils/getData2.js b/utils/getData2.js
index f67763b..31cba85 100644
--- a/utils/getData2.js
+++ b/utils/getData2.js
@@ -1,5 +1,4 @@
 import request from './request.js'
-import request1 from './request1.js'
 
 // 版本更新测试
 export const pdaUpdate = () => request({
@@ -97,4 +96,49 @@ export const changePointQty = (id, qty) => request({
 		group_id: id,
 		qty: qty
 	}
+})
+
+/**
+ * 指令管理
+ */
+// 1.1 查询未完成指令(生成任务号为-开头)
+export const handInsts = (key, scode, ncode) => request({
+	url:'api/hand/insts',
+	acsurl: true,
+	data: {
+		keyword: key,
+		start_devicecode: scode,
+		next_devicecode: ncode
+	}
+})
+// 1.2 指令操作
+export const handInst = (type, id) => request({
+	url:'api/hand/inst',
+	acsurl: true,
+	data: {
+		type: type,
+		inst_uuid: id
+	}
+})
+/**
+ * 任务管理
+ */
+// 1.1 1.1 查询无指令的任务（任务号为-开头）
+export const handTasks = (key, scode, ncode) => request({
+	url:'api/hand/tasks',
+	acsurl: true,
+	data: {
+		keyword: key,
+		start_devicecode: scode,
+		next_devicecode: ncode
+	}
+})
+// 1.2 任务操作
+export const handTaskoperation = (type, id) => request({
+	url:'api/hand/taskoperation',
+	acsurl: true,
+	data: {
+		type: type,
+		task_uuid: id
+	}
 })
\ No newline at end of file
diff --git a/utils/request.js b/utils/request.js
index a924e7c..f56c5ba 100644
--- a/utils/request.js
+++ b/utils/request.js
@@ -5,6 +5,7 @@ const request = (params) => {
 	let url = params.url;
 	let method = params.method || 'POST';
 	let data = params.data || {};
+	let acsurl = params.acsurl
 	// data.token = "default-access_token"
 	// if (!params.token) {
 	// 	let token = uni.getStorageSync('token');
@@ -34,7 +35,10 @@ const request = (params) => {
 		}
 		// data = qs.stringify(data)
 	}
-	const requestUrl = `${store.getters.baseUrl}/` + url;
+	let requestUrl = `${store.getters.baseUrl}/` + url;
+	if (acsurl) {
+		requestUrl = `${store.getters.acsUrl}/` + url;
+	}
 	uni.showLoading({
 		title: '加载中...'
 	});
diff --git a/utils/request1.js b/utils/request1.js
deleted file mode 100644
index 6f36217..0000000
--- a/utils/request1.js
+++ /dev/null
@@ -1,126 +0,0 @@
-import store from '@/vuex/store'
-const request1 = (params) => {
-	let _self = this;
-	let url = params.url;
-	let method = params.method || 'POST';
-	let data = params.data || {};
-	// data.token = "default-access_token"
-	// if (!params.token) {
-	// 	let token = uni.getStorageSync('token');
-	// 	if (!token) {
-	// 		uni.navigateTo({
-	// 			url: '/pages/login/login'
-	// 		});
-	// 	} else {
-	// 		data.token = '179509245-9c91827e0224bdc18d0b118b8be1b5af';
-	// 	}
-	// }
-	let token = ''
-	if (store.getters.saveToken !== '') {
-		token = store.getters.saveToken
-	}
-	let defaultOpot = {
-		// 'Content-Type': 'application/x-www-form-urlencoded',
-		'Terminal-Type': 'innerH5',
-		'Content-Type': 'application/json;charset=UTF-8',
-	}
-	let header = {}
-	method = method.toUpperCase()
-	if (method == 'POST') {
-		header = {
-			'Content-Type': 'application/json;charset=UTF-8',
-			'Authorization': token
-		}
-		// data = qs.stringify(data)
-	}
-	const requestUrl = url;
-	uni.showLoading({
-		title: '加载中...'
-	});
-	return new Promise((resolve, reject) => {
-		uni.request({
-				url: requestUrl,
-				method: method,
-				header: Object.assign({}, defaultOpot, header),
-				data: data,
-				dataType: 'json',
-			})
-			.then(res => { // 成功
-				if (res.length === 1) {
-					uni.showModal({
-						content: 'request:fail',
-						showCancel: false
-					})
-					reject('request:fail')
-				} else if (res[1] && res[1].statusCode === 400) {
-					uni.showModal({
-						content: res[1].data.message,
-						showCancel: false
-					})
-					reject(res[1].data.message)
-				} else if (res[1] && res[1].statusCode === 401) {
-					uni.showModal({
-						content: res[1].data.message,
-						showCancel: false
-					})
-					store.dispatch('delUserInfo', '')
-					uni.redirectTo({
-						url: '/pages/login/login'
-					})
-				} else if (res[1] && res[1].statusCode === 200) {
-					let {
-						data: dataType
-					} = res[1]
-					resolve(dataType)
-					// switch (dataType.code * 1) { // 拦截返回参数
-					// 	case 0:
-					// 		resolve(dataType)
-					// 		break;
-					// 	case 1003:
-					// 		uni.showModal({
-					// 			title: '登录已过期',
-					// 			content: '很抱歉，登录已过期，请重新登录',
-					// 			confirmText: '重新登录',
-					// 			success: function(res) {
-					// 				if (res.confirm) {
-					// 					uni.navigateTo({
-					// 						// 切记这儿需要哈pages.json保持一致；不能有.vue后缀
-					// 						url: '/pages/login/login'
-					// 					});
-					// 				} else if (res.cancel) {
-					// 					console.log('用户点击取消');
-					// 				}
-					// 			}
-					// 		})
-					// 		break;
-					// 	case -1:
-					// 		uni.showModal({
-					// 			title: '请求数据失败',
-					// 			content: '获取数据失败！',
-					// 			confirmText: '确定',
-					// 			showCancel: false,
-					// 			success: function(res) {
-					// 				if (res.confirm) {} else if (res.cancel) {
-					// 					console.log('用户点击取消');
-					// 				}
-					// 			}
-					// 		})
-					// 		break
-					// }
-				}else {
-					uni.showModal({
-						content: res[1].data.message,
-						showCancel: false
-					})
-					reject(res[1].data.message)
-				}
-			})
-			.catch(err => { // 错误
-				reject(err)
-			})
-			.finally(() => {
-				uni.hideLoading();
-			})
-	})
-}
-export default request1
\ No newline at end of file
diff --git a/vuex/modules/user.js b/vuex/modules/user.js
index 0e70daa..995dbca 100644
--- a/vuex/modules/user.js
+++ b/vuex/modules/user.js
@@ -1,8 +1,10 @@
 import * as types from '../types'
 
 const baseUrl = process.env.NODE_ENV === 'development' ? 'http://10.1.3.90:8010' : 'http://10.1.3.90:8010'
+const acsUrl = process.env.NODE_ENV === 'development' ? 'http://10.1.3.90:8010' : 'http://10.1.3.90:8010'
 const state = {
 	baseUrl: uni.getStorageSync('baseUrl') || baseUrl,
+	acsUrl: uni.getStorageSync('acsUrl') || acsUrl,
 	setTime: uni.getStorageSync('setTime') || 5000,
 	setPrintName: uni.getStorageSync('setPrintName') || '',
 	loginName: uni.getStorageSync('loginName') ? uni.getStorageSync('loginName') : '',
@@ -11,6 +13,7 @@ const state = {
 }
 const getters = {
 	baseUrl: state => state.baseUrl,
+	acsUrl: state => state.acsUrl,
     setTime: state => state.setTime,
     setPrintName: state => state.setPrintName,
 	loginName: state => state.loginName,
@@ -20,6 +23,7 @@ const getters = {
 const actions = {
 	setConfig ({commit}, res) {
 	    uni.setStorageSync('baseUrl', res.baseUrl)
+		uni.setStorageSync('acsUrl', res.acsUrl)
 	    uni.setStorageSync('setTime', res.setTime)
 	    uni.setStorageSync('setPrintName', res.setPrintName)
 	    commit(types.COM_CONFIG, res)
@@ -49,6 +53,7 @@ const actions = {
 const mutations = {
 	[types.COM_CONFIG] (state, res) {
 	    state.baseUrl = res.baseUrl
+		state.acsUrl = res.acsUrl
 	    state.setTime = res.setTime
 	    state.setPrintName = res.setPrintName
 	},