From 9101ad488486cd57be5f27ca4ad6071c07ab9557 Mon Sep 17 00:00:00 2001
From: Junjie <fallin.jie@qq.com>
Date: 星期五, 04 八月 2023 13:55:10 +0800
Subject: [PATCH] #
---
src/main/webapp/views/commandManage/commandManage.html | 239 ++++++++++++++++++++++++++++++++++++++++++++++-------------
1 files changed, 185 insertions(+), 54 deletions(-)
diff --git a/src/main/webapp/views/commandManage/commandManage.html b/src/main/webapp/views/commandManage/commandManage.html
index 19e67fc..b5d5949 100644
--- a/src/main/webapp/views/commandManage/commandManage.html
+++ b/src/main/webapp/views/commandManage/commandManage.html
@@ -1,63 +1,194 @@
<!DOCTYPE html>
<html lang="en">
-<head>
- <meta charset="utf-8">
- <title></title>
- <meta name="renderer" content="webkit">
- <meta http-equiv="X-UA-Compatible" content="IE=edge,chrome=1">
- <meta name="viewport" content="width=device-width, initial-scale=1, maximum-scale=1">
- <link rel="stylesheet" href="../../static/wms/layui/css/layui.css" media="all">
- <link rel="stylesheet" href="../../static/wms/css/cool.css" media="all">
- <link rel="stylesheet" href="../../static/wms/css/common.css" media="all">
-</head>
-<body>
-<!-- 鎼滅储鏍� -->
-<div id="search-box" class="layui-form layui-card-header">
- <div class="layui-inline">
- <div class="layui-input-inline">
- <input class="layui-input" type="text" name="id" placeholder="鎸囦护缂栧彿" autocomplete="off">
- </div>
- </div>
- <div class="layui-inline">
- <div class="layui-input-inline">
- <input class="layui-input" type="text" name="wrk_no" id="wrkNo" placeholder="浠诲姟鍙�" autocomplete="off">
- </div>
- </div>
- <div class="layui-inline">
- <div class="layui-input-inline">
- <input class="layui-input" type="text" name="wms_wrk_no" id="wmsWrkNo" placeholder="WMS浠诲姟鍙�" autocomplete="off">
- </div>
- </div>
- <!-- 寰呮坊鍔� -->
- <div id="data-search-btn" class="layui-btn-container layui-form-item">
- <button id="search" class="layui-btn layui-btn-primary layui-btn-radius" lay-submit lay-filter="search">鎼滅储</button>
- <button id="reset" class="layui-btn layui-btn-primary layui-btn-radius" lay-submit lay-filter="reset">閲嶇疆</button>
- </div>
-</div>
+ <head>
+ <meta charset="UTF-8">
+ <title>鎸囦护绠＄悊</title>
+ <link rel="stylesheet" href="../../static/wcs/css/element.css">
+ <script type="text/javascript" src="../../static/wcs/js/jquery/jquery-3.3.1.min.js"></script>
+ <script type="text/javascript" src="../../static/wms/layui/layui.js"></script>
+ <script type="text/javascript" src="../../static/wcs/js/common.js"></script>
+ <script type="text/javascript" src="../../static/wcs/js/vue.min.js"></script>
+ <script type="text/javascript" src="../../static/wcs/js/element.js"></script>
+ </head>
-<!-- 琛ㄦ牸 -->
-<div class="layui-form">
- <table class="layui-hide" id="commandManage" lay-filter="commandManage"></table>
-</div>
-<script type="text/html" id="toolbar">
- <div class="layui-btn-container">
- <button class="layui-btn layui-btn-primary layui-btn-sm" id="btn-export" lay-event="exportData" style="margin-top: 10px">瀵煎嚭</button>
- </div>
-</script>
+ <body>
+ <div id="app" style="display: flex;justify-content: center;flex-wrap: wrap;">
+ <div style="width: 100%;">
+ <el-card class="box-card">
+ <el-form :inline="true" :model="tableSearchParam" class="demo-form-inline">
+ <el-form-item label="">
+ <el-input v-model="tableSearchParam.task_no" placeholder="浠诲姟鍙�"></el-input>
+ </el-form-item>
+ <el-form-item label="">
+ <el-select v-model="tableSearchParam.command_status" placeholder="鎸囦护鐘舵��">
+ <el-option label="鍒涘缓" value="1"></el-option>
+ <el-option label="鎵ц" value="2"></el-option>
+ <el-option label="瀹屾垚" value="3"></el-option>
+ </el-select>
+ </el-form-item>
+ <el-form-item label="">
+ <el-input v-model="tableSearchParam.wrk_no" placeholder="宸ヤ綔鍙�"></el-input>
+ </el-form-item>
+ <el-form-item>
+ <el-button type="primary" @click="getTableData">鏌ヨ</el-button>
+ <el-button type="primary" @click="resetParam">閲嶇疆</el-button>
+ </el-form-item>
+ </el-form>
+ <el-table ref="singleTable" :data="tableData" style="width: 100%;">
+ <el-table-column label="鎿嶄綔" width="100">
+ <template slot-scope="scope">
+ <el-dropdown @command="(command)=>{handleCommand(command, scope.row)}">
+ <el-button icon="el-icon-more" size="mini" type="primary"></el-button>
+ <el-dropdown-menu slot="dropdown">
+ <el-dropdown-item command="showTask">鏌ョ湅浠诲姟</el-dropdown-item>
+ </el-dropdown-menu>
+ </el-dropdown>
+ </template>
+ </el-table-column>
+ <el-table-column property="id" label="鎸囦护缂栧彿">
+ </el-table-column>
+ <el-table-column property="wrkNo" label="宸ヤ綔鍙�">
+ </el-table-column>
+ <el-table-column property="taskNo" label="浠诲姟鍙�">
+ </el-table-column>
+ <el-table-column property="commandStatus$" label="鎸囦护鐘舵��">
+ </el-table-column>
+ <el-table-column show-overflow-tooltip property="durationTime" label="鎸佺画鏃堕暱">
+ </el-table-column>
+ <el-table-column property="commandType" label="鎸囦护绫诲瀷">
+ </el-table-column>
+ <el-table-column property="device" label="璁惧">
+ </el-table-column>
+ <el-table-column property="deviceLog" label="璁惧鎵ц淇℃伅">
+ </el-table-column>
+ <el-table-column property="commandDesc" label="鍛戒护鎻忚堪">
+ </el-table-column>
+ <el-table-column show-overflow-tooltip property="startTime$" label="寮�濮嬫椂闂�">
+ </el-table-column>
+ <el-table-column show-overflow-tooltip property="endTime$" label="缁撴潫鏃堕棿">
+ </el-table-column>
+ <el-table-column show-overflow-tooltip property="command" label="鍛戒护鎶ユ枃">
+ </el-table-column>
+ </el-table>
-<script type="text/html" id="operate">
- <a class="layui-btn layui-btn-xs btn-detlShow" id="btn-wrkMastShow" lay-event="wrkMastShow">浠诲姟</a>
-</script>
+ <div style="margin-top: 10px;">
+ <el-pagination @size-change="handleSizeChange" @current-change="handleCurrentChange"
+ :current-page="currentPage" :page-sizes="pageSizes" :page-size="pageSize"
+ layout="total, sizes, prev, pager, next, jumper" :total="pageTotal">
+ </el-pagination>
+ </div>
+ </el-card>
+ </div>
+ </div>
+ <script>
+ var $layui = layui.config({
+ base: baseUrl + "/static/wms/layui/lay/modules/"
+ }).use(['layer', 'form'], function() {})
-<script type="text/javascript" src="../../static/wms/js/jquery/jquery-3.3.1.min.js"></script>
-<script type="text/javascript" src="../../static/wms/layui/layui.js" charset="utf-8"></script>
-<script type="text/javascript" src="../../static/wms/js/common.js" charset="utf-8"></script>
-<script type="text/javascript" src="../../static/wms/js/cool.js" charset="utf-8"></script>
-<script type="text/javascript" src="../../static/wms/js/commandManage/commandManage.js" charset="utf-8"></script>
+ var app = new Vue({
+ el: '#app',
+ data: {
+ tableData: [],
+ currentPage: 1,
+ pageSizes: [16, 30, 50, 100, 150, 200],
+ pageSize: 16,
+ pageTotal: 0,
+ tableSearchParam: {
+ task_no: null,
+ status: null,
+ wrk_no: null
+ }
+ },
+ created() {
+ this.init()
+ },
+ watch: {
-<iframe id="detail-iframe" scrolling="auto" style="display:none;"></iframe>
+ },
+ methods: {
+ init() {
+ let taskNo = getQueryVariable('taskNo')
+ let wrkNo = getQueryVariable('wrkNo')
+ if (taskNo != false) {
+ this.tableSearchParam.task_no = taskNo
+ }
+ if (wrkNo != false) {
+ this.tableSearchParam.wrk_no = wrkNo
+ }
-</body>
+ this.getTableData()
+ },
+ getTableData() {
+ let that = this;
+ let data = this.tableSearchParam
+ data.curr = this.currentPage
+ data.limit = this.pageSize
+ $.ajax({
+ url: baseUrl + "/commandInfo/list/auth",
+ headers: {
+ 'token': localStorage.getItem('token')
+ },
+ data: data,
+ dataType: 'json',
+ contentType: 'application/json;charset=UTF-8',
+ method: 'GET',
+ success: function(res) {
+ if (res.code == 200) {
+ that.tableData = res.data.records
+ that.pageTotal = res.data.total
+ } else if (res.code === 403) {
+ top.location.href = baseUrl + "/";
+ } else {
+ that.$message({
+ message: res.msg,
+ type: 'error'
+ });
+ }
+ }
+ });
+ },
+ handleSizeChange(val) {
+ console.log(`姣忛〉 ${val} 鏉);
+ this.pageSize = val
+ this.getTableData()
+ },
+ handleCurrentChange(val) {
+ console.log(`褰撳墠椤�: ${val}`);
+ this.currentPage = val
+ this.getTableData()
+ },
+ resetParam() {
+ this.tableSearchParam = {
+ task_no: null,
+ status: null,
+ wrk_no: null
+ }
+ this.getTableData()
+ },
+ handleCommand(command, row) {
+ switch (command) {
+ case "showTask":
+ //鏌ョ湅浠诲姟
+ this.showTask(row)
+ break;
+ }
+ },
+ showTask(row) {
+ //鏌ョ湅浠诲姟
+ $layui.layer.open({
+ type: 2,
+ title: '浠诲姟绠＄悊',
+ maxmin: true,
+ area: [top.detailWidth, top.detailHeight],
+ shadeClose: true,
+ content: '../taskWrk/taskWrk.html?taskNo=' + row.taskNo + "&wrkNo=" + row.wrkNo,
+ success: function(layero, index) {}
+ });
+ }
+ }
+ })
+ </script>
+ </body>
+
</html>
-
--
Gitblit v1.9.1