Bläddra i källkod

Merge branch 'feature/work-test' of http://git.tjyourong.com.cn/ctop/adsp-vue into feature/work-test

liubei@c-top.com.cn 3 år sedan
förälder
incheckning
c62d9dcbed

+ 1 - 1
.env.production

@@ -7,7 +7,7 @@ VUE_APP_BASE_REPORT_URL = http://api.tjyourong.com.cn/reportModule
 # 线上地址 http://api.tjyourong.com.cn
 
 #脚本视频接口
-VUE_APP_BASE_SCRIPT_URL = http://192.168.0.195:31013
+VUE_APP_BASE_SCRIPT_URL = http://114.117.193.186:31013
 # 线上地址 http://114.117.193.186:31013
 # 测试地址 http://139.186.134.115:31013
 # 新测试地址 http://192.168.0.195:31013

Filskillnaden har hållts tillbaka eftersom den är för stor
+ 0 - 20041
package-lock.json


+ 1 - 0
package.json

@@ -29,6 +29,7 @@
     "cos-js-sdk-v5": "^0.5.26",
     "dayjs": "^1.8.0",
     "echarts": "^4.9.0",
+    "echarts-gl": "^1.1.2",
     "element-ui": "^2.13.0",
     "enquire.js": "^2.1.6",
     "html2canvas": "^1.0.0-rc.3",

+ 4 - 0
public/index.html

@@ -6,6 +6,10 @@
   <meta http-equiv="X-UA-Compatible" content="IE=edge">
   <meta name="referrer" content="never">
   <meta name="viewport" content="width=device-width,initial-scale=1.0">
+  <meta http-equiv="pragram" content="no-cache">
+  <meta http-equiv="cache-control" content="no-cache, no-store, must-revalidate">
+  <meta http-equiv="expires" content="0">
+
   <title>有腾投放助手</title>
   <link rel="icon" href="<%= BASE_URL %>logo.png">
   <link href="<%= BASE_URL %>color.less">

+ 2 - 2
src/utils/request.js

@@ -21,9 +21,9 @@ else if (process.env.NODE_ENV === 'debug') {
 else if (process.env.NODE_ENV === 'production') {
 	// axios.defaults.baseURL = 'http://apipre.tjyourong.com.cn/jeecg-boot'; // 预生产
 	// axios.defaults.baseURL = 'http://gateway.tjyourong.com.cn/jeecg-boot';//测试
-	// axios.defaults.baseURL = 'http://api.tjyourong.com.cn/jeecg-boot'; // 生产环境
+	axios.defaults.baseURL = 'http://api.tjyourong.com.cn/jeecg-boot'; // 生产环境
 	// axios.defaults.baseURL = 'http://gateway.tjyourong.com.cn/jeecg-boot'; // 测试环境
-	axios.defaults.baseURL = 'http://192.168.0.195:9999/jeecg-boot'; // 测试环境
+	// axios.defaults.baseURL = 'http://192.168.0.195:9999/jeecg-boot'; // 测试环境
 	// axios.defaults.baseURL = 'http://192.168.1.134:9999/jeecg-boot'; // 泽宇环境
 
 }

+ 2 - 2
src/views/modules/account-config/account-config-server.js

@@ -3,8 +3,8 @@
  * @author jiayufei
  */
 
-// export const urlAcount = 'http://118.24.244.213:8808'; // 线上
+export const urlAcount = 'http://118.24.244.213:8808'; // 线上
 // export const urlAcount = 'http://apipre.tjyourong.com.cn'; // 预生产
 // export const urlAcount = 'http://192.168.1.43:8808'; // 子安
-export const urlAcount = 'http://139.186.165.84:8808'; // 测试
+// export const urlAcount = 'http://139.186.165.84:8808'; // 测试
 // export const urlAcount = 'http://192.168.1.8:8080'; // 学超

+ 55 - 0
src/views/modules/advertiser/ProjectMemberList.vue

@@ -59,6 +59,29 @@
         </div>
         <div v-else>-</div>
       </span>
+      <span slot="ocpxActionType" slot-scope="text,record">
+        <div v-if="!!record.ocpxActionType&&JSON.parse(record.ocpxActionType).length>0">
+          <span v-for="(item, index)  in JSON.parse(record.ocpxActionType)" :key="index"
+            >{{item.ocpxName}}({{(item.maxValue / 1000).toFixed(2)}})<br>
+            <!-- <span v-if="item instanceof Object">{{item.ocpxName}}({{(item.maxValue / 1000).toFixed(2)}})<br></span>
+            <span v-else>{{(item / 1000).toFixed(2)}}</span> -->
+            </span
+          >
+        </div>
+        <div v-else>-</div>
+
+        <!-- {{ text | ocpxActionType }} -->
+      </span>
+      <span slot="deepConversionType" slot-scope="text,record">
+        <div v-if="!!record.deepConversionType&&JSON.parse(record.deepConversionType).length != 0">
+          <span v-for="(item, index)  in JSON.parse(record.deepConversionType)" :key="index"
+            >{{item.deepName}}({{(item.deepValue / 1000).toFixed(2)}})<br></span
+          >
+        </div>
+        <div v-else>-</div>
+
+        <!-- {{ text | ocpxActionType }} -->
+      </span>
         <span slot="maxBid" slot-scope="maxBid,record">{{ record.maxBid == 0? '-': (record.maxBid / 1000).toFixed(2) }}</span>
         <span slot="mediaId" slot-scope="mediaId">{{
           mediaId == 1 ? '头条' : mediaId == 2 ? '快手' : mediaId == 3 ? '头条内广' : mediaId == 4 ? '快手内广':mediaId== 5 ? '千川' :'磁力金牛'
@@ -420,6 +443,22 @@ const myProjectColumns = [
     },
   },
   {
+    title: '转化目标(出价/元)',
+    align: 'center',
+    dataIndex: 'ocpxActionType',
+    scopedSlots: {
+      customRender: 'ocpxActionType',
+    },
+  },
+  {
+    title: '深度转化目标(出价)',
+    align: 'center',
+    dataIndex: 'deepConversionType',
+    scopedSlots: {
+      customRender: 'deepConversionType',
+    },
+  },
+  {
     title: '操作',
     dataIndex: 'action',
     align: 'center',
@@ -479,6 +518,22 @@ const participationColumns = [
     },
   },
   {
+    title: '转化目标(出价/元)',
+    align: 'center',
+    dataIndex: 'ocpxActionType',
+    scopedSlots: {
+      customRender: 'ocpxActionType',
+    },
+  },
+  {
+    title: '深度转化目标(出价)',
+    align: 'center',
+    dataIndex: 'deepConversionType',
+    scopedSlots: {
+      customRender: 'deepConversionType',
+    },
+  },
+  {
     title: '操作',
     dataIndex: 'action',
     align: 'center',

+ 1 - 1
src/views/modules/autoLaunch/trusteeship/creatMaterialTest.vue

@@ -1745,7 +1745,7 @@ export default {
                     this.$nextTick(() => {
                         let data = res.result
                         this.accountIds = data.accountId
-                        data.sceneIds = data.sceneIds ? data.sceneIds : [1]
+                        data.sceneIds = data.sceneIds ? JSON.parse(data.sceneIds) : [1]
                         this.formProject.setFieldsValue(pick(data, 'campaignType', 'sceneIds'))
                         this.$nextTick(() => {
                             this.getActionBarText()

+ 34 - 6
src/views/modules/autoLaunchRevision/components/targetedPopulation.vue

@@ -53,6 +53,13 @@ li:hover {
             </div>
             <div class="dingxiang_paichu" v-if="allForm.people != '0'" style="width:100%">
                 <a-tabs v-model="allForm.tabKey" @change="retargetAccountId()">
+                    <a-button
+                        slot="tabBarExtraContent"
+                        type="primary"
+                        @click="refreshPopulation"
+                        :loading="refreshPopulationLoading"
+                        >刷新人群包</a-button
+                    >
                     <a-tab-pane key="1" tab="定向池" v-if="allForm.people != '2'">
                         <a-table
                             :columns="retargetColumns"
@@ -751,7 +758,7 @@ let retargetColumns = [
 
 export default {
     name: 'new-create-template',
-    components:{
+    components: {
         selectRegion
     },
     props: {
@@ -903,7 +910,7 @@ export default {
                                 'deviceBrand',
                                 'devicePrice',
                                 'businessInterest',
-                                'filterConvertedLevel',
+                                'filterConvertedLevel'
                                 // 'timeType',
                                 // 'strengthType',
                                 // 'sceneType'
@@ -977,6 +984,7 @@ export default {
     directives: { clickoutside },
     data() {
         return {
+            refreshPopulationLoading: false,
             behaviorData: [],
             interestData: [],
             optionsAll: [],
@@ -1070,6 +1078,26 @@ export default {
         }
     },
     methods: {
+        refreshPopulation() {
+            if (this.accountId) {
+                this.refreshPopulationLoading = true
+                // this.$refs.application.showApplication()
+                this.getAction('/kuaishou/batch/pullPopulationList', {
+                    accountId: this.accountId
+                }).then(res => {
+                    if (res.success) {
+                        this.refreshPopulationLoading = false
+                        this.$message.success(res.message)
+                        this.retargetAccountId()
+                    } else {
+                        this.refreshPopulationLoading = false
+                        this.$message.error(res.message)
+                    }
+                })
+            } else {
+                this.$message.error('请先选择账户')
+            }
+        },
         personSelect() {
             if (this.allForm.people === '1' || this.allForm.people === '2') {
                 this.retargetAccountId()
@@ -1341,16 +1369,16 @@ export default {
                         json.region = []
                     }
                     var jsonData = {}
-                    if(this.allForm.people == '0'){
+                    if (this.allForm.people == '0') {
                         jsonData.population = []
                         jsonData.excludePopulation = []
-                    }else if(this.allForm.people == '1'){
+                    } else if (this.allForm.people == '1') {
                         jsonData.population = this.allForm.incluedSelectedRowKeys
                         jsonData.excludePopulation = []
-                    }else if(this.allForm.people == '2'){
+                    } else if (this.allForm.people == '2') {
                         jsonData.population = []
                         jsonData.excludePopulation = this.allForm.excludeSelectedRowKeys
-                    }else if(this.allForm.people == '3'){
+                    } else if (this.allForm.people == '3') {
                         jsonData.population = this.allForm.incluedSelectedRowKeys
                         jsonData.excludePopulation = this.allForm.excludeSelectedRowKeys
                     }

+ 2 - 2
src/views/modules/copy-library/copy-library-server.js

@@ -3,8 +3,8 @@
  * @author jiayufei
  */
 
-// export const urlAcount = 'http://118.24.244.213:8808'; // 线上
+export const urlAcount = 'http://118.24.244.213:8808'; // 线上
 // export const urlAcount = 'http://apipre.tjyourong.com.cn'; // 预生产
 // export const urlAcount = 'http://192.168.1.43:8080'; // 子安
-export const urlAcount = 'http://139.186.165.84:8808'; // 测试
+// export const urlAcount = 'http://139.186.165.84:8808'; // 测试
 // export const urlAcount = 'http://192.168.1.8:8808'; // 学超

+ 2 - 2
src/views/modules/headline-view/headline-view-server.js

@@ -3,8 +3,8 @@
  * @author jiayufei
  */
 
-// export const urlAcount = 'http://118.24.244.213:8808'; // 线上
+export const urlAcount = 'http://118.24.244.213:8808'; // 线上
 // export const urlAcount = 'http://apipre.tjyourong.com.cn'; // 预生产
 // export const urlAcount = 'http://192.168.1.43:8808'; // 子安
-export const urlAcount = 'http://139.186.165.84:8808'; // 测试
+// export const urlAcount = 'http://139.186.165.84:8808'; // 测试
 // export const urlAcount = 'http://192.168.1.8:8080'; // 学超

+ 3 - 2
src/views/modules/material/videoMaterial.vue

@@ -848,7 +848,7 @@ a {
                         <a-menu-item
                           key="1"
                           v-show="active != '3'"
-                          v-if="items.userId == userInfo().id || role.roleCode == 'designTeamLeader'"
+                          v-if="items.userId == userInfo().id || role.roleCode == 'designTeamLeader'|| userInfo().id == 'e9ca23d68d884d4ebb19d07889727dae'"
                         >
                           <a href="javascript:;" style="margin-right: 20px" @click="personEdit(items, '2')">人员修改</a>
                         </a-menu-item>
@@ -861,7 +861,8 @@ a {
                         <a-menu-item key="5">
                           <a href="javascript:;" style="margin-right: 20px" @click="editTagList(items)">修改标签</a>
                         </a-menu-item>
-                        <a-menu-item key="6"  v-show="active !== '1'"  v-if="items.userId == userInfo().id ||(userInfo().id == '6a2e036486ea480ab3d9870e2d810daf' && items.projectId == 4830885)">
+                        <a-menu-item key="6"  v-show="userInfo().id == 'e9ca23d68d884d4ebb19d07889727dae'||active !== '1'"  
+                        v-if="items.userId == userInfo().id ||(userInfo().id == '6a2e036486ea480ab3d9870e2d810daf' && items.projectId == 4830885) || userInfo().id == 'e9ca23d68d884d4ebb19d07889727dae'">
                           <a href="javascript:;" style="margin-right: 20px" @click="editMaterialName(items)">修改素材名称</a>
                         </a-menu-item>
                         <a-menu-item key="7" v-show="active === '0' || active === '1'">

+ 2 - 2
src/views/modules/user-manage-operation/user-manage-operation-server.js

@@ -3,8 +3,8 @@
  * @author jiayufei
  */
 
-//  export const urlAcount = 'http://118.24.244.213:8808'; // 线上
+ export const urlAcount = 'http://118.24.244.213:8808'; // 线上
  // export const urlAcount = 'http://apipre.tjyourong.com.cn'; // 预生产
 //  export const urlAcount = 'http://192.168.1.43:'; // 子安
- export const urlAcount = 'http://139.186.165.84:8808'; // 测试
+//  export const urlAcount = 'http://139.186.165.84:8808'; // 测试
 //  export const urlAcount = 'http://192.168.1.8:9999'; // 学超

+ 2 - 2
vue.config.js

@@ -108,7 +108,7 @@ module.exports = {
         // target: 'http://192.168.1.59:7701', //请求本地 需要jeecg-boot后台项目  赵西安
         // target: 'http://192.168.1.193:8080', //请求本地 需要jeecg-boot后台项目  李煜一
         // target: 'http://192.168.1.193:31012', //请求本地 需要jeecg-boot后台项目  李煜一
-        // target: 'http://api.tjyourong.com.cn', //请求本地 需要jeecg-boot后台项目
+        target: 'http://api.tjyourong.com.cn', //请求本地 需要jeecg-boot后台项目
         // target: 'https://trac.tjyourong.com.cn', //请求本地 需要jeecg-boot后台项目
         // target: 'http://39.106.184.70:8088/', //请求本地 需要jeecg-boot后台项目
         //  target: 'http://adsp.tjyourong.com.cn/', //请求本地 需要jeecg-boot后台项目
@@ -119,7 +119,7 @@ module.exports = {
         // target:'http://gateway.tjyourong.com.cn', //测试
         // target:'http://apipre.tjyourong.com.cn', //预生产
         // target: 'http://192.168.1.134:7001', //请求本地 需要jeecg-boot后台项目  周泽宇
-        target:'http://192.168.0.195:9999/',
+        // target:'http://192.168.0.195:9999/',
         // target:'http://gateway.tjyourong.com.cn/',//测试
 
         ws: false,