From 5d0f7a5aa4ee994782f3f3bcc66e23653a6ac40a Mon Sep 17 00:00:00 2001
From: zjj <3272660260@qq.com>
Date: 星期五, 19 七月 2024 10:07:46 +0800
Subject: [PATCH] #

---
 src/main/webapp/views/deviceOperate/devpOperate.html |  159 ++++++++++++++++++++++++++++------------------------
 1 files changed, 85 insertions(+), 74 deletions(-)

diff --git a/src/main/webapp/views/deviceOperate/devpOperate.html b/src/main/webapp/views/deviceOperate/devpOperate.html
index f773bef..3e2b238 100644
--- a/src/main/webapp/views/deviceOperate/devpOperate.html
+++ b/src/main/webapp/views/deviceOperate/devpOperate.html
@@ -14,51 +14,55 @@
 <body>
 	<div id="app" style="display: flex;justify-content: center;flex-wrap: wrap;">
 		<div style="width: 100%;">
-			<el-table ref="singleTable" :data="tableData" highlight-current-row @row-click="handleRowClick"
-				max-height="250" style="width: 100%">
+			<el-table border ref="singleTable" :data="tableData" highlight-current-row @row-click="handleRowClick"
+				max-height="450" style="width: 100%">
 				<el-table-column property="devNo" label="绔欏彿">
 				</el-table-column>
-				<el-table-column property="workNo" label="宸ヤ綔鍙�">
-				</el-table-column>
-				<el-table-column property="locType1" label="楂樹綆搴撲綅">
-				</el-table-column>
-				<el-table-column property="pakMk" label="鍏ュ簱鏍囪">
-				</el-table-column>
+<!--				<el-table-column property="workNo" label="宸ヤ綔鍙�">-->
+<!--				</el-table-column>-->
+<!--				<el-table-column property="locType1" label="楂樹綆搴撲綅">-->
+<!--				</el-table-column>-->
+<!--				<el-table-column property="pakMk" label="鍏ュ簱鏍囪">-->
+<!--				</el-table-column>-->
+<!--				<el-table-column property="barcode" label="鏉$爜">-->
+<!--				</el-table-column>-->
 			</el-table>
 		</div>
 
 		<div style="width: 100%;display: flex;justify-content: center;margin-top: 10px;">
-			<div style="width: 55%;margin-right: 10px;">
-				<el-card class="box-card">
-					<div slot="header" class="clearfix">
-						<span>璁惧璋冭瘯</span>
-					</div>
-					<div>
-						<el-form :model="formParam" label-position="top" :inline="true" class="demo-form-inline">
-							<el-form-item label="宸ヤ綔鍙�">
-								<el-input v-model="formParam.workNo" placeholder="宸ヤ綔鍙�"></el-input>
-							</el-form-item>
-							<el-form-item label="鐩爣绔�">
-								<el-input v-model="formParam.staNo" placeholder="鐩爣绔�"></el-input>
-							</el-form-item>
-							<el-form-item label="鍏ュ簱鏍囪">
-								<el-input v-model="formParam.pakMk" placeholder="鍏ュ簱鏍囪"></el-input>
-							</el-form-item>
-						</el-form>
-						<el-form label-position="top" :inline="true" class="demo-form-inline">
-							<el-form-item label="">
-								<el-checkbox v-model="formParam.inEnable">鍙叆</el-checkbox>
-							</el-form-item>
-							<el-form-item label="">
-								<el-checkbox v-model="formParam.outEnable">鍙嚭</el-checkbox>
-							</el-form-item>
-						</el-form>
-						<div>
-							<el-button @click="requestOperate('put')" type="primary">鏇存柊</el-button>
-						</div>
-					</div>
-				</el-card>
-			</div>
+<!--			<div style="width: 55%;margin-right: 10px;">-->
+<!--				<el-card class="box-card">-->
+<!--					<div slot="header" class="clearfix">-->
+<!--						<span>璁惧璋冭瘯</span>-->
+<!--					</div>-->
+<!--					<div>-->
+<!--						<el-form :model="formParam" label-position="top" :inline="true" class="demo-form-inline">-->
+<!--							<el-form-item label="宸ヤ綔鍙�">-->
+<!--								<el-input v-model="formParam.workNo" placeholder="宸ヤ綔鍙�"></el-input>-->
+<!--							</el-form-item>-->
+<!--							<el-form-item label="鐩爣绔�">-->
+<!--								<el-input v-model="formParam.staNo" placeholder="鐩爣绔�"></el-input>-->
+<!--							</el-form-item>-->
+<!--							<el-form-item label="鍏ュ簱鏍囪">-->
+<!--								<el-input v-model="formParam.pakMk" placeholder="鍏ュ簱鏍囪"></el-input>-->
+<!--							</el-form-item>-->
+<!--						</el-form>-->
+<!--						<el-form label-position="top" :inline="true" class="demo-form-inline">-->
+<!--							<el-form-item label="">-->
+<!--								<el-checkbox v-model="formParam.inEnable">鍙叆</el-checkbox>-->
+<!--							</el-form-item>-->
+<!--							<el-form-item label="">-->
+<!--								<el-checkbox v-model="formParam.outEnable">鍙嚭</el-checkbox>-->
+<!--							</el-form-item>-->
+<!--						</el-form>-->
+<!--						<div>-->
+<!--							<el-button @click="requestOperate('update')" type="primary">鏇存柊</el-button>-->
+<!--							<el-button @click="requestOperate('out')" type="warning">鍙栬揣瀹屾垚</el-button>-->
+<!--							<el-button @click="requestOperate('in')" type="warning">鏀捐揣瀹屾垚</el-button>-->
+<!--						</div>-->
+<!--					</div>-->
+<!--				</el-card>-->
+<!--			</div>-->
 			<div style="width: 45%;">
 				<el-card class="box-card">
 					<div slot="header" class="clearfix">
@@ -69,27 +73,27 @@
 							<el-empty description="璇烽�夋嫨璁惧"></el-empty>
 						</div>
 						<div v-else>
-							<el-descriptions :title="currentTitle" direction="vertical" :column="4" border>
-								<el-descriptions-item label="绔欑偣">{{ tableData[currentIndex].devNo }}
+							<el-descriptions :title="currentTitle" direction="vertical" :column="2" border>
+<!--								<el-descriptions-item label="绔欑偣">{{ tableData[currentIndex].devNo }}-->
+<!--								</el-descriptions-item>-->
+<!--								<el-descriptions-item label="宸ヤ綔鍙�">-->
+<!--									{{ tableData[currentIndex].workNo }}-->
+<!--								</el-descriptions-item>-->
+								<el-descriptions-item label="杈撻�佺嚎 ==銆� 姘皵1">{{ tableData[currentIndex].autoing }}
 								</el-descriptions-item>
-								<el-descriptions-item label="宸ヤ綔鍙�">
-									{{ tableData[currentIndex].workNo }}
+								<el-descriptions-item label="杈撻�佺嚎 ==銆� 姘皵2">{{ tableData[currentIndex].loading }}
 								</el-descriptions-item>
-								<el-descriptions-item label="鑷姩">{{ tableData[currentIndex].autoing }}
+								<el-descriptions-item label="杈撻�佺嚎 ==銆� 姘皵3">{{ tableData[currentIndex].inEnable }}
 								</el-descriptions-item>
-								<el-descriptions-item label="鏈夌墿">{{ tableData[currentIndex].loading }}
+								<el-descriptions-item label="杈撻�佺嚎 ==銆� 姘皵4">{{ tableData[currentIndex].outEnable }}
 								</el-descriptions-item>
-								<el-descriptions-item label="鍙叆">{{ tableData[currentIndex].inEnable }}
+								<el-descriptions-item label="姘皵1 ==銆� 涓嬫枡浣�">{{ tableData[currentIndex].emptyMk }}
 								</el-descriptions-item>
-								<el-descriptions-item label="鍙嚭">{{ tableData[currentIndex].outEnable }}
+								<el-descriptions-item label="姘皵2 ==銆� 涓嬫枡浣�">{{ tableData[currentIndex].fullPlt }}
 								</el-descriptions-item>
-								<el-descriptions-item label="鍏ュ簱鏍囪">{{ tableData[currentIndex].pakMk }}
+								<el-descriptions-item label="姘皵3 ==銆� 涓嬫枡浣�">{{ tableData[currentIndex].car }}
 								</el-descriptions-item>
-								<el-descriptions-item label="绌烘澘淇″彿">{{ tableData[currentIndex].emptyMk }}
-								</el-descriptions-item>
-								<el-descriptions-item label="鐩爣绔�">{{ tableData[currentIndex].staNo }}
-								</el-descriptions-item>
-								<el-descriptions-item label="楂樹綆搴撲綅">{{ tableData[currentIndex].locType1 }}
+								<el-descriptions-item label="姘皵4 ==銆� 涓嬫枡浣�">{{ tableData[currentIndex].low }}
 								</el-descriptions-item>
 							</el-descriptions>
 						</div>
@@ -158,29 +162,36 @@
 						}
 					});
 				},
-				requestOperate() {
+				requestOperate(method) {
 					let that = this
-					$.ajax({
-						url: baseUrl + "/site/detl/update",
-						headers: {
-							'token': localStorage.getItem('token')
-						},
-						data: this.formParam,
-						method: 'POST',
-						success: function (res) {
-							if (res.code == 200) {
-								that.$message({
-									message: res.msg,
-									type: 'success'
-								});
-							} else {
-								that.$message({
-									message: res.msg,
-									type: 'error'
-								});
+					that.$confirm('姝ゆ搷浣滃瓨鍦ㄩ闄╋紝鏄惁缁х画','鎻愮ず',{
+						confirmButtonText: '纭畾',
+						cancelButtonText: '鍙栨秷',
+						type: 'warning'
+					}).then(()=>{
+						$.ajax({
+							url: baseUrl + "/site/detl/"+method,
+							headers: {
+								'token': localStorage.getItem('token')
+							},
+							data: this.formParam,
+							method: 'POST',
+							success: function (res) {
+								if (res.code == 200) {
+									that.$message({
+										message: res.msg,
+										type: 'success'
+									});
+								} else {
+									that.$message({
+										message: res.msg,
+										type: 'error'
+									});
+								}
 							}
-						}
-					});
+						});
+					})
+
 				}
 			}
 		})

--
Gitblit v1.9.1