diff --git a/src/api/cai/proxy.js b/src/api/cai/proxy.js new file mode 100644 index 0000000..1f17c8c --- /dev/null +++ b/src/api/cai/proxy.js @@ -0,0 +1,25 @@ +import request from '@/utils/request' + +export function getProxyUserList(query) { + return request({ + url: '/cai/proxyUser/bindUserList', + method: 'get', + params: query + }) +} + +export function getOrderLogList(query) { + return request({ + url: '/cai/proxyUser/orderLogList', + method: 'get', + params: query + }) +} + +export function getProxyTotal(query) { + return request({ + url: '/cai/proxyUser/proxyTotal', + method: 'get', + params: query + }) +} diff --git a/src/layout/components/Navbar.vue b/src/layout/components/Navbar.vue index 94560d5..6ca6bb5 100644 --- a/src/layout/components/Navbar.vue +++ b/src/layout/components/Navbar.vue @@ -12,7 +12,7 @@ {{payNotice}} - + @@ -92,14 +92,25 @@ export default { } } }, + data() { + return { + proxy: false, + } + }, created() { - // 进入系统后立即启动定时任务 - this.$store.dispatch('startPolling') - console.log(this.payNotice); + const userRoles = this.$store.getters.roles; + this.proxy = userRoles.includes("proxy") + if(!this.proxy){ + // 进入系统后立即启动定时任务 + this.$store.dispatch('startPolling') + console.log(this.payNotice); + } }, beforeDestroy() { - // 退出系统时关闭定时任务（可选） - this.$store.dispatch('stopPolling') + if(!this.proxy){ + // 退出系统时关闭定时任务（可选） + this.$store.dispatch('stopPolling') + } }, methods: { payNoticeGo(){ diff --git a/src/views/cai/orderLogs/index.vue b/src/views/cai/orderLogs/index.vue index c6730ff..031d6f1 100644 --- a/src/views/cai/orderLogs/index.vue +++ b/src/views/cai/orderLogs/index.vue @@ -17,6 +17,28 @@ @keyup.enter.native="handleQuery" /> + + + 失败 + 成功 + + + + + + + + + + + @@ -83,6 +106,9 @@ export default { queryParams: { pageNum: 1, pageSize: 10, + createTimeMax: undefined, + createTimeMin: undefined, + success: undefined, orderNo: undefined, flagName: undefined, stepName: undefined, diff --git a/src/views/cai/proxtBindUserList/index.vue b/src/views/cai/proxtBindUserList/index.vue new file mode 100644 index 0000000..c46e255 --- /dev/null +++ b/src/views/cai/proxtBindUserList/index.vue @@ -0,0 +1,135 @@ + + + diff --git a/src/views/cai/proxyOrderLogList/index.vue b/src/views/cai/proxyOrderLogList/index.vue new file mode 100644 index 0000000..86ff37d --- /dev/null +++ b/src/views/cai/proxyOrderLogList/index.vue @@ -0,0 +1,133 @@ + + + diff --git a/src/views/cai/proxyUserTotal/index.vue b/src/views/cai/proxyUserTotal/index.vue new file mode 100644 index 0000000..1a19e32 --- /dev/null +++ b/src/views/cai/proxyUserTotal/index.vue @@ -0,0 +1,87 @@ + + + + + diff --git a/src/views/dashboard/PanelGroupOld.vue b/src/views/dashboard/PanelGroupOld.vue new file mode 100644 index 0000000..1a1081f --- /dev/null +++ b/src/views/dashboard/PanelGroupOld.vue @@ -0,0 +1,181 @@ + + + + + diff --git a/src/views/dashboard/PanelGroupProxy.vue b/src/views/dashboard/PanelGroupProxy.vue new file mode 100644 index 0000000..dff6e8e --- /dev/null +++ b/src/views/dashboard/PanelGroupProxy.vue @@ -0,0 +1,164 @@ + + + + + diff --git a/src/views/index.vue b/src/views/index.vue index 28ba0e3..c3c8432 100644 --- a/src/views/index.vue +++ b/src/views/index.vue @@ -1,7 +1,8 @@