gang.huang 4 سال پیش
والد
کامیت
454baa65d5
8فایلهای تغییر یافته به همراه903 افزوده شده و 477 حذف شده
  1. 46 5
      src/api/index.js
  2. 165 89
      src/pages/index.vue
  3. 171 23
      src/pages/subPages/express.vue
  4. 49 52
      src/pages/subPages/log.vue
  5. 111 124
      src/pages/subPages/message.vue
  6. 68 50
      src/pages/subPages/order.vue
  7. 189 16
      src/pages/subPages/status.vue
  8. 104 118
      src/pages/subPages/view.vue

+ 46 - 5
src/api/index.js

@@ -151,11 +151,6 @@ export const msgList = (params) => {
     return requestLoading(`${Prefix}/MsgList`, 'post', params)
 }
 
-//柜子状态
-export const reboot = (params) => {
-    return requestLoading(`${Prefix}/Reboot`, 'post', params)
-}
-
 //开箱
 export const openBox = (params) => {
     return requestLoading(`${Prefix}/OpenBox`, 'post', params)
@@ -166,6 +161,52 @@ export const sendMsg = (params) => {
     return requestLoading(`${Prefix}/SendMsg`, 'post', params)
 }
 
+//锁柜
+export const lockCabinet = (params) => {
+    return requestLoading(`${Prefix}/LockCabinet`, 'post', params)
+}
+
+//解除锁柜
+export const unLockCabinet = (params) => {
+    return requestLoading(`${Prefix}/UnLockCabinet`, 'post', params)
+}
+
+//解除报警
+export const releaseAlarm = (params) => {
+    return requestLoading(`${Prefix}/ReleaseAlarm`, 'post', params)
+}
+
+//解除报警
+export const reboot = (params) => {
+    return requestLoading(`${Prefix}/Reboot`, 'post', params)
+}
+
+//新增箱子
+export const addBox = (params) => {
+    return requestLoading(`${Prefix}/AddBox`, 'post', params)
+}
+
+//管理员列表
+export const userList = (params) => {
+    return requestLoading(`${Prefix}/UserList`, 'post', params)
+}
+
+//新增管理员
+export const userAdd = (params) => {
+    return requestLoading(`${Prefix}/UserAdd`, 'post', params)
+}
+
+//删除管理员
+export const userDel = (params) => {
+    return requestLoading(`${Prefix}/UserDel`, 'post', params)
+}
+
+//修改管理员密码
+export const editPwd = (params) => {
+    return requestLoading(`${Prefix}/EditPwd`, 'post', params)
+}
+
+
 
 
 // export const AddCabinet = (alias,url,count) => {

+ 165 - 89
src/pages/index.vue

@@ -1,106 +1,182 @@
 <template>
-  <el-container>
+<el-container>
     <el-header>
-      <el-row type="flex" style="height:100%;" justify="space-between" align="middle">
-        <div>航空工业集团快递智能柜管理程序</div>
-        <div>
-          <el-dropdown @command="onUserEdit">
-            <span class="el-dropdown-link">
-              <i class="el-icon-user" style="margin-right: 10px"></i>管理员
-              <i class="el-icon-arrow-down el-icon--right"></i>
-            </span>
-            <el-dropdown-menu slot="dropdown">
-              <el-dropdown-item command="logout">退出登录</el-dropdown-item>
-              <!-- <el-dropdown-item>修改密码</el-dropdown-item> -->
-            </el-dropdown-menu>
-          </el-dropdown>
-        </div>
-      </el-row>
+        <el-row type="flex" style="height:100%;" justify="space-between" align="middle">
+            <div>航空工业集团快递智能柜管理程序</div>
+            <div>
+                <el-dropdown @command="onUserEdit">
+                    <span class="el-dropdown-link">
+                        <i class="el-icon-user" style="margin-right: 10px"></i>管理员
+                        <i class="el-icon-arrow-down el-icon--right"></i>
+                    </span>
+                    <el-dropdown-menu slot="dropdown">
+                        <el-dropdown-item command="logout" icon="el-icon-caret-left">退出登录</el-dropdown-item>
+                        <el-dropdown-item command="editPwd" icon="el-icon-edit">修改密码</el-dropdown-item>
+                    </el-dropdown-menu>
+                </el-dropdown>
+            </div>
+        </el-row>
     </el-header>
     <el-container style="height: 100%; border: 1px solid #eee">
-      <el-aside width="250px">
-        <el-menu
-          router
-          class="el-menu"
-          background-color="#545c64"
-          text-color="#fff"
-          active-text-color="#ffd04b"
-          :default-active="curPath"
-        >
-          <el-menu-item index="express" route="express">
-            <i class="el-icon-menu"></i>
-            <span slot="title">柜体控制</span>
-          </el-menu-item>
-          <el-menu-item index="order" route="order">
-            <i class="el-icon-s-order"></i>
-            <span slot="title">订单管理</span>
-          </el-menu-item>
-          <el-menu-item index="log" route="log">
-            <i class="el-icon-document"></i>
-            <span slot="title">日志管理</span>
-          </el-menu-item>
-          <el-menu-item index="message" route="message">
-            <i class="el-icon-message"></i>
-            <span slot="title">消息通知</span>
-          </el-menu-item>
-          <el-menu-item index="view" route="view">
-            <i class="el-icon-s-platform"></i>
-            <span slot="title">操作记录</span>
-          </el-menu-item>
-		<el-menu-item index="status" route="status">
-			<i class="el-icon-search"></i>
-			<span slot="title">运营人员管理</span>
-		</el-menu-item> 
-		</el-menu>
-      </el-aside>
-      <el-main class="el-menu">
-        <router-view />
-      </el-main>
+        <el-aside width="250px">
+            <el-menu router class="el-menu" background-color="#545c64" text-color="#fff" active-text-color="#ffd04b" :default-active="curPath">
+                <el-menu-item index="express" route="express">
+                    <i class="el-icon-menu"></i>
+                    <span slot="title">柜体控制</span>
+                </el-menu-item>
+                <el-menu-item index="order" route="order">
+                    <i class="el-icon-s-order"></i>
+                    <span slot="title">订单管理</span>
+                </el-menu-item>
+                <el-menu-item index="log" route="log">
+                    <i class="el-icon-document"></i>
+                    <span slot="title">日志管理</span>
+                </el-menu-item>
+                <el-menu-item index="message" route="message">
+                    <i class="el-icon-message"></i>
+                    <span slot="title">消息通知</span>
+                </el-menu-item>
+                <el-menu-item index="view" route="view">
+                    <i class="el-icon-s-platform"></i>
+                    <span slot="title">操作记录</span>
+                </el-menu-item>
+                <el-menu-item index="status" route="status">
+                    <i class="el-icon-user"></i>
+                    <span slot="title">运营人员管理</span>
+                </el-menu-item>
+            </el-menu>
+        </el-aside>
+        <el-main class="el-menu">
+            <router-view />
+        </el-main>
+        <el-dialog title="修改密码" :visible.sync="editVisible" width="50%" @closed="onCloseEditDialog">
+            <el-form :model="editForm" :rules="editRules" ref="editForm" label-width="120px" class="demo-ruleForm">
+                <el-form-item label="密码" prop="pwd">
+                    <el-input v-model="editForm.pwd" type="password"></el-input>
+                </el-form-item>
+                <el-form-item label="确认密码" prop="rePwd">
+                    <el-input v-model="editForm.rePwd" type="password"></el-input>
+                </el-form-item>
+            </el-form>
+            <span slot="footer" class="dialog-footer">
+                <el-button @click="onCloseEditDialog">取 消</el-button>
+                <el-button type="primary" @click="onEditSubmit('editForm')">确认修改</el-button>
+            </span>
+        </el-dialog>
     </el-container>
-  </el-container>
+</el-container>
 </template>
+
 <script>
-import { loginOut } from "@/api";
+import {
+    loginOut,
+    editPwd
+} from "@/api";
 export default {
-  created() {
-    this.curPath = this.$route.name;
-  },
-  data() {
-    return {
-      curPath: "",
-    };
-  },
-  methods: {
-    onUserEdit(command) {
-      if (command == "logout") {
-        this.$confirm("确认退出该账号?", "退出", {
-          confirmButtonText: "确定",
-          cancelButtonText: "取消",
-          type: "warning",
-        })
-          .then(() => {
-            this.onLoginOut();
-          })
-          .catch(() => {
-            return false;
-          });
-      }
+    created() {
+        this.curPath = this.$route.name;
+    },
+    data() {
+        return {
+            curPath: "",
+            editVisible: false,
+            editForm: {
+                pwd: "",
+                rePwd: "",
+            },
+            editRules: {
+                pwd: [{
+                    required: true,
+                    message: "请输入登录密码",
+                    trigger: "blur",
+                }, ],
+                rePwd: [{
+                    required: true,
+                    validator: this.validateRePwd2,
+                    trigger: "blur",
+                }, ],
+            },
+        };
     },
-    onLoginOut() {
-      loginOut().then((res) => {
-        if (res && res.msg == "ok") {
-          this.$router.replace({ path: "/login" });
-        }
-      });
+    methods: {
+        onCloseEditDialog() {
+            this.editForm = {};
+            this.editVisible = false;
+            this.editPwdId = "";
+            this.$refs.editForm.resetFields();
+        },
+        validateRePwd2(rule, value, callback) {
+            if (value === "") {
+                callback(new Error("请再次输入密码"));
+            } else if (value !== this.editForm.pwd) {
+                callback(new Error("两次输入密码不一致!"));
+            } else {
+                callback();
+            }
+        },
+        onUserEdit(command) {
+            if (command == "logout") {
+                this.$confirm("确认退出该账号?", "退出", {
+                        confirmButtonText: "确定",
+                        cancelButtonText: "取消",
+                        type: "warning",
+                    })
+                    .then(() => {
+                        this.onLoginOut();
+                    })
+                    .catch(() => {
+                        return false;
+                    });
+            } else if (command == "editPwd") {
+                this.editVisible = true;
+            }
+        },
+        onLoginOut() {
+            loginOut().then((res) => {
+                if (res && res.msg == "ok") {
+                    this.$router.replace({
+                        path: "/login",
+                    });
+                }
+            });
+        },
+        onEditSubmit(formName) {
+            const _self = this;
+            this.$refs[formName].validate((valid) => {
+                if (valid) {
+                    editPwd({
+                        password: _self.editForm.pwd,
+                        repassword: _self.editForm.rePwd,
+                    }).then((res) => {
+                        console.log(res);
+                        if (res && res.msg == "ok") {
+                            this.$message({
+                                message: "修改成功",
+                                type: "success",
+                                center: true,
+                                duration: 1000,
+                                onClose: () => {
+                                    _self.onCloseEditDialog();
+                                },
+                            });
+                        }
+                    });
+                } else {
+                    console.log("error submit!!");
+                    return false;
+                }
+            });
+        },
     },
-  },
 };
 </script>
+
 <style scoped>
 .el-menu {
-  height: calc(100vh - 62px);
+    height: calc(100vh - 62px);
 }
+
 .el-dropdown-link {
-  color: #409eff;
+    color: #409eff;
 }
-</style>
+</style>

+ 171 - 23
src/pages/subPages/express.vue

@@ -3,16 +3,16 @@
     <el-header height="40px" style="border-bottom: 1px solid #eee">
         <div style="float:left;">柜体控制</div>
         <div style="float:right;height:40px;">
-            <el-dropdown>
+            <el-dropdown @command="onHandleCabinet">
                 <span class="el-dropdown-link">
                     柜体操作
                     <i class="el-icon-arrow-down el-icon--right"></i>
                 </span>
                 <el-dropdown-menu slot="dropdown">
-                    <el-dropdown-item icon="el-icon-lock" style="color:red;">锁柜</el-dropdown-item>
-                    <el-dropdown-item icon="el-icon-unlock">解除锁柜</el-dropdown-item>
-                    <el-dropdown-item icon="el-icon-warning">解除报警</el-dropdown-item>
-                    <el-dropdown-item icon="el-icon-refresh-left" style="color:#409EFF;">重启</el-dropdown-item>
+                    <el-dropdown-item icon="el-icon-lock" style="color:red;" command="lock">锁柜</el-dropdown-item>
+                    <el-dropdown-item icon="el-icon-unlock" command="unlock">解除锁柜</el-dropdown-item>
+                    <el-dropdown-item icon="el-icon-warning" command="unwarn">解除报警</el-dropdown-item>
+                    <el-dropdown-item icon="el-icon-refresh-left" style="color:#409EFF;" command="reset">重启</el-dropdown-item>
                 </el-dropdown-menu>
             </el-dropdown>
         </div>
@@ -48,23 +48,30 @@
                         <el-tag effect="dark">箱子已{{v.status_text}}</el-tag>
                       </el-row>
                     </div>-->
-                                    <el-row type="flex" justify="space-between" v-if="v.order_sn == ''">
-                                        <div style="height:72px;">
+                                    <div v-if="v.order_sn == ''">
+                                        <div style="height:72px;display:flex;justify-content:center;align-items:center;">
                                             <h4>空闲中</h4>
                                         </div>
-                                    </el-row>
+                                    </div>
 
                                     <el-row type="flex" justify="space-between" v-if="v.order_sn != ''">
                                         <!--                      <el-row type="flex" align="middle">
                         <el-tag type="danger" effect="dark">{{v.status_text}}</el-tag>
                       </el-row>-->
                                         <div style="height:72px;">
-                                            <h4>
-                                                订单号:{{v.order_sn}}
+                                            <h4 class="info">
+                                                <div class="label">订单号:</div>
+                                                <div class="value">{{v.order_sn}}</div>
                                                 <!-- <el-button style="margin-left:10px;" size="mini" type="primary">通知</el-button> -->
                                             </h4>
-                                            <h4>入柜日期:{{v.enter_time}}</h4>
-                                            <h4>已使用:{{v.use_time}}</h4>
+                                            <h4 class="info">
+                                                <div class="label">入柜日期:</div>
+                                                <div class="value">{{v.enter_time}}</div>
+                                            </h4>
+                                            <h4 class="info">
+                                                <div class="label">存件时间:</div>
+                                                <div class="value">{{v.use_time}}</div>
+                                            </h4>
                                         </div>
                                     </el-row>
 
@@ -82,8 +89,8 @@
                                     <span>新增箱子</span>
                                 </div>
                                 <div style="height:72px;">
-                                    <el-row type="flex" align="middle" style="height:100%;">
-                                        <el-button type="primary">新增</el-button>
+                                    <el-row type="flex" align="middle" justify="center" style="height:100%;">
+                                        <el-button type="primary" @click="onAddBox(item.id)">新增</el-button>
                                     </el-row>
                                 </div>
                             </el-card>
@@ -138,6 +145,10 @@ import {
     reboot,
     openBox,
     sendMsg,
+    addBox,
+    lockCabinet,
+    unLockCabinet,
+    releaseAlarm
 } from "@/api";
 import moment from "moment";
 export default {
@@ -200,13 +211,6 @@ export default {
         this.getCabinetList();
     },
     methods: {
-        getReboot(cabinetId) {
-            reboot({
-                cabinet_number: cabinetId,
-            }).then((res) => {
-                console.log(888, res);
-            });
-        },
         getCabinetList() {
             cabinetList().then((res) => {
                 console.log(res);
@@ -220,7 +224,6 @@ export default {
                         return [];
                     });
                     this.getBoxList(res.data.rows[0].id, 0);
-                    this.getReboot(res.data.rows[0].id);
                     this.tabActive = res.data.rows[0].id + "";
                     console.log(this.tabActive);
                 }
@@ -296,6 +299,7 @@ export default {
                                     center: true,
                                     duration: 1000,
                                 });
+                                this.getCabinetList();
                             } else {
                                 this.$message({
                                     message: "操作失败",
@@ -341,6 +345,132 @@ export default {
                     });
             }
         },
+        onHandleCabinet(command) {
+            const cabinet_number = this.tabActive;
+            if (command == "lock") {
+                this.$confirm("确认锁定当前柜体?", "提示").then(() => {
+                    lockCabinet({
+                        cabinet_number,
+                    }).then((res) => {
+                        if (res && res.msg == "ok") {
+                            this.$message({
+                                message: "锁定成功",
+                                type: "success",
+                                center: true,
+                                duration: 1000,
+                            });
+                            this.getCabinetList();
+                        } else {
+                            this.$message({
+                                message: "锁定失败",
+                                type: "success",
+                                center: true,
+                                duration: 1000,
+                            });
+                        }
+                    });
+                });
+            } else if (command == "unlock") {
+                this.$confirm("确认解锁当前柜体?", "提示").then(() => {
+                    unLockCabinet({
+                        cabinet_number,
+                    }).then((res) => {
+                        if (res && res.msg == "ok") {
+                            this.$message({
+                                message: "解锁成功",
+                                type: "success",
+                                center: true,
+                                duration: 1000,
+                            });
+                            this.getCabinetList();
+                        } else {
+                            this.$message({
+                                message: "解锁失败",
+                                type: "success",
+                                center: true,
+                                duration: 1000,
+                            });
+                        }
+                    });
+                });
+            } else if (command == 'unwarn') {
+                this.$confirm("确认解除当前报警?", "提示").then(() => {
+                    releaseAlarm({
+                        cabinet_number,
+                    }).then((res) => {
+                        if (res && res.msg == "ok") {
+                            this.$message({
+                                message: "解除成功",
+                                type: "success",
+                                center: true,
+                                duration: 1000,
+                            });
+                            this.getCabinetList();
+                        } else {
+                            this.$message({
+                                message: "解除失败",
+                                type: "success",
+                                center: true,
+                                duration: 1000,
+                            });
+                        }
+                    });
+                });
+            } else if (command == 'reset') {
+                this.$confirm("确认重启当前柜体?", "提示").then(() => {
+                    reboot({
+                        cabinet_number,
+                    }).then((res) => {
+                        if (res && res.msg == "ok") {
+                            this.$message({
+                                message: "重启成功",
+                                type: "success",
+                                center: true,
+                                duration: 1000,
+                            });
+                            this.getCabinetList();
+                        } else {
+                            this.$message({
+                                message: "重启失败",
+                                type: "success",
+                                center: true,
+                                duration: 1000,
+                            });
+                        }
+                    });
+                });
+            }
+
+            console.log(command);
+        },
+        onAddBox(id) {
+            this.$confirm("确定新增箱子?", "提示")
+                .then(() => {
+                    addBox({
+                        cabinet_number: id,
+                    }).then((res) => {
+                        if (res && res.msg == "ok") {
+                            this.$message({
+                                message: "新增成功",
+                                type: "success",
+                                center: true,
+                                duration: 1000,
+                            });
+                            this.getCabinetList();
+                        } else {
+                            this.$message({
+                                message: "新增失败",
+                                type: "success",
+                                center: true,
+                                duration: 1000,
+                            });
+                        }
+                    });
+                })
+                .catch(() => {
+                    console.log("取消");
+                });
+        },
     },
 };
 </script>
@@ -348,7 +478,7 @@ export default {
 <style scoped>
 .box-card {
     color: #fff;
-    background: rgb(107, 107, 107);
+    background: rgba(107, 107, 107, 1);
     margin-top: 10px;
 }
 
@@ -366,4 +496,22 @@ export default {
     align-items: center;
     justify-content: space-between;
 }
+
+.el-tag {
+    background: transparent;
+    color: #fff;
+}
+
+.info {
+    display: flex;
+}
+
+.info .label {
+    width: 80px;
+    text-align: right;
+}
+
+.info .value {
+    flex: 1;
+}
 </style>

+ 49 - 52
src/pages/subPages/log.vue

@@ -1,5 +1,5 @@
 <template>
-  <el-container direction="vertical">
+<el-container direction="vertical">
     <el-header height="40px" style="border-bottom: 1px solid #eee">日志管理</el-header>
     <!-- <div style="margin:10px 0;">
       <el-date-picker v-model="selectDate" type="date" placeholder="选择日期"></el-date-picker>
@@ -7,65 +7,62 @@
     </div>
     -->
     <el-table :data="tableData" border style="width: 100%">
-      <el-table-column align="center" prop="id" label="记录ID"></el-table-column>
-      <el-table-column align="center" prop="admin_id" label="管理员ID"></el-table-column>
-      <el-table-column align="center" prop="username" label="管理员名称"></el-table-column>
-      <el-table-column align="center" prop="content" label="操作接口地址"></el-table-column>
-      <el-table-column align="center" prop="ip" label="IP地址"></el-table-column>
-      <el-table-column align="center" prop="date" label="记录日期"></el-table-column>
+        <el-table-column align="center" prop="id" label="记录ID"></el-table-column>
+        <el-table-column align="center" prop="admin_id" label="管理员ID"></el-table-column>
+        <el-table-column align="center" prop="username" label="管理员名称"></el-table-column>
+        <el-table-column align="center" prop="content" label="操作接口地址"></el-table-column>
+        <el-table-column align="center" prop="ip" label="IP地址"></el-table-column>
+        <el-table-column align="center" prop="date" label="记录日期"></el-table-column>
     </el-table>
     <el-row style="margin-top:10px;" type="flex" justify="end">
-      <el-pagination
-        background
-        layout="prev, pager, next"
-        :total="total"
-        :page-size="pageSize"
-        :current-page="pageNumber"
-        @current-change="onPageChange"
-      ></el-pagination>
+        <el-pagination background layout="prev, pager, next" :total="total" :page-size="pageSize" :current-page="pageNumber" @current-change="onPageChange"></el-pagination>
     </el-row>
-  </el-container>
+</el-container>
 </template>
+
 <script>
-import { actionLogList } from "@/api";
+import {
+    actionLogList
+} from "@/api";
 export default {
-  data() {
-    return {
-      tableData: [],
-      pageSize: 20,
-      pageNumber: 1,
-      total: 0,
-    };
-  },
-  mounted() {
-    this.getActionLogList();
-  },
-  methods: {
-    getActionLogList() {
-      const _self = this;
-      actionLogList({
-        pageSize: _self.pageSize,
-        pageNumber: _self.pageNumber,
-      }).then((res) => {
-        console.log(res);
-        if (res && res.msg == "ok") {
-          _self.total = res.data.total;
-          _self.tableData = [...res.data.rows];
-        }
-      });
+    data() {
+        return {
+            tableData: [],
+            pageSize: 10,
+            pageNumber: 1,
+            total: 0,
+        };
     },
-    onPageChange(page) {
-      if (page == this.pageNumber) {
-        return;
-      } else {
-        this.pageNumber = page;
-        setTimeout(() => {
-          this.getActionLogList();
-        }, 0);
-      }
+    mounted() {
+        this.getActionLogList();
+    },
+    methods: {
+        getActionLogList() {
+            const _self = this;
+            actionLogList({
+                pageSize: _self.pageSize,
+                pageNumber: _self.pageNumber,
+            }).then((res) => {
+                console.log(res);
+                if (res && res.msg == "ok") {
+                    _self.total = res.data.total;
+                    _self.tableData = [...res.data.rows];
+                }
+            });
+        },
+        onPageChange(page) {
+            if (page == this.pageNumber) {
+                return;
+            } else {
+                this.pageNumber = page;
+                setTimeout(() => {
+                    this.getActionLogList();
+                }, 0);
+            }
+        },
     },
-  },
 };
 </script>
+
 <style scoped>
-</style>
+</style>

+ 111 - 124
src/pages/subPages/message.vue

@@ -1,142 +1,129 @@
 <template>
-  <el-container direction="vertical">
+<el-container direction="vertical">
     <el-header height="40px" style="border-bottom: 1px solid #eee">消息通知</el-header>
     <div style="margin:10px 0;">
-      <el-form :inline="true">
-        <el-form-item label="选择柜子">
-          <el-select v-model="cabinetValue" placeholder="请选择" @change="onChangeCabinet">
-            <el-option
-              v-for="item in cabinetOptions"
-              :key="item.id"
-              :label="item.alias"
-              :value="item.id"
-            ></el-option>
-          </el-select>
-        </el-form-item>
-        <el-form-item label="选择箱子">
-          <el-select v-model="boxValue" placeholder="请选择">
-            <el-option
-              v-for="item in boxOptions"
-              :key="item.box_number"
-              :label="item.box_number"
-              :value="item.box_number"
-            ></el-option>
-          </el-select>
-        </el-form-item>
-        <el-form-item>
-          <el-button
-            style="margin-left:10px;"
-            type="primary"
-            @click="onSearch"
-          >查询</el-button>
-        </el-form-item>
-      </el-form>
+        <el-form :inline="true">
+            <el-form-item label="选择柜子">
+                <el-select v-model="cabinetValue" placeholder="请选择" @change="onChangeCabinet">
+                    <el-option v-for="item in cabinetOptions" :key="item.id" :label="item.alias" :value="item.id"></el-option>
+                </el-select>
+            </el-form-item>
+            <el-form-item label="选择箱子">
+                <el-select v-model="boxValue" placeholder="请选择">
+                    <el-option v-for="item in boxOptions" :key="item.box_number" :label="item.box_number" :value="item.box_number"></el-option>
+                </el-select>
+            </el-form-item>
+            <el-form-item>
+                <el-button style="margin-left:10px;" type="primary" @click="onSearch">查询</el-button>
+            </el-form-item>
+        </el-form>
     </div>
     <el-table :data="tableData" border style="width: 100%">
-      <el-table-column align="center" prop="id" label="记录ID"></el-table-column>
-      <el-table-column align="center" prop="cabinet_number" label="柜子号码"></el-table-column>
-      <el-table-column align="center" prop="box_number" label="箱子号码"></el-table-column>
-      <el-table-column align="center" prop="order_sn" label="订单号码"></el-table-column>
-      <el-table-column align="center" prop="msg" label="消息文本"></el-table-column>
-      <el-table-column align="center" prop="status_text" label="消息类型文本"></el-table-column>
-      <el-table-column align="center" prop="datetime" label="消息日期"></el-table-column>
+        <el-table-column align="center" prop="id" label="记录ID"></el-table-column>
+        <el-table-column align="center" prop="cabinet_number" label="柜子号码"></el-table-column>
+        <el-table-column align="center" prop="box_number" label="箱子号码"></el-table-column>
+        <el-table-column align="center" prop="order_sn" label="订单号码"></el-table-column>
+        <el-table-column align="center" prop="msg" label="消息文本"></el-table-column>
+        <el-table-column align="center" prop="status_text" label="消息类型文本"></el-table-column>
+        <el-table-column align="center" prop="datetime" label="消息日期"></el-table-column>
     </el-table>
     <el-row style="margin-top:10px;" type="flex" justify="end">
-      <el-pagination
-        background
-        layout="prev, pager, next"
-        :total="total"
-        :page-size="pageSize"
-        @current-change="onPageChange"
-        :current-page="pageNumber"
-      ></el-pagination>
+        <el-pagination background layout="prev, pager, next" :total="total" :page-size="pageSize" @current-change="onPageChange" :current-page="pageNumber"></el-pagination>
     </el-row>
-  </el-container>
+</el-container>
 </template>
+
 <script>
-import { msgList, cabinetList, boxList } from "@/api";
+import {
+    msgList,
+    cabinetList,
+    boxList
+} from "@/api";
 export default {
-  data() {
-    return {
-      pageSize: 20,
-      pageNumber: 1,
-      cabinetValue: "",
-      cabinetOptions: [],
-      boxOptions: [],
-      boxValue: "",
-      tableData: [],
-      total: 0,
-    };
-  },
-  created() {
-    this.getCabinetList();
-  },
-  computed: {
-    disSearch() {
-      return this.cabinetValue == "" || this.boxValue == "";
+    data() {
+        return {
+            pageSize: 10,
+            pageNumber: 1,
+            cabinetValue: "",
+            cabinetOptions: [],
+            boxOptions: [],
+            boxValue: "",
+            tableData: [],
+            total: 0,
+        };
     },
-  },
-  methods: {
-    onChangeCabinet(value) {
-      if (value) {
-        this.getBoxList();
-      }
-      console.log(value);
+    created() {
+        this.getCabinetList();
     },
-    getCabinetList() {
-      cabinetList().then((res) => {
-        console.log(res);
-        if (res && res.msg == "ok") {
-          this.cabinetOptions = res.data.rows;
-        }
-      });
+    computed: {
+        disSearch() {
+            return this.cabinetValue == "" || this.boxValue == "";
+        },
     },
-    getBoxList() {
-      boxList({ cabinet_number: this.cabinetValue }).then((res) => {
-        if (res && res.msg == "ok") {
-          this.boxOptions = res.data.rows;
-        }
-      });
+    methods: {
+        onChangeCabinet(value) {
+            if (value) {
+                this.getBoxList();
+            }
+            console.log(value);
+        },
+        getCabinetList() {
+            cabinetList().then((res) => {
+                console.log(res);
+                if (res && res.msg == "ok") {
+                    this.cabinetOptions = res.data.rows;
+                }
+            });
+        },
+        getBoxList() {
+            boxList({
+                cabinet_number: this.cabinetValue
+            }).then((res) => {
+                if (res && res.msg == "ok") {
+                    this.boxOptions = res.data.rows;
+                }
+            });
+        },
+        getBoxActionList() {
+            console.log(this.cabinetValue)
+            let cabinet = this.cabinetValue ? this.cabinetValue : 0;
+            let box = this.boxValue ? this.boxValue : 0;
+            if (box > 0 && cabinet == 0) {
+                alert("选定了箱子,必须选定柜子");
+                return;
+            }
+            msgList({
+                cabinet_number: this.cabinetValue,
+                box_number: this.boxValue,
+                pageSize: this.pageSize,
+                pageNumber: this.pageNumber,
+            }).then((res) => {
+                console.log(res);
+                if (res && res.msg == "ok") {
+                    this.total = res.data.total;
+                    this.tableData = res.data.rows;
+                }
+            });
+        },
+        onPageChange(page) {
+            if (page == this.pageNumber) {
+                return;
+            } else {
+                this.pageNumber = page;
+                setTimeout(() => {
+                    this.getBoxActionList();
+                }, 0);
+            }
+        },
+        onSearch() {
+            this.pageNumber = 1;
+            setTimeout(() => {
+                this.getBoxActionList();
+            }, 0);
+        },
     },
-    getBoxActionList() {
-		console.log(this.cabinetValue)
-		let cabinet = this.cabinetValue ? this.cabinetValue : 0;
-		let box = this.boxValue ? this.boxValue : 0;
-		if(box > 0 && cabinet == 0) {			
-			alert("选定了箱子,必须选定柜子");
-			return;
-		}
-	msgList({
-		cabinet_number: this.cabinetValue,
-		box_number: this.boxValue,
-		pageSize: this.pageSize,
-		pageNumber: this.pageNumber,
-	}).then((res) => {
-		console.log(res);
-		if (res && res.msg == "ok") {
-		this.total = res.data.total;
-		this.tableData = res.data.rows;
-		}
-	});
-    },
-    onPageChange(page) {
-      if (page == this.pageNumber) {
-        return;
-      } else {
-        this.pageNumber = page;
-        setTimeout(() => {
-          this.getBoxActionList();
-        }, 0);
-      }
-    },
-    onSearch() {
-      this.pageNumber = 1;
-      setTimeout(() => {
-        this.getBoxActionList();
-      }, 0);
-    },
-  },
 };
 </script>
+
 <style scoped>
-</style>
+</style>

+ 68 - 50
src/pages/subPages/order.vue

@@ -1,65 +1,83 @@
 <template>
-  <el-container direction="vertical">
+<el-container direction="vertical">
     <el-header height="40px" style="border-bottom: 1px solid #eee">订单管理</el-header>
-    <!-- <div style="margin:10px 0;">
-      <el-date-picker v-model="selectDate" type="date" placeholder="选择日期"></el-date-picker>
-      <el-button style="margin-left:10px;" type="primary">查询</el-button>
+    <div style="margin:10px 0;">
+        <el-input placeholder="请输入订单号" v-model="searchValue" style="width:200px;margin-left:10px;" />
+        <el-button style="margin-left:10px;" type="primary" @click="onSearch">查询</el-button>
+        <el-button style="margin-left:10px;" type="danger" @click="onReset">重置</el-button>
     </div>
-    -->
+
     <el-table :data="tableData" border style="width: 100%">
-      <el-table-column align="center" prop="id" label="订单id"></el-table-column>
-      <el-table-column align="center" prop="order_sn" label="订单编号"></el-table-column>
-      <el-table-column align="center" prop="cabinet_number" label="柜号"></el-table-column>
-      <el-table-column align="center" prop="box_number" label="箱号"></el-table-column>
-      <el-table-column align="center" prop="code" label="取件码"></el-table-column>
-      <el-table-column align="center" prop="order_status" label="订单状态"></el-table-column>
-      <el-table-column align="center" prop="enter_time" label="存件日期"></el-table-column>
-      <el-table-column align="center" prop="out_time" label="取件日期"></el-table-column>
+        <el-table-column align="center" prop="id" label="订单id"></el-table-column>
+        <el-table-column align="center" prop="order_sn" label="订单编号"></el-table-column>
+        <el-table-column align="center" prop="cabinet_number" label="柜号"></el-table-column>
+        <el-table-column align="center" prop="box_number" label="箱号"></el-table-column>
+        <el-table-column align="center" prop="code" label="取件码"></el-table-column>
+        <el-table-column align="center" prop="order_status" label="订单状态"></el-table-column>
+        <el-table-column align="center" prop="enter_time" label="存件日期"></el-table-column>
+        <el-table-column align="center" prop="out_time" label="取件日期"></el-table-column>
     </el-table>
     <el-row style="margin-top:10px;" type="flex" justify="end">
-      <el-pagination background layout="prev, pager, next" :total="total" :page-size="pageSize" :current-page="pageNumber" @current-change="onPageChange"></el-pagination>
+        <el-pagination background layout="prev, pager, next" :total="total" :page-size="pageSize" :current-page="pageNumber" @current-change="onPageChange"></el-pagination>
     </el-row>
-  </el-container>
+</el-container>
 </template>
+
 <script>
-import { orderList } from "@/api";
+import {
+    orderList
+} from "@/api";
 export default {
-  data() {
-    return {
-      tableData: [],
-      pageSize: 20,
-      pageNumber: 1,
-      total: 0,
-    };
-  },
-  mounted() {
-    this.getOrderList();
-  },
-  methods: {
-    getOrderList() {
-      const _self = this;
-      orderList({ pageSize: _self.pageSize, pageNumber: _self.pageNumber }).then(
-        (res) => {
-          if (res && res.msg == "ok") {
-            _self.total = res.data.total;
-            _self.tableData = [...res.data.rows];
-          }
+    data() {
+        return {
+            tableData: [],
+            pageSize: 10,
+            pageNumber: 1,
+            total: 0,
+            searchValue: ""
+        };
+    },
+    mounted() {
+        this.getOrderList();
+    },
+    methods: {
+        getOrderList() {
+            const _self = this;
+            orderList({
+                pageSize: _self.pageSize,
+                pageNumber: _self.pageNumber,
+                order_sn: _self.searchValue
+            }).then(
+                (res) => {
+                    if (res && res.msg == "ok") {
+                        _self.total = res.data.total;
+                        _self.tableData = [...res.data.rows];
+                    }
+                }
+            );
+        },
+        onPageChange(page) {
+            if (page == this.pageNumber) {
+                return;
+            } else {
+                this.pageNumber = page;
+                setTimeout(() => {
+                    this.getOrderList();
+                }, 0)
+            }
+        },
+        onSearch() {
+            this.pageNumber = 1;
+            this.getOrderList();
+        },
+        onReset() {
+            this.searchValue = "";
+            this.pageNumber = 1;
+            this.getOrderList();
         }
-      );
     },
-    onPageChange(page){
-      if(page == this.pageNumber) {
-        return;
-      }
-      else {
-        this.pageNumber = page;
-        setTimeout(()=>{
-          this.getOrderList();
-        },0)
-      }
-    }
-  },
 };
 </script>
+
 <style scoped>
-</style>
+</style>

+ 189 - 16
src/pages/subPages/status.vue

@@ -1,28 +1,201 @@
 <template>
-  <el-container direction="vertical">
-    <el-header height="40px" style="border-bottom: 1px solid #eee">状态查询</el-header>
+<el-container direction="vertical">
+    <el-header height="40px" style="border-bottom: 1px solid #eee">日志管理</el-header>
     <div style="margin:10px 0;">
-      <el-date-picker v-model="value1" type="date" placeholder="选择日期"></el-date-picker>
-      <el-button style="margin-left:10px;" type="primary">查询</el-button>
+        <el-button icon="el-icon-plus" style="margin-left:10px;" type="primary" @click="addVisible = true">新增</el-button>
+        <el-input v-model="searchValue" placeholder="请输入" style="width:200px;margin-left:10px;" />
+        <el-button style="margin-left:10px;" type="primary" @click="onSearch">搜索</el-button>
+        <el-button style="margin-left:10px;" type="danger" @click="onReset">重置</el-button>
     </div>
-    <el-table :data="tableData" height="100%" border style="width: 100%">
-      <el-table-column prop="date" label="日期" width="180"></el-table-column>
-      <el-table-column prop="name" label="姓名" width="180"></el-table-column>
-      <el-table-column prop="address" label="地址"></el-table-column>
+
+    <el-table :data="tableData" border style="width: 100%">
+        <el-table-column align="center" prop="id" label="记录ID"></el-table-column>
+        <el-table-column align="center" prop="username" label="管理员名称"></el-table-column>
+        <el-table-column align="center" prop="create_timestamp" label="创建时间"></el-table-column>
+        <el-table-column align="center" prop="last_login_ip" label="上次登录ip地址"></el-table-column>
+        <el-table-column align="center" prop="last_login_time" label="上次登录日期"></el-table-column>
+        <el-table-column align="center" prop="update_timestamp" label="最后修改日期"></el-table-column>
+        <el-table-column align="center" prop="status_text" label="管理员状态"></el-table-column>
+        <el-table-column align="center" label="操作">
+            <template slot-scope="scope">
+                <!-- <el-button size="mini" type="info" style="margin-bottom:10px;" @click="onEditUser(scope.$index, scope.row)">修改密码</el-button> -->
+                <el-button size="mini" v-show="scope.row.is_del" type="danger" style="width:80px;margin-left:0;" @click="onDelUser(scope.$index, scope.row)">删除</el-button>
+            </template>
+        </el-table-column>
     </el-table>
     <el-row style="margin-top:10px;" type="flex" justify="end">
-        <el-pagination background layout="prev, pager, next" :total="1000"></el-pagination>
+        <el-pagination background layout="prev, pager, next" :total="total" :page-size="pageSize" :current-page="pageNumber" @current-change="onPageChange"></el-pagination>
     </el-row>
-  </el-container>
+
+    <el-dialog title="新增" :visible.sync="addVisible" width="50%" @closed="onCloseAddDialog">
+        <el-form :model="addForm" :rules="addRules" ref="addForm" label-width="120px" class="demo-ruleForm">
+            <el-form-item label="管理员名称" prop="name">
+                <el-input v-model="addForm.name"></el-input>
+            </el-form-item>
+            <el-form-item label="密码" prop="pwd">
+                <el-input v-model="addForm.pwd" type="password"></el-input>
+            </el-form-item>
+            <el-form-item label="确认密码" prop="rePwd">
+                <el-input v-model="addForm.rePwd" type="password"></el-input>
+            </el-form-item>
+        </el-form>
+        <span slot="footer" class="dialog-footer">
+            <el-button @click="onCloseAddDialog">取 消</el-button>
+            <el-button type="primary" @click="onAddSubmit('addForm')">立即添加</el-button>
+        </span>
+    </el-dialog>
+</el-container>
 </template>
+
 <script>
+import {
+    userList,
+    userAdd,
+    userDel
+} from "@/api";
 export default {
-  data() {
-    return {
-      tableData: []
-    };
-  }
+    data() {
+        return {
+            editPwdId: "",
+            tableData: [],
+            pageSize: 10,
+            pageNumber: 1,
+            total: 0,
+            searchValue: "",
+
+            addVisible: false,
+            addForm: {
+                name: "",
+                pwd: "",
+                rePwd: "",
+            },
+            addRules: {
+                name: [{
+                    required: true,
+                    message: "请输入管理员名称",
+                    trigger: "blur",
+                }, ],
+                pwd: [{
+                    required: true,
+                    message: "请输入登录密码",
+                    trigger: "blur",
+                }, ],
+                rePwd: [{
+                    required: true,
+                    validator: this.validateRePwd,
+                    trigger: "blur",
+                }, ],
+            },
+        };
+    },
+    mounted() {
+        this.getUserList();
+    },
+    methods: {
+        validateRePwd(rule, value, callback) {
+            if (value === "") {
+                callback(new Error("请再次输入密码"));
+            } else if (value !== this.addForm.pwd) {
+                callback(new Error("两次输入密码不一致!"));
+            } else {
+                callback();
+            }
+        },
+
+        onReset() {
+            this.searchValue = "";
+            this.pageNumber = 1;
+            this.getUserList();
+        },
+        getUserList() {
+            const _self = this;
+            userList({
+                pageSize: _self.pageSize,
+                pageNumber: _self.pageNumber,
+                searchText: _self.searchValue,
+            }).then((res) => {
+                console.log(res);
+                if (res && res.msg == "ok") {
+                    _self.total = res.data.total;
+                    _self.tableData = [...res.data.rows];
+                }
+            });
+        },
+        onPageChange(page) {
+            if (page == this.pageNumber) {
+                return;
+            } else {
+                this.pageNumber = page;
+                setTimeout(() => {
+                    this.getActionLogList();
+                }, 0);
+            }
+        },
+        onSearch() {
+            this.pageNumber = 1;
+            this.getUserList();
+        },
+        onCloseAddDialog() {
+            this.addForm = {};
+            this.addVisible = false;
+            this.$refs.addForm.resetFields();
+        },
+        onAddSubmit(formName) {
+            const _self = this;
+            this.$refs[formName].validate((valid) => {
+                if (valid) {
+                    userAdd({
+                        username: this.addForm.name,
+                        password: this.addForm.pwd,
+                        repassword: this.addForm.rePwd,
+                    }).then((res) => {
+                        console.log(res);
+                        if (res && res.msg == "ok") {
+                            this.$message({
+                                message: "新增成功",
+                                type: "success",
+                                center: true,
+                                duration: 1000,
+                                onClose: () => {
+                                    _self.onReset();
+                                    _self.onCloseAddDialog();
+                                },
+                            });
+                        }
+                    });
+                } else {
+                    console.log("error submit!!");
+                    return false;
+                }
+            });
+        },
+        onDelUser(index, row) {
+            const _self = this;
+            this.$confirm("确认删除该管理员?", "提示").then(() => {
+                userDel({
+                    id: row.id,
+                }).then((res) => {
+                    if (res && res.msg == "ok") {
+                        this.$message({
+                            message: "删除成功",
+                            type: "success",
+                            center: true,
+                            duration: 1000,
+                            onClose: () => {
+                                _self.onReset();
+                            },
+                        });
+                    }
+                });
+            });
+        },
+        onEditUser(index, row) {
+            this.editPwdId = row.id;
+            this.editVisible = true;
+        }
+    },
 };
 </script>
+
 <style scoped>
-</style>
+</style>

+ 104 - 118
src/pages/subPages/view.vue

@@ -1,138 +1,124 @@
 <template>
-  <el-container direction="vertical">
+<el-container direction="vertical">
     <el-header height="40px" style="border-bottom: 1px solid #eee">操作记录</el-header>
     <div style="margin:10px 0;">
-      <el-form :inline="true">
-        <el-form-item label="选择柜子">
-          <el-select v-model="cabinetValue" placeholder="请选择" @change="onChangeCabinet">
-            <el-option
-              v-for="item in cabinetOptions"
-              :key="item.id"
-              :label="item.alias"
-              :value="item.id"
-            ></el-option>
-          </el-select>
-        </el-form-item>
-        <el-form-item label="选择箱子">
-          <el-select v-model="boxValue" placeholder="请选择">
-            <el-option
-              v-for="item in boxOptions"
-              :key="item.box_number"
-              :label="item.box_number"
-              :value="item.box_number"
-            ></el-option>
-          </el-select>
-        </el-form-item>
-        <el-form-item>
-          <el-button
-            style="margin-left:10px;"
-            type="primary"
-            :disabled="disSearch"
-            @click="onSearch"
-          >查询</el-button>
-        </el-form-item>
-      </el-form>
+        <el-form :inline="true">
+            <el-form-item label="选择柜子">
+                <el-select v-model="cabinetValue" placeholder="请选择" @change="onChangeCabinet">
+                    <el-option v-for="item in cabinetOptions" :key="item.id" :label="item.alias" :value="item.id"></el-option>
+                </el-select>
+            </el-form-item>
+            <el-form-item label="选择箱子">
+                <el-select v-model="boxValue" placeholder="请选择">
+                    <el-option v-for="item in boxOptions" :key="item.box_number" :label="item.box_number" :value="item.box_number"></el-option>
+                </el-select>
+            </el-form-item>
+            <el-form-item>
+                <el-button style="margin-left:10px;" type="primary" :disabled="disSearch" @click="onSearch">查询</el-button>
+            </el-form-item>
+        </el-form>
     </div>
     <el-table :data="tableData" border style="width: 100%">
-      <el-table-column align="center" prop="id" label="ID"></el-table-column>
-      <el-table-column align="center" prop="cabinet_number" label="柜号"></el-table-column>
-      <el-table-column align="center" prop="box_number" label="箱号"></el-table-column>
-      <el-table-column align="center" prop="status_text" label="操作类型"></el-table-column>
-      <el-table-column align="center" prop="datetime" label="操作日期"></el-table-column>
-<!--      <el-table-column align="center" prop="pic" label="图片">
+        <el-table-column align="center" prop="id" label="ID"></el-table-column>
+        <el-table-column align="center" prop="cabinet_number" label="柜号"></el-table-column>
+        <el-table-column align="center" prop="box_number" label="箱号"></el-table-column>
+        <el-table-column align="center" prop="status_text" label="操作类型"></el-table-column>
+        <el-table-column align="center" prop="datetime" label="操作日期"></el-table-column>
+        <!--      <el-table-column align="center" prop="pic" label="图片">
         <el-image style="width:100%;height:80px;"></el-image>
       </el-table-column> -->
     </el-table>
     <el-row style="margin-top:10px;" type="flex" justify="end">
-      <el-pagination
-        background
-        layout="prev, pager, next"
-        :total="total"
-        :page-size="pageSize"
-        @current-change="onPageChange"
-        :current-page="pageNumber"
-      ></el-pagination>
+        <el-pagination background layout="prev, pager, next" :total="total" :page-size="pageSize" @current-change="onPageChange" :current-page="pageNumber"></el-pagination>
     </el-row>
-  </el-container>
+</el-container>
 </template>
+
 <script>
-import { boxActionList, cabinetList, boxList } from "@/api";
+import {
+    boxActionList,
+    cabinetList,
+    boxList
+} from "@/api";
 export default {
-  data() {
-    return {
-      pageSize: 20,
-      pageNumber: 1,
-      cabinetValue: "",
-      cabinetOptions: [],
-      boxOptions: [],
-      boxValue: "",
-      tableData: [],
-      total: 0,
-    };
-  },
-  created() {
-    this.getCabinetList();
-  },
-  computed: {
-    disSearch() {
-      return this.boxValue != "" && this.cabinetValue == "";
+    data() {
+        return {
+            pageSize: 10,
+            pageNumber: 1,
+            cabinetValue: "",
+            cabinetOptions: [],
+            boxOptions: [],
+            boxValue: "",
+            tableData: [],
+            total: 0,
+        };
     },
-  },
-  methods: {
-    onChangeCabinet(value) {
-      if (value) {
-        this.getBoxList();
-      }
-      console.log(value);
+    created() {
+        this.getCabinetList();
     },
-    getCabinetList() {
-      cabinetList().then((res) => {
-        console.log(res);
-        if (res && res.msg == "ok") {
-          this.cabinetOptions = res.data.rows;
-        }
-      });
+    computed: {
+        disSearch() {
+            return this.boxValue != "" && this.cabinetValue == "";
+        },
     },
-    getBoxList() {
-      boxList({ cabinet_number: this.cabinetValue }).then((res) => {
-        if (res && res.msg == "ok") {
-          this.boxOptions = res.data.rows;
-        }
-      });
+    methods: {
+        onChangeCabinet(value) {
+            if (value) {
+                this.getBoxList();
+            }
+            console.log(value);
+        },
+        getCabinetList() {
+            cabinetList().then((res) => {
+                console.log(res);
+                if (res && res.msg == "ok") {
+                    this.cabinetOptions = res.data.rows;
+                }
+            });
+        },
+        getBoxList() {
+            boxList({
+                cabinet_number: this.cabinetValue
+            }).then((res) => {
+                if (res && res.msg == "ok") {
+                    this.boxOptions = res.data.rows;
+                }
+            });
+        },
+        getBoxActionList() {
+            let box = this.boxValue ? this.boxValue : 0;
+            boxActionList({
+                cabinet_number: this.cabinetValue,
+                box_number: box,
+                pageSize: this.pageSize,
+                pageNumber: this.pageNumber,
+            }).then((res) => {
+                console.log(res);
+                if (res && res.msg == "ok") {
+                    this.total = res.data.total;
+                    this.tableData = res.data.rows;
+                }
+            });
+        },
+        onPageChange(page) {
+            if (page == this.pageNumber) {
+                return;
+            } else {
+                this.pageNumber = page;
+                setTimeout(() => {
+                    this.getBoxActionList();
+                }, 0);
+            }
+        },
+        onSearch() {
+            this.pageNumber = 1;
+            setTimeout(() => {
+                this.getBoxActionList();
+            }, 0);
+        },
     },
-    getBoxActionList() {
-		let box = this.boxValue ? this.boxValue : 0;
-      boxActionList({
-        cabinet_number: this.cabinetValue,
-        box_number: box,
-        pageSize: this.pageSize,
-        pageNumber: this.pageNumber,
-      }).then((res) => {
-        console.log(res);
-        if (res && res.msg == "ok") {
-          this.total = res.data.total;
-          this.tableData = res.data.rows;
-        }
-      });
-    },
-    onPageChange(page) {
-      if (page == this.pageNumber) {
-        return;
-      } else {
-        this.pageNumber = page;
-        setTimeout(() => {
-          this.getBoxActionList();
-        }, 0);
-      }
-    },
-    onSearch() {
-      this.pageNumber = 1;
-      setTimeout(() => {
-        this.getBoxActionList();
-      }, 0);
-    },
-  },
 };
 </script>
+
 <style scoped>
-</style>
+</style>