jiayufei 3 лет назад
Родитель
Сommit
65001759ea

+ 2 - 2
src/utils/request.js

@@ -19,8 +19,8 @@ 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://gateway.tjyourong.com.cn/jeecg-boot';//测试
+	axios.defaults.baseURL = 'http://api.tjyourong.com.cn/jeecg-boot'; // 生产环境
 }
 const service = axios.create({
 	// baseURL: '/jeecg-boot', // api base_url

+ 4 - 1
src/views/modules/BatchCreate/TouTiaoBatch.vue

@@ -310,6 +310,8 @@
 
 <script>
 import moment from 'moment';
+import {mapGetters} from 'vuex';
+
 import { getAction, postAction, downFile, downFilePost } from '@/api/manage';
 // import { JeecgListMixin } from '@/mixins/ipagination'
 import editableCell from './editableCell'
@@ -683,6 +685,7 @@ export default {
         },
     },
     methods: {
+        ...mapGetters(['userInfo']),
         // 点击跳转
         goNextPage(item){
             console.log(item);
@@ -1520,7 +1523,7 @@ export default {
         accountHttp(){
             this.treeData=[];
             this.accountID=undefined;
-            getAction('/ctop/projectMember/getProjectAccountByUserId?mediaType=1', {}).then(res => {
+            getAction('/ctop/projectMember/getProjectAccountByUserId?mediaType=1&userId=' + this.userInfo().id, {}).then(res => {
             if(res.success){
                     // console.log(res);
                     if(res.result){

+ 1 - 1
src/views/modules/BatchCreate/components/Treeselect.vue

@@ -178,7 +178,7 @@
         // })
         this.options=[];
         this.accountID=undefined;
-            getAction('/ctop/projectMember/getProjectAccountByUserId?mediaType=1', {}).then(res => {
+            getAction('/ctop/projectMember/getProjectAccountByUserId?mediaType=1&userId=' + this.userInfo().id, {}).then(res => {
                 if(res.success){
                     // console.log(res);
                     if(res.result){

+ 4 - 1
src/views/modules/BatchCreate/directedPackage.vue

@@ -80,6 +80,8 @@
 
 <script>
 import moment from 'moment';
+import {mapGetters} from 'vuex';
+
 import { getAction, postAction, downFile, downFilePost } from '@/api/manage';
 import { JeecgListMixin } from '@/mixins/ipagination'
 import qs from 'qs'
@@ -143,6 +145,7 @@ export default {
         }
     }, 
     methods: {
+        ...mapGetters(['userInfo']),
         openDirectionalPackage(){
             this.$router.push({path:'/BatchCreate/newDirectedPackage'})
         },
@@ -167,7 +170,7 @@ export default {
         accountHttp(){
             this.treeData=[];
             this.accountID=undefined;
-            getAction('/ctop/projectMember/getProjectAccountByUserId?mediaType=1', {}).then(res => {
+            getAction('/ctop/projectMember/getProjectAccountByUserId?mediaType=1&userId=' + this.userInfo().id, {}).then(res => {
             if(res.success){
                     // console.log(res);
                 if(res.result){

+ 4 - 1
src/views/modules/BatchCreate/newGroup.vue

@@ -99,6 +99,8 @@
 <script>
 
 import moment from 'moment';
+import {mapGetters} from 'vuex';
+
 import { getAction, postAction, downFile, downFilePost } from '@/api/manage';
 import qs from 'qs'
 const formItemLayout = {
@@ -123,6 +125,7 @@ export default {
         }
     },
     methods: {
+        ...mapGetters(['userInfo']),
         tabChange(key){
             console.log(key);
             this.tabKey=key;
@@ -174,7 +177,7 @@ export default {
         accountHttp(){
             this.treeData=[];
             this.accountID=undefined;
-            getAction('/ctop/projectMember/getProjectAccountByUserId?mediaType=1', {}).then(res => {
+            getAction('/ctop/projectMember/getProjectAccountByUserId?mediaType=1&userId=' + this.userInfo().id, {}).then(res => {
             if(res.success){
                     // console.log(res);
                     if(res.result){

+ 1 - 1
src/views/modules/LaunchHousekeeper/LaunchHousekeeperList.vue

@@ -410,7 +410,7 @@ export default {
         accountHttp(){
             this.treeData=[];
             this.accountIds=[];
-            getAction('/ctop/projectMember/getProjectAccountByUserId?mediaType=1', {}).then(res => {
+            getAction('/ctop/projectMember/getProjectAccountByUserId?mediaType=1&userId=' + this.userInfo().id, {}).then(res => {
             if(res.success){
                     // console.log(res);
                     if(res.result){

+ 4 - 2
src/views/modules/Statistics/accountReport.vue

@@ -259,6 +259,8 @@
 
 <script>
 import moment from 'moment';
+import {mapGetters} from 'vuex';
+
 import { getAction, postAction, downFile, downFilePost } from '@/api/manage';
 
 import { TreeSelect } from 'ant-design-vue';
@@ -523,7 +525,7 @@ export default {
     },
   },
   methods: {
-
+    ...mapGetters(['userInfo']),
     //项目改变后的事件
     treeChange(val) {
       // console.log(this.treeData)
@@ -836,7 +838,7 @@ export default {
    accountHttp(){
      this.treeData=[];
      this.treeValue=[];
-     getAction('/ctop/projectMember/getProjectAccountByUserId?mediaType=1', {}).then(res => {
+     getAction('/ctop/projectMember/getProjectAccountByUserId?mediaType=1&userId=' + this.userInfo().id, {}).then(res => {
        if(res.success){
             // console.log(res);
             if(res.result){

+ 1 - 0
src/views/modules/Statistics/components/Treeselect.vue

@@ -230,6 +230,7 @@ export default {
       } else if (this.reqUrl == '/ctop/projectMember/getProjectAccountByUserId') {
         getAction(this.reqUrl, {
           mediaType: this.request,
+          userId: this.userInfo().id
         }).then((res) => {
           if (res.code == 0) {
             if (res.result.length > 0) {

+ 5 - 0
src/views/modules/Statistics/components/datePick.vue

@@ -126,6 +126,11 @@ export default {
   },
   directives: { clickoutside },
   watch: {
+    type(newVal) {
+      if (newVal) {
+        this.active = newVal;
+      }
+    },
     parentDate(n,o){
         if(n[0].format('YYYY-MM-DD')!=this.mydateValue[0].format('YYYY-MM-DD')){
               this.mydateValue=n

+ 30 - 15
src/views/modules/Statistics/newPlanStatic/newPlanStatic.vue

@@ -925,7 +925,7 @@ export default {
 					
 				});
 				this.operateDisabled=false;
-				this.operate=this.userId
+				// this.operate=this.userId
 				// this.accountDisabled=true
 			}
 			if(val){
@@ -952,10 +952,7 @@ export default {
 		// this.treeValue=arguments[0].value
 		},
 		disabledDate(current) {
-		// console.log(current)
-
-		//  return  current && current > moment().add(1, 'day')
-		return moment().endOf('day');
+		 return moment().endOf('day');
 		},
 		filterOption(input, option){
 
@@ -963,7 +960,6 @@ export default {
 			option.componentOptions.children[0].text.toLowerCase().indexOf(input.toLowerCase()) >= 0
 			);
 		},
-		
 		//打开日期框
 		opendate() {
 			this.openOptions =! this.openOptions;
@@ -1023,14 +1019,34 @@ export default {
 		moment,
 		// table区域的tab切换
 		tableTabChange(key) {
-			if (key === 1) {
-				this.columns = this.tabKey === 1 ? [...TTcolumns] : [...KScolumns];
-				this.target = 'new';
+			if (this.value === 1) {
+				if (key === 1) {
+					this.columns = this.tabKey === 1 ? [...TTcolumns] : [...KScolumnsPlan];
+					this.target = 'new';
+				}
+				else {
+					this.columns = this.tabKey === 1 ? [...TTcolumnsVaild] : [...KScolumnsPlanVaild];
+					this.target = 'valid';
+				}
 			}
 			else {
-				this.columns = this.tabKey === 1 ? [...TTcolumnsVaild] : [...KScolumnsVaild];
-				this.target = 'valid';
+				if (key === 1) {
+					this.columns = this.tabKey === 1 ? [...TTcolumns] : [...KScolumns];
+					this.target = 'new';
+				}
+				else {
+					this.columns = this.tabKey === 1 ? [...TTcolumnsVaild] : [...KScolumnsVaild];
+					this.target = 'valid';
+				}
 			}
+			// if (key === 1) {
+			// 	this.columns = this.tabKey === 1 ? [...TTcolumns] : [...KScolumns];
+			// 	this.target = 'new';
+			// }
+			// else {
+			// 	this.columns = this.tabKey === 1 ? [...TTcolumnsVaild] : [...KScolumnsVaild];
+			// 	this.target = 'valid';
+			// }
 			this.getNewPlan()
 		},
 		//处理echart
@@ -1111,7 +1127,7 @@ export default {
 		accountHttp(key){
 		this.treeData=[]
 		this.treeValue=[];
-		getAction(`/ctop/projectMember/getProjectAccountByUserId?mediaType=${key}`, {}).then(res => {
+		getAction(`/ctop/projectMember/getProjectAccountByUserId?mediaType=${key}&userId=${this.userInfo().id}`, {}).then(res => {
 		if(res.success){
 				// console.log(res);
 				
@@ -1170,7 +1186,6 @@ export default {
 		}
 		})
 		},
-
 		// 运营数据获取
 		operateHttp(){
 		postAction('',{}).then(res=>{
@@ -1183,7 +1198,7 @@ export default {
 			this.operateList = [];
 			const paramsData = {
 				userId: this.userInfo().id,
-				userName: this.userInfo().username
+				userName: this.userInfo().realname
 			};
 			// TODO 2021.8.24 和泽宇联调更换的统一接口
 			getAction('/ctop/kuaishou/newGroup/report/AllOperator', paramsData).then(res => {
@@ -1291,7 +1306,7 @@ export default {
 
 		// 查询按钮
 		search(){
-		if(this.accountId || this.operate){
+		if((this.accountId && this.accountId.length) || this.operate){
 			this.echartSpinning=true;
 			this.getNewPlan()
 		}else{

+ 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'; // 学超

+ 4 - 1
src/views/modules/autoLaunch/configLaunchInfo.vue

@@ -1748,6 +1748,8 @@
 
 <script>
 import moment from 'moment'
+import {mapGetters} from 'vuex';
+
 import { getAction, postAction, downFile, downFilePost } from '@/api/manage'
 import Treeselect from '@/views/modules/Statistics/components/Treeselect.vue'
 import { TreeSelect } from 'ant-design-vue';
@@ -2149,6 +2151,7 @@ export default {
             },
     },
     methods: {
+        ...mapGetters(['userInfo']),
         keyDown(event){
             if((event.keyCode>=96&&event.keyCode<=105)||(event.keyCode>=109&&event.keyCode<=111)||event.keyCode==46||event.keyCode==45||(event.keyCode>=48&&event.keyCode<=57)){
                 
@@ -2482,7 +2485,7 @@ export default {
         accountHttp(){
             this.treeData=[];
             this.accountIds=[];
-            getAction('/ctop/projectMember/getProjectAccountByUserId?mediaType=2', {}).then(res => {
+            getAction('/ctop/projectMember/getProjectAccountByUserId?mediaType=2&userId=' + this.userInfo().id, {}).then(res => {
             if(res.success){
                     // //console.log(res);
                     if(res.result){

+ 4 - 2
src/views/modules/autoLaunch/createStrategy.vue

@@ -99,6 +99,8 @@
 
 <script>
 import moment from 'moment'
+import {mapGetters} from 'vuex';
+
 import { getAction, postAction, downFile, downFilePost } from '@/api/manage'
 import Treeselect from '@/views/modules/Statistics/components/Treeselect.vue'
 import { TreeSelect } from 'ant-design-vue';
@@ -175,7 +177,7 @@ export default {
         }
     },
     methods: {
-    
+        ...mapGetters(['userInfo']),
 
         //获取表单的某一个属性值
         getFormData(className) {
@@ -274,7 +276,7 @@ export default {
         accountHttp(){
             this.treeData=[];
             this.accountIds=[];
-            getAction('/ctop/projectMember/getProjectAccountByUserId?mediaType=2', {}).then(res => {
+            getAction('/ctop/projectMember/getProjectAccountByUserId?mediaType=2&userId=' + this.userInfo().id, {}).then(res => {
             if(res.success){
                     // console.log(res);
                     if(res.result){

+ 4 - 0
src/views/modules/autoLaunch/material-test/creatMaterialTest.vue

@@ -1352,6 +1352,8 @@ li.chouzhen.first:before {
 <script>
 //   import UserMenu from '../tools/UserMenu'
 //   import SMenu from '../menu/'
+import { mapGetters } from 'vuex'
+
 import Logo from '@/components/tools/Logo.vue'
 import pick from 'lodash.pick'
 import { mixin } from '@/utils/mixin.js'
@@ -1860,6 +1862,7 @@ export default {
         }
     },
     methods: {
+        ...mapGetters(['userInfo']),
         moment,
         tongbuClick() {
             this.tongbuLoading = true
@@ -2496,6 +2499,7 @@ export default {
                     if (this.$route.query.id) {
                         params.id = this.$route.query.id
                     }
+                    params.userId = this.userInfo().id;
                     this.postDataAction('/dimension/kuaiShouDimensionStrategy/insertOrUpdate', params).then(res => {
                         if (res.success) {
                             this.sumbitLoading = false

+ 4 - 2
src/views/modules/autoLaunch/material-test/treeSelectAccount.vue

@@ -210,7 +210,8 @@ export default {
                 if (this.options.length > 0) {
                     return
                 }
-                getAction('/ctop/projectMember/projectList').then(res => {
+                // 2021/9/1 蒙蒙让修改 接口增加 userId 原来的url链接并没有使用声明好的params
+                getAction('/ctop/projectMember/projectList', {userId: this.userInfo().id}).then(res => {
                     if (res.success) {
                         this.options = res.data.map(item => {
                             return {
@@ -231,7 +232,8 @@ export default {
                 })
             } else if (this.reqUrl == '/ctop/projectMember/getProjectAccountByUserId') {
                 getAction(this.reqUrl, {
-                    mediaType: this.request
+                    mediaType: this.request,
+                    userId: this.userInfo().id
                 }).then(res => {
                     if (res.code == 0) {
                         if (res.result.length > 0) {

+ 4 - 2
src/views/modules/autoLaunch/newAppId.vue

@@ -105,6 +105,8 @@
 </template>
 
 <script>
+import {mapGetters} from 'vuex';
+
 import Vue from 'vue'
 import {ACCESS_TOKEN} from "@/store/mutation-types";
 import moment from 'moment'
@@ -175,7 +177,7 @@ export default {
         }
     },
     methods: {
-    
+        ...mapGetters(['userInfo']),
         fileWater(file) {
             console.log(file)
             var bmf = new BMF()
@@ -242,7 +244,7 @@ export default {
         accountHttp(){
             this.treeData=[];
             this.accountIds=[];
-            getAction('/ctop/projectMember/getProjectAccountByUserId?mediaType=2', {}).then(res => {
+            getAction('/ctop/projectMember/getProjectAccountByUserId?mediaType=2&userId=' + this.userInfo().id, {}).then(res => {
             if(res.success){
                     // console.log(res);
                     if(res.result){

+ 16 - 15
src/views/modules/material/videoMaterial.vue

@@ -2082,7 +2082,7 @@ a {
 		:footer="null"
 		@cancel="handleProfitModalnCancel"
     >
-		<div>
+		<div style="overflow: hidden;">	
 			<a-tabs v-model="materiaModalType" @change="handleMateriaTabsChange">
 				<a-tab-pane key="1" tab="头条">
 					<a-table
@@ -2208,6 +2208,11 @@ export default {
 				dataIndex: 'accountId'
 			},
 			{
+				title: '账户所属人',
+				align: 'center',
+				dataIndex: 'userName'
+			},
+			{
 				title: '账户状态',
 				align: 'center',
 				dataIndex: 'accountStatus',
@@ -2224,11 +2229,6 @@ export default {
 				dataIndex: 'relationCount'
 			},
 			{
-				title: '账户所属人',
-				align: 'center',
-				dataIndex: 'userName'
-			},
-			{
 				title: '审核拒绝创意数',
 				align: 'center',
 				dataIndex: 'refuseCount',
@@ -2252,25 +2252,25 @@ export default {
 				dataIndex: 'accountId'
 			},
 			{
-				title: '素材ID',
+				title: '账户归属人',
 				align: 'center',
-				dataIndex: 'materialId'
+				dataIndex: 'userName'
 			},
 			{
-				title: '素材关联创意数',
+				title: '账户状态',
 				align: 'center',
-				dataIndex: 'relationCount'
+				dataIndex: 'accountStatus',
+				scopedSlots: {customRender: 'accountStatus'}
 			},
 			{
-				title: '账户归属人',
+				title: '素材ID',
 				align: 'center',
-				dataIndex: 'userName'
+				dataIndex: 'materialId'
 			},
 			{
-				title: '账户状态',
+				title: '素材关联创意数',
 				align: 'center',
-				dataIndex: 'accountStatus',
-				scopedSlots: {customRender: 'accountStatus'}
+				dataIndex: 'relationCount'
 			}
 		],
 		materiaModalType: '1',
@@ -2673,6 +2673,7 @@ export default {
 		this.materiaDataKuaishou = [];
 		this.materiaDataTotalKuaishou = 0;
 		this.defaultCurrentKuaishou = 1;
+		this.materiaModalType = '1';
 		this.usageDetailsStatus = false;
 	},
 	handleUsageDetails(data) {

+ 2 - 2
src/views/modules/policy-management/policy-management-server.js

@@ -3,9 +3,9 @@
  * @author jiayufei
  */
 
-//  export const urlAcount = 'http://api.tjyourong.com.cn'; // 线上
+ export const urlAcount = 'http://api.tjyourong.com.cn'; // 线上
 //  export const urlAcount = 'http://gateway.tjyourong.com.cn'; // 测试
 //  export const urlAcount = 'http://192.168.1.43:9999'; // 子安
- export const urlAcount = 'http://gateway.tjyourong.com.cn'; // 测试
+//  export const urlAcount = 'http://gateway.tjyourong.com.cn'; // 测试
 //  export const urlAcount = 'http://192.168.1.8:9999'; // 学超
  

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

@@ -3,9 +3,9 @@
  * @author jiayufei
  */
 
-//  export const urlAcount = 'http://api.tjyourong.com.cn'; // 线上
+ export const urlAcount = 'http://api.tjyourong.com.cn'; // 线上
 //  export const urlAcount = 'http://gateway.tjyourong.com.cn'; // 测试
 // export const urlAcount = 'http://192.168.1.43:9999'; // 子安
- export const urlAcount = 'http://gateway.tjyourong.com.cn'; // 测试
+//  export const urlAcount = 'http://gateway.tjyourong.com.cn'; // 测试
 // export const urlAcount = 'http://192.168.1.8:9999'; // 学超
  

+ 2 - 2
src/views/modules/settlement-information/settlement-information-server.js

@@ -3,9 +3,9 @@
  * @author jiayufei
  */
 
-//  export const urlAcount = 'http://api.tjyourong.com.cn'; // 线上
+ export const urlAcount = 'http://api.tjyourong.com.cn'; // 线上
 //  export const urlAcount = 'http://gateway.tjyourong.com.cn'; // 测试
 //  export const urlAcount = 'http://192.168.1.43:9999'; // 子安
- export const urlAcount = 'http://gateway.tjyourong.com.cn'; // 测试
+//  export const urlAcount = 'http://gateway.tjyourong.com.cn'; // 测试
 // export const urlAcount = 'http://192.168.1.8:9999'; // 学超
  

+ 0 - 1
src/views/modules/settlement-information/settlement-information.vue

@@ -685,7 +685,6 @@ export default {
                             this.handleProfitModalnCancel();
                             this.$message.success('正在下载利润表,请稍后...', 4);
                             window.location.href = `${urlAcount}${urlData}?startTime=${paramsData.startTime}&endTime=${paramsData.endTime}`;
-
                             // this.handleDownUpdate(url);
                         }
                     }).catch(error => {

+ 2 - 2
vue.config.js

@@ -116,9 +116,9 @@ module.exports = {
         // target:'http://118.24.244.213:8804',
         // target: 'http://192.168.1.43:9999', // 子安
         // target: 'http://192.168.1.8:8806', // 学超
-        target:'http://gateway.tjyourong.com.cn', //测试
+        // target:'http://gateway.tjyourong.com.cn', //测试
         // target:'http://apipre.tjyourong.com.cn', //预生产
-        // target: 'http://192.168.1.134:8080', //请求本地 需要jeecg-boot后台项目  周泽宇
+        target: 'http://192.168.1.134:7001', //请求本地 需要jeecg-boot后台项目  周泽宇
 
         // target:'http://gateway.tjyourong.com.cn/',//测试