Quellcode durchsuchen

素材多维度测试提测

朱鑫波 vor 3 Jahren
Ursprung
Commit
4f06421f8e

+ 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

+ 2 - 1
src/views/modules/autoLaunch/material-test/creatMaterialTest.vue

@@ -1116,7 +1116,7 @@ li.chouzhen.first:before {
                                     </a-form-item>
                                 </a-col>
                             </a-row>
-<!-- 
+                            <!-- 
                             <a-row :gutter="16">
                                 <a-col :span="16">
                                     <a-form-item label="素材类型">
@@ -1222,6 +1222,7 @@ li.chouzhen.first:before {
                                                     right: 6px;
                                                     width: 100%;
                                                     margin-bottom: 0;
+                                                    border: 0;
                                                 "
                                             >
                                                 {{ item.value.length }}/30

+ 13 - 3
src/views/modules/autoLaunch/material-test/index.vue

@@ -531,7 +531,7 @@
             :width="1000"
             v-if="materialVisible"
             :visible="materialVisible"
-            :confirm-loading="modifyPriceLoading"
+            :confirm-loading="materialLoading"
             dialog-class="push-modal"
             @ok="handleOkMaterial"
             @cancel="
@@ -549,7 +549,14 @@
             <a-checkbox-group v-model="checkVideo" style="width: 100%;" @change="setVideoDataAll">
                 <div class="card-person-drawer info-detail">
                     <a-card class="card-person card-item" v-for="(item, index) in dataVideoList" :key="index">
-                        <!-- <a slot="title">查看视频</a> -->
+                        <div
+                            slot="title"
+                            style="    overflow: hidden;
+                            text-overflow: ellipsis;
+                            white-space: nowrap;"
+                        >
+                            {{ item.photoName }}
+                        </div>
                         <div slot="extra">
                             <a-checkbox :value="item.photoId" @change="setVideoData(item.photoId)"></a-checkbox>
                         </div>
@@ -732,6 +739,7 @@ export default {
             appIds: [],
             appOptions: [],
             materialVisible: false,
+            materialLoading: false,
             scheduleTimeData: [{ scheduleTime: '' }],
             indexAll: 0,
             spinning: false,
@@ -1268,10 +1276,12 @@ export default {
         handleOkMaterial() {
             let dataAll = this.checkPersonElse
             this.checkVideo = dataAll
+            this.materialLoading = true
             this.postDataAction('/dimension/kuaiShouDimensionStrategy/create', {
                 id: this.ipaginationVideo.id,
                 materialArray: this.checkVideo
             }).then(res => {
+                this.materialLoading = false
                 if (res.success) {
                     this.materialVisible = false
                     this.checkPersonElse = []
@@ -1319,7 +1329,7 @@ export default {
             let params = {}
             params.id = rescord.id
             params.strategyStatus = status
-            url = '/dimension/kuaiShouDimensionStrategy/insertOrUpdate'
+            url = '/dimension/kuaiShouDimensionStrategy/edit'
             this.postDataAction(url, params).then(res => {
                 if (res.success) {
                     const paramsData = this.form.getFieldsValue()

+ 2 - 2
vue.config.js

@@ -69,7 +69,7 @@ module.exports = {
 		proxy: {
 			'/jeecg-boot': {
 				// target: 'http://192.168.1.8:8080', //请求本地 需要jeecg-boot后台项目  蒙蒙
-				target: 'http://192.168.1.3:8080', //请求本地 需要jeecg-boot后台项目  蒙蒙
+				// target: 'http://192.168.1.3:8080', //请求本地 需要jeecg-boot后台项目  蒙蒙
 				// target: 'http://192.168.0.59:8088', //请求本地 需要jeecg-boot后台项目  英豪
 				// target: 'http://192.168.1.62:8088', //请求本地 需要jeecg-boot后台项目  英豪
 				// target: 'http://192.168.6.162:9806', //请求本地 需要jeecg-boot后台项目  祚云
@@ -88,7 +88,7 @@ module.exports = {
 				// 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://139.186.165.84:8806', //测试
 				// target:'http://apipre.tjyourong.com.cn', //预生产
 
 				ws: false,