瀏覽代碼

迭代 修改

jiayufei 3 年之前
父節點
當前提交
c3ee4323e6

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

+ 9 - 8
src/views/modules/Statistics/videoStatics/TTvideoStatics.vue

@@ -165,7 +165,8 @@
 			<!-- <a href="javascript:;" @click.stop="showRelevantPeople(record)">查看相关人员</a> -->
 				<p>剪辑:{{record.clip || '无'}}</p>
 				<p>拍摄:{{record.shot || '无'}}</p>
-				<p>编导:{{record.plan ||'无'}}</p>
+				<p>编导:{{record.plan || '无'}}</p>
+				<p>负责人:{{record.leader || '无'}}</p>
 		</span>
 
 		</a-table>
@@ -231,13 +232,13 @@ const columnsFixd = [
     width: 120,
     fixed: 'left'
   },
-  {
-    title: '设计负责人',
-    dataIndex: 'leader',
-    align: 'center',
-    width: 120,
-    fixed: 'left'
-  },
+  // {
+  //   title: '设计负责人',
+  //   dataIndex: 'leader',
+  //   align: 'center',
+  //   width: 120,
+  //   fixed: 'left'
+  // },
   {
     title: '视频ID',
     dataIndex: 'signature',

+ 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://192.168.1.43:8808'; // 子安
 // export const urlAcount = 'http://139.186.165.84:8808'; // 测试
 // export const urlAcount = 'http://192.168.1.8:8080'; // 学超

+ 2 - 1
src/views/modules/account-config/components/configuration-copy.vue

@@ -843,7 +843,7 @@
                                 <a-radio-button :value="1">启用</a-radio-button>
                             </a-radio-group>
                         </a-form-model-item>
-                        <a-form-model-item v-if="isTomatoStatus" label="创意展现">
+                        <a-form-model-item label="创意展现">
                             <a-radio-group v-model="configForm.creativeDisplayMode" button-style="solid">
                                 <a-radio-button value="CREATIVE_DISPLAY_MODE_CTR">优选模式</a-radio-button>
                                 <a-radio-button value="CREATIVE_DISPLAY_MODE_RANDOM">轮播模式</a-radio-button>
@@ -2007,6 +2007,7 @@ export default {
             }
             else {
                 this.isTAwemeStatus = true;
+                this.isTomatoStatus = false;
                 this.configForm.adUnionVideoType = '';
                 this.configForm.adAudiencePackageId = undefined;
                 this.packageMessageDetail = [];

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

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

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

+ 2 - 2
vue.config.js

@@ -87,8 +87,8 @@ module.exports = {
 				// target: 'http://192.168.1.251/', //请求本地 需要jeecg-boot后台项目 
 				// target:'http://118.24.244.213:8804',
 				// target: 'http://192.168.1.43:8806', // 子安
-				// target: 'http://192.168.1.8:8806', // 学超
-				target:'http://139.186.165.84:8806', //测试
+				target: 'http://192.168.1.8:8806', // 学超
+				// target:'http://139.186.165.84:8806', //测试
 				// target:'http://apipre.tjyourong.com.cn', //预生产
 
 				ws: false,