瀏覽代碼

发版提交

zhuxinbo 4 年之前
父節點
當前提交
149fa2d15e

+ 1 - 0
debug.log

@@ -22,3 +22,4 @@
 [0716/000711.617:ERROR:exception_snapshot_win.cc(98)] thread ID 15368 not found in process
 [0727/154120.269:ERROR:file_io.cc(89)] ReadExactly: expected 36, observed 0
 [0727/173939.302:ERROR:file_io.cc(89)] ReadExactly: expected 36, observed 0
+[0729/144506.169:ERROR:file_io.cc(89)] ReadExactly: expected 36, observed 0

+ 1 - 0
src/components/uploadFile.vue

@@ -15,6 +15,7 @@
         </div>
       </div>
     </a-upload>
+    <div style="color:red">{{uploadType=='image'?'请上传jpg格式的图片,并且大小在2m之内':'请上传mp4格式,大小在100m之内'}}</div>
     <a-modal :visible="previewVisible" :footer="null" @cancel="handleCancel">
       <img alt="example" style="width: 100%" :src="previewImage" v-if="uploadType=='image'" />
       <video :src="previewImage" v-else style="width: 100%" controls="controls">您的浏览器不支持 video 标签。</video>

+ 10 - 0
src/views/modules/advertiser/ProjectList.vue

@@ -153,6 +153,16 @@
             }
           },
           {
+            title: '供应商',
+            align: 'center',
+            dataIndex: 'supplierCode_dictText'
+          },
+          {
+            title: '销售',
+            align: 'center',
+            dataIndex: 'saleId_dictText'
+          },
+          {
             title: '运营负责人',
             align: 'center',
             dataIndex: 'responsibleName'

+ 49 - 42
src/views/modules/advertiser/ProjectTransferRecordAuditList.vue

@@ -5,13 +5,6 @@
     <div class="table-page-search-wrapper">
       <a-form layout="inline">
         <a-row :gutter="24">
-
-          <a-col :md="6" :sm="8">
-            <a-form-item label="账户">
-              <!--<a-input placeholder="请输入账户id" v-model="queryParam.accountId"></a-input>-->
-              <j-dict-select-tag v-model="queryParam.accountId" placeholder="请选择用户名称" dictCode="ctop_user_allocation,auth_name,account_id,account_status = '0'"/>
-            </a-form-item>
-          </a-col>
           <a-col :md="6" :sm="8">
             <a-form-item label="状态">
               <a-select default-value="0" v-model="queryParam.status">
@@ -30,7 +23,7 @@
               </a-select>
             </a-form-item>
           </a-col>
-          <a-col :md="6" :sm="8" >
+          <a-col :md="6" :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="searchReset" icon="reload" style="margin-left: 8px">重置</a-button>
@@ -48,21 +41,16 @@
 
     <!-- table区域-begin -->
 
-    <a-table
-      ref="table"
-      size="middle"
-      bordered
-      rowKey="id"
-      :columns="columns"
-      :dataSource="dataSource"
-      :pagination="ipagination"
-      :loading="loading"
-      @change="handleTableChange">
-        <span slot="action" slot-scope="text, record">
-          <a-popconfirm title="确定删除吗?" @confirm="() => handleDelete(record.id)">
-            <a>删除</a>
-          </a-popconfirm>
-        </span>
+    <a-table ref="table" size="middle" bordered rowKey="id" :columns="columns" :dataSource="dataSource"
+      :pagination="ipagination" :loading="loading" @change="handleTableChange">
+      <span slot="action" slot-scope="text, record">
+        <a @click="handleEditStatus(record,'2')" :disabled="record.status!=1">通过</a>
+
+        <a-divider type="vertical" />
+        <a @click="handleEditStatus(record,'3')" :disabled="record.status!=1">驳回</a>
+
+
+      </span>
     </a-table>
     <!-- table区域-end -->
 
@@ -73,60 +61,65 @@
 
 <script>
   import ProjectTransferRecordModal from './modules/ProjectTransferRecordModal'
-  import { JeecgListMixin } from '@/mixins/JeecgListMixin'
-  import {postAction} from "../../../api/manage";
-
+  import {
+    JeecgListMixin
+  } from '@/mixins/JeecgListMixin'
+  import {
+    postAction
+  } from "../../../api/manage";
+  import qs from 'qs'
   export default {
     name: "ProjectTransferRecordList",
-    mixins:[JeecgListMixin],
+    mixins: [JeecgListMixin],
     components: {
       ProjectTransferRecordModal
     },
-    data () {
+    data() {
       return {
         description: '账户转项目记录管理页面',
         // 表头
-        columns: [
-          {
+        columns: [{
             title: '账户id',
-            align:"center",
+            align: "center",
             dataIndex: 'accountId'
           },
           {
             title: '账户名称',
-            align:"center",
+            align: "center",
             dataIndex: 'accountId_dictText'
           },
           {
             title: '原项目',
-            align:"center",
+            align: "center",
             dataIndex: 'soucreProject_dictText'
           },
           {
             title: '目标项目',
-            align:"center",
+            align: "center",
             dataIndex: 'targetProject_dictText'
           },
           {
             title: '申请人',
-            align:"center",
+            align: "center",
             dataIndex: 'userId_dictText'
           },
           {
             title: '审核人',
-            align:"center",
+            align: "center",
             dataIndex: 'reviewerId_dictText'
           },
           {
             title: '审核状态',
-            align:"center",
+            align: "center",
             dataIndex: 'status_dictText'
           },
           {
             title: '操作',
             dataIndex: 'action',
-            align:"center",
-            scopedSlots: { customRender: 'action' },
+            align: "center",
+            scopedSlots: {
+              customRender: 'action'
+            },
           }
         ],
         url: {
@@ -137,15 +130,29 @@
       }
     },
     computed: {
-      importExcelUrl: function(){
+      importExcelUrl: function () {
         return `${window._CONFIG['domianURL']}/${this.url.importExcelUrl}`;
       }
     },
     methods: {
-      handleDele(record){
-        if(confirm("确认要删除此数据?")){
+      handleDele(record) {
+        if (confirm("确认要删除此数据?")) {
           postAction()
         }
+      },
+      handleEditStatus(item, status) {
+        var params = qs.stringify({
+          id: item.id,
+          status: status
+        })
+        postAction('/ctop/projectTransferRecord/editStatus', params).then(res => {
+          if (res.success) {
+            this.$message.success(res.message)
+            this.loadData()
+          } else {
+            this.$message.success(res.message)
+          }
+        })
       }
     }
   }

+ 87 - 3
src/views/modules/advertiser/UserAllocationList.vue

@@ -71,13 +71,16 @@
         </span>
         <span slot="mediaId" slot-scope="text">{{ text == 1 ? '头条' : '快手' }}</span>
         <span slot="action" slot-scope="text, record">
+          <a @click="account(record)">转移项目</a>
+
+          <a-divider type="vertical" />
           <a @click="project(record)">转让账户</a>
 
           <a-divider type="vertical" />
           <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-divider type="vertical" v-show="roleCode == 'admin'" />
+          <a-popconfirm title="确定删除吗?" @confirm="() => handleDelete(record.id)" v-show="roleCode == 'admin'">
             <a>删除</a>
           </a-popconfirm>
         </span>
@@ -129,6 +132,46 @@
         -->
       </a-form>
     </a-modal>
+    <a-modal title="项目转移" v-model="visibleAccount" @ok="handleOkAccount" :confirmLoading="accountLoading" :width="800">
+      <a-form :form="formAccount">
+        <a-form-item label="原项目" :labelCol="{ xs: { span: 24 }, sm: { span: 5 } }"
+          :wrapperCol="{ xs: { span: 24 }, sm: { span: 16 } }">
+          <a-select v-decorator="[
+              'projectId', // 给表单赋值或拉取表单时,该input对应的key
+              { rules: [{ required: true, message: '请选择项目!' }] }
+            ]" showSearch optionFilterProp="children" :filterOption="filterOption" disabled>
+            <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"?'头条内广':'快手内广'
+              }}&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;{{ item.advertiserName }}
+            </a-select-option>
+          </a-select>
+        </a-form-item>
+        <a-form-item label="转移项目" :labelCol="{ xs: { span: 24 }, sm: { span: 5 } }"
+          :wrapperCol="{ xs: { span: 24 }, sm: { span: 16 } }">
+          <a-select v-decorator="[
+              'projectNewId', // 给表单赋值或拉取表单时,该input对应的key
+              { rules: [{ required: true, message: '请选择项目!' }] }
+            ]" showSearch optionFilterProp="children" :filterOption="filterOption">
+            <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"?'头条内广':'快手内广'
+              }}&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;{{ item.advertiserName }}
+            </a-select-option>
+          </a-select>
+        </a-form-item>
+        <!-- 
+        <a-form-item
+          label="账号:"
+          :label-col="{ xs: { span: 24 }, sm: { span: 5 } }"
+          :wrapper-col="{ xs: { span: 24 }, sm: { span: 16 } }"
+          v-show="mode == 'login'"
+        >
+          <a-input v-model="accountName" placeholder="请输入账户名" />
+        </a-form-item>
+        -->
+      </a-form>
+    </a-modal>
   </a-card>
 </template>
 
@@ -151,6 +194,7 @@
   import {
     postAction
   } from '../../../api/manage'
+  import qs from 'qs'
   export default {
     name: 'UserAllocationList',
     mixins: [JeecgListMixin],
@@ -162,6 +206,7 @@
       return {
         description: '账号绑定管理页面',
         visibleAdd: false,
+        visibleAccount: false,
         options: [],
         optionsAll: [],
         dataElse: [],
@@ -246,11 +291,14 @@
           importExcelUrl: 'ctop/userAllocation/importExcel'
         },
         confirmLoading: false,
+        accountLoading: false,
         projectId: '',
         accountId: '',
         mediaId: '',
         form: this.$form.createForm(this),
-        roleCode:localStorage.getItem('roleCode')
+        formAccount: this.$form.createForm(this),
+        roleCode: localStorage.getItem('roleCode'),
+        dataElse: []
       }
     },
     computed: {
@@ -265,6 +313,7 @@
           this.optionsAll = res.result
         }
       })
+
     },
     methods: {
       moment,
@@ -313,6 +362,41 @@
         }, 0)
         this.getALLperson()
       },
+      account(item) {
+        this.visibleAccount = true
+        this.accountId = item.accountId
+        this.projectId = item.projectId
+
+        setTimeout(() => {
+          this.formAccount.setFieldsValue({
+            projectId: item.projectId
+          })
+        }, 0)
+      },
+      handleOkAccount(e) {
+        this.accountLoading = true
+
+        this.formAccount.validateFieldsAndScroll((err, values) => {
+          if (err) {
+            // 这里做逻辑处理
+          } else {
+            var params = qs.stringify({
+              projectId: values.projectNewId,
+              accountId: this.accountId
+            })
+            postAction('/ctop/projectTransferRecord/add', params).then(res => {
+              if (res.success) {
+                this.accountLoading = false
+                this.visibleAccount = false
+                this.formAccount.resetFields()
+                this.loadData()
+              } else {
+                this.$message.error(res.message)
+              }
+            })
+          }
+        })
+      },
       handleOkAdd(e) {
         this.confirmLoading = true
 

+ 22 - 32
src/views/modules/advertiser/modules/ProjectModal.vue

@@ -22,7 +22,7 @@
           <a-input placeholder="请输入项目名称" v-decorator="['projectName', validatorRules.projectName]" />
         </a-form-item>
          <a-form-item :labelCol="labelCol" :wrapperCol="wrapperCol" label="行业">
-          <j-tree-select ref="treeSelect" placeholder="请选择行业" v-decorator="['industryId', validatorRules.pid]"
+          <j-tree-select ref="treeSelect" placeholder="请选择行业" v-decorator="['industryId']"
             dict="sys_category,name,id" pidField="pid" pidValue="f5cb2d2d28417b3b65a6dd744bcb9a76">
           </j-tree-select>
         </a-form-item>
@@ -53,40 +53,19 @@
             }}</a-select-option>
           </a-select>
         </a-form-item>
-        <!-- <a-form-item :labelCol="labelCol" :wrapperCol="wrapperCol" label="客户类型">
-          <a-select
-            v-decorator="['advertiserType', validatorRules.advertiserId]"
-          >
-            <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>
-        </a-form-item>
-        <a-form-item :labelCol="labelCol" :wrapperCol="wrapperCol" label="销售" v-if="getFormFieldValue('advertiserType')==1||getFormFieldValue('advertiserType')==2">
-          <a-select
-            showSearch
-            optionFilterProp="children"
-            style="width: 100%"
-            @focus="handleFocus"
-            @blur="handleBlur"
-            @change="handleChange"
-            :filterOption="filterOption"
-            v-decorator="['saleId', { rules: [{ required: true, message: '请选择销售' }] }]"
-          >
-            <a-select-option
-              v-for="appModel in options"
-              :key="appModel.userId + new Date().getTime()"
-              :value="appModel.userId"
-              >{{ appModel.realName }}&#12288;&#12288;{{ appModel.roleName }}</a-select-option
-            >
-          </a-select>
-        </a-form-item> -->
         <a-form-item :labelCol="labelCol" :wrapperCol="wrapperCol" label="最高出价">
           <a-input placeholder="请输入最高出价" v-decorator="['maxBid', validatorRules.maxBid]" addonAfter="元" />
         </a-form-item>
         <a-form-item :labelCol="labelCol" :wrapperCol="wrapperCol" label="最高转化出价">
           <a-input placeholder="最高转化出价" v-decorator="['maxDeepCpaBid']" addonAfter="元" />
         </a-form-item>
+        <a-form-item :labelCol="labelCol" :wrapperCol="wrapperCol" label="销售">
+          <a-select showSearch optionFilterProp="children" style="width: 100%" :filterOption="filterOption"
+            v-decorator="['saleId', { rules: [{  required: true,message: '请选择销售' }] }]">
+            <a-select-option v-for="appModel in optionsElse" :key="appModel.userId + new Date().getTime()"
+              :value="appModel.userId">{{ appModel.realName }}&#12288;&#12288;{{ appModel.roleName }}</a-select-option>
+          </a-select>
+        </a-form-item>
         <a-form-item :labelCol="labelCol" :wrapperCol="wrapperCol" label="运营负责人">
           <a-select
             showSearch
@@ -178,6 +157,7 @@ export default {
       resId: '',
       shejiId: '',
       options: [],
+      optionsElse:[],
       supplierList:[]
     }
   },
@@ -249,6 +229,9 @@ export default {
       if (params.advertiserId) {
         params.advertiserId = { key: params.advertiserId, label: params.advertiserName }
       }
+    //   if (params.industryId) {
+    //     params.industryId = { key: params.industryId, label: params.industryId_dictText }
+    //   }
       console.log(record)
       this.form.resetFields()
       this.model = Object.assign({}, params)
@@ -269,10 +252,10 @@ export default {
             'userId',
             'designResponsibleId',
             'responsibleId',
-            'industryId',
-            'supplierCode'
+            'industryCode',
+            'supplierCode',
             // 'advertiserType',
-            // 'saleId'
+            'saleId'
           )
         )
         // this.resId = record.responsibleId
@@ -283,6 +266,12 @@ export default {
             this.options = res.result
           }
         })
+         getAction('/sys/user/getAllSaleList', '').then(res => {
+          console.log(res)
+          if (res.success) {
+            this.optionsElse = res.result
+          }
+        })
         //时间格式化
       })
     },
@@ -307,6 +296,7 @@ export default {
           }
           var data = values.advertiserId
           let formData = Object.assign(this.model, values)
+        //   if(this.model.mediaId)
           formData.maxBid = formData.maxBid * 1000
           formData.maxDeepCpaBid = formData.maxDeepCpaBid*1000
           //时间格式化

+ 48 - 1
src/views/modules/kuaishouapp/account/stepForm/Step3.vue

@@ -131,6 +131,9 @@
               <a-radio-button value="2">横版视频</a-radio-button>
             </a-radio-group>
           </a-form-item>
+          <!-- <a-form-item label="素材同步" :labelCol="labelCol" :wrapperCol="wrapperCol">
+           
+          </a-form-item> -->
           <a-form-item label="创意内容" :labelCol="labelCol">
             <a-layout>
               <a-layout-content style="padding:10px;">
@@ -142,9 +145,11 @@
                         @click="deleteCreative(bestIndex, index)" />
                       <div style="clear:both"></div>
                       <div class="dynamically_add_form_item">
+
                         <a-form-item label="">
                           <a @click="getVideoList('video', index, item, bestIndex)">选择视频</a>
                           <a @click="uploadVideo(index,bestIndex)" style="margin-left:10px">上传视频</a>
+
                           <br />
                           <video :src="item.videoList.url" controls="controls" style="width:25%"
                             v-if="item.videoList"></video>
@@ -367,7 +372,15 @@
               </li>
             </a-checkbox-group>
           </ul>
+          <div v-else style="width:100%;height:400px;display:flex;justify-content: center;align-items: center;">
+            <img
+              src="https://timgsa.baidu.com/timg?image&quality=80&size=b9999_10000&sec=1575627350102&di=02972956f2243933bffc0d85099adbfe&imgtype=jpg&src=http%3A%2F%2Fimg0.imgtn.bdimg.com%2Fit%2Fu%3D1095310825%2C1528244349%26fm%3D214%26gp%3D0.jpg"
+              alt="" v-if="!loadingVideoList" />
+            <img v-else src="@/views/modules/material/loading.gif" />
+          </div>
         </a-tab-pane>
+        <a-button slot="tabBarExtraContent" type="primary" @click="tongbu()" :loading="tongbuLoading">
+          刷新素材</a-button>
       </a-tabs>
 
       <!-- <ul class="actor-photo-list">
@@ -512,6 +525,7 @@
     },
     data() {
       return {
+        tongbuLoading: false,
         showTrackUrlNameElse: true,
         clickTrackUrlShow: false,
         clickTrackUrlList: false,
@@ -568,6 +582,7 @@
         pansKey: '',
         addImageVisible: false,
         addVideoVisible: false,
+        loadingVideoList: false,
         loadingVideo: false,
         loadingImage: false,
         allForm: {
@@ -972,10 +987,14 @@
       },
       showVideoList(url, params) {
         this.dataSource = []
+        this.loadingVideoList = true
         getAction(url, params).then(res => {
           if (res.success) {
             this.dataSource = res.result.records
             this.ipagination.total = res.result.total
+            this.loadingVideoList = false
+          } else {
+            this.loadingVideoList = false
           }
         })
       },
@@ -1160,6 +1179,32 @@
         bestIndex = bestIndex
         this.addVideoVisible = true
       },
+      tongbu() {
+        this.tongbuLoading = true
+        getAction('/kuaishou/batch/syncVideo', {
+          accountId: localStorage.getItem('accountId'),
+        }).then(res => {
+          if (res.success) {
+            this.$message.success(res.message)
+            this.tongbuLoading = false
+            var params = {}
+            params.accountId = localStorage.getItem('accountId')
+            params.materialType = this.getData('creativeMaterialType')
+            params.pageSize = this.ipagination.pageSize
+            params.pageNo = 1
+            params.status = 0
+            params.channelType = this.channelType
+            if (this.time.length > 0) {
+              params.startDate = moment(this.time[0]).format('YYYY-MM-DD')
+              params.endDate = moment(this.time[1]).format('YYYY-MM-DD')
+            }
+            this.showVideoList('/kuaishou/batch/getVideoList', params)
+          } else {
+            this.$message.error(res.message)
+            this.tongbuLoading = false
+          }
+        })
+      },
       handleOkChouzhen(e) {
 
         var arr = []
@@ -1643,8 +1688,10 @@
           })
 
           this.pansKey = this.pans[0].key
+          setTimeout(() => {
+            this.addCreative(0)
+          }, 0)
 
-          this.addCreative(0)
           getAction('/kuaishou/batch/checkCreativeCount', {
             unitId: this.pansKey,
             accountId: localStorage.getItem('accountId')

+ 959 - 0
src/views/modules/material/supplierMaterial.vue

@@ -0,0 +1,959 @@
+<style lang="scss">
+  .downLoad .ant-form-item-control-wrapper {
+    width: 70%;
+  }
+
+  #material-card .ant-tabs-tab {
+    border: 1px solid gainsboro !important;
+  }
+
+  #material-card .ant-tabs-top-bar {
+    position: relative;
+    z-index: 100;
+  }
+
+  #material-card .ant-badge-count {
+    top: 0px;
+  }
+
+  .detail .ant-form-item {
+    margin-bottom: 10px !important;
+  }
+
+  .ant-carousel>>>.slick-slide {
+    text-align: center;
+    //   height: 160px;
+    //   line-height: 160px;
+    background: #364d79;
+    overflow: hidden;
+  }
+
+  .ad_cover_container .ant-card-body {
+    padding: 0;
+  }
+
+  .ant-carousel>>>.slick-slide h3 {
+    color: #fff;
+  }
+
+  .ant-carousel>>>.custom-slick-arrow {
+    width: 25px;
+    height: 25px;
+    font-size: 25px;
+    color: #fff;
+    background-color: rgba(31, 45, 61, 0.11);
+    opacity: 0.3;
+  }
+
+  .ant-carousel>>>.custom-slick-arrow:before {
+    display: none;
+  }
+
+  .ant-carousel>>>.custom-slick-arrow:hover {
+    opacity: 0.5;
+  }
+
+  .cover_carousel_con .slick-dots {
+    bottom: 55px;
+  }
+
+  .add-image-material .draggable-list {
+    display: block !important;
+  }
+
+  li.chouzhen.first:before {
+    font-size: 12px;
+    content: "首帧";
+    position: absolute;
+    top: 7px;
+    left: 5px;
+    width: 36px;
+    height: 20px;
+    color: rgb(255, 255, 255);
+    line-height: 20px;
+    text-align: center;
+    background: rgba(0, 0, 0, 0.5);
+    border-radius: 2px;
+  }
+</style>
+<style lang="scss" scoped>
+  .chouzhen {
+    border-style: solid;
+    border-width: 1px;
+    border-color: #e4e4e4;
+    width: calc(20% - 10px);
+    padding: 10px;
+    margin-right: 10px;
+    margin-bottom: 10px;
+    display: flex;
+    align-items: center;
+    background: #fff;
+    position: relative;
+    z-index: 99;
+    float: left
+  }
+
+  .content {
+    display: flex !important;
+    flex-direction: column;
+    justify-content: center;
+    align-items: center;
+
+    .slick-dots {
+      bottom: 55px;
+    }
+  }
+
+  .video-content {
+    width: 50%;
+    padding: 10px;
+    box-sizing: border-box;
+    display: flex;
+    flex-direction: column;
+    justify-content: center;
+    border-right: 1px solid #f2f2f2;
+  }
+
+  .tag-video {
+    position: absolute;
+    right: 0px;
+    top: 8px;
+    padding: 4px;
+    border-radius: 2px;
+    line-height: 16px;
+    font-size: 12px;
+    color: #fff;
+    background-color: rgba(0, 0, 0, 0.3);
+  }
+
+  .home-item {
+    overflow: hidden;
+  }
+
+
+
+  @media only screen and (min-width: 1200px) {
+    .home-item {
+      border-style: solid;
+      border-width: 1px;
+      border-color: #e4e4e4;
+      width: calc(50% - 10px);
+      padding: 10px;
+      margin-right: 10px;
+      margin-bottom: 10px;
+      display: flex;
+      align-items: center;
+      background: #fff;
+      position: relative;
+      z-index: 99;
+    }
+  }
+
+  /*>=1024的设备*/
+
+  // @media (min-width: 1100px) {
+  //     .checkbox_item_container {
+  //         width:70%
+  //     }
+  // } /*>=1100的设备*/
+  @media only screen and (min-width: 1250px) {
+    .home-item {
+      border-style: solid;
+      border-width: 1px;
+      border-color: #e4e4e4;
+      width: calc(25% - 10px);
+      padding: 10px;
+      margin-right: 10px;
+      margin-bottom: 10px;
+      display: flex;
+      align-items: center;
+      background: #fff;
+      position: relative;
+      z-index: 99;
+    }
+  }
+
+  /*>=1280的设备*/
+
+  // @media (min-width: 1366px) {
+  // }
+
+  // @media (min-width: 1440px) {
+  // }
+
+  // @media (min-width: 1680px) {
+
+  // }
+  // @media (min-width: 1920px) {
+  //   .home-item {
+  //     border-style: solid;
+  //     border-width: 1px;
+  //     border-color: #e4e4e4;
+  //     width: calc(25% - 10px);
+  //     padding: 10px;
+  //     margin-right: 10px;
+  //     margin-bottom: 10px;
+  //     display: flex;
+  //     align-items: center;
+  //     background: #fff;
+  //     position: relative;
+  //     z-index: 99;
+  //     cursor: pointer;
+  //   }
+  // }
+
+  .actor-photo-list {
+    display: flex;
+    padding-left: 0;
+
+    li {
+      width: 25%;
+      margin: 10px;
+      position: relative;
+      height: 250px;
+      border: 1px solid #f2f2f2;
+
+      img,
+      video {
+        width: 100%;
+        margin-top: auto;
+        margin-bottom: auto;
+        top: 0;
+        bottom: 0;
+        position: absolute;
+        max-height: 250px;
+      }
+    }
+  }
+
+  .home-card {
+    width: 100%;
+    overflow: hidden;
+    padding: 10px 0px;
+    display: flex;
+    flex-wrap: wrap;
+    margin-right: -10px;
+
+    .home-right {
+      width: 100%;
+    }
+
+    .bg:after {
+      content: '';
+      width: 110%;
+      height: 110%;
+      position: absolute;
+      left: -5%;
+      top: -5%;
+      background: inherit;
+      filter: blur(10px);
+      z-index: 2;
+    }
+  }
+
+  .bh {
+    height: 60px;
+    line-height: 30px;
+    overflow: hidden;
+    text-overflow: ellipsis;
+    -webkit-line-clamp: 2;
+    display: -webkit-box;
+    -webkit-box-orient: vertical;
+  }
+
+  .bhShow {
+    height: 100px;
+    line-height: 25px;
+    text-align: center;
+  }
+
+  .bhShow span {
+    font-size: 14px;
+  }
+
+  .show-data {
+    width: 50%;
+    display: flex;
+    flex-direction: column;
+    align-items: flex-start;
+  }
+
+  a {
+    font-size: 14px;
+  }
+
+  .actor-photo-list {
+    display: flex;
+    padding-left: 0;
+
+    li {
+      width: 25%;
+      margin: 10px;
+      position: relative;
+      height: 250px;
+      border: 1px solid #f2f2f2;
+      list-style: none;
+
+      img,
+      video {
+        width: 100%;
+        margin-top: auto;
+        margin-bottom: auto;
+        top: 0;
+        bottom: 0;
+        position: absolute;
+        max-height: 250px;
+      }
+    }
+  }
+</style>
+<template>
+  <a-card :bordered="false">
+    <!-- 查询区域 -->
+    <div class="table-page-search-wrapper">
+      <a-form layout="inline">
+        <a-row :gutter="24">
+          <a-col :md="8" :sm="8">
+            <!-- <a-form-item label="项目名称"> -->
+            <selectTable :projectId.sync="queryParam.projectId"></selectTable>
+          </a-col>
+          <a-col :md="8" :sm="8">
+            <a-form-item label="素材名称">
+              <a-input placeholder="请输入素材名称" v-model="queryParam.materialName"></a-input>
+            </a-form-item>
+          </a-col>
+          <!--  -->
+          <a-col :md="8" :sm="8">
+            <a-form-item label="时间选择">
+              <a-date-picker v-model="queryParam.createTime" format="YYYY-MM-DD" style="width:100%" />
+              <!-- <a-input placeholder="请输入查询时间" v-model="queryParam.createTime"></a-input> -->
+            </a-form-item>
+          </a-col>
+          <a-col :md="8" :sm="8">
+            <a-form-item label="供应商选择">
+              <a-select v-model="queryParam.supplierCode">
+                <a-select-option value="kuaishou_001">汇创</a-select-option>
+                <a-select-option value="kuaishou_002">鸣闻</a-select-option>
+                <a-select-option value="kuaishou_003">优效</a-select-option>
+              </a-select>
+              <!-- <a-input placeholder="请输入查询时间" v-model="queryParam.createTime"></a-input> -->
+            </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>
+            </span>
+          </a-col>
+        </a-row>
+      </a-form>
+    </div>
+
+    <!-- table区域-begin -->
+    <!-- <div> -->
+
+    <!-- 操作按钮区域 -->
+
+
+    <a-tabs @change="callbackTwo" v-model="active" type="card" id="material-card">
+      <a-tab-pane :tab="item.tab" v-for="item of examinelList" :key="item.value">
+        <div v-if="dataSource.length > 0">
+          <a-checkbox-group @change="onChangeCheck" v-model="checkArr" class="home-card">
+            <div class="home-item" v-for="(items, index) in dataSource" :key="index" @click="showDetail(items)">
+              <span v-if="items.excellent == 0"></span>
+              <span v-else
+                style="position:absolute;top:30px;right:-105px;display:block;width:300px;height:30px;text-align:center;line-height;30px;background:red;transform:rotate(45deg);z-index:1000">优秀素材</span>
+              <div class="home-right">
+                <a-badge :count="checkArr.indexOf(items.id) > -1 ? checkArr.indexOf(items.id) + 1 : 0"
+                  :numberStyle="{ backgroundColor: '#52c41a' }" style="width:100%;display:flex" @click.stop>
+                  <span
+                    style="color: #999; fontSize: 14px;padding-bottom:10px;display:inline-block;width:100%;white-space: nowrap;overflow: hidden;text-overflow: ellipsis;"
+                    :title="items.projectName">
+                    {{ items.projectName }}
+                  </span>
+                  <span
+                    style="color: #999; fontSize: 14px;padding-bottom:10px;display:inline-block;width:100%;white-space: nowrap;overflow: hidden;text-overflow: ellipsis;"
+                    :title="items.materialName">
+                    {{items.materialName}}
+                  </span>
+                </a-badge>
+                <div style="display:flex;justify-content:center;width:100%;height:200px;position:relative;">
+
+
+
+                  <img :src="items.coverUrl" alt="" style="height:200px;max-width:100%;position:absolute;z-index:10;" />
+                </div>
+                <div style="width:100%;height:1px;border-bottom:1px solid #f2f2f2;margin-top:5px"></div>
+                <span
+                  style="color: black; fontSize: 16px;padding-top:10px;display:flex;width:100%;justify-content: space-between;"
+                  @click.stop>
+                  <span>{{ items.createTime | getDate }}</span>
+                  <span>{{items.supplierCode|supplierName}}</span>
+
+                </span>
+              </div>
+            </div>
+          </a-checkbox-group>
+          <a-pagination size="small" :showTotal="ipagination.showTotal" style="float:right" v-if="dataSource.length > 0"
+            showQuickJumper :pageSize.sync="ipagination.pageSize" :total="ipagination.total"
+            v-model="ipagination.current" @change="getDataSource" />
+        </div>
+        <div v-else style="width:100%;height:400px;display:flex;justify-content: center;align-items: center;">
+          <img
+            src="https://timgsa.baidu.com/timg?image&quality=80&size=b9999_10000&sec=1575627350102&di=02972956f2243933bffc0d85099adbfe&imgtype=jpg&src=http%3A%2F%2Fimg0.imgtn.bdimg.com%2Fit%2Fu%3D1095310825%2C1528244349%26fm%3D214%26gp%3D0.jpg"
+            alt="" v-if="!loading" />
+          <img v-else src="./loading.gif" />
+        </div>
+      </a-tab-pane>
+    </a-tabs>
+
+
+    <a-modal title="素材详情" v-model="visibleDetail" width="70%" :footer="null">
+      <div style="display:flex;height:700px">
+        <div class="video-content"
+          style="width:50%;padding:10px;box-sizing:border-box;display:flex;justify-content:center;border-right:1px solid #f2f2f2">
+          <video class="video" :src="showUrl" controls="controls" style="height:50%" controlsList="nodownload">
+            您的浏览器不支持 video 标签。
+          </video>
+          <div class="downLoad" style="height:50%;overflow:auto">
+            <ul class="actor-photo-list" :style="{ width: model.length>4?25 * model.length + '%':'100%' }"
+              v-if="model.length > 0">
+              <a-checkbox-group v-model="checkArrImage" style="width:100%;  display: flex;padding-left: 0;"
+                @change="onChangeCheckImage">
+                <li v-for="(item, index) of model" :key="index">
+                  <a-checkbox :value="item.id" style="position:absolute;z-index: 100"></a-checkbox><img class="video"
+                    :src="item.url" @click="coverPreviewShowModal(item, index)" />
+                  <span class="tag-video" :style="{
+                      backgroundColor:
+                        item.status == 0 ? 'rgba(0, 0, 0)' : item.status == 1 ? 'rgba(0, 180, 100)' : 'red'
+                    }">{{ item.status == 0 ? '未审核' : item.status == 1 ? '已批准' : '已驳回' }}</span>
+                </li>
+              </a-checkbox-group>
+            </ul>
+            <div v-else style="height:100%;display:flex;justify-content: center;align-items: center;">
+              <img
+                src="https://timgsa.baidu.com/timg?image&quality=80&size=b9999_10000&sec=1575627350102&di=02972956f2243933bffc0d85099adbfe&imgtype=jpg&src=http%3A%2F%2Fimg0.imgtn.bdimg.com%2Fit%2Fu%3D1095310825%2C1528244349%26fm%3D214%26gp%3D0.jpg"
+                alt="" />
+            </div>
+          </div>
+        </div>
+        <a-modal title="图片预览" v-model="coverPreviewVisible" :footer="null">
+          <a-carousel arrows class="cover_carousel_con">
+            <div v-for="(item, index) in modelNew" :key="index" class="content">
+              <img :src="item.url" :width="300" />
+            </div>
+            <a-icon type="left-circle" slot="prevArrow" slot-scope
+              style="left: 10px;zIndex: 9;font-size:30px;color:black" />
+            <a-icon type="right-circle" slot="nextArrow" slot-scope
+              style="right: 10px;zIndex: 9;font-size:30px;color:black" />
+          </a-carousel>
+        </a-modal>
+        <div style="flex:3;padding:10px;box-sizing:border-box;">
+          <a-form v-if="detail" class="detail ant-advanced-search-form" layout="inline">
+            <div v-if="detail.parameter" style="display:flex;">
+              <a-form-item label="视频时长" v-if="detail.parameter.second" style="flex:1">
+                {{ detail.parameter.second }}秒
+              </a-form-item>
+              <a-form-item label="尺寸" style="flex:1" v-if="detail.parameter.width">
+                {{ detail.parameter.width }}*{{ detail.parameter.height }}
+              </a-form-item>
+              <a-form-item label="大小" style="flex:1" v-if="detail.parameter.size">
+                {{ detail.parameter.size }}
+              </a-form-item>
+            </div>
+            <div v-if="detail.ascription" style="display:flex;">
+              <a-form-item label="策划" style="flex:1">
+                {{ detail.ascription.planName }}
+              </a-form-item>
+              <a-form-item label="拍摄" style="flex:1">
+                {{ detail.ascription.shotName }}
+              </a-form-item>
+              <a-form-item label="剪辑" v-if="detail.ascription.clipName" style="flex:1">
+                {{ detail.ascription.clipName }}
+              </a-form-item>
+            </div>
+            <div>
+              <a-form-item label="水印链接" v-if="watermarkUrl">
+                  <a-input v-model="watermarkUrl" type="text" style="width:200%" readonly />
+              </a-form-item>
+            </div>
+            <div>
+              <a-form-item label="标签" v-if="detail.tag">
+                <a-tag v-for="(item, index) of detail.tag" :key="index">{{ item }}</a-tag>
+              </a-form-item>
+            </div>
+            <div>
+              <a-form-item label="审核人" v-if="active == '2' && detail.auditorName">
+                {{ detail.auditorName }}
+              </a-form-item>
+            </div>
+            <div>
+              <a-form-item label="广告语" v-if="active == '1'">
+                {{ creativeCopywriter ? creativeCopywriter : '无广告语' }}
+              </a-form-item>
+            </div>
+            <div>
+              <a-form-item label="驳回原因" v-if="active == '2'">
+                {{ refuseReason ? refuseReason : '无原因' }}
+              </a-form-item>
+            </div>
+            <div>
+              <a-form-item label="截图" v-if="active == '2'">
+                <div v-if="refuseFile" style="width:100%">
+                  <img style="width:100px;height:auto;margin:5px" @click="showBoHui(item)" :src="item"
+                    v-for="(item,index) in refuseFile" :key="index" alt="">
+                </div>
+                <div v-else>无截图</div>
+              </a-form-item>
+            </div>
+          </a-form>
+        </div>
+      </div>
+    </a-modal>
+    <a-modal title="查看截图" v-model="bohuiShow" :width="300" :footer="null">
+      <img :src="bohui" alt="" style="width:100%">
+    </a-modal>
+
+   
+
+  </a-card>
+</template>
+
+<script>
+  import {
+    JeecgListMixin
+  } from '@/mixins/JeecgListMixin'
+  import JEllipsis from '@/components/jeecg/JEllipsis'
+  import UploadToAli from '@femessage/upload-to-ali'
+  import {
+    fileCheck,
+    fileInsertV2,
+    fileEdit,
+    fileCheckImage,
+    fileEditAll
+  } from '@/api/actor'
+  import {
+    getAction,
+    postAction,
+    postFile,
+    deleteAction,
+    putAction
+  } from '@/api/manage'
+  import qs from 'qs'
+  import {
+    mapGetters
+  } from 'vuex'
+  import moment from 'moment'
+
+  import selectTable from '@/views/modules/Statistics/components/selecTable.vue'
+
+  import BMF from 'browser-md5-file'
+  import uploadFile from '@/components/uploadFile.vue'
+  import {
+    stopOtherVideo,
+    closeAllVideoFun
+  } from '@/utils/videoControl'
+  import accountCheck from './accountCheck'
+  export default {
+    name: 'YardList',
+    mixins: [JeecgListMixin],
+    components: {
+      JEllipsis,
+      UploadToAli,
+      accountCheck,
+      selectTable,
+      uploadFile
+    },
+
+    data() {
+      return {
+        coverPreviewVisible: false,
+        chouzhen: false,
+        chouzhenList: [],
+        model: [],
+        modelNew: [],
+        goodsColumns: [{
+            title: '封面预览',
+            //   dataIndex: 'coverUrl',
+            //   key: 'coverUrl',
+            dataIndex: 'url',
+            align: 'center',
+            scopedSlots: {
+              customRender: 'url'
+            }
+          },
+          {
+            title: '审核',
+            align: 'center',
+            dataIndex: 'action',
+            width: 100,
+            scopedSlots: {
+              customRender: 'action'
+            }
+          }
+        ],
+
+        addImageVisible: false,
+        addImageData: null,
+        projectId: '',
+        inputVisible: false,
+        inputValue: '',
+        labelCol: {
+          xs: {
+            span: 24
+          },
+          sm: {
+            span: 5
+          }
+        },
+        wrapperCol: {
+          xs: {
+            span: 24
+          },
+          sm: {
+            span: 12
+          }
+        },
+        queryParam: {},
+        dataElse: [],
+        ascription: {
+          clipId: [], //剪辑人id
+          shotId: [], //拍摄人id
+          planId: [], //策划id
+          planeId: [] //平面id
+        },
+        show: true,
+        visible: false,
+        visibleDetail: false,
+        personVisible: false,
+        confirmLoading: false,
+        loading: false,
+        loadingImage: false,
+        loadingPerson: false,
+        activeKey: 'video',
+        active: '0',
+        examinelList: [{
+            value: '0',
+            tab: '未审核'
+          },
+          {
+            value: '1',
+            tab: '已批准'
+          },
+          {
+            value: '2',
+            tab: '已驳回'
+          }
+        ],
+        // 表头
+        columns: [],
+        urlList: {
+          url: '',
+          md5: '',
+          name: ''
+        },
+        urlListImage: {
+          url: [],
+          md5: [],
+          name: [],
+          size: []
+        },
+        watermarkUrl: "",
+        url: {
+          list: '/ctop/materialInfo/supplierList'
+        },
+        detail: false,
+        form: this.$form.createForm(this),
+        formPerson: this.$form.createForm(this),
+        tags: [],
+        refuseFile: [],
+        refuseReason: '',
+        refuseReasonImage: '',
+        creativeCopywriter: '',
+        customDomain: '',
+        region: 'oss-cn-beijing',
+        bucket: 'ctop-media',
+        acceptVideo: 'video/mpeg,video/mp4',
+        acceptImage: 'image/jpeg,image/jpg,image/png',
+        accessKeyId: 'LTAIbNbqWzSOklQV',
+        accessKeySecret: '1rkPz7JNoXk8sJevPaeYHWqfkQXBGh',
+        checkArr: [],
+        checkAll: false,
+        checkArrImage: [],
+        checkAllImage: false,
+        showUrl: '',
+        showUrlWater: '',
+        materialName: '',
+        materialDescribe: '',
+        name: '',
+        detail: null,
+        add: true,
+        id: '',
+        role: {
+          roleCode: '',
+          roleName: ''
+        },
+        key: '0',
+        mediaId: null,
+        sizeType: [],
+        size: null,
+        repeat: false,
+        excellent: 0,
+        code: '',
+        material: [],
+        imageArrList: [],
+        showDataBool: false,
+        kuaishouData: null,
+        douyinData: null,
+        bohui: "",
+        bohuiShow: false
+      }
+    },
+    filters: {
+      getDate(value) {
+        let date = new Date(value)
+        let y = date.getFullYear()
+        let MM = date.getMonth() + 1
+        MM = MM < 10 ? '0' + MM : MM
+        let d = date.getDate()
+        d = d < 10 ? '0' + d : d
+        return y + '-' + MM + '-' + d
+      },
+      supplierName(value) {
+        var data = {
+          'kuaishou_001': "汇创",
+          "kuaishou_002": "鸣闻",
+          "kuaishou_003": "优效"
+        }
+        return data[value]
+      }
+    },
+    computed: {
+      dirImg() {
+        let date = new Date()
+        let y = date.getFullYear()
+        let MM = date.getMonth() + 1
+        MM = MM < 10 ? '0' + MM : MM
+        let d = date.getDate()
+        d = d < 10 ? '0' + d : d
+
+        return 'image/' + y + '-' + MM + '-' + d + '/'
+      },
+      dirVideo() {
+        let date = new Date()
+        let y = date.getFullYear()
+        let MM = date.getMonth() + 1
+        MM = MM < 10 ? '0' + MM : MM
+        let d = date.getDate()
+        d = d < 10 ? '0' + d : d
+
+        return 'video/' + y + '-' + MM + '-' + d + '/'
+      }
+    },
+    created() {
+      this.queryParam.type = 'VIDEO'
+      this.queryParam.userId = this.userInfo().id
+      this.queryParam.status = localStorage.getItem('key') ? localStorage.getItem('key') : '0'
+      this.active = localStorage.getItem('key') ? localStorage.getItem('key') : '0'
+      // this.queryParam.status = key
+      this.ipagination.pageSize = 8
+      this.getParticipateList()
+      // /sys/user/getRoleInfo
+      getAction('/sys/user/getRoleInfo', {
+        userId: this.userInfo().id
+      }).then(res => {
+        this.role = res
+      })
+      getAction('/ctop/videoWatermarkTemplate/list').then(res => {
+        if (res.success) {
+          this.sizeType = res.result.records
+        }
+      })
+    },
+    updated() {
+      stopOtherVideo()
+    },
+    watch: {
+      $route: function (n, o) {
+        if (n.path == '/modules/material/videoMaterial') {
+          this.queryParam.userId = this.userInfo().id
+          this.queryParam.status = localStorage.getItem('key') ? localStorage.getItem('key') : '0'
+          this.active = localStorage.getItem('key') ? localStorage.getItem('key') : '0'
+          this.loadData()
+        }
+      },
+      'queryParam.projectId': function (n, o) {
+        if (n != '') {
+          this.getList(n)
+        }
+      },
+      visibleDetail: function (n, o) {
+        if (!n) {
+          this.refuseFile = []
+          this.refuseReason = ''
+        }
+      }
+    },
+    methods: {
+      showBoHui(item) {
+        this.bohui = item
+        this.bohuiShow = true
+      },
+      getData(className) {
+        return this.form.getFieldValue(className)
+      },
+      filterOption(input, option) {
+        return option.componentOptions.children[0].text.toLowerCase().indexOf(input.toLowerCase()) >= 0
+      },
+      moment,
+
+
+      ...mapGetters(['nickname', 'avatar', 'userInfo']),
+      searchRe() {
+        this.queryParam = {
+          type: 'VIDEO',
+          userId: this.userInfo().id,
+          status: this.active
+        }
+        this.loadData(1)
+      },
+      getList(value) {
+        if (value) {
+          this.mediaId = this.dataElse.filter(item => {
+            if (value == item.projectId) {
+              return item
+            }
+          })[0].mediaId
+        }
+        this.loadData()
+      },
+      onChangeCheckImage(checkedList) {
+        if (checkedList.length == 0) {
+          this.checkAllImage = false
+        }
+      },
+      onChangeCheck(checkedList) {
+        if (checkedList.length == 0) {
+          this.checkAll = false
+        }
+      },
+
+      showDetail(item) {
+        this.visibleDetail = true
+        this.showUrl = item.url
+        this.id = item.id
+        this.code = item.code
+        this.excellent = item.excellent
+        if (this.active == '2') {
+          this.refuseReason = item.refuseReason
+          this.refuseFile = item.refuseFile ? JSON.parse(item.refuseFile) : null
+        } else if (this.active == '1') {
+          this.creativeCopywriter = item.creativeCopywriter
+          this.refuseReason = ''
+          this.refuseFile = []
+        } else {
+          this.refuseReason = ''
+          this.refuseFile = []
+        }
+        getAction('/ctop/materialInfo/getDetail', {
+          materialId: item.id
+        }).then(res => {
+          this.detail = res
+          this.size =
+            res.parameter.width == '1080' ? 3 : res.parameter.width == '1920' ? 1 : res.parameter.width == '1280' ?
+            2 : 4
+        })
+        getAction('/ctop/supplierWatermark/list', {
+          videoSignature: item.code
+        }).then(res => {
+
+          if (res.success) {
+            this.watermarkUrl = res.result.records[0].watermarkUrl
+          }
+        })
+
+        getAction('/ctop/materialInfo/queryById', {
+          id: item.id
+        }).then(res => {
+          if (res.success) {
+            this.showUrlWater = res.result.watermarkUrl
+            this.name = res.result.watermarkCode
+            this.materialName = res.result.materialName
+          } else {
+            this.showUrlWater = null
+            this.name = null
+          }
+        })
+        getAction('/ctop/MaterialImageInfo/list', {
+          videoId: item.code
+        }).then(res => {
+          console.log(res)
+          if (res.success) {
+            this.model = res.result.map((item, index) => {
+              return {
+                ...item,
+                key: index
+              }
+            })
+          }
+        })
+      },
+      coverPreviewShowModal(item, index) {
+        console.log(this.model)
+        this.modelNew = this.model.filter(items => {
+          return items.status == 0
+        })
+        if (this.modelNew.length > 0) {
+          this.coverPreviewVisible = true
+        }
+      },
+      callbackTwo(key) {
+        this.checkAll = false
+        this.checkArr = []
+
+        if (key == '3') {
+          this.url.list = "/ctop/materialInfo/effiMaterialInfo"
+          this.queryParam = {}
+        } else {
+          this.url.list = "/ctop/materialInfo/list"
+          this.queryParam = {
+            type: 'VIDEO',
+            userId: this.userInfo().id,
+            status: key,
+            projectId: this.queryParam.projectId
+          }
+          if (this.form.getFieldValue('projectId')) {
+            this.form.setFieldsValue({
+              projectId: ''
+            })
+          }
+        }
+        //   if (this.form.getFieldValue('projectId')) {
+        //     this.form.setFieldsValue({
+        //       projectId: ''
+        //     })
+        //   }
+        //   this.queryParam.status = key
+        this.loadData(1)
+      },
+      getParticipateList() {
+        getAction('/ctop/projectMember/participateList', {
+          userId: this.userInfo().id
+        }).then(res => {
+          if (res.code == 0) {
+            this.dataElse = res.result
+          }
+        })
+      },
+      getDataSource(page, pageSize) {
+        this.ipagination.current = page
+        this.checkArr = []
+        this.checkAll = false
+        this.loadData()
+      }
+    }
+  }
+</script>
+<style scoped>
+  @import '~@assets/less/common.less';
+</style>

+ 2 - 2
vue.config.js

@@ -56,8 +56,8 @@ module.exports = {
     port: 3000,
     proxy: {
       '/jeecg-boot': {
-        // target: 'http://192.168.1.90:8080', //请求本地 需要jeecg-boot后台项目  蒙蒙
-        target: 'http://192.168.1.72:8088', //请求本地 需要jeecg-boot后台项目  英豪
+        target: 'http://192.168.1.90:8080', //请求本地 需要jeecg-boot后台项目  蒙蒙
+        // target: 'http://192.168.1.72:8088', //请求本地 需要jeecg-boot后台项目  英豪
         // target: 'http://192.168.2.115:8080', //请求本地 需要jeecg-boot后台项目  祚云
         // target: 'http://192.168.1.94:8804', //请求本地 需要jeecg-boot后台项目  孙震
         // target: 'http://192.168.1.51:8088', //请求本地 需要jeecg-boot后台项目  毕洁泉