Merge branch 'master' of 39.97.239.116:gyfl/console

src/api/index.js

@@ -140,6 +140,22 @@ export const addCabinet = (params) => {
     return requestLoading(`${Prefix}/AddCabinet`, 'post', params)
 }
 
+//日志记录
+export const actionLogList = (params) => {
+    return requestLoading(`${Prefix}/ActionLogList`, 'post', params)
+}
+
+//消息记录
+export const msgList = (params) => {
+    return requestLoading(`${Prefix}/MsgList`, 'post', params)
+}
+
+//柜子状态
+export const reboot = (params) => {
+    return requestLoading(`${Prefix}/Reboot`, 'post', params)
+}
+
+
 // export const AddCabinet = (alias,url,count) => {
 //     return requestLoading(`${Prefix}/index.php/api/AddCabinet?alias=${alias}&url=${url}&count=${count}`, 'get', {})
 // }

src/pages/login.vue

@@ -18,7 +18,7 @@
                 <el-input v-model="ruleForm.name" placeholder="请输入用户名"></el-input>
               </el-form-item>
               <el-form-item label="密码" prop="pwd">
-                <el-input v-model="ruleForm.pwd" type="password" placeholder="请输入密码"></el-input>
+                <el-input v-model="ruleForm.pwd" type="password" placeholder="请输入密码" @keyup.enter.native="onLogin('ruleForm')"></el-input>
               </el-form-item>
 
               <el-button
@@ -26,7 +26,6 @@
                 size="medium"
                 style="width:100%;"
                 @click="onLogin('ruleForm')"
-                @keydown.enter="onLogin('ruleForm')"
               >登录</el-button>
             </el-form>
           </div>
@@ -53,7 +52,9 @@ export default {
       labelPosition: "right",
     };
   },
-  created() {},
+  created() {
+    
+  },
   methods: {
     onLogin(formName) {
       this.$refs[formName].validate((valid) => {

src/pages/subPages/express.vue

@@ -5,12 +5,14 @@
       <div style="float:right;height:40px;">
         <el-dropdown>
           <span class="el-dropdown-link">
-            操作
+            柜体操作
             <i class="el-icon-arrow-down el-icon--right"></i>
           </span>
           <el-dropdown-menu slot="dropdown">
-            <el-dropdown-item>启用柜子</el-dropdown-item>
-            <el-dropdown-item>停用柜子</el-dropdown-item>
+            <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-menu>
         </el-dropdown>
       </div>
@@ -31,18 +33,26 @@
                 <el-col :span="6" :key="k">
                   <el-card class="box-card">
                     <div slot="header" class="clearfix">
-                      <span>{{v.box_number}}号柜</span>
-                      <el-button style="float: right; padding: 3px 0" type="text">开箱</el-button>
+                      <span>{{v.box_number}}号箱</span>
+                      <el-dropdown>
+                        <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-unlock" style="color:#409EFF;" disabled>开箱</el-dropdown-item>
+                        </el-dropdown-menu>
+                      </el-dropdown>
                     </div>
                     <div style="height:72px;" v-if="v.box_status == 1">
                       <el-row type="flex" align="middle" style="height:100%;">
-                        <el-button>{{v.status_text}}</el-button>
+                        <el-tag effect="dark">{{v.status_text}}</el-tag>
                       </el-row>
                     </div>
 
                     <el-row type="flex" justify="space-between" v-if="v.box_status == 2">
                       <el-row type="flex" align="middle">
-                        <el-button type="danger">{{v.status_text}}</el-button>
+                        <el-tag type="danger" effect="dark">{{v.status_text}}</el-tag>
                       </el-row>
                       <div style="height:72px;">
                         <h4>
@@ -56,7 +66,7 @@
 
                     <div style="height:72px;" v-if="v.box_status == 3">
                       <el-row type="flex" align="middle" style="height:100%;">
-                        <el-button type="info">{{v.status_text}}</el-button>
+                        <el-tag type="info" effect="dark">{{v.status_text}}</el-tag>
                       </el-row>
                     </div>
                   </el-card>
@@ -123,8 +133,8 @@
 </template>
 
 <script>
-import { cabinetList, boxList, addCabinet } from "@/api";
-import moment from 'moment';
+import { cabinetList, boxList, addCabinet, reboot } from "@/api";
+import moment from "moment";
 export default {
   data() {
     return {
@@ -152,24 +162,30 @@ export default {
       },
       cabinetList: [],
       boxList: [],
+      currentCabinetState: {},
     };
   },
-  computed:{
-    diffTime(){
-      return date=>{
+  computed: {
+    diffTime() {
+      return (date) => {
         const currentTime = moment();
         const startDate = moment(date);
-        const date3=currentTime.diff(startDate,'minute');//计算相差的分钟数
-        const h=Math.floor(date3/60);//相差的小时数
-        const mm=date3%60;//计算相差小时后余下的分钟数
+        const date3 = currentTime.diff(startDate, "minute"); //计算相差的分钟数
+        const h = Math.floor(date3 / 60); //相差的小时数
+        const mm = date3 % 60; //计算相差小时后余下的分钟数
         return `${h}小时${mm}分钟`;
-        }
-    }
+      };
+    },
   },
   created() {
     this.getCabinetList();
   },
   methods: {
+    getReboot(cabinetId) {
+      reboot({ cabinet_number: cabinetId }).then((res) => {
+        console.log(888, res);
+      });
+    },
     getCabinetList() {
       cabinetList().then((res) => {
         console.log(res);
@@ -183,6 +199,7 @@ 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);
         }
@@ -226,9 +243,9 @@ export default {
       let number = "";
       let login_key = "";
       let count = "";
-      addCabinet(requrl,alias,number,login_key,count).then((res) => {
+      addCabinet(requrl, alias, number, login_key, count).then((res) => {
         console.log(res);
-        if(res && res.msg == 'ok') {
+        if (res && res.msg == "ok") {
           this.getCabinetList();
         }
       });
@@ -255,4 +272,9 @@ export default {
 .el-icon-arrow-down {
   font-size: 12px;
 }
+.clearfix {
+  display: flex;
+ align-items: center;
+ justify-content: space-between;
+}
 </style>

src/pages/subPages/log.vue

@@ -1,83 +1,70 @@
 <template>
   <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>
+    <!-- <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>
-    <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="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="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>
 </template>
 <script>
+import { actionLogList } from "@/api";
 export default {
   data() {
     return {
-      tableData: [
-        {
-          date: "2016-05-03",
-          name: "王小虎",
-          address: "上海市普陀区金沙江路 1518 弄"
-        },
-        {
-          date: "2016-05-02",
-          name: "王小虎",
-          address: "上海市普陀区金沙江路 1518 弄"
-        },
-        {
-          date: "2016-05-04",
-          name: "王小虎",
-          address: "上海市普陀区金沙江路 1518 弄"
-        },
-        {
-          date: "2016-05-01",
-          name: "王小虎",
-          address: "上海市普陀区金沙江路 1518 弄"
-        },
-        {
-          date: "2016-05-08",
-          name: "王小虎",
-          address: "上海市普陀区金沙江路 1518 弄"
-        },
-        {
-          date: "2016-05-06",
-          name: "王小虎",
-          address: "上海市普陀区金沙江路 1518 弄"
-        },
-        {
-          date: "2016-05-07",
-          name: "王小虎",
-          address: "上海市普陀区金沙江路 1518 弄"
-        },
-        {
-          date: "2016-05-01",
-          name: "王小虎",
-          address: "上海市普陀区金沙江路 1518 弄"
-        },
-        {
-          date: "2016-05-08",
-          name: "王小虎",
-          address: "上海市普陀区金沙江路 1518 弄"
-        },
-        {
-          date: "2016-05-06",
-          name: "王小虎",
-          address: "上海市普陀区金沙江路 1518 弄"
-        },
-        {
-          date: "2016-05-07",
-          name: "王小虎",
-          address: "上海市普陀区金沙江路 1518 弄"
-        }
-      ]
+      tableData: [],
+      pageSize: 10,
+      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];
+        }
+      });
+    },
+    onPageChange(page) {
+      if (page == this.pageNumber) {
+        return;
+      } else {
+        this.pageNumber = page;
+        setTimeout(() => {
+          this.getActionLogList();
+        }, 0);
+      }
+    },
+  },
 };
 </script>
 <style scoped>

src/pages/subPages/message.vue

@@ -2,82 +2,138 @@
   <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-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" 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="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="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="1000"></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>
 </template>
 <script>
+import { msgList, cabinetList, boxList } from "@/api";
 export default {
   data() {
     return {
-      tableData: [
-        {
-          date: "2016-05-03",
-          name: "王小虎",
-          address: "上海市普陀区金沙江路 1518 弄"
-        },
-        {
-          date: "2016-05-02",
-          name: "王小虎",
-          address: "上海市普陀区金沙江路 1518 弄"
-        },
-        {
-          date: "2016-05-04",
-          name: "王小虎",
-          address: "上海市普陀区金沙江路 1518 弄"
-        },
-        {
-          date: "2016-05-01",
-          name: "王小虎",
-          address: "上海市普陀区金沙江路 1518 弄"
-        },
-        {
-          date: "2016-05-08",
-          name: "王小虎",
-          address: "上海市普陀区金沙江路 1518 弄"
-        },
-        {
-          date: "2016-05-06",
-          name: "王小虎",
-          address: "上海市普陀区金沙江路 1518 弄"
-        },
-        {
-          date: "2016-05-07",
-          name: "王小虎",
-          address: "上海市普陀区金沙江路 1518 弄"
-        },
-        {
-          date: "2016-05-01",
-          name: "王小虎",
-          address: "上海市普陀区金沙江路 1518 弄"
-        },
-        {
-          date: "2016-05-08",
-          name: "王小虎",
-          address: "上海市普陀区金沙江路 1518 弄"
-        },
-        {
-          date: "2016-05-06",
-          name: "王小虎",
-          address: "上海市普陀区金沙江路 1518 弄"
-        },
-        {
-          date: "2016-05-07",
-          name: "王小虎",
-          address: "上海市普陀区金沙江路 1518 弄"
-        }
-      ]
+      pageSize: 1,
+      pageNumber: 1,
+      cabinetValue: "",
+      cabinetOptions: [],
+      boxOptions: [],
+      boxValue: "",
+      tableData: [],
+      total: 0,
     };
-  }
+  },
+  created() {
+    this.getCabinetList();
+  },
+  computed: {
+    disSearch() {
+      return this.cabinetValue == "" || this.boxValue == "";
+    },
+  },
+  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() {
+      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>

src/pages/subPages/status.vue

@@ -19,63 +19,7 @@
 export default {
   data() {
     return {
-      tableData: [
-        {
-          date: "2016-05-03",
-          name: "王小虎",
-          address: "上海市普陀区金沙江路 1518 弄"
-        },
-        {
-          date: "2016-05-02",
-          name: "王小虎",
-          address: "上海市普陀区金沙江路 1518 弄"
-        },
-        {
-          date: "2016-05-04",
-          name: "王小虎",
-          address: "上海市普陀区金沙江路 1518 弄"
-        },
-        {
-          date: "2016-05-01",
-          name: "王小虎",
-          address: "上海市普陀区金沙江路 1518 弄"
-        },
-        {
-          date: "2016-05-08",
-          name: "王小虎",
-          address: "上海市普陀区金沙江路 1518 弄"
-        },
-        {
-          date: "2016-05-06",
-          name: "王小虎",
-          address: "上海市普陀区金沙江路 1518 弄"
-        },
-        {
-          date: "2016-05-07",
-          name: "王小虎",
-          address: "上海市普陀区金沙江路 1518 弄"
-        },
-        {
-          date: "2016-05-01",
-          name: "王小虎",
-          address: "上海市普陀区金沙江路 1518 弄"
-        },
-        {
-          date: "2016-05-08",
-          name: "王小虎",
-          address: "上海市普陀区金沙江路 1518 弄"
-        },
-        {
-          date: "2016-05-06",
-          name: "王小虎",
-          address: "上海市普陀区金沙江路 1518 弄"
-        },
-        {
-          date: "2016-05-07",
-          name: "王小虎",
-          address: "上海市普陀区金沙江路 1518 弄"
-        }
-      ]
+      tableData: []
     };
   }
 };