Переглянути джерело

Merge branch 'master' into work-newCreate

朱鑫波 3 роки тому
батько
коміт
ae463b73e8
51 змінених файлів з 865 додано та 345 видалено
  1. 1 1
      src/assets/less/common.less
  2. 1 1
      src/components/formComponents/selectAccount.vue
  3. 2 2
      src/components/jeecg/JAreaLinkage.vue
  4. 8 8
      src/components/jeecg/JSuperQuery.vue
  5. 1 1
      src/components/jeecgbiz/JSelectBizComponent/index.vue
  6. 1 1
      src/components/tools/UserMenu.vue
  7. 27 0
      src/mixins/JeecgListMixin.js
  8. 26 1
      src/mixins/videoMaterialMixin.js
  9. 2 3
      src/views/modules/Statistics/components/selectPagination.vue
  10. 11 11
      src/views/modules/Statistics/designerReport/material.less
  11. 1 1
      src/views/modules/Statistics/kuaishouReport/accountReport.vue
  12. 12 12
      src/views/modules/Statistics/kuaishouReport/kuaishouReport.less
  13. 1 1
      src/views/modules/Statistics/kuaishouReport/videoReport.vue
  14. 2 2
      src/views/modules/Statistics/materialReport/materialReport.vue
  15. 1 1
      src/views/modules/account-config/account-config.less
  16. 2 2
      src/views/modules/account-config/components/configuration-modal.less
  17. 1 1
      src/views/modules/account-config/components/directional-logic/directional-logic.less
  18. 9 9
      src/views/modules/autoLaunch/application/application.less
  19. 1 1
      src/views/modules/autoLaunch/application/components/creatApplication.vue
  20. 2 2
      src/views/modules/autoLaunch/auto-copy-library/auto-copy-library.less
  21. 3 3
      src/views/modules/autoLaunch/channelManage/channelDetailList.vue
  22. 1 1
      src/views/modules/autoLaunch/channelManage/components/creatApplication.vue
  23. 10 10
      src/views/modules/autoLaunch/channelManage/createChannel.vue
  24. 3 3
      src/views/modules/autoLaunch/channelManage/itemList.vue
  25. 4 4
      src/views/modules/autoLaunch/components/configLaunchExploreDrawer.vue
  26. 1 1
      src/views/modules/autoLaunch/configLaunchList.vue
  27. 8 8
      src/views/modules/autoLaunch/configProject/creatConfig.vue
  28. 1 1
      src/views/modules/autoLaunch/directional/components/templateModal.vue
  29. 9 9
      src/views/modules/autoLaunch/directional/directional.less
  30. 1 1
      src/views/modules/autoLaunch/material-all/components/templateModal.vue
  31. 1 1
      src/views/modules/autoLaunch/material-all/material-detail.vue
  32. 11 11
      src/views/modules/autoLaunch/material-all/material.less
  33. 9 9
      src/views/modules/autoLaunch/material-test/creatMaterialTest.vue
  34. 2 2
      src/views/modules/autoLaunch/material-test/index.vue
  35. 9 9
      src/views/modules/autoLaunch/url/url.less
  36. 2 2
      src/views/modules/copy-library/copy-library.less
  37. 4 4
      src/views/modules/creative-copywrit/creative-copywrit.less
  38. 188 6
      src/views/modules/creative-copywrit/creative-copywrit.vue
  39. 9 9
      src/views/modules/crowd-control/crowd-control.less
  40. 8 8
      src/views/modules/earlyWarningRules/accountClear/createClear.vue
  41. 4 1
      src/views/modules/material/accountCheck.vue
  42. 10 4
      src/views/modules/material/accountCheckBytedance.vue
  43. 2 3
      src/views/modules/material/comment/selectTable.vue
  44. 437 158
      src/views/modules/material/videoMaterial.vue
  45. 4 4
      src/views/modules/policy-management/policy-management.less
  46. 1 1
      src/views/modules/settlement-account/settlement-account.less
  47. 1 1
      src/views/modules/settlement-information/settlement-information.less
  48. 1 1
      src/views/modules/stockWatch/modules/custom-columns/custom-columns.less
  49. 6 6
      src/views/modules/stockWatch/modules/keep-manage/keep-manage.less
  50. 2 2
      src/views/modules/stockWatch/modules/keep-person/keep-person.less
  51. 1 1
      vue.config.js

+ 1 - 1
src/assets/less/common.less

@@ -54,6 +54,6 @@
 .ant-card-wider-padding.cust-erp-sub-tab>.ant-card-body{padding:5px 12px}
 
 /* 内嵌子表背景颜色 */
-.j-inner-table-wrapper /deep/ .ant-table-expanded-row .ant-table-wrapper .ant-table-tbody .ant-table-row {
+.j-inner-table-wrapper ::v-deep .ant-table-expanded-row .ant-table-wrapper .ant-table-tbody .ant-table-row {
   background-color: #FFFFFF;
 }

+ 1 - 1
src/components/formComponents/selectAccount.vue

@@ -2,7 +2,7 @@
 .select-project {
     width: 50%;
 }
-/deep/.vue-treeselect__control {
+::v-deep.vue-treeselect__control {
     line-height: 20px !important;
 }
 </style>

+ 2 - 2
src/components/jeecg/JAreaLinkage.vue

@@ -144,11 +144,11 @@
 <style lang="less" scoped>
   .j-area-linkage {
     height:40px;
-    /deep/ .area-cascader-wrap .area-select {
+    ::v-deep .area-cascader-wrap .area-select {
       width: 100%;
     }
 
-    /deep/ .area-select .area-selected-trigger {
+    ::v-deep .area-select .area-selected-trigger {
       line-height: 1.15;
     }
   }

+ 8 - 8
src/components/jeecg/JSuperQuery.vue

@@ -562,30 +562,30 @@
   .j-super-query-modal {
 
     .j-super-query-history-card {
-      /deep/ .ant-card-body,
-      /deep/ .ant-card-head-title {
+      ::v-deep .ant-card-body,
+      ::v-deep .ant-card-head-title {
         padding: 0;
       }
 
-      /deep/ .ant-card-head {
+      ::v-deep .ant-card-head {
         padding: 4px 8px;
         min-height: initial;
       }
     }
 
     .j-super-query-history-empty {
-      /deep/ .ant-empty-image {
+      ::v-deep .ant-empty-image {
         height: 80px;
         line-height: 80px;
         margin-bottom: 0;
       }
 
-      /deep/ img {
+      ::v-deep img {
         width: 80px;
         height: 65px;
       }
 
-      /deep/ .ant-empty-description {
+      ::v-deep .ant-empty-description {
         color: #afafaf;
         margin: 8px 0;
       }
@@ -626,11 +626,11 @@
 
       }
 
-      /deep/ .ant-tree-switcher {
+      ::v-deep .ant-tree-switcher {
         display: none;
       }
 
-      /deep/ .ant-tree-node-content-wrapper {
+      ::v-deep .ant-tree-node-content-wrapper {
         width: 100%;
       }
     }

+ 1 - 1
src/components/jeecgbiz/JSelectBizComponent/index.vue

@@ -158,7 +158,7 @@
       width: 100%;
     }
 
-    /deep/ .ant-select-search__field {
+    ::v-deep .ant-select-search__field {
       display: none !important;
     }
   }

+ 1 - 1
src/components/tools/UserMenu.vue

@@ -228,7 +228,7 @@
     width: 180px;
     color: inherit;
 
-    /deep/ .ant-select-selection {
+    ::v-deep .ant-select-selection {
       background-color: inherit;
       border: 0;
       border-bottom: 1px solid white;

+ 27 - 0
src/mixins/JeecgListMixin.js

@@ -94,6 +94,7 @@ export const JeecgListMixin = {
         }
     },
     async loadData(arg) {
+      this.cancel()
       this.spinning= true
       this.dataSource = []
       if (!this.url.list) {
@@ -114,6 +115,32 @@ export const JeecgListMixin = {
       if(params.stateDate){
         params.stateDate = moment(params.stateDate).format('YYYY-MM-DD')
       }
+
+      if(params.videoStatus == 0){
+        params.syncKuaishou = null
+        params.syncBytedance = null
+      }else if(params.videoStatus == 1){
+        params.syncKuaishou = 1
+        params.syncBytedance = 1
+      }else if(params.videoStatus == '2'){
+        params.syncKuaishou = 1
+        params.syncBytedance = null
+      }else if(params.videoStatus == 3){
+        params.syncKuaishou = null
+        params.syncBytedance = 1
+      }else if(params.videoStatus == 4){
+        params.syncKuaishou = 2
+        params.syncBytedance = null
+      }else if(params.videoStatus == 5){
+        params.syncKuaishou = null
+        params.syncBytedance = 2
+      }else if(params.videoStatus == 6){
+        params.syncKuaishou = 2
+        params.syncBytedance = 2
+      }else{
+        params.syncKuaishou = null
+        params.syncBytedance = null
+      }
       // if(params.endDate){
       //   params.endDate = moment(params.endDate).format('YYYY-MM-DD')
       // }

+ 26 - 1
src/mixins/videoMaterialMixin.js

@@ -94,6 +94,7 @@
          }
      },
      async loadData(arg) {
+       this.cancel()
        this.spinning= true
        this.dataSource = []
        if (!this.url.list) {
@@ -117,7 +118,31 @@
        // if(params.endDate){
        //   params.endDate = moment(params.endDate).format('YYYY-MM-DD')
        // }
- 
+       if(params.videoStatus == 0){
+        params.syncKuaishou = null
+        params.syncBytedance = null
+      }else if(params.videoStatus == 1){
+        params.syncKuaishou = 1
+        params.syncBytedance = 1
+      }else if(params.videoStatus == '2'){
+        params.syncKuaishou = 1
+        params.syncBytedance = null
+      }else if(params.videoStatus == 3){
+        params.syncKuaishou = null
+        params.syncBytedance = 1
+      }else if(params.videoStatus == 4){
+        params.syncKuaishou = 2
+        params.syncBytedance = null
+      }else if(params.videoStatus == 5){
+        params.syncKuaishou = null
+        params.syncBytedance = 2
+      }else if(params.videoStatus == 6){
+        params.syncKuaishou = 2
+        params.syncBytedance = 2
+      }else{
+        params.syncKuaishou = null
+        params.syncBytedance = null
+      }
        this.loading = true;
        await getAction(this.url.list, params).then((res) => {
          if (res.success) {

+ 2 - 3
src/views/modules/Statistics/components/selectPagination.vue

@@ -22,7 +22,7 @@
 </style>
 <style lang="scss" scoped>
 .require-check {
-  /deep/ .ant-form-item-label {
+  ::v-deep .ant-form-item-label {
     label::before {
       display: inline-block;
       margin-right: 4px;
@@ -47,7 +47,7 @@
   >
     <a-input
       placeholder="请选择项目名称"
-      @focus="topMiddle = true"
+      @focus="topMiddle = true;getData(productId)"
       v-model="keyValue"
       @change="getData(productId)"
       :disabled="disabled"
@@ -285,7 +285,6 @@ export default {
       this.topMiddle = false
       if(!!!this.projectId){
         this.keyValue = ''
-        this.getData(this.productId)
       }
     },
     // allData() {

+ 11 - 11
src/views/modules/Statistics/designerReport/material.less

@@ -3,7 +3,7 @@
     // height: calc(100vh - 137px);
     // padding: 20px;
     overflow: hidden;
-    /deep/.chart-card-content {
+    ::v-deep.chart-card-content {
         height: 0;
     }
     .middle-button {
@@ -12,7 +12,7 @@
     .control-con-header {
         margin-bottom: 20px;
         position: relative;
-        /deep/ .ant-form-inline .ant-form-item > .ant-form-item-control-wrapper, .ant-form-inline .ant-form-item > .ant-form-item-label {
+        ::v-deep .ant-form-inline .ant-form-item > .ant-form-item-control-wrapper, .ant-form-inline .ant-form-item > .ant-form-item-label {
             width: 200px !important;
         }
         .reset-class {
@@ -39,7 +39,7 @@
         margin-left: 210px;
     }
 }
-/deep/ .push-modal {
+::v-deep .push-modal {
     width: 600px !important;
     .acount-title {
         display: flex;
@@ -57,13 +57,13 @@
 }
 .person-modal {
     width: 500px;
-    /deep/ .ant-form-item {
+    ::v-deep .ant-form-item {
         display: flex;
     }
-    /deep/ .ant-form-item-label {
+    ::v-deep .ant-form-item-label {
         width: 20%;
     }
-    /deep/ .ant-form-item-control-wrapper {
+    ::v-deep .ant-form-item-control-wrapper {
         width: 80%;
     }
     .acount-search-class {
@@ -74,11 +74,11 @@
         margin-bottom: 10px;
         line-height: 1.5;
     }
-    /deep/ .ant-radio-group {
+    ::v-deep .ant-radio-group {
         line-height: 30px;
     }
 }
-/deep/ .cause-modal {
+::v-deep .cause-modal {
     width: 600px !important;
     .cause-modal-table-class {
         height: 500px;
@@ -90,7 +90,7 @@
         margin-top: 20px;
     }
 }
-/deep/ .relax-modal {
+::v-deep .relax-modal {
     width: 600px !important;
     .acount-title {
         display: flex;
@@ -108,7 +108,7 @@
 }
 
 .grid-form-item-account {
-    /deep/ .ant-form-item-control {
+    ::v-deep .ant-form-item-control {
         line-height: inherit;
     }
 }
@@ -116,7 +116,7 @@
     width: 100%;
     min-height:100px;
     margin-top:15px;
-    /deep/ .ant-card-body {
+    ::v-deep .ant-card-body {
         padding: 0;
     }
 }

+ 1 - 1
src/views/modules/Statistics/kuaishouReport/accountReport.vue

@@ -1,6 +1,6 @@
 <style lang="less" scoped>
 @import 'kuaishouReport';
-/deep/.vue-treeselect__control {
+::v-deep.vue-treeselect__control {
     line-height: 20px !important;
 }
 </style>

+ 12 - 12
src/views/modules/Statistics/kuaishouReport/kuaishouReport.less

@@ -4,8 +4,8 @@
         // height: calc(100vh - 137px);
         padding: 20px;
         margin-bottom: 15px;
-        /deep/.table-page-search-wrapper {
-            /deep/.ant-form-inline {
+        ::v-deep.table-page-search-wrapper {
+            ::v-deep.ant-form-inline {
                 .ant-form-item {
                     display: flex;
                     margin-bottom: 24px;
@@ -23,7 +23,7 @@
                         width: auto;
                     }
 
-                    /deep/.ant-form-item-control {
+                    ::v-deep.ant-form-item-control {
                         height: auto;
                         line-height: 32px;
                     }
@@ -43,7 +43,7 @@
         .control-con-header {
             margin-bottom: 20px;
             position: relative;
-            /deep/ .ant-form-inline .ant-form-item > .ant-form-item-control-wrapper,
+            ::v-deep .ant-form-inline .ant-form-item > .ant-form-item-control-wrapper,
             .ant-form-inline .ant-form-item > .ant-form-item-label {
                 width: 200px !important;
             }
@@ -157,7 +157,7 @@
             }
         }
     }
-    /deep/ .push-modal {
+    ::v-deep .push-modal {
         width: 600px !important;
         .acount-title {
             display: flex;
@@ -175,13 +175,13 @@
     }
     .person-modal {
         width: 500px;
-        /deep/ .ant-form-item {
+        ::v-deep .ant-form-item {
             display: flex;
         }
-        /deep/ .ant-form-item-label {
+        ::v-deep .ant-form-item-label {
             width: 20%;
         }
-        /deep/ .ant-form-item-control-wrapper {
+        ::v-deep .ant-form-item-control-wrapper {
             width: 80%;
         }
         .acount-search-class {
@@ -192,11 +192,11 @@
             margin-bottom: 10px;
             line-height: 1.5;
         }
-        /deep/ .ant-radio-group {
+        ::v-deep .ant-radio-group {
             line-height: 30px;
         }
     }
-    /deep/ .cause-modal {
+    ::v-deep .cause-modal {
         width: 600px !important;
         .cause-modal-table-class {
             height: 500px;
@@ -208,7 +208,7 @@
             margin-top: 20px;
         }
     }
-    /deep/ .relax-modal {
+    ::v-deep .relax-modal {
         width: 600px !important;
         .acount-title {
             display: flex;
@@ -228,7 +228,7 @@
     }
 
     .grid-form-item-account {
-        /deep/ .ant-form-item-control {
+        ::v-deep .ant-form-item-control {
             line-height: inherit;
         }
     }

+ 1 - 1
src/views/modules/Statistics/kuaishouReport/videoReport.vue

@@ -1,6 +1,6 @@
 <style lang="less" scoped>
 @import 'kuaishouReport';
-/deep/.vue-treeselect__control {
+::v-deep.vue-treeselect__control {
     line-height: 20px !important;
 }
 </style>

+ 2 - 2
src/views/modules/Statistics/materialReport/materialReport.vue

@@ -1234,10 +1234,10 @@ export default {
 .materialReport {
 	.material-report-card {
 		height: 220px;
-		/deep/ .ant-card-head {
+		::v-deep .ant-card-head {
 			border: none;
 		}
-		/deep/ .ant-card-body {
+		::v-deep .ant-card-body {
 			padding-top: 5px;
 		}
 		.report-card-result {

+ 1 - 1
src/views/modules/account-config/account-config.less

@@ -29,7 +29,7 @@
     justify-content: center;
     align-items: center;
 }
-/deep/ .mode-modal-class {
+::v-deep .mode-modal-class {
     width: 600px !important;
     .ant-form-item-label {
         width: 130px;

+ 2 - 2
src/views/modules/account-config/components/configuration-modal.less

@@ -191,7 +191,7 @@
                     }
                 }
             }
-            /deep/ .ant-form-item-control-wrapper {
+            ::v-deep .ant-form-item-control-wrapper {
                 width: 80%;
             }
             .common-input {
@@ -270,7 +270,7 @@
             }
             .position-radio-change {
                 margin-bottom: 10px;
-                /deep/ .ant-checkbox-wrapper {
+                ::v-deep .ant-checkbox-wrapper {
                     margin: 0 !important;
                 }
             }

+ 1 - 1
src/views/modules/account-config/components/directional-logic/directional-logic.less

@@ -44,7 +44,7 @@
                 padding: 0 10px;
                 height: 348px;
                 overflow-y: auto;
-                /deep/ .ant-tabs-nav-container {
+                ::v-deep .ant-tabs-nav-container {
                     margin-left: 0 !important;
                 }
                 .apply-right-tree {

+ 9 - 9
src/views/modules/autoLaunch/application/application.less

@@ -9,7 +9,7 @@
     .control-con-header {
         margin-bottom: 20px;
         position: relative;
-        /deep/ .ant-form-inline .ant-form-item > .ant-form-item-control-wrapper, .ant-form-inline .ant-form-item > .ant-form-item-label {
+        ::v-deep .ant-form-inline .ant-form-item > .ant-form-item-control-wrapper, .ant-form-inline .ant-form-item > .ant-form-item-label {
             width: 200px !important;
         }
         .reset-class {
@@ -36,7 +36,7 @@
         margin-left: 210px;
     }
 }
-/deep/ .push-modal {
+::v-deep .push-modal {
     width: 600px !important;
     .acount-title {
         display: flex;
@@ -54,13 +54,13 @@
 }
 .person-modal {
     width: 500px;
-    /deep/ .ant-form-item {
+    ::v-deep .ant-form-item {
         display: flex;
     }
-    /deep/ .ant-form-item-label {
+    ::v-deep .ant-form-item-label {
         width: 20%;
     }
-    /deep/ .ant-form-item-control-wrapper {
+    ::v-deep .ant-form-item-control-wrapper {
         width: 80%;
     }
     .acount-search-class {
@@ -71,11 +71,11 @@
         margin-bottom: 10px;
         line-height: 1.5;
     }
-    /deep/ .ant-radio-group {
+    ::v-deep .ant-radio-group {
         line-height: 30px;
     }
 }
-/deep/ .cause-modal {
+::v-deep .cause-modal {
     width: 600px !important;
     .cause-modal-table-class {
         height: 500px;
@@ -87,7 +87,7 @@
         margin-top: 20px;
     }
 }
-/deep/ .relax-modal {
+::v-deep .relax-modal {
     width: 600px !important;
     .acount-title {
         display: flex;
@@ -107,7 +107,7 @@
 }
 
 .grid-form-item-account {
-    /deep/ .ant-form-item-control {
+    ::v-deep .ant-form-item-control {
         line-height: inherit;
     }
 }

+ 1 - 1
src/views/modules/autoLaunch/application/components/creatApplication.vue

@@ -1,6 +1,6 @@
 <style lang="less" scoped>
 .require-class {
-  /deep/ .ant-form-item-label {
+  ::v-deep .ant-form-item-label {
     label::before {
       display: inline-block;
       margin-right: 4px;

+ 2 - 2
src/views/modules/autoLaunch/auto-copy-library/auto-copy-library.less

@@ -31,7 +31,7 @@
         margin-top: 20px;
     }
 }
-/deep/ .auto-copy-library-modal {
+::v-deep .auto-copy-library-modal {
     width: 700px !important;
     .ant-modal-body {
         height: 380px !important;
@@ -111,7 +111,7 @@
         }
     }
 }
-/deep/ .reject-ideas-modal {
+::v-deep .reject-ideas-modal {
     width: 900px !important;
     .pagin-table-class {
         display: flex;

+ 3 - 3
src/views/modules/autoLaunch/channelManage/channelDetailList.vue

@@ -1,9 +1,9 @@
 <style lang="scss" scoped>
-/deep/.vue-treeselect__control {
+::v-deep.vue-treeselect__control {
     line-height: 36px !important;
 }
-/deep/ .ant-collapse-item,
-/deep/.ant-collapse-content {
+::v-deep .ant-collapse-item,
+::v-deep.ant-collapse-content {
     overflow: inherit !important;
 }
 .search-bar {

+ 1 - 1
src/views/modules/autoLaunch/channelManage/components/creatApplication.vue

@@ -1,6 +1,6 @@
 <style lang="less" scoped>
 .require-class {
-    /deep/ .ant-form-item-label {
+    ::v-deep .ant-form-item-label {
         label::before {
             display: inline-block;
             margin-right: 4px;

+ 10 - 10
src/views/modules/autoLaunch/channelManage/createChannel.vue

@@ -1,23 +1,23 @@
 <style scoped lang="scss">
-/deep/.vue-treeselect__control {
+::v-deep.vue-treeselect__control {
     line-height: 36px !important;
 }
 .account-item {
-    /deep/ .ant-form-item-control {
+    ::v-deep .ant-form-item-control {
         line-height: 1;
     }
 }
 
-/deep/.display-none-selset {
+::v-deep.display-none-selset {
     display: none !important;
 }
 // .step-jump {
-//     /deep/ table tr td {
+//     ::v-deep table tr td {
 //         border-bottom: 0px;
 //     }
 // }
 .bottom-to-one {
-    /deep/ .ant-form-item {
+    ::v-deep .ant-form-item {
         margin-bottom: 0;
     }
 }
@@ -26,10 +26,10 @@
 }
 .card-person {
     width: 300px;
-    /deep/.ant-card-body {
+    ::v-deep.ant-card-body {
         padding: 0px;
     }
-    /deep/.ant-card-head {
+    ::v-deep.ant-card-head {
         padding: 0px 10px;
     }
     .card-main-case {
@@ -140,15 +140,15 @@ li.chouzhen.first:before {
     }
 }
 
-/deep/ .ant-descriptions-item-content {
+::v-deep .ant-descriptions-item-content {
     font-weight: bold;
 }
 
 .info-detail {
-    /deep/ table tr td {
+    ::v-deep table tr td {
         border: 0;
     }
-    /deep/ .ant-descriptions-item-label {
+    ::v-deep .ant-descriptions-item-label {
         color: darkgray;
         // min-width: 30px;
         white-space: nowrap;

+ 3 - 3
src/views/modules/autoLaunch/channelManage/itemList.vue

@@ -1,9 +1,9 @@
 <style lang="scss" scoped>
-/deep/.vue-treeselect__control {
+::v-deep.vue-treeselect__control {
     line-height: 36px !important;
 }
-/deep/ .ant-collapse-item,
-/deep/.ant-collapse-content {
+::v-deep .ant-collapse-item,
+::v-deep.ant-collapse-content {
     overflow: inherit !important;
 }
 .search-bar {

+ 4 - 4
src/views/modules/autoLaunch/components/configLaunchExploreDrawer.vue

@@ -1,16 +1,16 @@
 <style scoped lang="scss">
-/deep/ .ant-drawer-header {
+::v-deep .ant-drawer-header {
     border-bottom: 0px;
     padding: 0;
 }
-/deep/.ant-drawer-body {
+::v-deep.ant-drawer-body {
     padding-top: 0;
 }
-/deep/.ant-tooltip-inner {
+::v-deep.ant-tooltip-inner {
     color: #fff !important;
     background-color: rgba(0, 0, 0, 0.75) !important;
 }
-/deep/.ant-tooltip-arrow::before {
+::v-deep.ant-tooltip-arrow::before {
     color: #fff !important;
     background-color: rgba(0, 0, 0, 0.75) !important;
 }

+ 1 - 1
src/views/modules/autoLaunch/configLaunchList.vue

@@ -1,5 +1,5 @@
 <style scoped lang="scss">
-    /deep/ .ant-drawer-header{
+    ::v-deep .ant-drawer-header{
         border-bottom: 0px;
     }
 </style>

+ 8 - 8
src/views/modules/autoLaunch/configProject/creatConfig.vue

@@ -1,14 +1,14 @@
 <style scoped lang="scss">
-/deep/.display-none-selset {
+::v-deep.display-none-selset {
     display: none !important;
 }
 .step-jump {
-    /deep/ table tr td {
+    ::v-deep table tr td {
         border-bottom: 0px;
     }
 }
 .bottom-to-one {
-    /deep/ .ant-form-item {
+    ::v-deep .ant-form-item {
         margin-bottom: 0;
     }
 }
@@ -17,10 +17,10 @@
 }
 .card-person {
     width: 300px;
-    /deep/.ant-card-body {
+    ::v-deep.ant-card-body {
         padding: 0px;
     }
-    /deep/.ant-card-head {
+    ::v-deep.ant-card-head {
         padding: 0px 10px;
     }
     .card-main-case {
@@ -132,15 +132,15 @@ li.chouzhen.first:before {
     }
 }
 
-/deep/ .ant-descriptions-item-content {
+::v-deep .ant-descriptions-item-content {
     font-weight: bold;
 }
 
 .info-detail {
-    /deep/ table tr td {
+    ::v-deep table tr td {
         border: 0;
     }
-    /deep/ .ant-descriptions-item-label {
+    ::v-deep .ant-descriptions-item-label {
         color: darkgray;
         // min-width: 30px;
         white-space: nowrap;

+ 1 - 1
src/views/modules/autoLaunch/directional/components/templateModal.vue

@@ -35,7 +35,7 @@
 </style>
 <style lang="scss" scoped>
 .require-check {
-  /deep/ .ant-form-item-label {
+  ::v-deep .ant-form-item-label {
     label::before {
       display: inline-block;
       margin-right: 4px;

+ 9 - 9
src/views/modules/autoLaunch/directional/directional.less

@@ -9,7 +9,7 @@
     .control-con-header {
         margin-bottom: 20px;
         position: relative;
-        /deep/ .ant-form-inline .ant-form-item > .ant-form-item-control-wrapper, .ant-form-inline .ant-form-item > .ant-form-item-label {
+        ::v-deep .ant-form-inline .ant-form-item > .ant-form-item-control-wrapper, .ant-form-inline .ant-form-item > .ant-form-item-label {
             width: 200px !important;
         }
         .reset-class {
@@ -36,7 +36,7 @@
         margin-left: 210px;
     }
 }
-/deep/ .push-modal {
+::v-deep .push-modal {
     width: 600px !important;
     .acount-title {
         display: flex;
@@ -54,13 +54,13 @@
 }
 .person-modal {
     width: 500px;
-    /deep/ .ant-form-item {
+    ::v-deep .ant-form-item {
         display: flex;
     }
-    /deep/ .ant-form-item-label {
+    ::v-deep .ant-form-item-label {
         width: 20%;
     }
-    /deep/ .ant-form-item-control-wrapper {
+    ::v-deep .ant-form-item-control-wrapper {
         width: 80%;
     }
     .acount-search-class {
@@ -71,11 +71,11 @@
         margin-bottom: 10px;
         line-height: 1.5;
     }
-    /deep/ .ant-radio-group {
+    ::v-deep .ant-radio-group {
         line-height: 30px;
     }
 }
-/deep/ .cause-modal {
+::v-deep .cause-modal {
     width: 600px !important;
     .cause-modal-table-class {
         height: 500px;
@@ -87,7 +87,7 @@
         margin-top: 20px;
     }
 }
-/deep/ .relax-modal {
+::v-deep .relax-modal {
     width: 600px !important;
     .acount-title {
         display: flex;
@@ -105,7 +105,7 @@
 }
 
 .grid-form-item-account {
-    /deep/ .ant-form-item-control {
+    ::v-deep .ant-form-item-control {
         line-height: inherit;
     }
 }

+ 1 - 1
src/views/modules/autoLaunch/material-all/components/templateModal.vue

@@ -35,7 +35,7 @@
 </style>
 <style lang="scss" scoped>
 .require-check {
-  /deep/ .ant-form-item-label {
+  ::v-deep .ant-form-item-label {
     label::before {
       display: inline-block;
       margin-right: 4px;

+ 1 - 1
src/views/modules/autoLaunch/material-all/material-detail.vue

@@ -7,7 +7,7 @@
     min-height: 250px;
     width: 100%;
     padding: 20px;
-    /deep/.title-border {
+    ::v-deep.title-border {
         width: calc(100% + 40px);
         height:50px;
         line-height:50px;

+ 11 - 11
src/views/modules/autoLaunch/material-all/material.less

@@ -3,7 +3,7 @@
     // height: calc(100vh - 137px);
     // padding: 20px;
     overflow: hidden;
-    /deep/.chart-card-content {
+    ::v-deep.chart-card-content {
         height: 0;
     }
     .middle-button {
@@ -12,7 +12,7 @@
     .control-con-header {
         margin-bottom: 20px;
         position: relative;
-        /deep/ .ant-form-inline .ant-form-item > .ant-form-item-control-wrapper, .ant-form-inline .ant-form-item > .ant-form-item-label {
+        ::v-deep .ant-form-inline .ant-form-item > .ant-form-item-control-wrapper, .ant-form-inline .ant-form-item > .ant-form-item-label {
             width: 200px !important;
         }
         .reset-class {
@@ -39,7 +39,7 @@
         margin-left: 210px;
     }
 }
-/deep/ .push-modal {
+::v-deep .push-modal {
     width: 600px !important;
     .acount-title {
         display: flex;
@@ -57,13 +57,13 @@
 }
 .person-modal {
     width: 500px;
-    /deep/ .ant-form-item {
+    ::v-deep .ant-form-item {
         display: flex;
     }
-    /deep/ .ant-form-item-label {
+    ::v-deep .ant-form-item-label {
         width: 20%;
     }
-    /deep/ .ant-form-item-control-wrapper {
+    ::v-deep .ant-form-item-control-wrapper {
         width: 80%;
     }
     .acount-search-class {
@@ -74,11 +74,11 @@
         margin-bottom: 10px;
         line-height: 1.5;
     }
-    /deep/ .ant-radio-group {
+    ::v-deep .ant-radio-group {
         line-height: 30px;
     }
 }
-/deep/ .cause-modal {
+::v-deep .cause-modal {
     width: 600px !important;
     .cause-modal-table-class {
         height: 500px;
@@ -90,7 +90,7 @@
         margin-top: 20px;
     }
 }
-/deep/ .relax-modal {
+::v-deep .relax-modal {
     width: 600px !important;
     .acount-title {
         display: flex;
@@ -108,7 +108,7 @@
 }
 
 .grid-form-item-account {
-    /deep/ .ant-form-item-control {
+    ::v-deep .ant-form-item-control {
         line-height: inherit;
     }
 }
@@ -116,7 +116,7 @@
     width: 100%;
     min-height:100px;
     margin-top:15px;
-    /deep/ .ant-card-body {
+    ::v-deep .ant-card-body {
         padding: 0;
     }
 }

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

@@ -1,20 +1,20 @@
 <style scoped lang="scss">
 .account-item {
-    /deep/ .ant-form-item-control {
+    ::v-deep .ant-form-item-control {
         line-height: 1;
     }
 }
 
-/deep/.display-none-selset {
+::v-deep.display-none-selset {
     display: none !important;
 }
 // .step-jump {
-//     /deep/ table tr td {
+//     ::v-deep table tr td {
 //         border-bottom: 0px;
 //     }
 // }
 .bottom-to-one {
-    /deep/ .ant-form-item {
+    ::v-deep .ant-form-item {
         margin-bottom: 0;
     }
 }
@@ -23,10 +23,10 @@
 }
 .card-person {
     width: 300px;
-    /deep/.ant-card-body {
+    ::v-deep.ant-card-body {
         padding: 0px;
     }
-    /deep/.ant-card-head {
+    ::v-deep.ant-card-head {
         padding: 0px 10px;
     }
     .card-main-case {
@@ -137,15 +137,15 @@ li.chouzhen.first:before {
     }
 }
 
-/deep/ .ant-descriptions-item-content {
+::v-deep .ant-descriptions-item-content {
     font-weight: bold;
 }
 
 .info-detail {
-    /deep/ table tr td {
+    ::v-deep table tr td {
         border: 0;
     }
-    /deep/ .ant-descriptions-item-label {
+    ::v-deep .ant-descriptions-item-label {
         color: darkgray;
         // min-width: 30px;
         white-space: nowrap;

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

@@ -20,10 +20,10 @@
     flex-wrap: wrap;
     margin-right: -10px;
     justify-content: space-between;
-    /deep/ .ant-card-body {
+    ::v-deep .ant-card-body {
         padding: 0;
     }
-    /deep/ .ant-card-head {
+    ::v-deep .ant-card-head {
         padding: 0 5px;
     }
     .card-item {

+ 9 - 9
src/views/modules/autoLaunch/url/url.less

@@ -9,7 +9,7 @@
     .control-con-header {
         margin-bottom: 20px;
         position: relative;
-        /deep/ .ant-form-inline .ant-form-item > .ant-form-item-control-wrapper, .ant-form-inline .ant-form-item > .ant-form-item-label {
+        ::v-deep .ant-form-inline .ant-form-item > .ant-form-item-control-wrapper, .ant-form-inline .ant-form-item > .ant-form-item-label {
             width: 200px !important;
         }
         .reset-class {
@@ -36,7 +36,7 @@
         margin-left: 210px;
     }
 }
-/deep/ .push-modal {
+::v-deep .push-modal {
     width: 600px !important;
     .acount-title {
         display: flex;
@@ -54,13 +54,13 @@
 }
 .person-modal {
     width: 500px;
-    /deep/ .ant-form-item {
+    ::v-deep .ant-form-item {
         display: flex;
     }
-    /deep/ .ant-form-item-label {
+    ::v-deep .ant-form-item-label {
         width: 20%;
     }
-    /deep/ .ant-form-item-control-wrapper {
+    ::v-deep .ant-form-item-control-wrapper {
         width: 80%;
     }
     .acount-search-class {
@@ -71,11 +71,11 @@
         margin-bottom: 10px;
         line-height: 1.5;
     }
-    /deep/ .ant-radio-group {
+    ::v-deep .ant-radio-group {
         line-height: 30px;
     }
 }
-/deep/ .cause-modal {
+::v-deep .cause-modal {
     width: 600px !important;
     .cause-modal-table-class {
         height: 500px;
@@ -87,7 +87,7 @@
         margin-top: 20px;
     }
 }
-/deep/ .relax-modal {
+::v-deep .relax-modal {
     width: 600px !important;
     .acount-title {
         display: flex;
@@ -105,7 +105,7 @@
 }
 
 .grid-form-item-account {
-    /deep/ .ant-form-item-control {
+    ::v-deep .ant-form-item-control {
         line-height: inherit;
     }
 }

+ 2 - 2
src/views/modules/copy-library/copy-library.less

@@ -36,7 +36,7 @@
     justify-content: center;
     align-items: center;
 }
-/deep/ .copywrit-modal {
+::v-deep .copywrit-modal {
     width: 700px !important;
     .ant-modal-body {
         height: 500px !important;
@@ -109,7 +109,7 @@
         }
     }
 }
-/deep/ .select-matermal-modal {
+::v-deep .select-matermal-modal {
     width: 1000px !important;
     .common-input-long {
         width: 280px;

+ 4 - 4
src/views/modules/creative-copywrit/creative-copywrit.less

@@ -1,6 +1,6 @@
 @import '~@assets/less/common.less';
 
-/deep/ .examin-modal {
+::v-deep .examin-modal {
     width: 700px !important;
     .ant-modal-body {
         height: 500px !important;
@@ -56,7 +56,7 @@
     }
 }
 
-/deep/ .recommend-modal {
+::v-deep .recommend-modal {
     width: 700px !important;
     .ant-modal-body {
         height: 500px !important;
@@ -89,7 +89,7 @@
         .examin-form-input {
             width: 320px;
         }
-        /deep/ .ant-form-item-children {
+        ::v-deep .ant-form-item-children {
             display: inline-flex;
             align-items: center;
         }
@@ -101,7 +101,7 @@
             text-overflow: ellipsis;
         }
         .solgan-form-model {
-            /deep/ .ant-form-item-children {
+            ::v-deep .ant-form-item-children {
                 display: contents !important;
             }
             .solgan-tags-change {

+ 188 - 6
src/views/modules/creative-copywrit/creative-copywrit.vue

@@ -383,6 +383,7 @@
                             </a-select>
                         </a-form-item>
                     </a-col>
+                    
                     <a-col :md="8" :sm="8">
                         <a-form-item label="编导">
                             <a-select
@@ -401,6 +402,33 @@
                             </a-select>
                         </a-form-item>
                     </a-col>
+                    <a-col :md="8" :sm="8" v-if="active == '1'">
+                        <a-form-item label="状态">
+                            <a-select v-model="queryParam.videoStatus">
+                                <a-select-option :value="0">
+                                    不限
+                                </a-select-option>
+                                <a-select-option :value="1">
+                                    未推送
+                                </a-select-option>
+                                <a-select-option :value="2">
+                                    未推送到快手
+                                </a-select-option>
+                                <a-select-option :value="3">
+                                    未推送到头条 
+                                </a-select-option>
+                                <a-select-option :value="4">
+                                    推送到快手
+                                </a-select-option>
+                                <a-select-option :value="5">
+                                    推送到头条
+                                </a-select-option>
+                                <a-select-option :value="6">
+                                    已推送到快手&头条 
+                                </a-select-option>
+                            </a-select>
+                        </a-form-item>
+                    </a-col>
                     <a-col :md="8" :sm="8">
                         <span style="float: left; overflow: hidden" class="table-page-search-submitButtons">
                             <a-button type="primary" @click="handleSubmit" icon="search">查询</a-button>
@@ -411,7 +439,7 @@
             </a-form>
         </div>
         <div class="table-operator" style="position: relative; z-index: 100">
-            <a-button
+            <!-- <a-button
                 @click="
                     visible = true
                     confirmLoading = false
@@ -421,7 +449,7 @@
                 icon="plus"
             >
                 新增
-            </a-button>
+            </a-button> -->
             <a-button
                 @click="onCheckAllChange"
                 v-if="
@@ -535,7 +563,7 @@
                                     </template>
                                     <img
                                         style="width: 30px; height: 30px"
-                                        v-if="items.kuaishouVideoIsUp == 1"
+                                        v-if="items.syncKuaishou == 2"
                                         :style="{ filter: items.kuaishouEffiType == 1 ? 'grayscale(0%)' : 'grayscale(100%)' }"
                                         src="@/views/modules/material/kuaishou.jpg"
                                     />
@@ -545,13 +573,13 @@
                                     <span>{{ items.toutiaoEffiType == 1 ? '抖音有效视频' : '已经同步到抖音平台' }}</span>
                                     </template>
                                     <img
-                                        v-if="items.toutiaoVideoIsUp == 1 && items.toutiaoEffiType == 1"
+                                        v-if="items.syncBytedance == 2 && items.toutiaoEffiType == 1"
                                         style="width: 30px; height: 30px; margin-left: 5px"
                                         src="@/views/modules/material/douyin.jpg"
                                         alt
                                     />
                                     <img
-                                        v-else-if="items.toutiaoVideoIsUp == 1 && items.toutiaoEffiType == 0"
+                                        v-else-if="items.syncBytedance == 2 && items.toutiaoEffiType == 0"
                                         style="width: 30px; height: 30px; margin-left: 5px"
                                         src="@/views/modules/material/douyinhui.jpg"
                                         alt
@@ -678,6 +706,7 @@
                                         </a-menu-item>
                                     </a-menu>
                                 </a-dropdown>
+                                <a v-show="active === '1'" style="margin-right: 20px" @click="handleRecord(items)">同步记录</a>
                                 <a-checkbox :value="items.id" style="float: right" v-show="active == '0' || active == '1'"></a-checkbox>
                                 <br />
                                 {{ items.createTime }}
@@ -1714,6 +1743,42 @@
                 </div>
             </div>
         </a-modal>
+        <a-modal v-model="showDataListVisible" title="信息" :footer="null">
+            <div v-if="showDataList">
+                <p v-for="(item, index) in showDataList" :key="index">
+                    素材:{{item.materialName}},{{item.message}};
+                    <br/>
+                    同步账户:{{item.ids.join()}}
+                </p>
+            </div>
+            
+        </a-modal>
+        <a-modal
+        v-if="recordDetailVisible"
+        title="素材同步记录"
+        :width="750"
+        :visible="recordDetailVisible"
+        dialog-class="usage-details-modal change-face-modal change-list-modal-show"
+        :footer="null"
+        @cancel="handleRecordCancel"
+        >
+            <div style="overflow: hidden;">	
+                <a-table
+                class="face-right-table"
+                ref="table"
+                size="middle"
+                bordered
+                :columns="recordColumns"
+                :dataSource="recordData"
+                :pagination="recordIpagination"
+                :loading="toutiaoMateriaLoading"
+                >
+                    <span slot="createTime" slot-scope="text">
+                        {{text}}
+                    </span>
+                </a-table>
+            </div>
+        </a-modal>
     </a-card>
 </template>
 <script>
@@ -1912,6 +1977,8 @@ export default {
             checkArr: [],
             checkAll: false,
             checkArrImage: [],
+            showDataList:[],
+            showDataListVisible: false,
             checkAllImage: false,
             showUrl: '',
             showUrlWater: '',
@@ -1942,7 +2009,81 @@ export default {
             waterLoading: false,
             videoTag: [],
             videoVisibleChange: '',
-            modalShowBatchList: []
+            modalShowBatchList: [],
+            recordDetailVisible:false,
+            recordSignature: null,
+            toutiaoMateriaLoading:false,
+            recordColumns:[
+                {
+                        title: '项目',
+                        align: 'center',
+                        dataIndex: 'projectName'
+                    },
+                    {
+                        title: '账户Id',
+                        align: 'center',
+                        dataIndex: 'userId',
+                customRender: function (text, records) {
+                if(records.mediaId == '1' || records.mediaId == '3') {
+                    return records.accountId
+                }else if(records.mediaId == '2' || records.mediaId == '4') {
+                    return records.userId
+                }else {
+                    return text
+                }
+                }
+                    },
+                    {
+                        title: '媒体',
+                        align: 'center',
+                        dataIndex: 'mediaId',
+                        customRender: function (text) {
+                if (text == '1' || text == '3') {
+                    return '头条'
+                } else if (text == '2' || text == '4') {
+                    return '快手'
+                } else {
+                    return text
+                }
+                }
+                    },
+                    {
+                        title: '同步人',
+                        align: 'center',
+                        dataIndex: 'userName'
+                    },
+            {
+                        title: '同步时间',
+                        align: 'center',
+                        dataIndex: 'createTime',
+                scopedSlots: { customRender: 'createTime' },
+                    },
+                    {
+                        title: '结果',
+                        align: 'center',
+                        dataIndex: 'remarks'
+                    }
+            ],
+            recordData:[],
+            recordIpagination: {
+            current: 1,
+            pageSize: 10,
+            //   pageSizeOptions: ['10', '20', '30'],
+            showTotal: (total, range) => {
+                return range[0] + "-" + range[1] + " 共" + total + "条"
+            },
+            showQuickJumper: true,
+            // showSizeChanger:true,
+            // pageSizeOptions: ['10', '30', '50'],
+            total: 0,
+            onChange: (current, pageSize) => {
+                // 切换分页时的回调,
+                // 当在页面定义change事件时,切记要把此处的事件清除,因为这两个事件重叠了,可能到时候会导致一些莫名的bug
+                this.recordIpagination.current = current;
+                this.recordIpagination.pageSize= pageSize;
+                this.handleGetRecordDetail(this.recordSignature)
+            }
+            },
         };
     },
     filters: {
@@ -2086,6 +2227,39 @@ export default {
     },
     methods: {
         ...mapGetters(['nickname', 'avatar', 'userInfo']),
+        handleRecordCancel(){
+            this.recordDetailVisible = false;
+        },
+        handleRecord(data){
+            this.handleGetRecordDetail(data.code);
+            this.recordSignature = data.code;
+            this.recordDetailVisible = true;
+            this.toutiaoMateriaLoading = true;
+            this.kuaishouMateriaLoading = true;
+        },
+        handleGetRecordDetail(id) {
+            // 测试code '7b676546bfb50f1b992d44bd479a1536'
+            var params = {}
+            params.signature = id
+            params.pageNo = this.recordIpagination.current
+            params.pageSize = this.recordIpagination.pageSize
+            getAction('/ctop/materialUpload/uploadDetail', params).then(result => {
+                if (result.success) {
+                
+                    // 头条处理数据
+                    this.recordData = result.result.list || []
+                    this.recordIpagination.total = result.result.total || 0
+                }
+                else {
+                    this.$message.error(result.message);
+                }
+            }).catch(error => {
+                console.log(error, 'eeee');
+            }).finally(() => {
+                this.toutiaoMateriaLoading = false;
+                this.kuaishouMateriaLoading = false;
+            });
+        },
         handleBudgetCancel() {
             this.defaultSolganTitle = 'test';
             this.defaultSolganStatus = 'input';
@@ -3085,10 +3259,18 @@ export default {
             params.mediaId = this.mediaId;
             params.materialArray = JSON.stringify(this.checkArr);
             params.accountArray = JSON.stringify(data);
+            params.loginId = this.userInfo().id
+            params.userName = this.userInfo().realname
             postAction('/ctop/materialUpload/uploadAccount', params).then(res => {
                 if (res.code === 0) {
                     this.checkArr = [];
                     this.checkAll = false;
+                    if(res.data){
+                        this.showDataList = res.data
+                        this.showDataListVisible = true
+                    }else{
+                        this.$message.success(res.message)
+                    }
                 }
             });
         },

+ 9 - 9
src/views/modules/crowd-control/crowd-control.less

@@ -9,7 +9,7 @@
     .control-con-header {
         margin-bottom: 20px;
         position: relative;
-        /deep/ .ant-form-inline .ant-form-item > .ant-form-item-control-wrapper, .ant-form-inline .ant-form-item > .ant-form-item-label {
+        ::v-deep .ant-form-inline .ant-form-item > .ant-form-item-control-wrapper, .ant-form-inline .ant-form-item > .ant-form-item-label {
             width: 100% !important;
         }
         .reset-class {
@@ -36,7 +36,7 @@
         margin-left: 210px;
     }
 }
-/deep/ .push-modal {
+::v-deep .push-modal {
     width: 600px !important;
     .acount-title {
         display: flex;
@@ -54,13 +54,13 @@
 }
 .person-modal {
     width: 500px;
-    /deep/ .ant-form-item {
+    ::v-deep .ant-form-item {
         display: flex;
     }
-    /deep/ .ant-form-item-label {
+    ::v-deep .ant-form-item-label {
         width: 20%;
     }
-    /deep/ .ant-form-item-control-wrapper {
+    ::v-deep .ant-form-item-control-wrapper {
         width: 80%;
     }
     .acount-search-class {
@@ -71,11 +71,11 @@
         margin-bottom: 10px;
         line-height: 1.5;
     }
-    /deep/ .ant-radio-group {
+    ::v-deep .ant-radio-group {
         line-height: 30px;
     }
 }
-/deep/ .cause-modal {
+::v-deep .cause-modal {
     width: 600px !important;
     .cause-modal-table-class {
         height: 500px;
@@ -87,7 +87,7 @@
         margin-top: 20px;
     }
 }
-/deep/ .relax-modal {
+::v-deep .relax-modal {
     width: 600px !important;
     .acount-title {
         display: flex;
@@ -105,7 +105,7 @@
 }
 
 .grid-form-item-account {
-    /deep/ .ant-form-item-control {
+    ::v-deep .ant-form-item-control {
         line-height: inherit;
     }
 }

+ 8 - 8
src/views/modules/earlyWarningRules/accountClear/createClear.vue

@@ -1,14 +1,14 @@
 <style scoped lang="scss">
-/deep/.display-none-selset {
+::v-deep.display-none-selset {
     display: none !important;
 }
 .step-jump {
-    /deep/ table tr td {
+    ::v-deep table tr td {
         border-bottom: 0px;
     }
 }
 .bottom-to-one {
-    /deep/ .ant-form-item {
+    ::v-deep .ant-form-item {
         margin-bottom: 0;
     }
 }
@@ -17,10 +17,10 @@
 }
 .card-person {
     width: 300px;
-    /deep/.ant-card-body {
+    ::v-deep.ant-card-body {
         padding: 0px;
     }
-    /deep/.ant-card-head {
+    ::v-deep.ant-card-head {
         padding: 0px 10px;
     }
     .card-main-case {
@@ -131,15 +131,15 @@ li.chouzhen.first:before {
     }
 }
 
-/deep/ .ant-descriptions-item-content {
+::v-deep .ant-descriptions-item-content {
     font-weight: bold;
 }
 
 .info-detail {
-    /deep/ table tr td {
+    ::v-deep table tr td {
         border: 0;
     }
-    /deep/ .ant-descriptions-item-label {
+    ::v-deep .ant-descriptions-item-label {
         color: darkgray;
         // min-width: 30px;
         white-space: nowrap;

+ 4 - 1
src/views/modules/material/accountCheck.vue

@@ -12,7 +12,7 @@
 </style>
 <template>
   <div>
-    <a-modal title="账户选择" v-model="showEdit" @ok="handleOk" @cancel="close" width="80%">
+    <a-modal title="账户选择" v-model="showEdit" @ok="handleOk" @cancel="close" width="80%" :confirm-loading="confirmLoading">
       <!-- <a-checkbox :indeterminate="indeterminate" @change="onCheckAllChange" :checked="checkAll">全选</a-checkbox>
       <br />
       <a-checkbox-group :options="showList" v-model="dataValue" class="checked-account" @change="onChange" /> -->
@@ -51,6 +51,7 @@ export default {
       autoExpandParent: true,
       selectedKeys: [],
       treeData:[],
+      confirmLoading:false,
     }
   },
   watch: {
@@ -73,6 +74,7 @@ export default {
       this.selectedKeys = selectedKeys
     },
     handleOk(e) {
+      this.confirmLoading = true
 	  let defaultData = this.checkedKeys.filter(item => item.toString().indexOf('-') === -1);
       this.showEdit = false
       this.$emit('synchro', defaultData)
@@ -101,6 +103,7 @@ export default {
       this.checkAll = this.dataValue.length === this.showList.length
     },
     getData(url, item) {
+       this.confirmLoading = false
       this.showEdit = true
       this.dataList = []
       this.showList = null

+ 10 - 4
src/views/modules/material/accountCheckBytedance.vue

@@ -82,7 +82,7 @@
 </style>
 <template>
   <div class="select-project">
-    <a-modal title="账户选择" v-model="showEdit" @ok="handleOk" @cancel="close" width="80%">
+    <a-modal title="账户选择" v-model="showEdit" @ok="handleOk" @cancel="close" width="80%" :confirm-loading="confirmLoading">
       <!-- <span style="margin-bottom:15px">是否同步快手主页</span> -->
       <div class="row-item">
         <div class="hint-item"></div>
@@ -162,6 +162,7 @@ export default {
     valueConsistsOf: 'LEAF_PRIORITY',
     options: [],
     showLoading: 'loading...',
+    confirmLoading:false
   }),
   props: {
     //是否多选
@@ -210,10 +211,14 @@ export default {
       console.log(this.$refs.tree.getCheckedKeys())
     },
     handleOk(e) {
-      console.log(e)
+      this.confirmLoading = true
       var data = this.$refs.tree.getCheckedKeys()
       var dataArr = data.map(item=>{
-        return item.split('@')[0]
+        return {
+          accountId:item.split('@')[0],
+          userName:item.split('@')[2],
+          userId:item.split('@')[1],
+        }
       })
       // console.log(dataArr)
       this.showEdit = false
@@ -298,6 +303,7 @@ export default {
     getParticipateList(productId) {d:
       //我参与的
       //   toutiaoParticipateList
+      this.confirmLoading = false
       this.showEdit = true
       getAction('/ctop/userAllocation/getUserIdListByProductId', {
         productId: productId,
@@ -307,7 +313,7 @@ export default {
           console.log(res)
           this.options = res.result.map((item) => {
             return {
-              id: item.accountId+'@'+item.userId,
+              id: item.accountId+'@'+item.userId+'@'+item.userName,
               label: item.userId+'-'+item.projectName,
               children: [],
             }

+ 2 - 3
src/views/modules/material/comment/selectTable.vue

@@ -22,7 +22,7 @@
 </style>
 <style lang="scss" scoped>
 .require-check {
-  /deep/ .ant-form-item-label {
+  ::v-deep .ant-form-item-label {
     label::before {
       display: inline-block;
       margin-right: 4px;
@@ -47,7 +47,7 @@
   >
     <a-input
       placeholder="请选择产品名称"
-      @focus="topMiddle = true"
+      @focus="topMiddle = true;getData()"
       v-model="keyValue"
       @change="getData"
       :disabled="disabled"
@@ -283,7 +283,6 @@ export default {
       this.topMiddle = false
       if(!!!this.projectId){
         this.keyValue = ''
-        this.getData()
       }
     },
     // allData() {

+ 437 - 158
src/views/modules/material/videoMaterial.vue

@@ -1,5 +1,5 @@
 <style lang="scss">
-/deep/ .usage-details-modal {
+::v-deep .usage-details-modal {
 	width: 750px !important;
 }
 .is-disabled .el-checkbox__inner {
@@ -429,6 +429,46 @@ a {
           </a-col>
 
           <a-col :md="8" :sm="8">
+            <a-form-item label="是否创新视频">
+              <a-select v-model="queryParam.materialInnovate" allowClear>
+                <a-select-option :value="1">
+                    否
+                </a-select-option>
+                <a-select-option :value="2">
+                    是
+                </a-select-option>
+              </a-select>
+            </a-form-item>
+          </a-col>
+          <a-col :md="8" :sm="8" v-if="active == '1'">
+            <a-form-item label="状态">
+              <a-select v-model="queryParam.videoStatus">
+                <a-select-option :value="0">
+                    不限
+                </a-select-option>
+                <a-select-option :value="1">
+                    未推送
+                </a-select-option>
+                <a-select-option :value="2">
+                    未推送到快手
+                </a-select-option>
+                <a-select-option :value="3">
+                    未推送到头条 
+                </a-select-option>
+                <a-select-option :value="4">
+                    推送到快手
+                </a-select-option>
+                <a-select-option :value="5">
+                    推送到头条
+                </a-select-option>
+                <a-select-option :value="6">
+                    已推送到快手&头条 
+                </a-select-option>
+              </a-select>
+            </a-form-item>
+          </a-col>
+
+          <a-col :md="8" :sm="8">
             <span style="float: left; overflow: hidden" class="table-page-search-submitButtons">
               <a-button type="primary" @click="searchQuery" icon="search">查询</a-button>
               <a-button type="primary" @click="searchRe" icon="reload" style="margin-left: 8px">重置</a-button>
@@ -590,7 +630,7 @@ a {
                     <a-icon
                       type="close-circle"
                       @click="deleteData(items.id)"
-                      v-show="active == '0'"
+                      v-show="active == '0'||active == '2'"
                       v-if="items.userId == userInfo().id"
                     />
                   </a-badge>
@@ -607,7 +647,7 @@ a {
                         </template>
                         <img
                           style="width: 30px; height: 30px"
-                          v-if="items.kuaishouVideoIsUp == 1"
+                          v-if="items.syncKuaishou == 2"
                           :style="{ filter: items.kuaishouEffiType == 1 ? 'grayscale(0%)' : 'grayscale(100%)' }"
                           src="./kuaishou.jpg"
                         />
@@ -617,13 +657,13 @@ a {
                           <span>{{ items.toutiaoEffiType == 1 ? '抖音有效视频' : '已经同步到抖音平台' }}</span>
                         </template>
                         <img
-                          v-if="items.toutiaoVideoIsUp == 1 && items.toutiaoEffiType == 1"
+                          v-if="items.syncBytedance == 2 && items.toutiaoEffiType == 1"
                           style="width: 30px; height: 30px; margin-left: 5px"
                           src="./douyin.jpg"
                           alt
                         />
                         <img
-                          v-else-if="items.toutiaoVideoIsUp == 1 && items.toutiaoEffiType == 0"
+                          v-else-if="items.syncBytedance == 2 && items.toutiaoEffiType == 0"
                           style="width: 30px; height: 30px; margin-left: 5px"
                           src="./douyinhui.jpg"
                           alt
@@ -645,6 +685,7 @@ a {
                         <!-- {{ videoTag.join(',') }} -->
                         <!-- <br v-if="index%3"/> -->
                         <a-tag v-for="(item, index) of videoTag" :key="index" style="margin: 5px">{{ item }}</a-tag>
+                        <a-tag>{{ items.materialInnovate == 2? '创新素材' : '非创新素材'  }}</a-tag>
                       </template>
                       <template slot="content" v-else>
                         <div style="width: 100%; text-align: center">加载中。。。</div>
@@ -815,9 +856,12 @@ a {
                         <a-menu-item key="6"  v-show="active !== '1'"  v-if="items.userId == userInfo().id">
                           <a href="javascript:;" style="margin-right: 20px" @click="editMaterialName(items)">修改素材名称</a>
                         </a-menu-item>
+                        <a-menu-item key="7" v-show="active === '0' || active === '1'">
+                          <a href="javascript:;" @click="handleUsageDetails(items)">使用详情</a>
+                        </a-menu-item>
                       </a-menu>
                     </a-dropdown>
-					<a v-show="active === '0' || active === '1'" style="margin-right: 20px" @click="handleUsageDetails(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 }}
@@ -1125,7 +1169,13 @@ a {
                 required: true,
                 message: '场景标签必选',
                 trigger: 'blur',
-              }">
+              }"
+              v-if="!items.modalityTagList.includes(60158)
+              && !items.modalityTagList.includes(60159)
+              && !items.modalityTagList.includes(101)
+              && !items.modalityTagList.includes(104)
+              && !items.modalityTagList.includes(112)"
+              >
                 <el-cascader
                   placeholder="搜索你想要的场景标签"
                   :options="departTreeSence"
@@ -1167,6 +1217,17 @@ a {
                   style="width: 100%"
                 ></el-cascader>
               </a-form-model-item>
+              <a-form-model-item label="创新素材" 
+              :prop="'urlListData.'+index+'.materialInnovate'"  
+              :label-col="{ span: 4 }" 
+              :wrapper-col="{ span: 14 }"
+                :rules="{
+                required: true,
+                message: '创新素材必选',
+                trigger: 'change',
+              }">
+                  <a-switch v-model="items.materialInnovate"/>
+              </a-form-model-item>
               <a-form-model-item :wrapper-col="{ span: 14,offset:4 }" v-if="index == 0">
                   <a-button type="primary" @click="syncDesign">剩余素材同步设计人员</a-button>
               </a-form-model-item>
@@ -1367,7 +1428,7 @@ a {
             :options="departTreeModality"
             v-decorator="[
               'modalityTagList', // 给表单赋值或拉取表单时,该input对应的key
-              { rules: [{ required: true, message: '请选择形式标签!' }] },
+              { rules: [{ required: true, message: '请选择形式标签!' }],initialValue:[] },
             ]"
             :props="{
               multiple: true,
@@ -1417,7 +1478,11 @@ a {
             sm: { span: 12 },
           }"
           label="场景标签"
-          v-if="add && visible"
+          v-if="add && visible && (!getData('modalityTagList')||(!getData('modalityTagList').includes(60158)
+          && !getData('modalityTagList').includes(60159)
+          && !getData('modalityTagList').includes(101)
+          && !getData('modalityTagList').includes(104)
+          && !getData('modalityTagList').includes(112)))"
         >
           <el-cascader
             placeholder="搜索你想要的场景标签"
@@ -1470,6 +1535,20 @@ a {
           :label-col="labelCol"
           :wrapper-col="{
             xs: { span: 24 },
+            sm: { span: 12 },
+          }"
+          label="创新素材"
+          v-if="add && visible"
+        >
+         <a-switch v-decorator="[
+              'materialInnovate', // 给表单赋值或拉取表单时,该input对应的key
+              { rules: [{ required: true, message: '' }],initialValue:false },
+            ]"/>
+        </a-form-item>
+        <a-form-item
+          :label-col="labelCol"
+          :wrapper-col="{
+            xs: { span: 24 },
             sm: { span: 18 },
           }"
           label="其他"
@@ -1910,6 +1989,7 @@ a {
           placeholder="搜索你想要的形式标签"
           :options="departTreeModality"
           v-model="departValueInfoModality"
+          @change="clearChangjing"
           :props="{
             multiple: true,
             value: 'id',
@@ -1946,6 +2026,11 @@ a {
           sm: { span: 12 },
         }"
         label="场景"
+        v-if="!departValueInfoModality.includes(60158)
+              && !departValueInfoModality.includes(60159)
+              && !departValueInfoModality.includes(101)
+              && !departValueInfoModality.includes(104)
+              && !departValueInfoModality.includes(112)"
       >
         <el-cascader
           placeholder="搜索你想要的场景标签"
@@ -1987,6 +2072,16 @@ a {
           style="width: 100%"
         ></el-cascader>
       </a-form-item>
+      <a-form-item
+          :label-col="labelCol"
+          :wrapper-col="{
+            xs: { span: 24 },
+            sm: { span: 12 },
+          }"
+          label="创新素材"
+        >
+         <a-switch v-model="materialInnovate"/>
+        </a-form-item>
     </a-modal>
     <a-modal title="推荐封面" v-model="chouzhen" width="60%">
       <template slot="footer">
@@ -2015,13 +2110,13 @@ a {
     <accountCheckBytedance ref="accountCheckBytedance" @synchro="implement" />
     <permission-modal ref="modalForm" @ok="modalFormOkElse"></permission-modal>
     <!-- 换脸模块 -->
-	<change-face
-		:status="faceTypeStatus"
-		:defaultList="faceChangeList"
-		@closeface="handleFaceCloseModal"
-		@sureface="handleFaceSureModal"
-	>
-	</change-face>
+    <change-face
+      :status="faceTypeStatus"
+      :defaultList="faceChangeList"
+      @closeface="handleFaceCloseModal"
+      @sureface="handleFaceSureModal"
+    >
+    </change-face>
     <a-modal
         v-if="faceShowStatus"
         title="换脸操作"
@@ -2073,90 +2168,128 @@ a {
           @showSizeChange="onShowSizeChange"
       />
     </a-modal>
-	<a-modal
-        v-if="usageDetailsStatus"
-        title="使用详情"
-		:width="750"
-        :visible="usageDetailsStatus"
-        dialog-class="usage-details-modal change-face-modal change-list-modal-show"
-		:footer="null"
-		@cancel="handleProfitModalnCancel"
-    >
-		<div style="overflow: hidden;">	
-			<a-tabs v-model="materiaModalType" @change="handleMateriaTabsChange">
-				<a-tab-pane key="1" tab="头条">
-					<a-table
-						class="face-right-table"
-						ref="table"
-						size="middle"
-						bordered
-						:columns="materiaColumnsToutiao"
-						:dataSource="materiaDataToutiao"
-						:pagination="false"
-						:loading="toutiaoMateriaLoading"
-					>
-						<span slot="accountStatus" slot-scope="text">
-							<span>{{ text === 0 ? '投放中' : '已暂停' }}</span>
-						</span>
-					</a-table>
-					<a-pagination
-						class="pagin-table-class"
-						:total="materiaDataTotalToutiao"
-						:show-total="total => `共 ${materiaDataTotalToutiao} 条`"
-						size="small"
-						:current="defaultCurrentToutiao"
-						:defaultPageSize="10"
-						@change="materiaDataSizeChange"
-						@showSizeChange="materiaDataSizeChange"
-					/>
-				</a-tab-pane>
-				<a-tab-pane key="2" tab="快手">
-					<a-table
-						class="face-right-table"
-						ref="table"
-						size="middle"
-						bordered
-						:columns="materiaColumnsKuaishou"
-						:dataSource="materiaDataKuaishou"
-						:pagination="false"
-						:loading="kuaishouMateriaLoading"
-					>
-						<span slot="accountStatus" slot-scope="text">
-							<span>{{ text === 0 ? '投放中' : '已暂停' }}</span>
-						</span>
-						<span slot="refuseCount" slot-scope="text, record">
-							<span>{{ record.refuseInfo.refuseCount }}</span>
-						</span>
-						<span slot="refuseDetail" slot-scope="text, record">
-							<a :disabled="!record.refuseInfo.refuseDetail" @click="handleRejectReason(record)">拒绝原因</a>
-						</span>
-					</a-table>
-					<a-pagination
-						class="pagin-table-class"
-						:total="materiaDataTotalKuaishou"
-						:show-total="total => `共 ${materiaDataTotalKuaishou} 条`"
-						size="small"
-						:current="defaultCurrentKuaishou"
-						:defaultPageSize="10"
-						@change="materiaDataSizeChangeKuaishou"
-						@showSizeChange="materiaDataSizeChangeKuaishou"
-					/>
-				</a-tab-pane>
-			</a-tabs>
-		</div>
+    <a-modal
+          v-if="usageDetailsStatus"
+          title="使用详情"
+      :width="750"
+          :visible="usageDetailsStatus"
+          dialog-class="usage-details-modal change-face-modal change-list-modal-show"
+      :footer="null"
+      @cancel="handleProfitModalnCancel"
+      >
+      <div style="overflow: hidden;">	
+        <a-tabs v-model="materiaModalType" @change="handleMateriaTabsChange">
+          <a-tab-pane key="1" tab="头条">
+            <a-table
+              class="face-right-table"
+              ref="table"
+              size="middle"
+              bordered
+              :columns="materiaColumnsToutiao"
+              :dataSource="materiaDataToutiao"
+              :pagination="false"
+              :loading="toutiaoMateriaLoading"
+            >
+              <span slot="accountStatus" slot-scope="text">
+                <span>{{ text === 0 ? '投放中' : '已暂停' }}</span>
+              </span>
+            </a-table>
+            <a-pagination
+              class="pagin-table-class"
+              :total="materiaDataTotalToutiao"
+              :show-total="total => `共 ${materiaDataTotalToutiao} 条`"
+              size="small"
+              :current="defaultCurrentToutiao"
+              :defaultPageSize="10"
+              @change="materiaDataSizeChange"
+              @showSizeChange="materiaDataSizeChange"
+            />
+          </a-tab-pane>
+          <a-tab-pane key="2" tab="快手">
+            <a-table
+              class="face-right-table"
+              ref="table"
+              size="middle"
+              bordered
+              :columns="materiaColumnsKuaishou"
+              :dataSource="materiaDataKuaishou"
+              :pagination="false"
+              :loading="kuaishouMateriaLoading"
+            >
+              <span slot="accountStatus" slot-scope="text">
+                <span>{{ text === 0 ? '投放中' : '已暂停' }}</span>
+              </span>
+              <span slot="refuseCount" slot-scope="text, record">
+                <span>{{ record.refuseInfo.refuseCount }}</span>
+              </span>
+              <span slot="refuseDetail" slot-scope="text, record">
+                <a :disabled="!record.refuseInfo.refuseDetail" @click="handleRejectReason(record)">拒绝原因</a>
+              </span>
+            </a-table>
+            <a-pagination
+              class="pagin-table-class"
+              :total="materiaDataTotalKuaishou"
+              :show-total="total => `共 ${materiaDataTotalKuaishou} 条`"
+              size="small"
+              :current="defaultCurrentKuaishou"
+              :defaultPageSize="10"
+              @change="materiaDataSizeChangeKuaishou"
+              @showSizeChange="materiaDataSizeChangeKuaishou"
+            />
+          </a-tab-pane>
+        </a-tabs>
+      </div>
     </a-modal>
-	<a-modal
-        v-if="rejectReasonStatus"
-        title="审核拒绝原因"
-		:width="750"
-        :visible="rejectReasonStatus"
-		:footer="null"
-		@cancel="handleRejectReasonCancel"
-    >
-		<div>
-			<p v-for="(item, index) in rejectReasonList" :key="index + 1">{{ index + 1 }}:{{ item }}</p>
-		</div>
-	</a-modal>
+    <a-modal
+      v-if="recordDetailVisible"
+      title="素材同步记录"
+      :width="750"
+      :visible="recordDetailVisible"
+      dialog-class="usage-details-modal change-face-modal change-list-modal-show"
+      :footer="null"
+      @cancel="handleRecordCancel"
+      >
+      <div style="overflow: hidden;">	
+        <a-table
+          class="face-right-table"
+          ref="table"
+          size="middle"
+          bordered
+          :columns="recordColumns"
+          :dataSource="recordData"
+          :pagination="recordIpagination"
+          :loading="toutiaoMateriaLoading"
+        >
+          <span slot="createTime" slot-scope="text">
+            {{text}}
+          </span>
+        </a-table>
+      </div>
+    </a-modal>
+    
+    <a-modal
+          v-if="rejectReasonStatus"
+          title="审核拒绝原因"
+      :width="750"
+          :visible="rejectReasonStatus"
+      :footer="null"
+      @cancel="handleRejectReasonCancel"
+      >
+      <div>
+        <p v-for="(item, index) in rejectReasonList" :key="index + 1">{{ index + 1 }}:{{ item }}</p>
+      </div>
+    </a-modal>
+    <a-modal v-model="showDataListVisible" title="信息" :footer="null">
+      <div v-if="showDataList">
+        <p v-for="(item, index) in showDataList" :key="index">
+            素材:{{item.materialName}},{{item.message}};
+            <br/>
+            同步账户:{{item.ids.join()}}
+        </p>
+      </div>
+       
+    </a-modal>
+
   </a-card>
 </template>
 
@@ -2276,7 +2409,80 @@ export default {
 		materiaModalType: '2',
 		materialUseDetailList: {},
 		usageDetailsStatus: false,
-      ruleForm:{
+    recordDetailVisible:false,
+    recordSignature: null,
+    recordColumns:[
+      	{
+				title: '项目',
+				align: 'center',
+				dataIndex: 'projectName'
+			},
+			{
+				title: '账户Id',
+				align: 'center',
+				dataIndex: 'userId',
+        customRender: function (text, records) {
+          if(records.mediaId == '1' || records.mediaId == '3') {
+            return records.accountId
+          }else if(records.mediaId == '2' || records.mediaId == '4') {
+            return records.userId
+          }else {
+            return text
+          }
+        }
+			},
+			{
+				title: '媒体',
+				align: 'center',
+				dataIndex: 'mediaId',
+				customRender: function (text) {
+          if (text == '1' || text == '3') {
+            return '头条'
+          } else if (text == '2' || text == '4') {
+            return '快手'
+          } else {
+            return text
+          }
+        }
+			},
+			{
+				title: '同步人',
+				align: 'center',
+				dataIndex: 'userName'
+			},
+      {
+				title: '同步时间',
+				align: 'center',
+				dataIndex: 'createTime',
+        scopedSlots: { customRender: 'createTime' },
+			},
+			{
+				title: '结果',
+				align: 'center',
+				dataIndex: 'remarks'
+			}
+    ],
+    recordData:[],
+    recordIpagination: {
+      current: 1,
+      pageSize: 10,
+      //   pageSizeOptions: ['10', '20', '30'],
+      showTotal: (total, range) => {
+          return range[0] + "-" + range[1] + " 共" + total + "条"
+      },
+      showQuickJumper: true,
+      // showSizeChanger:true,
+      // pageSizeOptions: ['10', '30', '50'],
+      total: 0,
+      onChange: (current, pageSize) => {
+          // 切换分页时的回调,
+          // 当在页面定义change事件时,切记要把此处的事件清除,因为这两个事件重叠了,可能到时候会导致一些莫名的bug
+          this.recordIpagination.current = current;
+          this.recordIpagination.pageSize= pageSize;
+          this.handleGetRecordDetail(this.recordSignature)
+      }
+    },
+    ruleForm:{
         projectId:'',
         urlList:[],
         urlListData:[]
@@ -2341,6 +2547,7 @@ export default {
       departTreeMod: [],
       departValue: [],
       departValueInfo: [],
+      materialInnovate:false,
       departValueInfoModality: [],
       departValueInfoContent: [],
       departValueInfoSence: [],
@@ -2474,6 +2681,8 @@ export default {
       acceptImage: 'image/jpeg,image/jpg,image/png',
       accessKeyId: 'LTAIbNbqWzSOklQV',
       accessKeySecret: '1rkPz7JNoXk8sJevPaeYHWqfkQXBGh',
+      showDataList:null,
+      showDataListVisible:false,
       checkArr: [],
       checkAll: false,
       checkArrImage: [],
@@ -2653,58 +2862,91 @@ export default {
 		  this.rejectReasonList = data.refuseInfo.refuseDetail.split('@#');
 		  this.rejectReasonStatus = true;
 	  },
-	materiaDataSizeChange(current, pageSize) {
-		this.materiaDataToutiao = [];
-        this.defaultCurrentToutiao = current;
-        const defaultData = this.materialUseDetailList['byteDance'];
-        this.materiaDataToutiao = [...defaultData.slice(10 * current - 10, 10 * current)];
-	},
-	materiaDataSizeChangeKuaishou(current, pageSize) {
-		this.materiaDataKuaishou = [];
-        this.defaultCurrentKuaishou = current;
-        const defaultData = this.materialUseDetailList['kuaishou'];
-        this.materiaDataKuaishou = [...defaultData.slice(10 * current - 10, 10 * current)];
-	},
-	handleProfitModalnCancel() {
-		this.materialUseDetailList = {};
-		this.materiaDataToutiao = [];
-		this.materiaDataTotalToutiao = 0;
-		this.defaultCurrentToutiao = 1;
-		this.materiaDataKuaishou = [];
-		this.materiaDataTotalKuaishou = 0;
-		this.defaultCurrentKuaishou = 1;
-		this.materiaModalType = '2';
-		this.usageDetailsStatus = false;
-	},
-	handleUsageDetails(data) {
-		this.handleGetMaterialUseDetail(data.code);
-		this.usageDetailsStatus = true;
-		this.toutiaoMateriaLoading = true;
-		this.kuaishouMateriaLoading = true;
-	},
-	handleGetMaterialUseDetail(id) {
-		// 测试code '7b676546bfb50f1b992d44bd479a1536'
-		getAction('/materialUse/getMaterialUseDetail', {code: id}).then(result => {
-			if (result.success) {
-				const defaultData = result.result;
-				this.materialUseDetailList = defaultData;
-				// 头条处理数据
-				this.materiaDataToutiao = defaultData['byteDance'] ? defaultData['byteDance'].slice(0, 10) : [];
-				this.materiaDataTotalToutiao = defaultData['byteDance'] ? defaultData['byteDance'].length : 0;
-				// 快手处理数据 
-				this.materiaDataKuaishou = defaultData['kuaishou'] ? defaultData['kuaishou'].slice(0, 10) : [];
-				this.materiaDataTotalKuaishou = defaultData['kuaishou'] ? defaultData['kuaishou'].length : 0;
-			}
-			else {
-				this.$message.error(result.message);
-			}
-		}).catch(error => {
-			console.log(error, 'eeee');
-		}).finally(() => {
-			this.toutiaoMateriaLoading = false;
-			this.kuaishouMateriaLoading = false;
-		});
-	},
+    materiaDataSizeChange(current, pageSize) {
+      this.materiaDataToutiao = [];
+          this.defaultCurrentToutiao = current;
+          const defaultData = this.materialUseDetailList['byteDance'];
+          this.materiaDataToutiao = [...defaultData.slice(10 * current - 10, 10 * current)];
+    },
+    materiaDataSizeChangeKuaishou(current, pageSize) {
+      this.materiaDataKuaishou = [];
+          this.defaultCurrentKuaishou = current;
+          const defaultData = this.materialUseDetailList['kuaishou'];
+          this.materiaDataKuaishou = [...defaultData.slice(10 * current - 10, 10 * current)];
+    },
+    handleProfitModalnCancel() {
+      this.materialUseDetailList = {};
+      this.materiaDataToutiao = [];
+      this.materiaDataTotalToutiao = 0;
+      this.defaultCurrentToutiao = 1;
+      this.materiaDataKuaishou = [];
+      this.materiaDataTotalKuaishou = 0;
+      this.defaultCurrentKuaishou = 1;
+      this.materiaModalType = '2';
+      this.usageDetailsStatus = false;
+    },
+    handleRecordCancel(){
+      this.recordDetailVisible = false;
+    },
+    handleRecord(data){
+      this.handleGetRecordDetail(data.code);
+      this.recordSignature = data.code;
+      this.recordDetailVisible = true;
+      this.toutiaoMateriaLoading = true;
+      this.kuaishouMateriaLoading = true;
+    },
+    handleGetRecordDetail(id) {
+      // 测试code '7b676546bfb50f1b992d44bd479a1536'
+      var params = {}
+      params.signature = id
+      params.pageNo = this.recordIpagination.current
+      params.pageSize = this.recordIpagination.pageSize
+      getAction('/ctop/materialUpload/uploadDetail', params).then(result => {
+        if (result.success) {
+        
+          // 头条处理数据
+          this.recordData = result.result.list || []
+          this.recordIpagination.total = result.result.total || 0
+        }
+        else {
+          this.$message.error(result.message);
+        }
+      }).catch(error => {
+        console.log(error, 'eeee');
+      }).finally(() => {
+        this.toutiaoMateriaLoading = false;
+        this.kuaishouMateriaLoading = false;
+      });
+    },
+    handleUsageDetails(data) {
+      this.handleGetMaterialUseDetail(data.code);
+      this.usageDetailsStatus = true;
+      this.toutiaoMateriaLoading = true;
+      this.kuaishouMateriaLoading = true;
+    },
+    handleGetMaterialUseDetail(id) {
+      // 测试code '7b676546bfb50f1b992d44bd479a1536'
+      getAction('/materialUse/getMaterialUseDetail', {code: id}).then(result => {
+        if (result.success) {
+          const defaultData = result.result;
+          this.materialUseDetailList = defaultData;
+          // 头条处理数据
+          this.materiaDataToutiao = defaultData['byteDance'] ? defaultData['byteDance'].slice(0, 10) : [];
+          this.materiaDataTotalToutiao = defaultData['byteDance'] ? defaultData['byteDance'].length : 0;
+          // 快手处理数据 
+          this.materiaDataKuaishou = defaultData['kuaishou'] ? defaultData['kuaishou'].slice(0, 10) : [];
+          this.materiaDataTotalKuaishou = defaultData['kuaishou'] ? defaultData['kuaishou'].length : 0;
+        }
+        else {
+          this.$message.error(result.message);
+        }
+      }).catch(error => {
+        console.log(error, 'eeee');
+      }).finally(() => {
+        this.toutiaoMateriaLoading = false;
+        this.kuaishouMateriaLoading = false;
+      });
+    },
     ruleFormFile(file){
       var bmf = new BMF()
       var that = this
@@ -2746,7 +2988,8 @@ export default {
           modTagList:[],
           modalityTagList:[],
           senceTagList:[],
-          materialName:''
+          materialName:'',
+          materialInnovate:false
         }
       })
     },
@@ -2777,7 +3020,8 @@ export default {
                 planId:item.planId,
                 clipId:item.clipId,
                 shotId:item.shotId,
-              }
+              },
+              materialInnovate:item.materialInnovate?2:1
             }
           })
           postAction('/insertV3',params).then(res=>{
@@ -2971,26 +3215,51 @@ export default {
     modalFormOkElse() {
       this.getTagListAll()
     },
+    clearChangjing(data){
+      if(data.includes(60158)
+      || data.includes(60159)
+      || data.includes(101)
+      || data.includes(104)
+      || data.includes(112)){
+        this.departValueInfoSence = []
+      }
+    },
     handleOkTag(e) {
       this.loadingTag = true
+      if(this.departValueInfoModality.includes(60158)
+      || this.departValueInfoModality.includes(60159)
+      || this.departValueInfoModality.includes(101)
+      || this.departValueInfoModality.includes(104)
+      || this.departValueInfoModality.includes(112)){
+        this.departValueInfoSence = []
+      }
       var data = [
         ...this.departValueInfoModality,
         ...this.departValueInfoMod,
         ...this.departValueInfoContent,
         ...this.departValueInfoSence,
       ]
+      var params = {}
+      params.id = this.id
+      params.materialInnovate = this.materialInnovate?2:1
+      fileEdit({
+        ...params
+      }).then((res) => {
+
+      })
       postAction('/ctop/materialTagInfo/mark', {
         code: this.tagCode,
-        tagList: data,
+        tagList: data
       }).then((res) => {
-        console.log(res)
         if (res.success) {
           this.departValueInfoModality = []
           this.departValueInfoMod = []
           this.departValueInfoContent = []
           this.departValueInfoSence = []
+          this.materialInnovate = false
           this.loadingTag = false
           this.tagInfoListVisible = false
+          this.loadData()
         } else {
           this.loadingTag = false
           this.$message.error(res.message)
@@ -2999,8 +3268,10 @@ export default {
     },
     editTagList(item) {
       this.tagInfoListVisible = true
+      this.materialInnovate = item.materialInnovate == 1?false:true
       this.getTagListInfo(item.code)
       this.tagCode = item.code
+      this.id = item.id
     },
     getTagListAll() {
       this.departTree = []
@@ -3198,14 +3469,21 @@ export default {
       params.mediaId = this.mediaId
       params.materialArray = JSON.stringify(this.checkArr)
       params.accountArray = data.treeData ? JSON.stringify(data.treeData) : JSON.stringify(data)
+      params.loginId = this.userInfo().id
+      params.userName = this.userInfo().realname
       if (this.mediaId == '2') {
-        params.shieldBackwardSwitch = data.shieldBackwardSwitch
+        params.shieldBackwardSwitch = data.shieldBackwardSwitch?1:2
       }
-
       postAction('/ctop/materialUpload/uploadAccount', params).then((res) => {
         if (res.code == 0) {
           this.checkArr = []
           this.checkAll = false
+          if(res.data){
+            this.showDataList = res.data
+            this.showDataListVisible = true
+          }else{
+            this.$message.success(res.message)
+          }
         }
       })
       //   /ctop/materialUpload/uploadAccount
@@ -3666,6 +3944,7 @@ export default {
                 }
           params.tag = this.tags
           params.imageArr = this.imageArrList
+          params.materialInnovate = values.materialInnovate?2:1
           if (this.add) {
             fileInsertV2(params).then((res) => {
               if (res.success) {

+ 4 - 4
src/views/modules/policy-management/policy-management.less

@@ -75,7 +75,7 @@
     }
 
 }
-/deep/ .rejection-reason-class {
+::v-deep .rejection-reason-class {
     width: 600px !important;
 
     .audit-policy-icon {
@@ -114,7 +114,7 @@
     }
 
 }
-/deep/ .audit-policy-class {
+::v-deep .audit-policy-class {
     width: 930px !important;
 
     .audit-policy-footer {
@@ -177,7 +177,7 @@
 
     }
 }
-/deep/ .policy-operation-class {
+::v-deep .policy-operation-class {
     width: 1000px !important;
     .ant-modal-body {
         height: 600px;
@@ -235,7 +235,7 @@
             .isActive {
                 padding-left: 139px;
             }
-            // /deep/ .ant-col-14 {
+            // ::v-deep .ant-col-14 {
             //     width: 100%;
             // }
         }

+ 1 - 1
src/views/modules/settlement-account/settlement-account.less

@@ -45,7 +45,7 @@
         margin-top: 20px;
     }
 }
-/deep/ .settlement-modal-class {
+::v-deep .settlement-modal-class {
     width: 700px !important;
     .file-down-title {
         margin-left: 12px;

+ 1 - 1
src/views/modules/settlement-information/settlement-information.less

@@ -45,7 +45,7 @@
         margin-top: 20px;
     }
 }
-/deep/ .information-modal-class {
+::v-deep .information-modal-class {
     width: 750px !important;
     .upload-txt-rules {
         margin: 0;

+ 1 - 1
src/views/modules/stockWatch/modules/custom-columns/custom-columns.less

@@ -1,4 +1,4 @@
-/deep/ .custom-columns-modal {
+::v-deep .custom-columns-modal {
     width: 800px !important;
     .custom-modal-content {
         .input-search {

+ 6 - 6
src/views/modules/stockWatch/modules/keep-manage/keep-manage.less

@@ -1,10 +1,10 @@
 .keep-manage-content {
-    /deep/ .keep-manage-col {
+    ::v-deep .keep-manage-col {
         min-height: 300px;
         margin-bottom: 20px;
     }
     .echarts-card {
-        /deep/  .ant-card-body {
+        ::v-deep  .ant-card-body {
             padding: 0;
         }
     }
@@ -35,7 +35,7 @@
         }
     }
     .title-checkout-select {
-        /deep/ .ant-select-enabled {
+        ::v-deep .ant-select-enabled {
             width: 150px;
             margin-left: 10px;
         }
@@ -108,7 +108,7 @@
             font-size: 16px;
             display: flex;
             line-height: 30px;
-            /deep/ .anticon {
+            ::v-deep .anticon {
                 line-height: 37px;
             }
             .title-label {
@@ -144,14 +144,14 @@
 }
 
 #outTable {
-    /deep/ .ant-table-header-column {
+    ::v-deep .ant-table-header-column {
         word-break: break-all; 
         font-size: 14px; 
         font-weight: 600
     }
    
 }
-/deep/ .ant-card-extra {
+::v-deep .ant-card-extra {
     padding: 0!important;
 }
 

+ 2 - 2
src/views/modules/stockWatch/modules/keep-person/keep-person.less

@@ -106,14 +106,14 @@
 }
 
 #outTable {
-    /deep/ .ant-table-header-column {
+    ::v-deep .ant-table-header-column {
         word-break: break-all; 
         font-size: 14px; 
         font-weight: 600
     }
    
 }
-/deep/ .ant-card-extra {
+::v-deep .ant-card-extra {
     padding: 0!important;
 }
 

+ 1 - 1
vue.config.js

@@ -97,7 +97,7 @@ module.exports = {
       '/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:7001', //请求本地 需要jeecg-boot后台项目  蒙蒙
+        target: 'http://192.168.1.3:7001', //请求本地 需要jeecg-boot后台项目  蒙蒙
         // target: 'http://192.168.0.59:8088', //请求本地 需要jeecg-boot后台项目  英豪
         // target: 'http://192.168.1.62:7001', //请求本地 需要jeecg-boot后台项目  英豪
         // target: 'http://192.168.6.162:9806', //请求本地 需要jeecg-boot后台项目  祚云