魏志佳 vor 4 Jahren
Ursprung
Commit
8dbe3de230

+ 8 - 13
src/views/modules/Statistics/videoStatics/KSvideoStatics.vue

@@ -82,18 +82,10 @@
      <!-- 报表区域 -->
      <div class="tableBox">
           <div class="tableTop">
-              <!-- <a-tooltip>
-                <template slot="title">
-                  日期选择具体某一天之后,这里可以查看具体的时间段数据哦~
-                </template>
-                  <a-select  placeholder="请选择具体时间段" style="width: 160px" @change="timeChange"  v-model='timeDefaultValue'  label-in-value class="selectTime" v-show="dateValue[0].format('YYYY-MM-DD')==dateValue[1].format('YYYY-MM-DD')" :disabled='accountId.length==0'>
-                    <a-select-option v-for="(i,index) in 24 " :key="index" :value="index" >{{index>=10 ? `00:00-${index}:59` :`00:00-0${index}:59`}}</a-select-option>
-                  </a-select>
-              </a-tooltip> -->
+              
                <a-button type="primary" @click="customColumns">自定义列</a-button>
-                <a-button type="default" style="float:right" @click="exportExcel" id="mybtn" v-show="exportExcelIsOk">导出报表</a-button>
-              <!-- <a-button type='primary' class="export" @click="exportExcel">导出报表</a-button>
-              <a-button type='primary' class="add" @click="customColumns" >自定义列</a-button> -->
+                <a-button type="default" style="float:right" @click="exportExcel" id="mybtn" :loading='exportLoading'>导出报表</a-button>
+             
           </div>
             <a-table
                 size="middle"
@@ -263,7 +255,7 @@ const columnsFixd = [
     key:'operation',
     scopedSlots: { customRender: 'operation' },
     align: 'center',
-    width:100,
+    width:120,
     fixed: 'left'
   },
 
@@ -374,6 +366,7 @@ let show = 0
 export default {
   data() {
     return {
+      exportLoading:false,
        target:'cost',
         order:'desc',
         type:0,
@@ -568,6 +561,7 @@ export default {
     },
     //导出报表
     exportExcel() {
+      this.exportLoading=true;
        let column = this.columns.map((item, index) => {
         return item.dataIndex
       })
@@ -582,13 +576,14 @@ export default {
         endDate: this.dateValue[1].format('YYYY-MM-DD'),
         accountIds:this.appId,
       }).then(res => {
+        this.exportLoading=false;
         let blob = new Blob([res], {
           type:'application/vnd.openxmlformats-officedocument.spreadsheetml.sheet'
         })
         let downloadElement = document.createElement('a')
         let href = window.URL.createObjectURL(blob) //创建下载的链接
         downloadElement.href = href
-        downloadElement.download = '视频汇总.xlsx' //下载后文件名
+        downloadElement.download = `${this.dateValue[0].format('YYYY-MM-DD')}~${this.dateValue[0].format('YYYY-MM-DD')}视频汇总.xlsx`   //下载后文件名
         document.body.appendChild(downloadElement)
         downloadElement.click() //点击下载
         document.body.removeChild(downloadElement) //下载完成移除元素

+ 7 - 47
src/views/modules/Statistics/videoStatics/TTvideoStatics.vue

@@ -37,52 +37,10 @@
 
     <div style="margin:15px 0" class="btndiv">
       <a-button type="primary" @click="customColumns">自定义列</a-button>
-      <a-button type="default" style="float:right" @click="exportExcel" id="mybtn" v-show="exportExcelIsOk">导出报表</a-button>
+      <a-button type="default" style="float:right" @click="exportExcel" id="mybtn"  :loading='exportLoading'>导出报表</a-button>
     </div>
 
-    <!-- <a-modal v-model="visible" title="自定义列" on-ok="handleOk" width="65%">
-      <template slot="footer">
-        <a-button key="back" @click="handleCancel">取消</a-button>
-        <a-button key="submit" type="primary" :loading="loading" @click="handleOk">应用</a-button>
-      </template>
-      
-      <div class="zhuti">
-        <div class="addlist">
-          <p>可添加的列</p>
-          <div class="selectionList">
-           
-            <selectComponent
-              :showCol="listNum"
-              @getshowlist="getshowlist"
-              :fixedCol="columnsFixd"
-            />
-          </div>
-        </div>
-        <div class="listNum">
-          <p>已选{{listNum.length}}列</p>
-          <a-button id="btn" type="link" @click="clearAllList">清空全部</a-button>
-          <ul class="selectlist">
-            <li v-for="(item,index) in listNum" :key="index">
-              <span v-if=" index <4">
-                <a-icon type="lock" />
-                <span class="listText">{{item.title}}</span>
-              </span>
-              <span v-else-if=" index >=4">
-                <a-icon type="menu" style="color:#ccc" />
-                <span class="listText">{{item.title}}</span>
-                <a-icon
-                  type="close"
-                  @click="deleteCol(item,index)"
-                  id="closeStyle"
-                  style="fontSize:12px;"
-                />
-              </span>
-            </li>
-          </ul>
-        </div>
-      </div>
-    </a-modal> -->
-
+    
     <a-table
       size="middle"
       :columns="columns"
@@ -250,7 +208,7 @@ const columnsFixd = [
     key:'operation',
     scopedSlots: { customRender: 'operation' },
     align: 'center',
-    width:100,
+    width:120,
     fixed: 'left'
   },
   {
@@ -317,6 +275,7 @@ export default {
   data() {
     return {
        listNum:[],
+       exportLoading:false,
       target:'cost',
       order:'desc',
         type:0,
@@ -502,7 +461,7 @@ export default {
     },
     //导出报表
     exportExcel() {
-      
+      this.exportLoading=true;
       let column = this.columns.map((item, index) => {
         return item.dataIndex
       })
@@ -516,13 +475,14 @@ export default {
         endDate: this.dateValue[1].format('YYYY-MM-DD'),
         accountIds:this.appId,
       }).then(res => {
+        this.exportLoading=false;
         let blob = new Blob([res], {
           type:'application/vnd.openxmlformats-officedocument.spreadsheetml.sheet'
         })
         let downloadElement = document.createElement('a')
         let href = window.URL.createObjectURL(blob) //创建下载的链接
         downloadElement.href = href
-        downloadElement.download = this.statDate.format('YYYY-MM-DD') + '视频汇总.xlsx' //下载后文件名
+        downloadElement.download = `${this.dateValue[0].format('YYYY-MM-DD')}~${this.dateValue[0].format('YYYY-MM-DD')}视频汇总.xlsx`   //下载后文件名
         document.body.appendChild(downloadElement)
         downloadElement.click() //点击下载
         document.body.removeChild(downloadElement) //下载完成移除元素

+ 64 - 48
src/views/modules/advertiser/UserAllocationList.vue

@@ -21,7 +21,8 @@
                   v-for="appModel in optionsAll"
                   :key="appModel.userId + new Date().getTime()"
                   :value="appModel.userId"
-                >{{ appModel.realName }}</a-select-option>
+                  >{{ appModel.realName }}</a-select-option
+                >
               </a-select>
               <a-input placeholder="请输入所属人" v-model="queryParam.userName" v-else></a-input>
             </a-form-item>
@@ -50,10 +51,15 @@
                 :filterOption="filterOption"
               >
                 <a-select-option :value="item.projectId" v-for="item of dataElse" :key="item.id">
-                  {{ item.mediaId == "1" ? '头条' :item.mediaId == "2"? '快手':item.mediaId == "3"?'头条内广':'快手内广'
-                  }}&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;{{
-                  item.projectName
-                  }}
+                  {{
+                    item.mediaId == '1'
+                      ? '头条'
+                      : item.mediaId == '2'
+                      ? '快手'
+                      : item.mediaId == '3'
+                      ? '头条内广'
+                      : '快手内广'
+                  }}&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;{{ item.projectName }}
                 </a-select-option>
               </a-select>
             </a-form-item>
@@ -64,14 +70,9 @@
             </a-form-item>
           </a-col>
           <a-col :md="6" :sm="8">
-            <span style="float: left;overflow: hidden;" class="table-page-search-submitButtons">
+            <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="searchReset"
-                icon="reload"
-                style="margin-left: 8px"
-              >重置</a-button>
+              <a-button type="primary" @click="searchReset" icon="reload" style="margin-left: 8px">重置</a-button>
             </span>
           </a-col>
         </a-row>
@@ -95,12 +96,16 @@
         <span slot="accountStatus" slot-scope="text, record">
           <!-- {{ text == 0 ? '启用' : '禁用' }} -->
 
-          <a-switch
-            v-model="record.accountStatus == 0 ? true : false"
-            @change="onChangeSwitch(record)"
-          />
+          <a-switch v-model="record.accountStatus == 0 ? true : false" @change="onChangeSwitch(record)" />
         </span>
         <span slot="mediaId" slot-scope="text">{{ text == 1 ? '头条' : '快手' }}</span>
+
+        <div slot="authName" slot-scope="text, record">
+          <span>{{ text }}</span>
+          <a-button size="small" @click="renew(record)" style="float: right" :loading="record.showVideo"> 更新 </a-button>
+          <!-- showVideo -->
+        </div>
+
         <span slot="action" slot-scope="text, record">
           <a @click="account(record)">转移项目</a>
 
@@ -111,11 +116,7 @@
           <a @click="handleEdit(record)">编辑</a>
 
           <a-divider type="vertical" v-show="roleCode == 'admin'" />
-          <a-popconfirm
-            title="确定删除吗?"
-            @confirm="() => handleDelete(record.id)"
-            v-show="roleCode == 'admin'"
-          >
+          <a-popconfirm title="确定删除吗?" @confirm="() => handleDelete(record.id)" v-show="roleCode == 'admin'">
             <a>删除</a>
           </a-popconfirm>
         </span>
@@ -126,13 +127,7 @@
     <!-- 表单区域 -->
     <userAllocation-modal ref="modalForm" @ok="modalFormOk"></userAllocation-modal>
     <!--  添加项目成员 -->
-    <a-modal
-      title="账户转让"
-      v-model="visibleAdd"
-      @ok="handleOkAdd"
-      :confirmLoading="confirmLoading"
-      :width="800"
-    >
+    <a-modal title="账户转让" v-model="visibleAdd" @ok="handleOkAdd" :confirmLoading="confirmLoading" :width="800">
       <a-form :form="form">
         <a-form-item
           label="转户人"
@@ -144,14 +139,12 @@
             showSearch
             optionFilterProp="children"
             :filterOption="filterOption"
-            style="width:100%"
+            style="width: 100%"
             disabled
           >
-            <a-select-option
-              :value="item.userId"
-              v-for="(item, index) of options"
-              :key="index"
-            >{{ item.realName }}</a-select-option>
+            <a-select-option :value="item.userId" v-for="(item, index) of options" :key="index">{{
+              item.realName
+            }}</a-select-option>
           </a-select>
         </a-form-item>
         <a-form-item
@@ -165,13 +158,11 @@
             showSearch
             optionFilterProp="children"
             :filterOption="filterOption"
-            style="width:100%"
+            style="width: 100%"
           >
-            <a-select-option
-              :value="item.userId"
-              v-for="(item, index) of options"
-              :key="index"
-            >{{ item.realName }}</a-select-option>
+            <a-select-option :value="item.userId" v-for="(item, index) of options" :key="index">{{
+              item.realName
+            }}</a-select-option>
           </a-select>
         </a-form-item>
         <a-form-item
@@ -221,7 +212,7 @@
           <a-select
             v-decorator="[
               'projectId', // 给表单赋值或拉取表单时,该input对应的key
-              { rules: [{ required: true, message: '请选择项目!' }] }
+              { rules: [{ required: true, message: '请选择项目!' }] },
             ]"
             showSearch
             optionFilterProp="children"
@@ -230,7 +221,13 @@
           >
             <a-select-option :value="item.projectId" v-for="item of dataElse" :key="item.id">
               {{ item.projectName }}&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;{{
-              item.mediaId == "1" ? '头条' :item.mediaId == "2"? '快手':item.mediaId == "3"?'头条内广':'快手内广'
+                item.mediaId == '1'
+                  ? '头条'
+                  : item.mediaId == '2'
+                  ? '快手'
+                  : item.mediaId == '3'
+                  ? '头条内广'
+                  : '快手内广'
               }}&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;{{ item.advertiserName }}
             </a-select-option>
           </a-select>
@@ -243,7 +240,7 @@
           <a-select
             v-decorator="[
               'projectNewId', // 给表单赋值或拉取表单时,该input对应的key
-              { rules: [{ required: true, message: '请选择项目!' }] }
+              { rules: [{ required: true, message: '请选择项目!' }] },
             ]"
             showSearch
             optionFilterProp="children"
@@ -251,7 +248,13 @@
           >
             <a-select-option :value="item.projectId" v-for="item of dataElse" :key="item.id">
               {{ item.projectName }}&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;{{
-              item.mediaId == "1" ? '头条' :item.mediaId == "2"? '快手':item.mediaId == "3"?'头条内广':'快手内广'
+                item.mediaId == '1'
+                  ? '头条'
+                  : item.mediaId == '2'
+                  ? '快手'
+                  : item.mediaId == '3'
+                  ? '头条内广'
+                  : '快手内广'
               }}&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;{{ item.advertiserName }}
             </a-select-option>
           </a-select>
@@ -327,6 +330,9 @@ export default {
           title: '授权名称',
           align: 'center',
           dataIndex: 'authName',
+          scopedSlots: {
+            customRender: 'authName',
+          },
         },
         {
           title: '平台类型',
@@ -397,6 +403,20 @@ export default {
     this.getParticipateList()
   },
   methods: {
+    renew(item) {
+      console.log(item)
+      item.showVideo = true
+      getAction('/ctop/userAllocation/updateAuthName', { accountId: item.accountId, mediaId: item.mediaId }).then(
+        (res) => {
+          if (res.success) {
+            this.loadData()
+          } else {
+            this.$message.error('更新数据失败,请稍后重试!!!')
+            item.showVideo = false
+          }
+        }
+      )
+    },
     moment,
     search(value) {
       this.optionsAll = []
@@ -475,8 +495,6 @@ export default {
       }, 0)
     },
     handleOkAccount(e) {
-      
-
       this.formAccount.validateFieldsAndScroll((err, values) => {
         if (err) {
           // 这里做逻辑处理
@@ -500,8 +518,6 @@ export default {
       })
     },
     handleOkAdd(e) {
-      
-
       this.form.validateFieldsAndScroll((err, values) => {
         if (err) {
           // 这里做逻辑处理

+ 17 - 13
src/views/modules/material/accountCheck.vue

@@ -1,17 +1,21 @@
 <style>
-.checked {
+.checked-account {
   width: 100%;
 }
-.checked .ant-checkbox-wrapper {
+.checked-account .ant-checkbox-wrapper {
   width: 20%;
+  min-width: 300px;
+  white-space: nowrap;
+  text-overflow: ellipsis;
+  overflow: hidden;
 }
 </style>
 <template>
   <div>
-    <a-modal title="账户选择" v-model="showEdit" @ok="handleOk" @cancel="close" width="60%">
+    <a-modal title="账户选择" v-model="showEdit" @ok="handleOk" @cancel="close" width="80%">
       <a-checkbox :indeterminate="indeterminate" @change="onCheckAllChange" :checked="checkAll">全选</a-checkbox>
       <br />
-      <a-checkbox-group :options="showList" v-model="dataValue" class="checked" @change="onChange" />
+      <a-checkbox-group :options="showList" v-model="dataValue" class="checked-account" @change="onChange"/>
     </a-modal>
   </div>
 </template>
@@ -24,14 +28,14 @@ export default {
   name: 'modules',
   components: {},
 
-  data: function() {
+  data: function () {
     return {
       showEdit: false,
       dataList: [],
       showList: null,
       dataValue: [],
       indeterminate: false,
-      checkAll: false
+      checkAll: false,
     }
   },
   methods: {
@@ -51,12 +55,12 @@ export default {
     onCheckAllChange(e) {
       Object.assign(this, {
         dataValue: e.target.checked
-          ? this.showList.map(item => {
+          ? this.showList.map((item) => {
               return item.value
             })
           : [],
         indeterminate: false,
-        checkAll: e.target.checked
+        checkAll: e.target.checked,
       })
     },
     onChange(checkedList) {
@@ -71,19 +75,19 @@ export default {
       this.indeterminate = false
       this.checkAll = false
       console.log(url, item)
-      getAction(url, item).then(res => {
+      getAction(url, item).then((res) => {
         if (res.code == 0) {
-          this.showList = res.result.map(item => {
+          this.showList = res.result.map((item) => {
             return {
               label: item.authName,
-              value: item.accountId
+              value: item.accountId,
             }
           })
         }
         console.log(res)
       })
-    }
+    },
   },
-  computed: {}
+  computed: {},
 }
 </script>

+ 229 - 0
src/views/modules/material/accountCheckBytedance.vue

@@ -0,0 +1,229 @@
+<style lang="scss" scoped>
+.select-project {
+  width: 50%;
+}
+</style>
+<template>
+  <div class="select-project">
+    <a-modal title="账户选择" v-model="showEdit" @ok="handleOk" @cancel="close" width="80%">
+      {{ value }}
+      <!-- <treeselect
+        :multiple="multiple"
+        :disable-branch-nodes="!multiple"
+        :branch-nodes-first="true"
+        :options="options"
+        :load-options="loadOptions"
+        placeholder="请选择项目"
+        v-model="value"
+        :value-consists-of="valueConsistsOf"
+        :auto-load-root-options="false"
+        :auto-select-descendants="false"
+        @select="update"
+        @input="emitValue"
+        :limit="2"
+        :default-options="true"
+        :limitText="
+          (count) => {
+            return '隐藏' + count + '条'
+          }
+        "
+        noChildrenText="该项目下暂无账号"
+        :noOptionsText="showLoading"
+      /> -->
+      <!-- :default-expanded-keys="[2, 3]"
+        :default-checked-keys="[5]" -->
+      <el-tree
+        :data="options"
+        show-checkbox
+        node-key="id"
+        :props="defaultProps"
+        :load="loadOptions"
+        lazy
+        :check-strictly="true"
+        ref="tree"
+      >
+      </el-tree>
+    </a-modal>
+  </div>
+</template>
+
+<script>
+//   @open="getParticipateList"
+// import the component
+import Treeselect from '@riophae/vue-treeselect'
+// import the styles
+import '@riophae/vue-treeselect/dist/vue-treeselect.css'
+import { LOAD_CHILDREN_OPTIONS } from '@riophae/vue-treeselect'
+
+import { getAction, postAction } from '@/api/manage'
+import { mapGetters } from 'vuex'
+// We just use `setTimeout()` here to simulate an async operation
+// instead of requesting a real API server for demo purpose.
+let called = false
+export default {
+  data: () => ({
+    defaultProps: {
+      children: 'children',
+      label: 'label',
+      id: 'id',
+    },
+    showEdit: false,
+    value: null,
+    valueConsistsOf: 'LEAF_PRIORITY',
+    options: [],
+    showLoading: 'loading...',
+  }),
+  props: {
+    //是否多选
+    multiple: {
+      type: Boolean,
+      default() {
+        return true
+      },
+    },
+    //判断媒体类型
+    request: {
+      type: String,
+      default() {
+        return '2,4'
+      },
+    },
+    //一级请求接口
+    reqUrl: {
+      type: String,
+      default() {
+        return '/ctop/projectMember/participateListByMediaId'
+      },
+    },
+  },
+  components: {
+    Treeselect,
+  },
+  watch: {
+    $route(n, o) {},
+    //   appId: {
+    //     handler(n, o) {
+    //       console.log(n)
+    //       if (n.length == 0) {
+    //         if (this.multiple) {
+    //           this.value = []
+    //         } else {
+    //           this.value = ''
+    //         }
+    //       }
+    //     },
+    //     deep: true
+    //   }
+  },
+  methods: {
+    getCheckedKeys() {
+      console.log(this.$refs.tree.getCheckedKeys())
+    },
+    handleOk(e) {
+      console.log(e)
+      var data = this.$refs.tree.getCheckedKeys()
+      this.showEdit = false
+      this.$emit('synchro', data)
+    },
+    close() {
+      this.showEdit = false
+    },
+    ...mapGetters(['nickname', 'avatar', 'userInfo']),
+    update(node, id) {
+      // console.log(node)
+      getAction('/ctop/userAllocation/getAccountIdListByUserId', {
+        userId: node.id.split(',')[1],
+      }).then((res) => {
+        console.log(res)
+        // if (res.code == 0) {
+        //   if (res.result.length > 0) {
+        //     node.children = res.result.map((item) => {
+        //       return {
+        //         id: item.accountId,
+        //         label: item.userName + '         ' + item.authName,
+        //         isDisabled: true,
+        //       }
+        //     })
+        //   } else {
+        //   }
+        // } else {
+        //   new Error('Failed to load options: network error.')
+        // }
+      })
+    },
+    emitValue() {
+      // this.$emit('update:appId', this.value)
+    },
+    loadOptions(node, resolve) {
+      // Typically, do the AJAX stuff here.
+      // Once the server has responded,
+      // assign children options to the parent node & call the callback.
+      console.log(node)
+      var data = []
+      if (node.level == 1) {
+        var id = node.label
+
+        getAction('/ctop/userAllocation/getAccountIdListByUserId', {
+          userId: id,
+        }).then((res) => {
+          console.log(res)
+          if (res.code == 0) {
+            if (res.result.length > 0) {
+              data = res.result.map((item) => {
+                return {
+                  id: item.accountId,
+                  label:
+                    (item.userName.length == 2
+                      ? item.userName + '\xa0\xa0\xa0\xa0\xa0\xa0\xa0\xa0'
+                      : item.userName.length == 3
+                      ? item.userName + '\xa0\xa0\xa0\xa0'
+                      : item.userName) +
+                    '\xa0\xa0\xa0\xa0\xa0\xa0\xa0\xa0\xa0\xa0\xa0\xa0' +
+                    item.accountId +
+                    '\xa0\xa0\xa0\xa0\xa0\xa0\xa0\xa0\xa0\xa0\xa0\xa0' +
+                    item.authName,
+                  disabled: true,
+                }
+              })
+
+              resolve(data)
+            } else {
+              data = []
+              resolve(data)
+            }
+          } else {
+          }
+        })
+      } else {
+        data = []
+        resolve(data)
+      }
+    },
+    getParticipateList(projectId) {
+      //我参与的
+      //   toutiaoParticipateList
+      this.showEdit = true
+      getAction('/ctop/userAllocation/getUserIdListByProjectId', {
+        projectId: projectId,
+      }).then((res) => {
+        if (res.code == 0) {
+          console.log(res)
+          this.options = res.result.map((item) => {
+            return {
+              id: item.accountId,
+              label: item.userId,
+              children: [],
+            }
+          })
+        } else {
+          this.showLoading = '暂无数据'
+        }
+      })
+    },
+  },
+
+  mounted() {
+    // this.getParticipateList()
+  },
+}
+</script>

+ 24 - 11
src/views/modules/material/videoMaterial.vue

@@ -831,11 +831,10 @@ a {
       <template slot="footer">
         <a-button key="back" @click="close">取消</a-button>
         <a-button
-          key="submit"
           type="primary"
           :disabled="!confirmLoading"
-          :loding="loading"
           @click="handleOk"
+          :loading="loadingElse"
         >确定</a-button>
       </template>
 
@@ -1664,6 +1663,7 @@ a {
     </a-modal>
 
     <account-check ref="check" @synchro="implement"></account-check>
+    <accountCheckBytedance ref="accountCheckBytedance" @synchro="implement"/>
     <permission-modal ref="modalForm" @ok="modalFormOkElse"></permission-modal>
   </a-card>
 </template>
@@ -1685,7 +1685,7 @@ import BMF from 'browser-md5-file'
 import uploadFile from '@/components/uploadFile.vue'
 import { closeAllVideoFun, stopOtherVideo } from '@/utils/videoControl'
 import accountCheck from './accountCheck'
-
+import accountCheckBytedance from './accountCheckBytedance'
 export default {
   name: 'video-material',
   mixins: [JeecgListMixin],
@@ -1696,6 +1696,7 @@ export default {
     selectTable,
     uploadFile,
     PermissionModal,
+    accountCheckBytedance
   },
 
   data() {
@@ -1781,7 +1782,7 @@ export default {
       visibleDetail: false,
       personVisible: false,
       confirmLoading: false,
-      loading: false,
+      loadingElse: false,
       loadingImage: false,
       loadingPerson: false,
       activeKey: 'video',
@@ -2186,10 +2187,22 @@ export default {
     },
     moment,
     tongbu() {
-      this.$refs.check.getData('/ctop/userAllocation/getAccountListByProjectId', {
-        userId: this.userInfo().id,
-        projectId: this.queryParam.projectId,
+      getAction('/ctop/project/queryById',{id:this.queryParam.projectId}).then(res=>{
+        console.log(res)
+        if(res.success){
+          if(res.result.mediaId == '1'||res.result.mediaId == '3'){
+            this.$refs.check.getData('/ctop/userAllocation/getAccountListByProjectId', {
+              userId: this.userInfo().id,
+              projectId: this.queryParam.projectId,
+            })
+          }else if(res.result.mediaId == '2'||res.result.mediaId == '4'){
+            this.$refs.accountCheckBytedance.getParticipateList(this.queryParam.projectId)
+          }
+        }else{
+          this.$message.error('网络波动,请稍后再试')
+        }
       })
+     
     },
     implement(data) {
       var params = {}
@@ -2611,11 +2624,12 @@ export default {
       // }
     },
     handleOk() {
-      this.loading = true
+     
       this.form.validateFieldsAndScroll((err, values) => {
         if (err) {
           // 这里做逻辑处理
         } else {
+          this.loadingElse = true
           var params = {
             ...values,
           }
@@ -2673,18 +2687,17 @@ export default {
                 this.loadData()
                 this.visible = false
                 this.add = true
-                this.loading = false
                 for (const key in this.role) {
                   if (key == 'roleCode') {
                     this.role[key] = this.role[key].substr(0, this.role[key].length - 2)
                   }
                 }
                 this.$message.success('素材上传成功')
-                this.loading = false
+                this.loadingElse = false
                 //   this.departValue = []
               } else {
                 this.$message.error(res.message)
-                this.loading = false
+                this.loadingElse = false
               }
             })
           } else {

+ 7 - 0
vue.config.js

@@ -58,8 +58,12 @@ module.exports = {
     open : true,
     proxy: {
       '/jeecg-boot': {
+<<<<<<< HEAD
         //  target: 'http://192.168.1.8:8080', //请求本地 需要jeecg-boot后台项目  蒙蒙
 
+=======
+         target: 'http://192.168.1.8:8080', //请求本地 需要jeecg-boot后台项目  蒙蒙
+>>>>>>> 214b4a24efbeb0b91c0ccc6d88b84488e855c983
         // target: 'http://192.168.0.59:8088', //请求本地 需要jeecg-boot后台项目  英豪
         // target: 'http://192.168.1.72:8088', //请求本地 需要jeecg-boot后台项目  英豪
 
@@ -68,10 +72,13 @@ module.exports = {
         target: 'http://192.168.1.74:8098', //请求本地 需要jeecg-boot后台项目  毕洁泉
         // target: 'http://192.168.0.252:8098', //请求本地 需要jeecg-boot后台项目  毕洁泉
         // target: 'http://192.168.0.170:8088', //请求本地 需要jeecg-boot后台项目  毕洁泉
+<<<<<<< HEAD
 
         // target: 'http://192.168.1.94:8081', //请求本地 需要jeecg-boot后台项目  赵西安
 
 
+=======
+>>>>>>> 214b4a24efbeb0b91c0ccc6d88b84488e855c983
         //  target: 'http://api.tjyourong.com.cn', //请求本地 需要jeecg-boot后台项目
         // target: 'https://trac.tjyourong.com.cn', //请求本地 需要jeecg-boot后台项目
         // target: 'http://39.106.184.70:8088/', //请求本地 需要jeecg-boot后台项目