From aa102b739e446f8d0d9fb64df2dd15f61e656010 Mon Sep 17 00:00:00 2001
From: lsh <lsh@163.com>
Date: 星期二, 25 十一月 2025 20:06:40 +0800
Subject: [PATCH] *
---
src/main/webapp/views/deviceOperate/devpOperate.html | 358 ++++++++++++++++++++++++++++++++---------------------------
1 files changed, 193 insertions(+), 165 deletions(-)
diff --git a/src/main/webapp/views/deviceOperate/devpOperate.html b/src/main/webapp/views/deviceOperate/devpOperate.html
index db67b5f..14ca625 100644
--- a/src/main/webapp/views/deviceOperate/devpOperate.html
+++ b/src/main/webapp/views/deviceOperate/devpOperate.html
@@ -5,6 +5,7 @@
<meta charset="UTF-8">
<title>杈撻�佺珯鐐硅澶�</title>
<link rel="stylesheet" href="../../static/css/element.css">
+ <link rel="stylesheet" href="../../static/css/element-ui.css">
<script type="text/javascript" src="../../static/js/jquery/jquery-3.3.1.min.js"></script>
<script type="text/javascript" src="../../static/js/common.js"></script>
<script type="text/javascript" src="../../static/js/vue.min.js"></script>
@@ -12,190 +13,217 @@
</head>
<body>
- <div id="app" style="display: flex;justify-content: center;flex-wrap: wrap;">
- <div 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="barcode" label="鏉＄爜">
- </el-table-column>
- </el-table>
- </div>
+<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="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="pakMkRun" label="閫�鍥炴爣璁�">
+ </el-table-column>
+ <el-table-column property="pakMkTask" label="灏忚溅浠诲姟涓嬪彂鏍囪">
+ </el-table-column>
+ <el-table-column property="weight" label="绉伴噸">
+ </el-table-column>
+ <el-table-column property="barcode" label="鏉＄爜">
+ </el-table-column>
+ <el-table-column property="errorDev" 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 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>
+ <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-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>
+ <el-button @click="requestOperate('update')" type="primary">鏇存柊绔欑偣淇℃伅</el-button>
+ <!-- <el-button @click="requestOperate('in')" type="warning">鏀捐揣瀹屾垚</el-button>-->
</div>
- </el-card>
- </div>
- <div style="width: 45%;">
- <el-card class="box-card">
- <div slot="header" class="clearfix">
- <span>璁惧鐘舵��</span>
+ <div style="margin-top: 10px">
+ <el-button @click="requestOperate('pakMk')" type="warning">鍏ュ簱鏍囪澶嶄綅</el-button>
+ <el-button @click="requestOperate('pakMkRun')" type="warning">閫�搴撴爣璁板浣�</el-button>
+ <el-button @click="requestOperate('pakMkTask')" type="warning">灏忚溅浠诲姟涓嬪彂鏍囪澶嶄綅</el-button>
+ <el-button @click="requestOperate('pakMkWalk')" type="warning">WMS浠诲姟涓嬪彂鏍囪澶嶄綅</el-button>
</div>
- <div>
- <div v-if="currentIndex == null">
- <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-item>
- <el-descriptions-item label="宸ヤ綔鍙�">
- {{ tableData[currentIndex].workNo }}
- </el-descriptions-item>
- <el-descriptions-item label="鑷姩">{{ tableData[currentIndex].autoing }}
- </el-descriptions-item>
- <el-descriptions-item label="鏈夌墿">{{ tableData[currentIndex].loading }}
- </el-descriptions-item>
- <el-descriptions-item label="鍙叆">{{ tableData[currentIndex].inEnable }}
- </el-descriptions-item>
- <el-descriptions-item label="鍙嚭">{{ tableData[currentIndex].outEnable }}
- </el-descriptions-item>
- <el-descriptions-item label="鍏ュ簱鏍囪">{{ tableData[currentIndex].pakMk }}
- </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>
- </el-descriptions>
- </div>
+ </div>
+ </el-card>
+ </div>
+ <div style="width: 45%;">
+ <el-card class="box-card">
+ <div slot="header" class="clearfix">
+ <span>璁惧鐘舵��</span>
+ </div>
+ <div>
+ <div v-if="currentIndex == null">
+ <el-empty description="璇烽�夋嫨璁惧"></el-empty>
</div>
- </el-card>
- </div>
+ <div v-else>
+ <el-descriptions :title="currentTitle" direction="vertical" :column="4" 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="鑷姩">
+ <el-tag>{{ tableData[currentIndex].autoing }}</el-tag>
+ </el-descriptions-item>
+ <el-descriptions-item label="鏈夌墿">
+ <el-tag>{{ tableData[currentIndex].loading }}</el-tag>
+ </el-descriptions-item>
+ <el-descriptions-item label="鍙叆">
+ <el-tag>{{ tableData[currentIndex].inEnable }}</el-tag>
+ </el-descriptions-item>
+ <el-descriptions-item label="鍙嚭">
+ <el-tag>{{ tableData[currentIndex].outEnable }}</el-tag>
+ </el-descriptions-item>
+ <el-descriptions-item label="绌烘澘淇″彿">
+ <el-tag>{{ tableData[currentIndex].emptyMk }}</el-tag>
+ </el-descriptions-item>
+ <el-descriptions-item label="鐩爣绔�">{{ tableData[currentIndex].staNo }}
+ </el-descriptions-item>
+ <el-descriptions-item label="楂樹綆搴撲綅">{{ tableData[currentIndex].locType1 }}
+ </el-descriptions-item>
+ <el-descriptions-item label="閲嶉噺">{{ tableData[currentIndex].weight }}
+ </el-descriptions-item>
+ <el-descriptions-item label="鏉＄爜">{{ tableData[currentIndex].barcode }}
+ </el-descriptions-item>
+ <el-descriptions-item label="鍏ュ簱鏍囪">{{ tableData[currentIndex].pakMk }}
+ </el-descriptions-item>
+ <el-descriptions-item label="鍏ュ簱鍥為��鏍囪">{{ tableData[currentIndex].pakMkRun }}
+ </el-descriptions-item>
+ <el-descriptions-item label="鍏ュ簱灏忚溅浠诲姟涓嬪彂鏍囪">{{ tableData[currentIndex].pakMkTask }}
+ </el-descriptions-item>
+ <el-descriptions-item label="鍏ュ簱wms浠诲姟涓嬪彂鏍囪">{{ tableData[currentIndex].pakMkWalk }}
+ </el-descriptions-item>
+ <el-descriptions-item label="寮傚父鎻愮ず">{{ tableData[currentIndex].errorDev }}
+ </el-descriptions-item>
+ </el-descriptions>
+ </div>
+ </div>
+ </el-card>
</div>
</div>
- <script>
- var app = new Vue({
- el: '#app',
- data: {
- tableData: [],
- currentRow: null,
- currentTitle: "鏈�夋嫨璁惧",
- currentIndex: null,
- formParam: {
- devNo: null,
- workNo: null,
- staNo: null,
- pakMk: null,
- inEnable: false,
- outEnable: false
- }
- },
- created() {
- this.init()
- },
- watch: {
+</div>
+<script>
+ var app = new Vue({
+ el: '#app',
+ data: {
+ tableData: [],
+ currentRow: null,
+ currentTitle: "鏈�夋嫨璁惧",
+ currentIndex: null,
+ formParam: {
+ devNo: null,
+ workNo: null,
+ staNo: null,
+ pakMk: null,
+ inEnable: false,
+ outEnable: false
+ }
+ },
+ created() {
+ this.init()
+ },
+ watch: {
- },
- methods: {
- init() {
+ },
+ methods: {
+ init() {
+ this.getTableData()
+
+ setInterval(() => {
this.getTableData()
+ }, 1000)
+ },
+ handleRowClick(row, col, event) {
+ const index = this.tableData.indexOf(row)
+ this.currentRow = row;
+ this.currentIndex = index
+ this.currentTitle = row.devNo + "绔欑偣"
- setInterval(() => {
- this.getTableData()
- }, 1000)
- },
- handleRowClick(row, col, event) {
- const index = this.tableData.indexOf(row)
- this.currentRow = row;
- this.currentIndex = index
- this.currentTitle = row.devNo + "绔欑偣"
-
- this.formParam.devNo = row.devNo
- this.formParam.workNo = row.workNo
- this.formParam.staNo = row.staNo
- this.formParam.pakMk = row.pakMk
- this.formParam.inEnable = row.inEnable == "Y" ? true : false
- this.formParam.outEnable = row.outEnable == "Y" ? true : false
- },
- getTableData() {
- let that = this;
+ this.formParam.devNo = row.devNo
+ this.formParam.workNo = row.workNo
+ this.formParam.staNo = row.staNo
+ this.formParam.pakMk = row.pakMk
+ this.formParam.inEnable = row.inEnable == "Y" ? true : false
+ this.formParam.outEnable = row.outEnable == "Y" ? true : false
+ },
+ getTableData() {
+ let that = this;
+ $.ajax({
+ url: baseUrlWcs + "/site/list/auth",
+ headers: {
+ 'token': localStorage.getItem('token')
+ },
+ data: {},
+ dataType: 'json',
+ contentType: 'application/json;charset=UTF-8',
+ method: 'GET',
+ success: function (res) {
+ that.tableData = res.data
+ }
+ });
+ },
+ requestOperate(method) {
+ let that = this
+ that.$confirm('姝ゆ搷浣滃瓨鍦ㄩ闄╋紝鏄惁缁х画','鎻愮ず',{
+ confirmButtonText: '纭畾',
+ cancelButtonText: '鍙栨秷',
+ type: 'warning'
+ }).then(()=>{
$.ajax({
- url: baseUrl + "/site/list/auth",
+ url: baseUrlWcs + "/site/detl/"+method,
headers: {
'token': localStorage.getItem('token')
},
- data: {},
- dataType: 'json',
- contentType: 'application/json;charset=UTF-8',
- method: 'GET',
+ data: this.formParam,
+ method: 'POST',
success: function (res) {
- that.tableData = res.data
+ if (res.code == 200) {
+ that.$message({
+ message: res.msg,
+ type: 'success'
+ });
+ } else {
+ that.$message({
+ message: res.msg,
+ type: 'error'
+ });
+ }
}
});
- },
- requestOperate(method) {
- let that = this
- 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'
- });
- }
- }
- });
- })
+ })
- }
}
- })
- </script>
+ }
+ })
+</script>
</body>
</html>
\ No newline at end of file
--
Gitblit v1.9.1