1 year ago · b2786a32b1
--- a/dist/assets/_dialog.5c0eecd7.css
+++ b/dist/assets/_dialog.5c0eecd7.css
--- a/dist/assets/_dialog.f81dc45c.css
+++ b/dist/assets/_dialog.f81dc45c.css
--- a/dist/assets/_input.443bfc7b.css
+++ b/dist/assets/_input.443bfc7b.css
--- a/dist/assets/_input.8be04cf3.css
+++ b/dist/assets/_input.8be04cf3.css
--- a/dist/assets/_select.45a53dbb.css
+++ b/dist/assets/_select.45a53dbb.css
--- a/dist/assets/_select.97e73788.css
+++ b/dist/assets/_select.97e73788.css
--- a/dist/assets/accountManage.896650f8.css
+++ b/dist/assets/accountManage.896650f8.css
--- a/dist/assets/accountManage.e596ae97.css
+++ b/dist/assets/accountManage.e596ae97.css
--- a/dist/assets/adqManage.c38660fd.css
+++ b/dist/assets/adqManage.c38660fd.css
--- a/dist/assets/adqManage.c4615848.css
+++ b/dist/assets/adqManage.c4615848.css
--- a/dist/assets/element-plus.42083445.css
+++ b/dist/assets/element-plus.42083445.css
--- a/dist/assets/element-plus.de6aff2c.css
+++ b/dist/assets/element-plus.de6aff2c.css
--- a/dist/assets/error.284bd084.css
+++ b/dist/assets/error.284bd084.css
--- a/dist/assets/error.c755c3af.css
+++ b/dist/assets/error.c755c3af.css
--- a/dist/assets/home.67358f3d.css
+++ b/dist/assets/home.67358f3d.css
--- a/dist/assets/home.9f35d1d5.css
+++ b/dist/assets/home.9f35d1d5.css
--- a/dist/assets/index.07826104.css
+++ b/dist/assets/index.07826104.css
--- a/dist/assets/index.2610afaa.css
+++ b/dist/assets/index.2610afaa.css
--- a/dist/assets/index.2e049eb2.css
+++ b/dist/assets/index.2e049eb2.css
--- a/dist/assets/index.37b5a88f.css
+++ b/dist/assets/index.37b5a88f.css
--- a/dist/assets/index.63306221.css
+++ b/dist/assets/index.63306221.css
--- a/dist/assets/index.69ddcace.css
+++ b/dist/assets/index.69ddcace.css
--- a/dist/assets/index.7cc73b3f.css
+++ b/dist/assets/index.7cc73b3f.css
--- a/dist/assets/index.b2b9d624.js
+++ b/dist/assets/index.b2b9d624.js
--- a/dist/assets/index.887b6b4f.css
+++ b/dist/assets/index.887b6b4f.css
--- a/dist/assets/index.8b776482.css
+++ b/dist/assets/index.8b776482.css
--- a/dist/assets/index.9234b91e.css
+++ b/dist/assets/index.9234b91e.css
--- a/dist/assets/index.9ac83a14.css
+++ b/dist/assets/index.9ac83a14.css
--- a/dist/assets/index.a3fd41f8.css
+++ b/dist/assets/index.a3fd41f8.css
--- a/dist/assets/index.c52404ad.css
+++ b/dist/assets/index.c52404ad.css
--- a/dist/assets/index.ca1fc3d5.css
+++ b/dist/assets/index.ca1fc3d5.css
--- a/dist/assets/index.cce9b594.css
+++ b/dist/assets/index.cce9b594.css
--- a/dist/assets/index.d52cf2c0.css
+++ b/dist/assets/index.d52cf2c0.css
--- a/dist/assets/index.e0c76342.css
+++ b/dist/assets/index.e0c76342.css
--- a/dist/assets/index.e93eadb8.css
+++ b/dist/assets/index.e93eadb8.css
--- a/dist/assets/index.eb07d23d.css
+++ b/dist/assets/index.eb07d23d.css
--- a/dist/assets/index.f1d960a4.css
+++ b/dist/assets/index.f1d960a4.css
--- a/dist/assets/index_head.749167cf.css
+++ b/dist/assets/index_head.749167cf.css
--- a/dist/assets/index_head.bd849dfa.css
+++ b/dist/assets/index_head.bd849dfa.css
--- a/dist/assets/login.38e47126.css
+++ b/dist/assets/login.38e47126.css
--- a/dist/assets/login.beda51df.css
+++ b/dist/assets/login.beda51df.css
--- a/dist/assets/materialBlock.1f80e2d3.css
+++ b/dist/assets/materialBlock.1f80e2d3.css
--- a/dist/assets/materialBlock.c7482e77.css
+++ b/dist/assets/materialBlock.c7482e77.css
--- a/dist/assets/menuList.0fd4f2be.css
+++ b/dist/assets/menuList.0fd4f2be.css
--- a/dist/assets/menuList.45586ed7.css
+++ b/dist/assets/menuList.45586ed7.css
--- a/dist/assets/radioGroup.0160dc8d.css
+++ b/dist/assets/radioGroup.0160dc8d.css
--- a/dist/assets/radioGroup.aa4af5c1.css
+++ b/dist/assets/radioGroup.aa4af5c1.css
--- a/dist/assets/tableInfo.2ba43d84.css
+++ b/dist/assets/tableInfo.2ba43d84.css
--- a/dist/assets/tableInfo.fc4a7715.css
+++ b/dist/assets/tableInfo.fc4a7715.css
--- a/dist/assets/timeScreen.0ab73184.css
+++ b/dist/assets/timeScreen.0ab73184.css
--- a/dist/assets/timeScreen.54304402.css
+++ b/dist/assets/timeScreen.54304402.css
--- a/dist/index.html
+++ b/dist/index.html
@@ -6,7 +6,7 @@
 
				     <meta name="viewport" content="width=device-width, initial-scale=1.0, minimum-scale=1.0, maximum-scale=1.0, user-scalable=no">
			
 
				     <title>广告系统</title>
			
 
				       <script src="//open.thunderurl.com/thunder-link.js"></script>
			
 
				-    <script type="module" crossorigin src="./assets/index.b2b9d624.js"></script>
			
 
				+    <script type="module" crossorigin src="./assets/index.83fb429b.js"></script>
			
 
				     <link rel="modulepreload" href="./js/@vue/@vue.e7eafc10.js">
			
 
				     <link rel="modulepreload" href="./js/vue-router/vue-router.647267ed.js">
			
 
				     <link rel="modulepreload" href="./js/axios/axios.27022086.js">
			
@@ -21,14 +21,14 @@
 
				     <link rel="modulepreload" href="./js/@ctrl/@ctrl.9c8f424f.js">
			
 
				     <link rel="modulepreload" href="./js/escape-html/escape-html.d572c0fd.js">
			
 
				     <link rel="modulepreload" href="./js/normalize-wheel-es/normalize-wheel-es.94de1731.js">
			
 
				-    <link rel="modulepreload" href="./js/element-plus/element-plus.f07772b8.js">
			
 
				+    <link rel="modulepreload" href="./js/element-plus/element-plus.6d451228.js">
			
 
				     <link rel="modulepreload" href="./js/@element-plus/@element-plus.6e467d43.js">
			
 
				     <link rel="modulepreload" href="./js/tslib/tslib.e35f93b8.js">
			
 
				     <link rel="modulepreload" href="./js/zrender/zrender.fe59a237.js">
			
 
				     <link rel="modulepreload" href="./js/echarts/echarts.5b4b2848.js">
			
 
				     <link rel="stylesheet" href="./assets/nprogress.18a10d8a.css">
			
 
				-    <link rel="stylesheet" href="./assets/element-plus.42083445.css">
			
 
				-    <link rel="stylesheet" href="./assets/index.63306221.css">
			
 
				+    <link rel="stylesheet" href="./assets/element-plus.de6aff2c.css">
			
 
				+    <link rel="stylesheet" href="./assets/index.f1d960a4.css">
			
 
				   </head>
			
 
				   <body>
			
 
				     <div id="app"></div>
			
--- a/dist/js/_dialog/_dialog.4fc4a290.js
+++ b/dist/js/_dialog/_dialog.4fc4a290.js
--- a/dist/js/_drawer/_drawer.69a0f214.js
+++ b/dist/js/_drawer/_drawer.69a0f214.js
--- a/dist/js/_dropdown/_dropdown.44bd9fa0.js
+++ b/dist/js/_dropdown/_dropdown.44bd9fa0.js
--- a/dist/js/_input/_input.65ce393b.js
+++ b/dist/js/_input/_input.65ce393b.js
--- a/dist/js/_popconfirm/_popconfirm.0df63186.js
+++ b/dist/js/_popconfirm/_popconfirm.0df63186.js
--- a/dist/js/_select/_select.72445a62.js
+++ b/dist/js/_select/_select.72445a62.js
--- a/dist/js/api/api.eea43b67.js
+++ b/dist/js/api/api.eea43b67.js
--- a/dist/js/basisMoudle/accountManage.52f3da9d.js
+++ b/dist/js/basisMoudle/accountManage.52f3da9d.js
--- a/dist/js/basisMoudle/error.574ddcc4.js
+++ b/dist/js/basisMoudle/error.574ddcc4.js
--- a/dist/js/basisMoudle/home.60ef4258.js
+++ b/dist/js/basisMoudle/home.60ef4258.js
--- a/dist/js/basisMoudle/login.79ecf05b.js
+++ b/dist/js/basisMoudle/login.79ecf05b.js
--- a/dist/js/businessMoudle/adqManage.9a497387.js
+++ b/dist/js/businessMoudle/adqManage.9a497387.js
--- a/dist/js/collectClip/index.fc9aff48.js
+++ b/dist/js/collectClip/index.fc9aff48.js
--- a/dist/js/configArea/index.3603cd6f.js
+++ b/dist/js/configArea/index.3603cd6f.js
--- a/dist/js/configArea/index.46ea8917.js
+++ b/dist/js/configArea/index.46ea8917.js
--- a/dist/js/element-plus/element-plus.6d451228.js
+++ b/dist/js/element-plus/element-plus.6d451228.js
--- a/dist/js/gdtList/index.46f694f6.js
+++ b/dist/js/gdtList/index.46f694f6.js
--- a/dist/js/gdtList/index.f9b3c9c8.js
+++ b/dist/js/gdtList/index.f9b3c9c8.js
--- a/dist/js/index/index.989967a9.js
+++ b/dist/js/index/index.989967a9.js
--- a/dist/js/index/index.a78b085e.js
+++ b/dist/js/index/index.a78b085e.js
--- a/dist/js/layout/index.3ad454ea.js
+++ b/dist/js/layout/index.3ad454ea.js
--- a/dist/js/layout/index_head.f33e198f.js
+++ b/dist/js/layout/index_head.f33e198f.js
--- a/dist/js/materialBlock/materialBlock.fe6fab80.js
+++ b/dist/js/materialBlock/materialBlock.fe6fab80.js
--- a/dist/js/materialLibrary/index.cc5f1976.js
+++ b/dist/js/materialLibrary/index.cc5f1976.js
--- a/dist/js/materialTs/materialTs.aa881f10.js
+++ b/dist/js/materialTs/materialTs.aa881f10.js
--- a/dist/js/menuPermission/menuList.ab95dbfc.js
+++ b/dist/js/menuPermission/menuList.ab95dbfc.js
--- a/dist/js/miniprogram/index.e3274605.js
+++ b/dist/js/miniprogram/index.e3274605.js
--- a/dist/js/question-filled/question-filled.23a894b6.js
+++ b/dist/js/question-filled/question-filled.23a894b6.js
--- a/dist/js/radioGroup/radioGroup.5c1a2e8b.js
+++ b/dist/js/radioGroup/radioGroup.5c1a2e8b.js
--- a/dist/js/radioGroup/radioGroup.91d90946.js
+++ b/dist/js/radioGroup/radioGroup.91d90946.js
--- a/dist/js/sortablejs/sortablejs.cbc4d4ad.js
+++ b/dist/js/sortablejs/sortablejs.cbc4d4ad.js
--- a/dist/js/tableInfo/tableInfo.8a3e1c7b.js
+++ b/dist/js/tableInfo/tableInfo.8a3e1c7b.js
--- a/dist/js/taskList/index.de60a06d.js
+++ b/dist/js/taskList/index.de60a06d.js
--- a/dist/js/timeScreen/timeScreen.f1ce7818.js
+++ b/dist/js/timeScreen/timeScreen.f1ce7818.js
--- a/dist/js/vue/vue.051f0374.js
+++ b/dist/js/vue/vue.051f0374.js
--- a/dist/js/vuedraggable/vuedraggable.e4c47c81.js
+++ b/dist/js/vuedraggable/vuedraggable.e4c47c81.js
--- a/src/api/ApiModel.ts
+++ b/src/api/ApiModel.ts
@@ -205,6 +205,14 @@ export interface batchGdt_edit{
 
				     flag?:any
			
 
				 }
			
 
				 
			
 
				+export interface batchAccount_list extends pageParams{
			
 
				+  st_date:any,
			
 
				+  en_date:any,
			
 
				+  keyword?:string,
			
 
				+  temp_id?:string,
			
 
				+  field?:string,
			
 
				+  order?:string
			
 
				+}
			
 
				 
			
 
				 
			
 
				 
			
--- a/src/api/api.ts
+++ b/src/api/api.ts
@@ -110,6 +110,7 @@ export enum Api{
 
				     batchGdt_plan_single_edit = '/api/ad/campaignEdit',
			
 
				     batchGdt_advert_select = '/api/ad/getAdStatusList',
			
 
				     batchGdt_advert_list = '/api/ad/adsList',
			
 
				+    batchGdt_accountList_list = '/api/ad/accountList',
			
 
				 
			
 
				 
			
 
				 
			
--- a/src/components/businessMoudle/batchGdt/configArea/basicInfo/index.vue
+++ b/src/components/businessMoudle/batchGdt/configArea/basicInfo/index.vue
@@ -474,9 +474,7 @@ const submitEvent = () => {
 
				   FillBackData({
			
 
				     data: form, 
			
 
				     type: 'me', 
			
 
				-    updateScene: basicInfoJsonInfo['场景'], 
			
 
				-    optimizationGoal_1: optimizationGoal_1.value,
			
 
				-    optimizationGoal_2: optimizationGoal_2.value,
			
 
				+    updateScene: basicInfoJsonInfo['场景'],
			
 
				     cb: (data: { params: any, copywriting: [] }) => {
			
 
				       if (adSet.value) {
			
 
				         loading.value = true;
			
@@ -668,6 +666,7 @@ const onChangeKey = ({ val, key }) => {
 
				     computed_deep_conversion_behavior_spec_fillBack2()
			
 
				   }else if(key == 'optimization_goal'){// 优化目标
			
 
				     form[key] = val;
			
 
				+    form['optimization_goal_name'] = optimizationGoal_1.value.filter((v: any) => { return v.value == val })[0]?.label
			
 
				     changeOptimizationGoal()
			
 
				   }else{
			
 
				     form[key] = val;
			
--- a/src/components/businessMoudle/batchGdt/configArea/basicInfo/ts/fillBack.ts
+++ b/src/components/businessMoudle/batchGdt/configArea/basicInfo/ts/fillBack.ts
@@ -107,10 +107,8 @@ interface IFillBackData {
 
				   type: 'me' | 'api',
			
 
				   cb?: Function,
			
 
				   updateScene?: any,
			
 
				-  optimizationGoal_1: any[],
			
 
				-  optimizationGoal_2: any[]
			
 
				 }
			
 
				-export const FillBackData = ({ data, type, updateScene = {}, cb, optimizationGoal_1, optimizationGoal_2 }: IFillBackData) => {
			
 
				+export const FillBackData = ({ data, type, updateScene = {}, cb }: IFillBackData) => {
			
 
				   let copywriting: string[] = [];
			
 
				   let site_ids: string[] = [];//广告版位
			
 
				   let params: any = {}
			
@@ -178,7 +176,7 @@ export const FillBackData = ({ data, type, updateScene = {}, cb, optimizationGoa
 
				         params['auto_acquisition_enabled'] = data.auto_acquisition_enabled
			
 
				         params['auto_acquisition_amount'] = data.auto_acquisition_amount
			
 
				         params['optimization_goal'] = data.optimization_goal
			
 
				-        params['optimization_goal_name'] = optimizationGoal_1.filter((v: any) => { return v.value == data.optimization_goal })[0]?.label
			
 
				+        params['optimization_goal_name'] = data.optimization_goal_name
			
 
				         params['forward_link_assist_enabled'] = data.forward_link_assist_enabled
			
 
				         params['forward_link_assist'] = data.forward_link_assist_enabled == 1 ? data.forward_link_assist : ''
			
 
				         params['bid_strategy'] = data.bid_strategy
			
@@ -363,9 +361,9 @@ export const FillBackData = ({ data, type, updateScene = {}, cb, optimizationGoa
 
				     }
			
 
				 
			
 
				     if (data.bid_mode == 'BID_MODE_OCPM' || data.bid_mode == 'BID_MODE_OCPC') {
			
 
				-      copywriting.push(`优化目标：${optimizationGoal_1.filter((v: any) => { return v.value == data.optimization_goal })[0]?.label}`)
			
 
				+      copywriting.push(`优化目标：${data.optimization_goal_name}`)
			
 
				       if (data.forward_link_assist_enabled == 1) {
			
 
				-        copywriting.push(`助攻行为：${optimizationGoal_1.filter((v: any) => { return v.value == data.forward_link_assist })[0]?.label}`)
			
 
				+        // copywriting.push(`助攻行为：${optimizationGoal_1.filter((v: any) => { return v.value == data.forward_link_assist })[0]?.label}`)
			
 
				       }
			
 
				       copywriting.push(`出价策略：${scheduleBid.bid_strategy.data.list.filter((v: any) => { return v.value == data.bid_strategy })[0]?.label}`)
			
 
				       copywriting.push(`深度转化优化：${scheduleBid.deep_optimize_type.data.list.filter((v: any) => { return v.value == data.deep_optimize_type })[0]?.label}`)
			
@@ -374,7 +372,7 @@ export const FillBackData = ({ data, type, updateScene = {}, cb, optimizationGoa
 
				 
			
 
				         if (data.deep_conversion_type == 'DEEP_CONVERSION_BEHAVIOR' && data.deep_conversion_behavior_spec && data.deep_conversion_behavior_spec != '') {
			
 
				           let obj = JSON.parse(data.deep_conversion_behavior_spec)
			
 
				-          copywriting.push(`深度优化目标：${optimizationGoal_2.filter((v: any) => { return v.value == obj.target })[0]?.label}`)
			
 
				+          // copywriting.push(`深度优化目标：${optimizationGoal_2.filter((v: any) => { return v.value == obj.target })[0]?.label}`)
			
 
				           if (data.bid_way == '1') {
			
 
				             copywriting.push(`深度优化出价：${obj.price}元`)
			
 
				           } else {
			
@@ -383,7 +381,7 @@ export const FillBackData = ({ data, type, updateScene = {}, cb, optimizationGoa
 
				         }
			
 
				         if (data.deep_conversion_type == 'DEEP_CONVERSION_WORTH' && data.deep_conversion_worth_spec && data.deep_conversion_worth_spec != '') {
			
 
				           let obj = JSON.parse(data.deep_conversion_worth_spec)
			
 
				-          copywriting.push(`深度优化目标：${optimizationGoal_2.filter((v: any) => { return v.value == obj.target })[0]?.label}`)
			
 
				+          // copywriting.push(`深度优化目标：${optimizationGoal_2.filter((v: any) => { return v.value == obj.target })[0]?.label}`)
			
 
				           if (data.bid_way == '1') {
			
 
				             copywriting.push(`期望ROI：${obj.roi}元`)
			
 
				           } else {
			
--- a/src/components/businessMoudle/batchGdt/configArea/originalityBasic/components/brand/brand.vue
+++ b/src/components/businessMoudle/batchGdt/configArea/originalityBasic/components/brand/brand.vue
@@ -60,7 +60,7 @@ const init = (keyword)=>{
 
				     page: 1,
			
 
				     page_size: 20,
			
 
				     keyword: keyword
			
 
				-  }).then((res)=>{
			
 
				+  }).then((res:any)=>{
			
 
				     options.value = res.data
			
 
				   })
			
 
				 }
			
--- a/src/components/businessMoudle/batchGdt/configArea/originalityBasic/components/brand/brandManage.vue
+++ b/src/components/businessMoudle/batchGdt/configArea/originalityBasic/components/brand/brandManage.vue
@@ -79,7 +79,7 @@ const init = () => {
 
				     page: pagination.page,
			
 
				     page_size: pagination.page_size,
			
 
				     keyword: keyword.value
			
 
				-  }).then((res) => {
			
 
				+  }).then((res:any) => {
			
 
				     loading.value = false
			
 
				     tableData.value = res.data;
			
 
				     pagination.total = res.pageInfo.total
			
--- a/src/components/businessMoudle/batchGdt/configArea/originalityBasic/components/brand/brandUpload.vue
+++ b/src/components/businessMoudle/batchGdt/configArea/originalityBasic/components/brand/brandUpload.vue
@@ -120,7 +120,7 @@ const httpRequest = (params) => {
 
				           file_type: data.rst.file_type,
			
 
				           local_file: data.rst.local_file,
			
 
				           type: props.type
			
 
				-        }).then((result) => {
			
 
				+        }).then((result:any) => {
			
 
				           ruleForm['oss_url'] = result.oss_url;
			
 
				           ruleForm['mType'] = result.mType;
			
 
				         })
			
--- a/src/components/businessMoudle/batchGdt/configArea/originalityBasic/components/brand/profilesManage.vue
+++ b/src/components/businessMoudle/batchGdt/configArea/originalityBasic/components/brand/profilesManage.vue
@@ -83,7 +83,7 @@ const accItemEvent = (item) => {
 
				   adcreativesGetProfiles({
			
 
				     account_id: accId.value,
			
 
				     profile_type: 'PROFILE_TYPE_DEFINITION'
			
 
				-  }).then((res) => {
			
 
				+  }).then((res:any) => {
			
 
				     tableData.value = res.list;
			
 
				     loading.value = false
			
 
				   }).catch(() => { loading.value = false })
			
--- a/src/components/businessMoudle/batchGdt/configArea/ts/adBasic.ts
+++ b/src/components/businessMoudle/batchGdt/configArea/ts/adBasic.ts
@@ -119,7 +119,9 @@ export function handleAdBasic({
 
				     getAdPresets({ 'promoted_object_type': targetRef.value?.value }).then((res) => {
			
 
				       getButtonBasicOuter(res)
			
 
				       FillBackData({
			
 
				-        data: res, type: 'api', cb: (data: { params: any, copywriting: [] }) => {
			
 
				+        data: res, 
			
 
				+        type: 'api', 
			
 
				+        cb: (data: { params: any, copywriting: [] }) => {
			
 
				           if (data.copywriting && Array.isArray(data.copywriting) && data.copywriting.length > 0) {
			
 
				             basicInfoData.copywriting = data.copywriting
			
 
				             basicInfoData.fillBack = data.params
			
--- a/src/components/businessMoudle/gdtList/account.vue
+++ b/src/components/businessMoudle/gdtList/account.vue
@@ -2,22 +2,10 @@
 
				   <div>
			
 
				     <div class="screenBox_mini">
			
 
				       <Input ref="InputRef_text" title="关键词" placeholderTxt="关键词" @changeEvent="()=>init()" @clearEvent="()=>init()"/>
			
 
				-      <Select ref="acRef"
			
 
				-              title="账号"
			
 
				-              selectWidth="160px"
			
 
				-              @changeEvent="()=>init()" @clearEvent="()=>init()"
			
 
				-              :isMultiple="true"
			
 
				-              :optObj="{k:'account_id',la:'account_id',val:'account_id'}"
			
 
				-              :options="pageInfo.acList"/>
			
 
				-      <Select ref="statusRef"
			
 
				-              title="状态"
			
 
				-              selectWidth="160px"
			
 
				-              @changeEvent="()=>init()" @clearEvent="()=>init()"
			
 
				-              :options="pageInfo.statusList"/>
			
 
				-      <TimeScreen title="时间" selectWidth="260px" :haveQuick="false" :clearFlag="true" :valueIsKong="true"
			
 
				+      <TimeScreen title="时间" selectWidth="260px" :haveQuick="false" :timeIdx="1"
			
 
				                   ref="timeRef"
			
 
				                   @init="()=>init()"></TimeScreen>
			
 
				-      <span class="pointer c-theme lMar10" @click="clearEvent">清空</span>
			
 
				+      <!-- <span class="pointer c-theme lMar10" @click="clearEvent">清空</span> -->
			
 
				       <el-button class="lMarauto" type="primary" @click="goNewPlanEvent">新建计划</el-button>
			
 
				     </div>
			
 
				     <div>
			
@@ -25,60 +13,37 @@
 
				         <Dropdown title="批量操作" :list="tableInfo.moreList" @close="dropdownEvent" class="rMar10"
			
 
				                   :disabledFlag="tableInfo.multipleSelection&&tableInfo.multipleSelection.length == 0"></Dropdown>
			
 
				         <div>已选 : <span>{{tableInfo.multipleSelection&&tableInfo.multipleSelection.length}}</span></div>
			
 
				-<!--        <el-button class="lMarauto" type="primary" @click="customIndEvent">自定义指标</el-button>-->
			
 
				 
			
 
				         <div  class="lMarauto">
			
 
				-          <Indicators type="media_base" @refresh="IndicatorsRefreshList"></Indicators>
			
 
				+          <Indicators type="media_base" @refresh="init()"></Indicators>
			
 
				         </div>
			
 
				       </div>
			
 
				-我是账户列表
			
 
				+
			
 
				       <el-table v-loading="loading" ref="tableRef" :data="tableInfo.tableList"
			
 
				                 :header-cell-style="tableHeaderStyle"
			
 
				-                :key="tableInfo.updateKey" style="width: 100%"
			
 
				+                :key="tableInfo.updateKey" style="width: 100%;"
			
 
				                 border empty-text="暂无数据"
			
 
				                 row-key="campaign_id"
			
 
				                 max-height="calc(100vh - 294px)">
			
 
				-        <el-table-column fixed width="80" >
			
 
				-          <template #header>
			
 
				-            <div class="flex">
			
 
				-              <el-checkbox v-model="tableInfo.chooseAll" @change="allChooseCheckboxEvent"></el-checkbox>
			
 
				-              <el-dropdown class="lMar10" @command="handleCommandChoosePage">
			
 
				-                <el-icon color="#3173FF"><i-ep-ArrowDownBold /></el-icon>
			
 
				-                <template #dropdown>
			
 
				-                  <el-dropdown-menu>
			
 
				-                    <el-dropdown-item command="1">当前页</el-dropdown-item>
			
 
				-                    <el-dropdown-item command="2">全部</el-dropdown-item>
			
 
				-                  </el-dropdown-menu>
			
 
				-                </template>
			
 
				-              </el-dropdown>
			
 
				-            </div>
			
 
				-          </template>
			
 
				-          <template #default="scope">
			
 
				-            <div class="checkBoxSelf flex"
			
 
				-                 @click="singleChooseCheckboxEvent(tableInfo.multipleSelection.findIndex(n=>n.campaign_id == scope.row.campaign_id),scope.row)"
			
 
				-                 :class="tableInfo.multipleSelection.findIndex(n=>n.campaign_id == scope.row.campaign_id)>=0 ? 'active' : ''">
			
 
				-              <el-icon color="#fff" v-if="tableInfo.multipleSelection.findIndex(n=>n.campaign_id == scope.row.campaign_id)>=0"><i-ep-Check /></el-icon>
			
 
				-            </div>
			
 
				-          </template>
			
 
				-        </el-table-column>
			
 
				+        <el-table-column type="selection" width="55" align="center" fixed="left"/>
			
 
				         <template v-for="item in tableInfo.descol">
			
 
				-          <el-table-column :fixed="item.isfixed" :min-width="item.minWidth ? item.minWidth : '80px'">
			
 
				+          <el-table-column :fixed="item.isfixed" :min-width="item.label.length <= 4 ? '100px' : item.label.length <= 8 ? '150px' : '180px'">
			
 
				             <template #header>
			
 
				               <div class="flex"
			
 
				                    :style="{ justifyContent: item.alignSelf ? item.alignSelf : 'center' }"
			
 
				-                   :class="[tableInfo.sortKey == item.column ? 'active_css' : '',item.isSort ? 'pointer' : '']"
			
 
				-                   @click="item.isSort&&sortEvent(item.column)">
			
 
				-                {{ item.name }}
			
 
				-                <el-tooltip v-if="item.notes" effect="dark" :content="item.notes"><i-ep-QuestionFilled class="lMar5 c-999 f14 pointer" /></el-tooltip>
			
 
				+                   :class="[tableInfo.sortKey == item.key_value ? 'active_css' : '',item.isSort ? 'pointer' : '']"
			
 
				+                   @click="item.isSort&&sortEvent(item.key_value)">
			
 
				+                {{ item.label }}
			
 
				+                <el-tooltip v-if="item.tooltip && item.tooltip != item.label" placement="top" effect="dark" :content="item.tooltip"><i-ep-QuestionFilled class="lMar5 c-999 f14 pointer" /></el-tooltip>
			
 
				                 <div v-if="item.isSort">
			
 
				-                  <div class="sortItem"><el-icon :color="tableInfo.sortKey == item.column ? '#3173FF' : ''"><i-ep-CaretBottom /></el-icon></div>
			
 
				+                  <div class="sortItem"><el-icon :color="tableInfo.sortKey == item.key_value ? '#3173FF' : ''"><i-ep-CaretBottom /></el-icon></div>
			
 
				                 </div>
			
 
				               </div>
			
 
				             </template>
			
 
				             <template #default="scope">
			
 
				               <div class="flex" :style="{ justifyContent: item.alignSelf ? item.alignSelf : 'center' }">
			
 
				 
			
 
				-              <div v-if="item.column == 'campaign_name'">
			
 
				+              <!-- <div v-if="item.column == 'campaign_name'">
			
 
				                 <span class="c-theme flex campaignName">
			
 
				                   <span class="pointer" @click="goAdvertEvent(scope.row.campaign_id)">{{scope.row[item.column]}}</span>
			
 
				                   <el-icon color="#3173FF" class="pointer lMarauto f16 icon" @click="edit_campaign_name_event(scope.row)"><i-ep-Edit /></el-icon>
			
@@ -116,15 +81,15 @@
 
				               </div>
			
 
				               <div class="flex c-theme pointer" v-else-if="item.column == 'daily_budget'" @click="editPlanEvent(scope.row)">
			
 
				                 {{scope.row[item.column] ? NumberHandle(scope.row[item.column]) : '不限'}}
			
 
				-              </div>
			
 
				+              </div> -->
			
 
				 
			
 
				 
			
 
				-              <div class="cellDiv" :class="tableInfo.sortKey == item.column ? 'active_css' : ''" v-else>
			
 
				-                <el-tooltip :disabled="!(scope.row[item.column] && scope.row[item.column].length >30)" effect="dark" :content="scope.row[item.column]+''">
			
 
				+              <div class="cellDiv" :class="tableInfo.sortKey == item.key_value ? 'active_css' : ''">
			
 
				+                <el-tooltip :disabled="!(scope.row[item.key_value] && scope.row[item.key_value].length >30)" effect="dark" :content="scope.row[item.key_value]+''">
			
 
				                   <div class="clampTwo line21" style="flex: 1">
			
 
				-                    {{ scope.row[item.column] || scope.row[item.column]==0 ?
			
 
				-                      (item.cancleForMat ? (scope.row[item.column] ? scope.row[item.column] : '-') : NumberHandle(scope.row[item.column])) : '-'}}
			
 
				-                    <span v-if="item.hasPercent&&(scope.row[item.column] || scope.row[item.column] ==0)">%</span>
			
 
				+                    {{ scope.row[item.key_value] || scope.row[item.key_value]==0 ?
			
 
				+                      (item.cancleForMat ? (scope.row[item.key_value] ? scope.row[item.key_value] : '-') : scope.row[item.key_value]) : '-'}}
			
 
				+                    <span v-if="item.hasPercent&&(scope.row[item.key_value] || scope.row[item.key_value] ==0)">%</span>
			
 
				                   </div>
			
 
				                 </el-tooltip>
			
 
				               </div>
			
@@ -134,14 +99,6 @@
 
				         </template>
			
 
				       </el-table>
			
 
				 
			
 
				-      <div class="paginationBox flex" style="justify-content: center" v-if="Number(tableInfo.total) > 0">
			
 
				-        <el-pagination
			
 
				-            v-model:currentPage="tableInfo.currentPage"
			
 
				-            v-model:page-size="tableInfo.pageSize"
			
 
				-            background
			
 
				-            :total="tableInfo.total"
			
 
				-            @current-change="handleCurrentChange" />
			
 
				-      </div>
			
 
				     </div>
			
 
				 
			
 
				     <EditIpt ref="planEditIptRef" title="推广计划" @confirm="planEditConfirm"></EditIpt>
			
@@ -161,7 +118,7 @@ import noData from '@/components/capsulationMoudle/noData.vue'
 
				 import {listTs} from "@/components/businessMoudle/gdtList/ts/list";
			
 
				 import {Api} from "@/api/api";
			
 
				 import {ElMessage} from "element-plus";
			
 
				-import {batchGdt_edit, batchGdt_list, reactiveTableAndAny} from "@/api/ApiModel";
			
 
				+import {batchGdt_edit, batchAccount_list, reactiveTableAndAny} from "@/api/ApiModel";
			
 
				 import Indicators from './indicators/index.vue'
			
 
				 
			
 
				 const { proxy } = getCurrentInstance() as any;
			
@@ -183,19 +140,8 @@ const loading = ref<boolean>(false)
 
				 const tableInfo = reactive<reactiveTableAndAny>({
			
 
				   tableList:[],
			
 
				   tableList_all:[],
			
 
				-  descol:[
			
 
				-    { name:'计划名称',column:'campaign_name',slotFlag: true,isfixed:true,alignSelf:'left'},
			
 
				-    { name:'操作',column:'operate',slotFlag: true,isfixed:true},
			
 
				-    { name:'账号ID',column:'account_id',cancleForMat:true},
			
 
				-    { name:'计划ID',column:'campaign_id',cancleForMat:true},
			
 
				-    { name:'计划类型',column:'campaign_type'},
			
 
				-    { name:'推广目标类型',column:'promoted_object_type'},
			
 
				-    { name:'日预算(元)',column:'daily_budget',slotFlag: true},
			
 
				-    // { name:'总预算',column:'total_budget'},
			
 
				-    { name:'投放日期',column:'created_time'},
			
 
				-    { name:'客户状态',column:'configured_status',slotFlag: true},
			
 
				-    { name:'投放速度',column:'speed_mode',slotFlag: true},
			
 
				-  ],
			
 
				+  descol:[],
			
 
				+  summary:[],
			
 
				   multipleSelection:[],
			
 
				   updateKey:1,
			
 
				   chooseAll:false,
			
@@ -279,38 +225,24 @@ const sortEvent = (row:any) => {
 
				 }
			
 
				 
			
 
				 //列表
			
 
				-const init = async (page?:any,totalPages?:any) => {
			
 
				+const init = async () => {
			
 
				   loading.value = true
			
 
				-  const paramsModel = reactive<batchGdt_list>({
			
 
				-    account_ids:acRef.value!.value,
			
 
				+  const paramsModel = reactive<batchAccount_list>({
			
 
				     keyword:InputRef_text.value!.value,
			
 
				-    status:statusRef.value!.value,
			
 
				-    start:timeRef.value!.dateVal&&timeRef.value!.dateVal[0],
			
 
				-    end:timeRef.value!.dateVal&&timeRef.value!.dateVal[1],
			
 
				-    page:page?page:1,
			
 
				-    pageSize:totalPages ? totalPages : tableInfo.pageSize
			
 
				+    st_date:timeRef.value!.dateVal&&timeRef.value!.dateVal[0],
			
 
				+    en_date:timeRef.value!.dateVal&&timeRef.value!.dateVal[1],
			
 
				   })
			
 
				-  let res:any = await proxy.$http.get(Api.batchGdt_plan_list,paramsModel)
			
 
				+  let res:any = await proxy.$http.get(Api.batchGdt_accountList_list,paramsModel)
			
 
				   loading.value = false
			
 
				   if(res&&res.errNo=='0'){
			
 
				-    if(totalPages){
			
 
				-      tableInfo.tableList_all = res.rst.data
			
 
				-    }else{
			
 
				-      tableInfo.tableList = res.rst.data
			
 
				-      tableInfo.total = res.rst.pageInfo.total
			
 
				-      tableInfo.totalPages = res.rst.pageInfo.total
			
 
				-    }
			
 
				+    tableInfo.summary = res.rst.summary;
			
 
				+    tableInfo.descol = res.rst.explain;
			
 
				+    tableInfo.tableList = res.rst.list;
			
 
				   }else{
			
 
				     ElMessage.error(res.errMsg)
			
 
				   }
			
 
				 }
			
 
				 
			
 
				-//分页
			
 
				-const handleCurrentChange = (val) => {
			
 
				-  tableInfo.currentPage = val
			
 
				-  init(val)
			
 
				-}
			
 
				-
			
 
				 
			
 
				 //清空值
			
 
				 const clearChooseVal = ()=>{
			
@@ -336,7 +268,7 @@ const handleCommandChoosePage = async (command: string | number | object)=>{
 
				   clearChooseVal()
			
 
				   tableInfo.chooseAll = true
			
 
				   if(command == 2){ // 全部
			
 
				-    await init(1,tableInfo.totalPages)
			
 
				+    await init()
			
 
				     arr = tableInfo.tableList_all
			
 
				   }
			
 
				   arr.forEach(item=>{
			
@@ -363,9 +295,6 @@ const singleChooseCheckboxEvent = (idx:number,row:any)=>{
 
				   }
			
 
				 }
			
 
				 
			
 
				-const IndicatorsRefreshList = () => {
			
 
				-  //这里刷新列表
			
 
				-}
			
 
				 
			
 
				 const {
			
 
				   init_acList,
			
@@ -389,6 +318,12 @@ onMounted(()=>{
 
				 })
			
 
				 </script>
			
 
				 <style lang="scss" scoped>
			
 
				+.el-table th div.cell {
			
 
				+  white-space: nowrap;
			
 
				+  text-overflow: ellipsis;
			
 
				+  overflow: hidden;
			
 
				+  max-width: 600px; /* 设置最大宽度，根据需要调整 */
			
 
				+}
			
 
				 .campaignName{
			
 
				   .icon{
			
 
				     color: #3173FF;
			
--- a/src/components/businessMoudle/gdtList/indicators/index.vue
+++ b/src/components/businessMoudle/gdtList/indicators/index.vue
@@ -75,7 +75,7 @@ const selectTemplate = (info) => {
 
				     type: props.type
			
 
				   }).then((res)=>{
			
 
				     ElMessage.success(`自定义指标“${info.name}”应用成功！`)
			
 
				-    getTemplate()
			
 
				+    saveSuccess({ refreshList: true })
			
 
				     loading.value = false
			
 
				   }).catch(()=>{
			
 
				     loading.value = false
			
@@ -89,7 +89,7 @@ const deleteTemplate = (info) => {
 
				     temp_id: info.id,
			
 
				   }).then((res)=>{
			
 
				     ElMessage.success(`删除自定义指标“${info.name}”成功！`)
			
 
				-    getTemplate()
			
 
				+    saveSuccess({ refreshList: true })
			
 
				     loading.value = false
			
 
				   }).catch(()=>{
			
 
				     loading.value = false
			
--- a/src/components/businessMoudle/gdtList/indicators/indexDialog.vue
+++ b/src/components/businessMoudle/gdtList/indicators/indexDialog.vue