修改字段 & 修改月用量表格数据

src/api/path/lotCard.api.js

@@ -57,7 +57,7 @@ export function getDataPlanList(params) {
 
 // CDR详单查询
 export function getDataCDR(params) {
-    return service.post("/admin/sim/simCDR", params);
+    return service.post("/admin/sim/newSimCDR", params);
 }
 
 

src/i18n/zh/lotCard.js

@@ -128,14 +128,14 @@ export default {
      PackageUseTrafficToday:'套餐今日使用流量',
      PackageValidDays:'套餐有效天数',
      MonthlyConsumption:'月用量',
-     CardPackageInformation:'卡套餐信息',
+     CardPackageInformation:'卡资费信息',
      EarlyWarningInformation:'预警信息',
      RechargeRecord:'充值记录',
      UsageAmount:'使用量',
      OperationRecord:'操作记录',
      SuspensionService:'暂停SIM卡服务',
      RestoreService:'恢复SIM卡服务',
-     CloseCard:'关闭SIM卡',
+     CloseCard:'注销SIM卡',
      Jan:'1月',
      February:'2月',
      March:'3月',
@@ -151,7 +151,6 @@ export default {
      AvailableFlow:'可用流量',
      Usedflow:'已使用流量',
      TrafficUsedToday:'今日使用流量',
-     PackageValidity:'套餐有效期(天数)',
      OrderNumber:'订单号',
      PurchasePackage:'购买套餐',
      OrderType:'订单类型',
@@ -160,10 +159,9 @@ export default {
      PaymentStatus:'支付状态',
      OrderDate:'下单日期',
      ID:'编号',
-     accountCard:'SIM账户(卡号)',
      FlowRate:'流量',
      CargoAreaCode:'流量产生国家或地区编号',
-     DetailDate:'详单日期',
+     DetailDate:'CDR数据的记录日期',
      settingUser:'操作人',
      Controls:'操作',
      remark:'备注',

src/views/flowPool/index.vue

@@ -27,7 +27,7 @@
           }}</a>
         <a class="a-link" href="javascript:;" style="margin-right: 1rem" @click="handelForewring(record)"
           v-if="role == 1">{{ $t('flowPool.Waring') }}</a>
-        <a class="a-link" href="javascript:;" style="margin-right: 1rem" @click="handelgetCard(record)">导卡</a>
+        <!-- <a class="a-link" href="javascript:;" style="margin-right: 1rem" @click="handelgetCard(record)">导卡</a> -->
         <!-- 删除 -->
         <a-popconfirm :content="$t('form.Delete')" :ok-text="$t('form.Confirm')" :cancel-text="$t('form.Cancel')"
           @ok="handleDel(record.id)">

src/views/flowPool/rearFlowPool/index.vue

@@ -25,7 +25,7 @@
           v-if="role == 1">{{ $t("form.Edit") }}</a>
         <a class="a-link" href="javascript:;" style="margin-right: 1rem" @click="handelForewring(record)"
           v-if="role == 1">{{ $t('flowPool.Waring') }}</a>
-        <a class="a-link" href="javascript:;" style="margin-right: 1rem" @click="handelgetCard(record)">导卡</a>
+        <!-- <a class="a-link" href="javascript:;" style="margin-right: 1rem" @click="handelgetCard(record)">导卡</a> -->
         <!-- 删除 -->
         <a-popconfirm :content="$t('form.Delete')" :ok-text="$t('form.Confirm')" :cancel-text="$t('form.Cancel')"
           @ok="handleDel(record.id)" v-if="role == 1">

src/views/home/index.vue

@@ -98,8 +98,6 @@
             <div class="txt">账户余额</div>
             <div class="val">
               0
-              <a-link href="link" :hoverable="false">告警</a-link>
-              <a-link href="link" :hoverable="false">充值</a-link>
             </div>
           </div>
           <div class="item">

src/views/lotCard/cardList/config.js

@@ -39,7 +39,6 @@ export const columns = [
   {
     title: window.$t("lotCard.TotalFlow"),
     dataIndex: "dataUsageTotal",
-    slotName: "dataUsageTotal",
     align: "center",
     ellipsis: true,
   },
@@ -230,11 +229,6 @@ export const columnsCard = [
     dataIndex: 'dataToday',
     align: 'center', ellipsis: true
   },
-  {
-    title: window.$t('lotCard.PackageValidity'),
-    dataIndex: 'validDays',
-    align: 'center', ellipsis: true
-  },
   {
     title: window.$t('lotCard.ActivationDate'),
     dataIndex: 'activeTime',
@@ -254,24 +248,12 @@ export const columnsTopup = [
     ellipsis: true,
     align: 'center',
   },
-  {
-    title: 'ICCID',
-    dataIndex: 'productName',
-    ellipsis: true,
-    align: 'center',
-  },
   {
     title: window.$t('lotCard.PurchasePackage'),
     dataIndex: 'productName',
     ellipsis: true,
     align: 'center',
   },
-  {
-    title: window.$t('lotCard.OrderType'),
-    dataIndex: 'productName',
-    ellipsis: true,
-    align: 'center',
-  },
   {
     title: window.$t('lotCard.PackagePrice'),
     dataIndex: 'productName',
@@ -311,7 +293,7 @@ export const columnsAmount = [
   },
 
   {
-    title: window.$t('lotCard.accountCard'),
+    title: 'ICCID',
     dataIndex: 'account',
     align: 'center', ellipsis: true
   },

src/views/lotCard/cardList/index.vue

@@ -7,9 +7,6 @@
     </div>
 
     <a-table row-key="iccid" :data="dataSource" :columns="columns" :pagination="false" :scroll="{ x: 'auto' }">
-      <template #dataUsageTotal="{ record }">
-        <span>{{ record.dataUsageTotal }}MB</span>
-      </template>
       <template #iccidStatus="{ record }">
         <a-tag color="#7bc616" v-if="record.iccidStatus == '正常'">{{ record.iccidStatus }}</a-tag>
         <a-tag v-else>{{ record.iccidStatus }}</a-tag>
@@ -86,7 +83,7 @@ const intData = async (item) => {
       DatapackageStatus: item.dataPackage[0]?.status,
       dataUsage: item.dataPackage[0]?.dataUsage ? item.dataPackage[0]?.dataUsage + '/MB' : '0' + '/MB',
       dataTotal: item.dataPackage[0]?.dataTotal ? item.dataPackage[0]?.dataTotal + '/MB' : '0' + '/MB',
-
+      dataUsageTotal:item.dataUsageTotal?item.dataUsageTotal+'/MB':'---'
     }
   })
   pagination.value.total = data.total

src/views/lotCard/cardList/trafficUseDialog.vue

@@ -198,11 +198,8 @@ const dataCard = ref([])
 
 const dataTopup = ref([])
 // 使用量
-
 const dataAmount = ref([])
-
 // 操作记录
-
 const dataOperation = ref([])
 const open = (data) => {
   if (!data) {
@@ -230,54 +227,25 @@ const open = (data) => {
 
 // 使用量
 const intData = async () => {
-  // 获取今天的日期
-  const today = new Date();
-  const toDay = today.toISOString().split('T')[0];
+  // 获取当前年份
+  const currentYear = new Date().getFullYear();
 
-  // 获取三个月前的日期
-  const pastDate = new Date(today);
-  pastDate.setMonth(today.getMonth() - 3); // 减去三个月
-  const formattedDate = pastDate.toISOString().split('T')[0];
+  // 获取今年的第一天（2025-01-01）
+  const startDate = `${currentYear}-01-01`;
 
-  // 获取 CDR 数据
+  // 获取今年的最后一天（2025-12-31）
+  const endDateTime = `${currentYear}-12-31`;
+
+  // 调用你的 getDataCDR 方法
   let res = await getDataCDR({
     iccid: Card_info.value.iccid,
     source: Card_info.value.source,
-    startDate: formattedDate,
-    endDate: toDay
+    startDate: startDate, // 今年的第一天
+    endDate: endDateTime // 今天的日期
   });
 
-  dataAmount.value = res.data
-
-
-  // 定义季度时间段
-  const time = ['1-3', '4-6', '7-9', '9-12'];
-
-  // 获取当前年份
-  const year = today.getFullYear();
-  for (let val of time) {
-    // 拆分每个时间段，获取开始月和结束月
-    const [startMonth, endMonth] = val.split('-');
-    const startDate = `${year}-${startMonth}-01`; // 格式化开始日期
-    const endDate = `${year}-${endMonth}-01`; // 格式化结束日期
-
-    // 获取每个时间段的数据
-    let res = await getDataCDR({
-      iccid: Card_info.value.iccid,
-      source: Card_info.value.source,
-      startDate: startDate,
-      endDate: endDate
-    });
-
-    // 将当前时间段的数据中的 'usage' 字段合并到 series[0].data 数组中
-    const usageData = res.data.length === 0
-      ? []
-      : res.data.map(val => val.usage !== undefined && val.usage !== null ? val.usage : 0);
-    if (usageData.length !== 0) {
-      option.value.series[0].data.push(...usageData);
-    }
-    initChart()
-  }
+  option.value.series[0].data = res.data.yAxis
+  initChart()
 }
 
 // SIM卡操作

src/views/tariffManagement/Management/add.vue

@@ -15,7 +15,7 @@
             <template v-if="formState.source">
                 <a-form-item :label="$t('tariffManagement.simDataPlanId')" field="simDataPlanId">
                     <a-select v-model="formState.simDataPlanId" :disabled="typeIndexSet !== 1">
-                        <a-option v-for=" (item, index) in planList" :key="item.id" :value="item.id">{{
+                        <a-option v-for=" (item, index) in planList" :key="item.id" :value="item.productId">{{
                             $t('tariffManagement.simDataPlanId') }} {{
                                 item.productName
                             }}
@@ -24,9 +24,9 @@
                 </a-form-item>
             </template>
             <template v-if="formState.source">
-                <a-form-item :label="$t('tariffManagement.TestFlowPacket')" field="productId">
-                    <a-select v-model="formState.productId" >
-                        <a-option v-for=" (item, index) in planList" :key="item.id" :value="item.id">{{
+                <a-form-item :label="$t('tariffManagement.TestFlowPacket')" field="testSimDataPlanId">
+                    <a-select v-model="formState.testSimDataPlanId" >
+                        <a-option v-for=" (item, index) in planList" :key="item.id" :value="item.productId">{{
                             $t('tariffManagement.TestFlowPacket') }} {{
                                 item.productName
                             }}
@@ -185,7 +185,7 @@ const state = ref({
         // 网络接入费
         "networkAccessFee": '',
         "endDate": '',
-        "productId": null
+        "testSimDataPlanId":null, // 测试流量包
     },
     sourceList: [],
     userIdList: [],
@@ -226,8 +226,6 @@ const handleSubmit = ({ values, errors }) => {
             formVal.simDataPlanId = String(values.simDataPlanId)
             formVal.simDataPlanId = String(values.simDataPlanId)
             formVal.pricing = Number(values.pricing)
-
-
             if (typeIndexSet.value === 2) {
                 const { code, data } = await updateTariff(formVal)
 
@@ -329,6 +327,7 @@ watch(() => props.typeIndex, val => {
 }, { immediate: true })
 
 const detaile = (val) => {
+    console.log(val);
     if (!val) return
     Object.keys(formState.value).forEach(key => {
         if (val[key]) {

vite.config.js

@@ -63,10 +63,10 @@ export default defineConfig(({command, mode})=>{
             cors: true,
             hmr: true,
             proxy: {
-                "/api": {
-                    // target: "http://sim.nanodreamtech.com",
-                    target: config.VITE_API_URL,
-                    // target: "http://sim.ainets.net",
+                "/api": { 
+                    // target:"https://sim.nanodreamtech.com",
+                    // target: config.VITE_API_URL,
+                    target: "http://sim.ainets.net",
                     changeOrigin: true,
                     ws: true,
                     secure: true,