更新

.env.development

@@ -12,12 +12,12 @@ ENV = 'development'
 # VITE_APP_BASE_URL = 'https://qtzl.etcjz.cn/dev/' #试运行环境/青云环境/生成环境地址
 # VITE_APP_BASE_URL = 'http://100.65.11.2:8086/nDev/' #线上地址 nDev
 # VITE_APP_BASE_URL = 'http://100.64.2.104:8087/nDev/' #线上地址 nDev
-VITE_APP_BASE_URL = 'http://100.65.11.2:8086/nDev/' #线上地址 nDev
+VITE_APP_BASE_URL = 'http://100.65.11.2:8086/ndev/' #线上地址 nDev
 # VITE_APP_BASE_URL = 'http://100.64.2.104:8086/html/'
 # VITE_APP_BASE_URL = 'http://100.64.2.111:50001/' #宇轩给测试环境
 # VITE_APP_BASE_URL = 'https://192.168.124.43:50001/' #宇轩服务器 
 # VITE_APP_BASE_URL = 'http://192.168.124.56:50001/' #试运行环境/青云环境/生成环境地址
-VITE_APP_BASE_URL_N = 'http://100.65.11.2:8086/nDev/' # 新地址  prod
+VITE_APP_BASE_URL_N = 'http://100.65.11.2:8086/ndev/' # 新地址  prod
 # VITE_APP_BASE_URL_N = 'http://100.64.2.104:8087/nDev/' #线上地址 nDev  
 # VITE_APP_BASE_URL_N = 'https://qtzl.etcjz.cn/ndev/' # 新地址
 # VITE_APP_BASE_URL_N = 'http://100.65.11.2:8086/nDev/' # 新地址

src/views/onlineBusinessHall/inquiryStatistics/dailyChannelReleaseStatisticalChart/index.vue

@@ -39,11 +39,11 @@
 
             <!-- <el-input maxlength="60"v-trim clearable v-model="productName" style="width: 200px;" placeholder="请输入产品名称" /> -->
 
-            <el-select clearable style="width: 200px;margin-bottom: 10px;" multiple v-model="orderType"
+            <!-- <el-select clearable style="width: 200px;margin-bottom: 10px;" multiple v-model="orderType"
                 placeholder="请选订单类型">
                 <el-option v-for="(itemData, index) in ORDER_TYPE" :key="index" :label="itemData.label"
                     :value="itemData.value" />
-            </el-select>
+            </el-select> -->
             <el-button style="margin-bottom: 10px;" type="success" icon="search" @click="search" :loading="loading"
                 class="btn">搜索</el-button>
             <el-button style="margin-bottom: 10px;" type="warning" icon="refreshLeft" @click="refreshLeft"
@@ -152,6 +152,7 @@
         // getData()
     }
     function getData() {
+        if (!ChannelSideValue.value) return ElMessage.warning('请选择渠道方')
         const loadings = ElLoading.service({
             lock: true,
             text: 'Loading',

src/views/onlineBusinessHall/inquiryStatistics/issueStatistics/index.vue

@@ -571,9 +571,9 @@
                     brokenLineY = item
                 }
             });
-            if (index) {
-                ElMessage.error('该渠道暂无数据内容!')
-            }
+            // if (index) {
+            //     ElMessage.error('该渠道暂无数据内容!')
+            // }
             refresh.value = false
             nextTick(() => {
                 refresh.value = true

src/views/settlement/businessManagement/disputeManagement/ETCparkingLotInterProvincialReconciliationDayStatistics/index.vue

@@ -142,44 +142,108 @@
         },
       },
       {
-        label: '清分交易(元)',
-        prop: 'clearingTransaction',
-        isAmount: true,
-        form: {
-          formLabelWidth: formLabelWidth,
-          width: '45%',
-          type: 'input',
+      prop: '',
+      label: '清算交易',
+      width: '120px',
+      children: [
+      {
+          label: '交易量',
+          prop: 'clearingTransaction2',
+          form: {
+            formLabelWidth: formLabelWidth,
+            width: '45%',
+            type: 'input',
+          },
+        },
+        {
+          label: '交易额(元)',
+          prop: 'clearingTransaction',
+          isAmount: true,
+          form: {
+            formLabelWidth: formLabelWidth,
+            width: '45%',
+            type: 'input',
+          },
         },
+      ] 
       },
       {
-        label: '正常交易(元)',
-        prop: 'normalTransaction',
-        isAmount: true,
-        form: {
-          formLabelWidth: formLabelWidth,
-          width: '45%',
-          type: 'input',
+      prop: '',
+      label: '正常交易',
+      width: '120px',
+      children: [
+      {
+          label: '交易量',
+          prop: 'normalTransaction2',
+          form: {
+            formLabelWidth: formLabelWidth,
+            width: '45%',
+            type: 'input',
+          },
+        },
+        {
+          label: '交易额(元)',
+          prop: 'normalTransaction',
+          isAmount: true,
+          form: {
+            formLabelWidth: formLabelWidth,
+            width: '45%',
+            type: 'input',
+          },
         },
+      ] 
       },
       {
-        label: '确认记账交易(元)',
-        prop: 'acknowledgeTransactions',
-        isAmount: true,
-        form: {
-          formLabelWidth: formLabelWidth,
-          width: '45%',
-          type: 'input',
+      prop: '',
+      label: '确认记账交易',
+      width: '120px',
+      children: [
+      {
+          label: '交易量',
+          prop: 'acknowledgeTransactions2',
+          form: {
+            formLabelWidth: formLabelWidth,
+            width: '45%',
+            type: 'input',
+          },
+        },
+        {
+          label: '交易额(元)',
+          prop: 'acknowledgeTransactions',
+          isAmount: true,
+          form: {
+            formLabelWidth: formLabelWidth,
+            width: '45%',
+            type: 'input',
+          },
         },
+      ] 
       },
       {
-        label: '确认不记账交易(元)',
-        prop: 'confirmUntransactions',
-        isAmount: true,
-        form: {
-          formLabelWidth: formLabelWidth,
-          width: '45%',
-          type: 'input',
+      prop: '',
+      label: '确认不记账交易',
+      width: '120px',
+      children: [
+      {
+          label: '交易量',
+          prop: 'confirmUntransactions2',
+          form: {
+            formLabelWidth: formLabelWidth,
+            width: '45%',
+            type: 'input',
+          },
+        },
+        {
+          label: '交易额(元)',
+          prop: 'confirmUntransactions',
+          isAmount: true,
+          form: {
+            formLabelWidth: formLabelWidth,
+            width: '45%',
+            type: 'input',
+          },
         },
+      ] 
       },
       // {
       //   label: '填报时间',

src/views/settlement/statisticalManagement/groupStatistics/index.vue

@@ -130,7 +130,7 @@
   function generateAeport() {
     const params = handleParams(2, true)
     console.log(params)
-    reportExportFn('52000b0ca8cf493d8ad17a967b7bef16', params, '集团数据统计样表')
+    reportExportFn('/settlew/groupcard/find', params, '集团数据统计样表')
       .then((res) => {
         const initiateApprovalData =
           field.value.searchOperation.initiateApprovalData
@@ -146,7 +146,7 @@
   // 下载
   const downloadHandle = () => {
     const params = handleParams(2, true)
-    exportFn('52000b0ca8cf493d8ad17a967b7bef16', params, '集团数据统计样表')
+    exportFn('/settlew/groupcard/find', params, '集团数据统计样表')
   }
 </script>
 <style scoped lang="less"></style>