浏览代码

视频素材修改已上线

朱鑫波 3 年之前
父节点
当前提交
ea4f34ada6
共有 2 个文件被更改,包括 20 次插入11 次删除
  1. 2 2
      src/utils/request.js
  2. 18 9
      src/views/modules/material/videoMaterial.vue

+ 2 - 2
src/utils/request.js

@@ -20,8 +20,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'; // 生产环境
 	// axios.defaults.baseURL = 'http://gateway.tjyourong.com.cn/jeecg-boot'; // 生产环境
 
 }

+ 18 - 9
src/views/modules/material/videoMaterial.vue

@@ -861,7 +861,7 @@ a {
                         </a-menu-item>
                       </a-menu>
                     </a-dropdown>
-					          <a v-show="active === '0' || active === '1'" style="margin-right: 20px" @click="handleRecord(items)">同步记录</a>
+					          <a v-show="active === '1'" style="margin-right: 20px" @click="handleRecord(items)">同步记录</a>
                     <a-checkbox :value="items.id" style="float: right" v-show="active == '1'"></a-checkbox>
                     <br />
                     {{ items.createTime }}
@@ -1218,13 +1218,13 @@ a {
                 ></el-cascader>
               </a-form-model-item>
               <a-form-model-item label="创新素材" 
-              :prop="'urlListData.'+index+'.modTagList'"  
+              :prop="'urlListData.'+index+'.materialInnovate'"  
               :label-col="{ span: 4 }" 
               :wrapper-col="{ span: 14 }"
                 :rules="{
                 required: true,
                 message: '创新素材必选',
-                trigger: 'blur',
+                trigger: 'change',
               }">
                   <a-switch v-model="items.materialInnovate"/>
               </a-form-model-item>
@@ -2241,11 +2241,11 @@ a {
       </div>
     </a-modal>
     <a-modal
-          v-if="recordDetailVisible"
-          title="账户同步记录"
+      v-if="recordDetailVisible"
+      title="素材同步记录"
       :width="750"
-          :visible="recordDetailVisible"
-          dialog-class="usage-details-modal change-face-modal change-list-modal-show"
+      :visible="recordDetailVisible"
+      dialog-class="usage-details-modal change-face-modal change-list-modal-show"
       :footer="null"
       @cancel="handleRecordCancel"
       >
@@ -2260,6 +2260,9 @@ a {
           :pagination="recordIpagination"
           :loading="toutiaoMateriaLoading"
         >
+          <span slot="createTime" slot-scope="text">
+            {{text}}
+          </span>
         </a-table>
       </div>
     </a-modal>
@@ -2447,6 +2450,12 @@ export default {
 				align: 'center',
 				dataIndex: 'userName'
 			},
+      {
+				title: '同步时间',
+				align: 'center',
+				dataIndex: 'createTime',
+        scopedSlots: { customRender: 'createTime' },
+			},
 			{
 				title: '结果',
 				align: 'center',
@@ -2462,8 +2471,8 @@ export default {
           return range[0] + "-" + range[1] + " 共" + total + "条"
       },
       showQuickJumper: true,
-      showSizeChanger:true,
-      pageSizeOptions: ['10', '30', '50'],
+      // showSizeChanger:true,
+      // pageSizeOptions: ['10', '30', '50'],
       total: 0,
       onChange: (current, pageSize) => {
           // 切换分页时的回调,