From 4b596e99bbe851eb98c661e113571df537b43827 Mon Sep 17 00:00:00 2001
From: aoshiguchen <1052045476@qq.com>
Date: Sun, 26 Mar 2023 16:34:39 +0800
Subject: [PATCH] =?UTF-8?q?=E7=94=A8=E6=88=B7=E6=B5=81=E9=87=8F=E8=A1=A8?=
 =?UTF-8?q?=E8=A1=A8=E3=80=81license=E6=B5=81=E9=87=8F=E6=8A=A5=E8=A1=A8?=
 =?UTF-8?q?=E6=96=B0=E5=A2=9E=E6=93=8D=E4=BD=9C=E5=88=97=EF=BC=8C=E8=B7=B3?=
 =?UTF-8?q?=E8=BD=AC=E5=88=B0=E6=9C=88=E5=BA=A6=E6=98=8E=E7=BB=86?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../views/report/licenseFlowMonthReport.vue   | 11 ++++++----
 .../src/views/report/licenseFlowReport.vue    | 10 +++++++++-
 .../src/views/report/userFlowMonthReport.vue  |  8 ++++----
 .../src/views/report/userFlowReport.vue       | 20 +++++++++++++++----
 4 files changed, 36 insertions(+), 13 deletions(-)

diff --git a/neutrino-proxy-admin/src/views/report/licenseFlowMonthReport.vue b/neutrino-proxy-admin/src/views/report/licenseFlowMonthReport.vue
index f2f7e407..d2d28d93 100644
--- a/neutrino-proxy-admin/src/views/report/licenseFlowMonthReport.vue
+++ b/neutrino-proxy-admin/src/views/report/licenseFlowMonthReport.vue
@@ -58,7 +58,7 @@ import waves from '@/directive/waves'
 import { licenseList } from '@/api/license'
 
 export default {
-  name: 'jobLog',
+  name: 'licenseFlowMonthReport',
   directives: {
     waves
   },
@@ -90,10 +90,13 @@ export default {
   activated() {
     this.getUserList()
     this.getLicenseList()
-    if (this.$route.query.jobId) {
-      this.listQuery.jobId = this.$route.query.jobId
-      this.getList()
+    if (this.$route.query.userId) {
+      this.listQuery.userId = this.$route.query.userId
     }
+    if (this.$route.query.licenseId) {
+      this.listQuery.licenseId = this.$route.query.licenseId
+    }
+    this.getList()
   },
   methods: {
     getList() {
diff --git a/neutrino-proxy-admin/src/views/report/licenseFlowReport.vue b/neutrino-proxy-admin/src/views/report/licenseFlowReport.vue
index bd5f98e2..62b3b78a 100644
--- a/neutrino-proxy-admin/src/views/report/licenseFlowReport.vue
+++ b/neutrino-proxy-admin/src/views/report/licenseFlowReport.vue
@@ -34,6 +34,11 @@
           <span>{{scope.row.totalFlowDesc}}</span>
         </template>
       </el-table-column>
+      <el-table-column align="center" :label="$t('table.actions')" min-width="230" class-name="small-padding fixed-width">
+        <template slot-scope="scope">
+          <el-button size="mini" type="text" @click="handleFlowMonthReportClick(scope.row)">流量月度明细</el-button>
+        </template>
+      </el-table-column>
     </el-table>
     <div class="pagination-container">
       <el-pagination background @size-change="handleSizeChange" @current-change="handleCurrentChange" :current-pageInfo.sync="listQuery.current"
@@ -49,7 +54,7 @@ import { userList } from '@/api/user'
 import waves from '@/directive/waves'
 
 export default {
-  name: 'jobLog',
+  name: 'licenseFlowReport',
   directives: {
     waves
   },
@@ -115,6 +120,9 @@ export default {
     handleLookOver(row) {
       this.selectRow = row
       this.dialogVisible = true
+    },
+    handleFlowMonthReportClick(row) {
+      this.$router.push({ path: '/report/licenseFlowMonthReport', query: { userId: row.userId, licenseId: row.licenseId }})
     }
   }
 }
diff --git a/neutrino-proxy-admin/src/views/report/userFlowMonthReport.vue b/neutrino-proxy-admin/src/views/report/userFlowMonthReport.vue
index 1e83dea1..70f70c1d 100644
--- a/neutrino-proxy-admin/src/views/report/userFlowMonthReport.vue
+++ b/neutrino-proxy-admin/src/views/report/userFlowMonthReport.vue
@@ -49,7 +49,7 @@ import { userList } from '@/api/user'
 import waves from '@/directive/waves' // 水波纹指令
 
 export default {
-  name: 'jobLog',
+  name: 'userFlowMonthReport',
   directives: {
     waves
   },
@@ -62,7 +62,7 @@ export default {
       listQuery: {
         current: 1,
         size: 10,
-        jobId: undefined
+        userId: undefined
       },
       userList: [],
       dialogVisible: false,
@@ -77,8 +77,8 @@ export default {
   },
   activated() {
     this.getUserList()
-    if (this.$route.query.jobId) {
-      this.listQuery.jobId = this.$route.query.jobId
+    if (this.$route.query.userId) {
+      this.listQuery.userId = this.$route.query.userId
       this.getList()
     }
   },
diff --git a/neutrino-proxy-admin/src/views/report/userFlowReport.vue b/neutrino-proxy-admin/src/views/report/userFlowReport.vue
index 3447a6b6..06d4613f 100644
--- a/neutrino-proxy-admin/src/views/report/userFlowReport.vue
+++ b/neutrino-proxy-admin/src/views/report/userFlowReport.vue
@@ -29,6 +29,12 @@
           <span>{{scope.row.totalFlowDesc}}</span>
         </template>
       </el-table-column>
+      <el-table-column align="center" :label="$t('table.actions')" min-width="230" class-name="small-padding fixed-width">
+        <template slot-scope="scope">
+          <el-button size="mini" type="text" @click="handleFlowMonthReportClick(scope.row)">流量月度明细</el-button>
+          <el-button size="mini" type="text" @click="handleLicenseFlowMonthReportClick(scope.row)">License流量月度明细</el-button>
+        </template>
+      </el-table-column>
     </el-table>
     <div class="pagination-container">
       <el-pagination background @size-change="handleSizeChange" @current-change="handleCurrentChange" :current-pageInfo.sync="listQuery.current"
@@ -44,7 +50,7 @@ import { userList } from '@/api/user'
 import waves from '@/directive/waves' // 水波纹指令
 
 export default {
-  name: 'jobLog',
+  name: 'userFlowReport',
   directives: {
     waves
   },
@@ -57,7 +63,7 @@ export default {
       listQuery: {
         current: 1,
         size: 10,
-        jobId: undefined
+        userId: undefined
       },
       userList: [],
       dialogVisible: false,
@@ -72,8 +78,8 @@ export default {
   },
   activated() {
     this.getUserList()
-    if (this.$route.query.jobId) {
-      this.listQuery.jobId = this.$route.query.jobId
+    if (this.$route.query.userId) {
+      this.listQuery.userId = this.$route.query.userId
       this.getList()
     }
   },
@@ -110,6 +116,12 @@ export default {
     handleLookOver(row) {
       this.selectRow = row
       this.dialogVisible = true
+    },
+    handleFlowMonthReportClick(row) {
+      this.$router.push({ path: '/report/userFlowMonthReport', query: { userId: row.userId }})
+    },
+    handleLicenseFlowMonthReportClick(row) {
+      this.$router.push({ path: '/report/licenseFlowMonthReport', query: { userId: row.userId }})
     }
   }
 }