3 months ago · 7af7a7eb51
--- a/index.html
+++ b/index.html
 
															         hm.src = "https://hm.baidu.com/hm.js?d61b9e2caf4d46ccda7471b5385e2333";
														
 
															         var s = document.getElementsByTagName("script")[0];
														
 
															         s.parentNode.insertBefore(hm, s);
														
 
															-      })();</script><link href=./static/css/app.0e4451c01c962d84085deeefb29c12de.css rel=stylesheet></head><body><div id=app></div><script type=text/javascript src=./static/js/manifest.9a27d0411801e6eb4aba.js></script><script type=text/javascript src=./static/js/app.a422327706a6fd12c282.js></script></body></html>
														
 
															+      })();</script><link href=./static/css/app.4cef2d4d8499be9fa2ff980d2ff2137d.css rel=stylesheet></head><body><div id=app></div><script type=text/javascript src=./static/js/manifest.005760f08540e67b9957.js></script><script type=text/javascript src=./static/js/app.796b9751e25609984bf2.js></script></body></html>
														
--- a/project/src/assets/config/interface_api.js
+++ b/project/src/assets/config/interface_api.js
 
															   dataBoard_orderData_yxOrderList: '/api/order/yxOrderList',// 云选订单列表
														
 
															   dataBoard_orderData_yxOrderActionReport: '/api/order/yxOrderActionReport',// 云选订单手动回传
														
 
															   dataBoard_orderData_yxOrderExport: '/api/order/yxOrderExport',// 云选订单导出
														
 
															+  dataBoard_orderData_adgroupStatList: '/api/order/adgroupStatList',// 云选广告数据统计
														
 
															   getPlatformOptions: "/api/intelligentMassSending/platformIndex", // 平台筛选选项
														
 
															   accountManage_accountIndex: "/api/intelligentMassSending/accountIndex", // 平台账号管理 - 账号列表
														
--- a/project/src/components/dataBoard/yxOrderData.vue
+++ b/project/src/components/dataBoard/yxOrderData.vue
 
															         <selfInput style="margin-right: 10px;" width="220px" :hasLabel="false" :reset="resetFlag" label_name="订单ID" @inputChange='onInputOrderId' @onChange="onChangeOrderId" />
														
 
															         <selfChannelMultiple style="margin-right: 10px;" title="" type='adqAccount' :reset="resetFlag" :labelWidth="true" @channelDefine="onChangeAccountId" />
														
 
															         <selfInput style="margin-right: 10px;" width="220px" :hasLabel="false" :reset="resetFlag" label_name="自定义参数" @inputChange="onInputCpsId" @onChange="onChangeCpsId" />
														
 
															-        <!-- <selfChannel style="margin-right: 10px;" title="" type="yxOrderStatus" :reset="resetFlag" :labelWidth="true" @channelDefine="onChangeOrderStatus"/>
														
 
															-        <selfChannelMultiple style="margin-right: 10px;" title="" type='yxOrderReportStatus' :reset="resetFlag" :labelWidth="true" @channelDefine="onChangeReportStatus" />
														
 
															-        <inputRange style="margin-right: 10px;" v-model="filter.money" label="预估佣金"/>
														
 
															-        <el-button size="mini" type="primary" plain @click="init(1)">确定</el-button> -->
														
 
															       </div>
														
 
															       <div class="reset" @click="resetEvent">重置</div>
														
 
															       <!-- <el-button v-if="isCanExport" class="export-btn" type="primary" size="mini" @click="onClickExport">导出Excel</el-button> -->
														
 
															     </div>
														
 
															+    <!-- S 广告汇总 summaryTable -->
														
 
															+    <div v-loading="summaryLoading">
														
 
															+        <ux-grid class="uxGridBox" ref="summaryTable" :border="false" @row-click="() => { return }" :header-cell-style="headerColor" :max-height="height" show-footer-overflow="tooltip" show-overflow="tooltip" size="mini">
														
 
															+          <ux-table-column v-for="(item, idx) in summaryTableCol" :key="item.prop" :resizable="true" :field="item.prop" :title="item.label" :min-width="item.min_width ? item.min_width : 120" :fixed="item.fixed ? item.fixed : ''" align="center">
														
 
															+            <template #header>
														
 
															+            <div class="flex-align-jus-center">{{ item.label }}
														
 
															+              <el-tooltip v-if="item.notes" :content="item.notes" placement="top">
														
 
															+                <div><i class="el-icon-question"></i></div>
														
 
															+              </el-tooltip>
														
 
															+            </div>
														
 
															+          </template>
														
 
															+            <template v-slot="{ row }">
														
 
															+              <span>{{ (row[item.prop] || row[item.prop] == 0) ? $formatNum(row[item.prop]) : '-' }}</span>
														
 
															+            </template>
														
 
															+          </ux-table-column>
														
 
															+        </ux-grid>
														
 
															+      </div>
														
 
															+      <!-- E 广告汇总 summaryTable -->
														
 
															     <div v-loading="loading">
														
 
															       <ux-grid class="uxGridBox" ref="plxTable" :border="false" @row-click="() => { return }"
														
 
															         :header-cell-style="headerColor" :height="height" show-footer-overflow="tooltip" show-overflow="tooltip"
														
 
															     return {
														
 
															       dataLoading: false,
														
 
															       loading: false,
														
 
															+      summaryLoading: false,
														
 
															       page: 1,
														
 
															       pages: 0,
														
 
															       total: 0,
														
 
															         { prop: "adgroup_name", label: "回传广告名称"},
														
 
															         { prop: "actionBtn", label: "操作", fixed: 'right' },
														
 
															       ],
														
 
															-
														
 
															+      summaryTableCol: [
														
 
															+        { prop: "adgroup_name", label: "广告" },
														
 
															+        { prop: "cost", label: "花费" },
														
 
															+        { prop: "predict_commission_fee", label: "预估收入" },
														
 
															+        { prop: "actual_roi", label: "实际roi" },
														
 
															+        { prop: "bid_amount", label: "出价" },
														
 
															+        { prop: "conversions_cost", label: "目标转化成本" }
														
 
															+      ],
														
 
															       filter: {
														
 
															         time: [],
														
 
															         order_id: '', // 订单ID
														
 
															     this.height = document.documentElement.clientHeight - 280 > 400 ? document.documentElement.clientHeight - 280 : 400
														
 
															     this.filter.time = this.default_time
														
 
															     this.init(1)
														
 
															+    this.handleGetSummaryList()
														
 
															     // this.init_predata()
														
 
															   },
														
 
															   methods: {
														
 
															         start_date: this.filter.time[0],
														
 
															         end_date: this.filter.time[1],
														
 
															         account_id: this.filter.account_id.join(','),
														
 
															-        order_status: this.filter.order_status,
														
 
															+        // order_status: this.filter.order_status,
														
 
															         tx_cps_id: this.filter.cps_id,
														
 
															-        money_min: this.filter.money[0],
														
 
															-        money_max: this.filter.money[1],
														
 
															-        report_status: this.filter.report_status.join(','),
														
 
															+        // money_min: this.filter.money[0],
														
 
															+        // money_max: this.filter.money[1],
														
 
															+        // report_status: this.filter.report_status.join(','),
														
 
															         sys_group_id: this.$cookie.getCookie('isSuperManage') == 1 ? sessionStorage.getItem('company_session_defaultCorp_level_1').toString() : '',
														
 
															         page: this.page,
														
 
															         page_size: this.page_size,
														
 
															     onInputCpsId(val) {
														
 
															       this.filter.cps_id = val
														
 
															       this.init(1)
														
 
															+      this.handleGetSummaryList();
														
 
															     },
														
 
															     onChangeCpsId(val) {
														
 
															       this.filter.cps_id = val
														
 
															     onChangeAccountId(val) {
														
 
															       this.filter.account_id = val;
														
 
															       this.init(1);
														
 
															+      this.handleGetSummaryList();
														
 
															       // this.init_predata();
														
 
															     },
														
 
															     onChangeReportStatus(val) {
														
 
															       this.filter.order_status = ''
														
 
															       this.filter.report_status = []
														
 
															       // this.init_predata()
														
 
															-      this.init(1)
														
 
															+      this.init(1);
														
 
															+      this.handleGetSummaryList();
														
 
															+    },
														
 
															+    async flushData () {
														
 
															+      this.init();
														
 
															+      this.handleGetSummaryList();
														
 
															     },
														
 
															     async onClickReport(row) {
														
 
															       try {
														
 
															         this.loading = false
														
 
															       }
														
 
															     },
														
 
															+    // 获取广告统计数据
														
 
															+    async handleGetSummaryList() {
														
 
															+      try {
														
 
															+        this.summaryLoading = true
														
 
															+        const params = {
														
 
															+          start_date: this.filter.time[0],
														
 
															+          end_date: this.filter.time[1],
														
 
															+          account_id: this.filter.account_id.join(','),
														
 
															+          tx_cps_id: this.filter.cps_id,
														
 
															+          sys_group_id: this.$cookie.getCookie('isSuperManage') == 1 ? sessionStorage.getItem('company_session_defaultCorp_level_1').toString() : '',
														
 
															+        }
														
 
															+        const url = `${this.URL.BASEURL}${this.URL.dataBoard_orderData_adgroupStatList}`
														
 
															+        const { data: res = {} } = await this.$axios.get(url, { params })
														
 
															+        if (res && res.errno == 0) {
														
 
															+          await this.$nextTick()
														
 
															+          // const summaryTableList = Array.isArray(res.rst) ? res.rst : [res.rst]
														
 
															+          const summaryTableList = res.rst
														
 
															+          this.$refs.summaryTable.reloadData(summaryTableList)
														
 
															+        } else if (res.errno != 4002) {
														
 
															+          this.$message.warning(res.err)
														
 
															+          this.$refs.summaryTable.reloadData([])
														
 
															+        }
														
 
															+      } catch (error) {
														
 
															+        console.log(error)
														
 
															+        this.$refs.summaryTable.reloadData([])
														
 
															+      } finally {
														
 
															+        this.summaryLoading = false
														
 
															+      }
														
 
															+    },
														
 
															     // 监听点击"导出" - 离线导出
														
 
															     async onClickExport() {
														
 
															       try {
														
--- a/static/css/app.0e4451c01c962d84085deeefb29c12de.css
+++ b/static/css/app.0e4451c01c962d84085deeefb29c12de.css
--- a/static/js/88.f8d119bdd6cc624e81d0.js
+++ b/static/js/88.f8d119bdd6cc624e81d0.js
--- a/static/js/88.df44eaa7533aedeb5c3d.js
+++ b/static/js/88.df44eaa7533aedeb5c3d.js
--- a/static/js/89.2c8ae0658bba4e503dd6.js
+++ b/static/js/89.2c8ae0658bba4e503dd6.js
--- a/static/js/90.3f37bb3ebb245a060232.js
+++ b/static/js/90.3f37bb3ebb245a060232.js
--- a/static/js/91.f8c2f5c4c3dc43a6c304.js
+++ b/static/js/91.f8c2f5c4c3dc43a6c304.js
--- a/static/js/92.0249ea1c8f5cd9f474ec.js
+++ b/static/js/92.0249ea1c8f5cd9f474ec.js
--- a/static/js/93.41918ce7b7243452ec79.js
+++ b/static/js/93.41918ce7b7243452ec79.js
--- a/static/js/94.0e4d1ec155bc6359d2ad.js
+++ b/static/js/94.0e4d1ec155bc6359d2ad.js
--- a/static/js/95.0b14eb70672a9ce774ce.js
+++ b/static/js/95.0b14eb70672a9ce774ce.js
--- a/static/js/96.fbeeca7ce05d2fe451bd.js
+++ b/static/js/96.fbeeca7ce05d2fe451bd.js
--- a/static/js/97.88cc08499fa2a35aba0e.js
+++ b/static/js/97.88cc08499fa2a35aba0e.js
--- a/static/js/98.470e4344a266f86165fc.js
+++ b/static/js/98.470e4344a266f86165fc.js
--- a/static/js/app.a422327706a6fd12c282.js
+++ b/static/js/app.a422327706a6fd12c282.js
--- a/static/js/manifest.9a27d0411801e6eb4aba.js
+++ b/static/js/manifest.9a27d0411801e6eb4aba.js