Parcourir la source

注释删除多余接口路由

dujingxian il y a 4 ans
Parent
commit
460f430693

+ 94 - 94
src/api/index.js

@@ -129,97 +129,97 @@ export const loginOut = () => {
 }
 
 // 余额列表
-export const balanceList = (params) => {
-    return requestLoading(`${Prefix}/balanceList`, 'get', params)
-}
-
-//箱子操作记录列表
-export const boxActionList = (params) => {
-    return requestLoading(`${Prefix}/BoxActionList`, 'get', params)
-}
-
-//柜子列表
-export const cabinetList = (params) => {
-    return requestLoading(`${Prefix}/CabinetList`, 'get', params)
-}
-
-//箱子列表
-export const boxList = (params) => {
-    return requestLoading(`${Prefix}/BoxList`, 'post', params)
-}
-
-//新增柜子
-export const addCabinet = (params) => {
-	console.log('call:',addCabinet);
-    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 openBox = (params) => {
-    return requestLoading(`${Prefix}/OpenBox`, 'post', params)
-}
-
-//通知
-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 manualSave = (params) => {
-    return requestLoading(`${Prefix}/ManualSave`, 'post', params)
-}
+// export const balanceList = (params) => {
+//     return requestLoading(`${Prefix}/balanceList`, 'get', params)
+// }
+
+// //箱子操作记录列表
+// export const boxActionList = (params) => {
+//     return requestLoading(`${Prefix}/BoxActionList`, 'get', params)
+// }
+
+// //柜子列表
+// export const cabinetList = (params) => {
+//     return requestLoading(`${Prefix}/CabinetList`, 'get', params)
+// }
+
+// //箱子列表
+// export const boxList = (params) => {
+//     return requestLoading(`${Prefix}/BoxList`, 'post', params)
+// }
+
+// //新增柜子
+// export const addCabinet = (params) => {
+// 	console.log('call:',addCabinet);
+//     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 openBox = (params) => {
+//     return requestLoading(`${Prefix}/OpenBox`, 'post', params)
+// }
+
+// //通知
+// 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 manualSave = (params) => {
+//     return requestLoading(`${Prefix}/ManualSave`, 'post', params)
+// }

+ 1 - 1
src/pages/index.vue

@@ -44,7 +44,7 @@
                     <i class="el-icon-s-order"></i>
                     <span slot="title">余额充值</span>
                 </el-menu-item>
-                <el-menu-item index="log" route="log">
+                <el-menu-item index="order" route="order">
                     <i class="el-icon-document"></i>
                     <span slot="title">订单统计</span>
                 </el-menu-item>

+ 5 - 2
src/pages/subPages/balance.vue

@@ -4,7 +4,7 @@
     <div style="margin:10px 0;">
         <el-date-picker v-model="dataRange" :clearable="false" value-format="yyyy-MM-dd&nbspHH:mm:ss" type="datetimerange" range-separator="至" start-placeholder="开始日期" end-placeholder="结束日期"></el-date-picker>
         <el-input placeholder="请输入订单ID" v-model="searchValue" style="width:200px;margin-left:10px;margin-right:10px;" />
-        <el-select v-model="value" placeholder="--请选择状态--">
+        <el-select v-model="balanceStatus" placeholder="--请选择状态--">
             <el-option
                 v-for="item in balanceType"
                 :key="item.value"
@@ -43,6 +43,7 @@ import {
 } from "@/api";
 import { balanceType } from '@/utils/constants'
 export default {
+    name: 'balance',
     data() {
         return {
             tableData: [
@@ -54,8 +55,10 @@ export default {
             total: 0,
             searchValue: "",
             dataRange: [],
+            // 余额-常量
+            balanceType,
             // 余额状态
-            balanceType
+            balanceStatus: ''
         };
     },
     mounted() {

+ 0 - 101
src/pages/subPages/log.vue

@@ -1,101 +0,0 @@
-<template>
-<el-container direction="vertical">
-    <el-header height="40px">
-        <el-date-picker
-            v-model="dataRange"
-            :clearable="false"
-            value-format="yyyy-MM-dd&nbspHH:mm:ss"
-            type="datetimerange"
-            range-separator="至" start-placeholder="开始日期" end-placeholder="结束日期"></el-date-picker>
-        <el-button style="margin-left:10px;" type="primary">查询</el-button>
-    </el-header>
-
-    <!-- 订单总数 -->
-    <el-alert
-        :title="'订单总数 : ' + oderCount +'笔 成功订单数 : ' + successCount + '笔 成功率 : '+ SuccessRate + '订单总金额 : '+ countMoney +'元 成功订单总金额 : '+successMoney +' 元 商户扣款 :'+deduction + '元'"
-        type="info"
-        show-icon
-        style="margin-top:20px"
-        :closable="false">
-    </el-alert>
-   
-    <el-table :data="tableData" border style="width: 100%; margin-top:20px">
-        <el-table-column align="center" type="index" width="50" label="序号" />
-        <el-table-column align="center" prop="name" label="名称"></el-table-column>
-        <el-table-column align="center" prop="admin_id" label="订单总数"></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="订单总金额"></el-table-column>
-        <el-table-column align="center" prop="date" label="成功订单总金额"></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-row>
-</el-container>
-</template>
-
-<script>
-import {
-    actionLogList
-} from "@/api";
-export default {
-    data() {
-        return {
-            tableData: [],
-            pageSize: 10,
-            pageNumber: 1,
-            total: 0,
-            // 筛选时间
-            dataRange: [],
-            // 订单总数
-            oderCount: 0,
-            // 成功订单数
-            successCount: 0,
-            // 成功率
-            SuccessRate: 0,
-            // 订单总金额
-            countMoney: 0,
-            // 成功订单总金额
-            successMoney: 0,
-            // 商户扣款
-            deduction: 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>
-.el-header {
-    padding: 0;
-}
-</style>

+ 7 - 4
src/pages/subPages/message.vue

@@ -3,7 +3,7 @@
     <div style="margin:10px 0;">
         <el-date-picker v-model="dataRange" :clearable="false" value-format="yyyy-MM-dd&nbspHH:mm:ss" type="datetimerange" range-separator="至" start-placeholder="开始日期" end-placeholder="结束日期" style="margin-right: 10px"></el-date-picker>
         <el-input placeholder="业务单号" style="width:182px; margin-right: 10px" v-model="orderNum" ></el-input>
-        <el-select v-model="value" placeholder="变动类型" style="margin-right: 10px">
+        <el-select v-model="changeVal" placeholder="变动类型" style="margin-right: 10px">
             <el-option
                 v-for="item in changeType"
                 :key="item.value"
@@ -68,16 +68,19 @@ export default {
             boxValue: "",
             tableData: [],
             total: 0,
+            // 开始结束时间
+            dataRange: [],
             // 业务单号
             orderNum: '',
             // 变更内容
             changeContent: '',
-            // 变动类型
-            changeType
+            // 变动类型-常量
+            changeType,
+            changeVal: ''
         };
     },
     created() {
-        this.getCabinetList();
+        // this.getCabinetList();
     },
     computed: {
         disSearch() {

+ 1 - 16
src/pages/subPages/view.vue

@@ -1,21 +1,6 @@
 <template>
 <el-container direction="vertical">
     <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-input placeholder="ip" style="width:182px;margin-right:10px" v-model="ip"></el-input>
         <el-button type="primary">搜索</el-button>
         <el-button type="success">新增</el-button>
@@ -59,7 +44,7 @@ export default {
         };
     },
     created() {
-        this.getCabinetList();
+        // this.getCabinetList();
     },
     computed: {
         disSearch() {

+ 14 - 15
src/router/index.js

@@ -3,12 +3,12 @@ import VueRouter from 'vue-router'
 
 const Index = () => import('@/pages/index');
 const Login = () => import('@/pages/login');
-const Log = () => import('@/pages/subPages/log');
+const order = () => import('@/pages/subPages/order');
 // 柜体控制
 // const Express = () => import('@/pages/subPages/express');
 const balance = () => import('@/pages/subPages/balance');
 const Message = () => import('@/pages/subPages/message');
-const Status = () => import('@/pages/subPages/status');
+// const Status = () => import('@/pages/subPages/status');
 const View = () => import('@/pages/subPages/view');
 
 Vue.use(VueRouter)
@@ -20,31 +20,30 @@ Vue.use(VueRouter)
     component: Index,
     // redirect:'/express',
     children:[
+      // 订单统计
       {
-        path:'/log',
-        name:'log',
-        component:Log
+        path:'/order',
+        name:'order',
+        component:order
       },
-      // {
-      //   path:'/express',
-      //   name:'express',
-      //   component:Express
-      // },
+      // 余额充值
       {
         path:'/balance',
         name:'balance',
         component:balance
       },
+      // 实时动账
       {
         path:'/message',
         name:'message',
         component:Message
       },
-      {
-        path:'/status',
-        name:'status',
-        component:Status
-      },
+      // {
+      //   path:'/status',
+      //   name:'status',
+      //   component:Status
+      // },
+      // 安全IP控制
       {
         path:'/view',
         name:'view',