Bläddra i källkod

测试代码合饼

朱鑫波 3 år sedan
förälder
incheckning
c55a29cbe5

+ 14 - 14
src/components/formComponents/Cascader.vue

@@ -1,18 +1,18 @@
 <style lang="scss">
-// .hcst-cascader{
-//     .el-cascader {
-//         display: inline-block;
-//         position: relative;
-//         font-size: 14px;
-//         height: 32px;
-//     }
-//     .el-input__inner{
-//         height: 32px  !important;
-//     }
-//     .el-cascader__tags {
-//         top: 64%;
-//     }
-// }
+.hcst-cascader{
+    .el-cascader {
+        display: inline-block;
+        position: relative;
+        font-size: 14px;
+        height: 32px;
+    }
+    .el-input__inner{
+        height: 32px  !important;
+    }
+    .el-cascader__tags {
+        top: 64%;
+    }
+}
 
 </style>
 <template>

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

@@ -62,7 +62,9 @@
                                                     { label: '优选广告位', value: 1 },
                                                     { label: '上下滑大屏广告', value: 6 },
 
-                                                    { label: '快手联盟优选', value: 10 }
+                                                    { label: '快手联盟优选', value: 10 },
+
+                                                    { label: '激励视频广告', value: 24 }
                                                 ]"
                                                 v-decorator="[
                                                     'sceneIds',

+ 53 - 30
src/views/modules/material/videoPopular.vue

@@ -123,6 +123,12 @@ li.chouzhen.first:before {
 // }
 </style>
 <style lang="scss" scoped>
+::v-deep .radio-cascader{
+    height:32px !important;
+}
+::v-deep .radio-cascader .el-input .el-input__inner{
+   height:32px !important;
+}
 .chouzhen {
     border-style: solid;
     border-width: 1px;
@@ -414,7 +420,7 @@ a {
                     </a-col>
                     <a-col :md="8" :sm="8">
                         <a-form-item label="版位">
-                            <a-select v-model="queryParam.platePosition" style="width: 100%" placeholder="请选择版位">
+                            <a-select v-model="queryParam.platePosition" style="width: 100%" allowClear placeholder="请选择版位">
                                 <a-select-option value="优选广告位"> 优选广告位 </a-select-option>
                                 <a-select-option value="上下滑大屏"> 上下滑大屏 </a-select-option>
                                 <a-select-option value="激励视频广告"> 激励视频广告 </a-select-option>
@@ -434,6 +440,8 @@ a {
                     <a-col :md="8" :sm="8">
                         <a-form-item label="场景标签">
                             <el-cascader
+                                clearable
+                                class="radio-cascader"
                                 placeholder="搜索你想要的场景标签"
                                 :options="departTreeSence"
                                 v-model="queryParam.sceneTag"
@@ -453,6 +461,8 @@ a {
                     <a-col :md="8" :sm="8">
                         <a-form-item label="形式标签">
                             <el-cascader
+                                 class="radio-cascader"
+                                 clearable
                                 placeholder="搜索你想要的形式标签"
                                 :options="departTreeModality"
                                 v-model="queryParam.modalityTag"
@@ -472,6 +482,8 @@ a {
                     <a-col :md="8" :sm="8">
                         <a-form-item label="基调标签">
                             <el-cascader
+                                class="radio-cascader"
+                                clearable
                                 placeholder="搜索你想要的基调标签"
                                 :options="departTreeMod"
                                 v-model="queryParam.daTag"
@@ -633,7 +645,7 @@ a {
                                 />
                                 <a-popover
                                     title="视频标签"
-                                    @visibleChange="changeTag(items.md5)"
+                                    @visibleChange="changeTag(items.md5, items.mediaType)"
                                     :overlayStyle="{ width: '400px' }"
                                 >
                                     <template slot="content" v-if="videoTag && videoTag.length > 0">
@@ -708,7 +720,7 @@ a {
                                 </a-dropdown>
                                 <a-checkbox :value="items.id" style="float: right" v-show="active != '2'"></a-checkbox>
                                 <br />
-                                {{ items.createTime }}
+                                {{ items.statDate }}
                             </span>
                         </div>
                     </div>
@@ -933,7 +945,7 @@ a {
                                 :rules="{
                                     required: true,
                                     message: '行业必选',
-                                    trigger: 'blur',
+                                    trigger: 'change',
                                 }"
                             >
                                 <j-tree-select
@@ -955,7 +967,7 @@ a {
                                 :rules="{
                                     required: true,
                                     message: '形式标签必选',
-                                    trigger: 'blur',
+                                    trigger: 'change',
                                 }"
                             >
                                 <el-cascader
@@ -983,7 +995,7 @@ a {
                                 :rules="{
                                     required: true,
                                     message: '场景标签必选',
-                                    trigger: 'blur',
+                                    trigger: 'change',
                                 }"
                                 v-if="
                                     !items.modalityTag.includes(60158) &&
@@ -1018,7 +1030,7 @@ a {
                                 :rules="{
                                     required: true,
                                     message: '基调标签必选',
-                                    trigger: 'blur',
+                                    trigger: 'change',
                                 }"
                             >
                                 <el-cascader
@@ -1419,13 +1431,10 @@ a {
                         </div>
                         <div>
                             <a-form-item label="标签">
-                                <div v-if="tagInfoList.length>0">
+                                <div v-if="tagInfoList.length > 0">
                                     <a-tag v-for="(item, index) of tagInfoList" :key="index">{{ item.tagName }}</a-tag>
                                 </div>
-                                <span v-else>
-                                    -
-                                </span>
-                                
+                                <span v-else> - </span>
                             </a-form-item>
                         </div>
                         <div>
@@ -2052,6 +2061,7 @@ export default {
             waterLoading: false,
             videoTag: [],
             videoVisibleChange: '',
+            videoVisibleMediaType: '',
             allDetailData: null,
             dataAllList: [],
             dataSourceFace: [],
@@ -2339,19 +2349,21 @@ export default {
                 })
             } else {
                 var data = JSON.parse(JSON.stringify(urlAll))
-                data.splice(0,this.ruleForm.urlListData.length)
-                this.ruleForm.urlListData.push(...data.map((item) => {
-                    return {
-                        url: item.url,
-                        daTag: [],
-                        modalityTag: [],
-                        sceneTag: [],
-                        materialSource: undefined,
-                        industry: undefined,
-                        platePosition: undefined,
-                        materialDescribe: undefined,
-                    }
-                }))
+                data.splice(0, this.ruleForm.urlListData.length)
+                this.ruleForm.urlListData.push(
+                    ...data.map((item) => {
+                        return {
+                            url: item.url,
+                            daTag: [],
+                            modalityTag: [],
+                            sceneTag: [],
+                            materialSource: undefined,
+                            industry: undefined,
+                            platePosition: undefined,
+                            materialDescribe: undefined,
+                        }
+                    })
+                )
                 // for (let i = 0; i < this.ruleForm.urlListData.length; i++) {
                 //     for (let j = 0; j < urlAll.length; j++) {
                 //         if (this.ruleForm.urlListData[i].url == urlAll[j].url) {
@@ -2580,11 +2592,12 @@ export default {
                 }
             })
         },
-        changeTag(visible) {
-            if (this.videoVisibleChange != visible) {
+        changeTag(visible,mediaType) {
+            if (this.videoVisibleChange != visible||this.videoVisibleMediaType != mediaType) {
                 this.videoVisibleChange = visible
+                this.videoVisibleMediaType = mediaType
                 this.videoTag = []
-                getAction('/external/materialCollection/getTagDetail', { md5: visible }).then((res) => {
+                getAction('/external/materialCollection/getTagDetail', { md5: visible,mediaType:mediaType }).then((res) => {
                     if (res.success) {
                         this.videoTag = [
                             ...res.result.modTagList,
@@ -3037,7 +3050,7 @@ export default {
                 //         ? 2
                 //         : 4
             })
-            getAction('/external/materialCollection/getTagDetail', { md5: item.md5 }).then((res) => {
+            getAction('/external/materialCollection/getTagDetail', { md5: item.md5,mediaType:item.mediaType }).then((res) => {
                 if (res.success) {
                     this.tagInfoList = [
                         ...res.result.modTagList,
@@ -3050,7 +3063,7 @@ export default {
         editTagList(item) {
             this.tagInfoListVisible = true
             this.industryId = item.industry
-            getAction('/external/materialCollection/getTagDetail', { md5: item.md5 }).then((res) => {
+            getAction('/external/materialCollection/getTagDetail', { md5: item.md5,mediaType:item.mediaType }).then((res) => {
                 if (res.success) {
                     // this.tagInfoList = [
                     //     ...res.result.modTagList,
@@ -3109,6 +3122,11 @@ export default {
                         this.postDataAction('/external/materialCollection/addByVideo', params).then((res) => {
                             if (res.success) {
                                 this.form.resetFields()
+                                this.urlList = {
+                                    url: '',
+                                    md5: '',
+                                    name: '',
+                                }
                                 this.loadData()
                                 this.visible = false
                                 this.add = true
@@ -3123,6 +3141,11 @@ export default {
                         this.postDataAction('/external/materialCollection/addByUrl', params).then((res) => {
                             if (res.success) {
                                 this.form.resetFields()
+                                this.urlList = {
+                                    url: '',
+                                    md5: '',
+                                    name: '',
+                                }
                                 this.loadData()
                                 this.visible = false
                                 this.add = true