吴sir пре 3 месеци
родитељ
комит
8f82ca1f28

+ 0 - 2
src/App.vue

@@ -37,8 +37,6 @@ onMounted(async () => {
   if (getLoadingNode) {
     body.removeChild(getLoadingNode)
   }
-
-  console.log(import.meta.env.VITE_API_URL);
 })
 </script>
 

+ 6 - 0
src/api/path/lotCard.api.js

@@ -91,4 +91,10 @@ export function OperationRecord(data) {
 // 查询当前卡下的充值记录
 export function getOrderCard(data){
     return service.post("/admin/sim/payOrders", data);
+}
+
+
+// 查询使用量
+export function getFlowData(data) {
+    return service.post("/admin/sim/simCDR", data);
 }

+ 14 - 14
src/views/lotCard/cardList/config.js

@@ -288,35 +288,35 @@ export const columnsTopup = [
 ]
 
 export const columnsAmount = [
-  {
-    title: window.$t('lotCard.ID'),
-    dataIndex: 'productId',
-    align: 'center', ellipsis: true
-  },
-  {
-    title: 'IMIS',
-    dataIndex: 'imsi',
-    align: 'center', ellipsis: true
-  },
+  // {
+  //   title: window.$t('lotCard.ID'),
+  //   dataIndex: 'productId',
+  //   align: 'center', ellipsis: true
+  // },
+  // {
+  //   title: 'IMIS',
+  //   dataIndex: 'imsi',
+  //   align: 'center', ellipsis: true
+  // },
 
   {
     title: 'ICCID',
-    dataIndex: 'account',
+    dataIndex: 'ICCID',
     align: 'center', ellipsis: true
   },
   {
     title: `${window.$t('lotCard.FlowRate')}(MB)`,
-    dataIndex: 'usage',
+    dataIndex: 'dataVolTotalKb',
     align: 'center', ellipsis: true
   },
   {
     title: window.$t('lotCard.CargoAreaCode'),
-    dataIndex: 'countryNo',
+    dataIndex: 'mcc',
     align: 'center', ellipsis: true
   },
   {
     title: window.$t('lotCard.DetailDate'),
-    dataIndex: 'date',
+    dataIndex: 'startTime',
     align: 'center', ellipsis: true
   },
 ]

+ 25 - 2
src/views/lotCard/cardList/trafficUseDialog.vue

@@ -138,7 +138,7 @@
             </a-table>
           </a-tab-pane>
           <a-tab-pane key="5" :title="$t('lotCard.UsageAmount')">
-            <a-table :columns="columnsAmount" :data="dataAmount" :scroll="{ x: 'auto' }" :pagination="false" />
+            <a-table :columns="columnsAmount" :data="dataAmount" :scroll="{ x: 'auto' }" :pagination="pageDataAounmt" @page-change="evChangePageAounmt"/>
           </a-tab-pane>
           <a-tab-pane key="6" :title="$t('lotCard.OperationRecord')">
             <a-table :columns="columnsOperation" :data="dataOperation" :scroll="{ x: 'auto' }"
@@ -162,7 +162,7 @@
 </template>
 <script setup>
 import { onMounted, ref, h } from "vue";
-import { getDataCDR, PauseSIMService, RecoverSIMService, OperationRecord, OffSIMCard, getOrderCard } from '@/api/path/lotCard.api'
+import { getDataCDR, PauseSIMService, RecoverSIMService, OperationRecord, OffSIMCard, getOrderCard,getFlowData } from '@/api/path/lotCard.api'
 import { Getdictionary } from '@/mixins/index'
 import { Message, Modal } from '@arco-design/web-vue'
 // 图表插件
@@ -182,6 +182,13 @@ const pageData = ref({
   size: 10,
   current: 1,
 })
+const pageDataAounmt = ref({
+  total: 0,
+  size: 10,
+  current: 1,
+  source:'',
+  iccid:''
+})
 
 const pagination = ref({
   total: 0,
@@ -234,6 +241,9 @@ const open = (data) => {
       dataToday: val.dataToday + '/MB',
     }
   })
+  pageDataAounmt.value.iccid = data.iccid
+  pageDataAounmt.value.source = data.source
+  getAountData(pageDataAounmt.value)
   optionsRecordSetting()
   intData()
   visible.value = true
@@ -241,6 +251,19 @@ const open = (data) => {
 }
 
 
+const getAountData = async (type) => {
+  let res = await getFlowData(type)
+  if(res.code == 200) {
+     dataAmount.value = res.data
+  }
+  pageDataAounmt.value.total = res.total
+}
+
+const evChangePageAounmt = (e)=>{
+  pageDataAounmt.value.current = e
+  getAountData(pageDataAounmt.value)
+}
+
 const ICCIDPuyData = async (id) => {
   let res = await getOrderCard({ iccid: id, current: 1, size: 10 })
   let res1 = await Getdictionary('puyType')