Browse Source

增加视频水印模板列表、视频合成任务列表、视频水印任务列表、视频片段列表

xuzuoyun 5 years ago
parent
commit
2b0c936966

+ 2 - 1
src/views/dashboard/Analysis.vue

@@ -1,6 +1,6 @@
 <template>
   <div class="page-header-index-wide">
-    <div v-if="roleCode == 'operator'">
+    <div v-if="roleCode == 'operator' || roleCode == 'touTiaoOperationManager'">
       <a-row :gutter="24">
         <a-col :sm="24" :md="12" :xl="6" :style="{ marginBottom: '24px' }">
           <chart-card :loading="loading" title="总销售额" total="¥126,560">
@@ -145,6 +145,7 @@
     </div>
 
     <statistics v-else-if="roleCode == 'kuaishouOperationManager'" />
+
     <statistics v-else-if="roleCode == 'admin'" />
     <Workbench v-else-if="roleCode == 'clip'" />
     <Workbench v-else-if="roleCode == 'plane'" />

+ 2 - 51
src/views/modules/agent/KuaishouReportDailyAgentList.vue

@@ -16,7 +16,6 @@
               <a-input placeholder="请输入账户ID" v-model="queryParam.accountId"></a-input>
             </a-form-item>
           </a-col>
-        <template v-if="toggleSearchStatus">
         <a-col :md="6" :sm="8">
             <a-form-item label="快手ID">
               <a-input placeholder="请输入快手ID" v-model="queryParam.kid"></a-input>
@@ -32,15 +31,10 @@
               <a-input placeholder="请输入广告主创建时间" v-model="queryParam.advertiserCreateTime"></a-input>
             </a-form-item>
           </a-col>
-          </template>
           <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>
-              <a @click="handleToggleSearch" style="margin-left: 8px">
-                {{ toggleSearchStatus ? '收起' : '展开' }}
-                <a-icon :type="toggleSearchStatus ? 'up' : 'down'"/>
-              </a>
             </span>
           </a-col>
 
@@ -55,20 +49,10 @@
       <a-upload name="file" :showUploadList="false" :multiple="false" :headers="tokenHeader" :action="importExcelUrl" @change="handleImportExcel">
         <a-button type="primary" icon="import">导入</a-button>
       </a-upload>
-      <a-dropdown v-if="selectedRowKeys.length > 0">
-        <a-menu slot="overlay">
-          <a-menu-item key="1" @click="batchDel"><a-icon type="delete"/>删除</a-menu-item>
-        </a-menu>
-        <a-button style="margin-left: 8px"> 批量操作 <a-icon type="down" /></a-button>
-      </a-dropdown>
     </div>
 
     <!-- table区域-begin -->
     <div>
-      <div class="ant-alert ant-alert-info" style="margin-bottom: 16px;">
-        <i class="anticon anticon-info-circle ant-alert-icon"></i> 已选择 <a style="font-weight: 600">{{ selectedRowKeys.length }}</a>项
-        <a style="margin-left: 24px" @click="onClearSelected">清空</a>
-      </div>
 
       <a-table
         ref="table"
@@ -79,25 +63,8 @@
         :dataSource="dataSource"
         :pagination="ipagination"
         :loading="loading"
-        :rowSelection="{selectedRowKeys: selectedRowKeys, onChange: onSelectChange}"
         @change="handleTableChange">
 
-        <span slot="action" slot-scope="text, record">
-          <a @click="handleEdit(record)">编辑</a>
-
-          <a-divider type="vertical" />
-          <a-dropdown>
-            <a class="ant-dropdown-link">更多 <a-icon type="down" /></a>
-            <a-menu slot="overlay">
-              <a-menu-item>
-                <a-popconfirm title="确定删除吗?" @confirm="() => handleDelete(record.id)">
-                  <a>删除</a>
-                </a-popconfirm>
-              </a-menu-item>
-            </a-menu>
-          </a-dropdown>
-        </span>
-
       </a-table>
     </div>
     <!-- table区域-end -->
@@ -122,16 +89,6 @@
         description: '代理商报表管理页面',
         // 表头
         columns: [
-          {
-            title: '#',
-            dataIndex: '',
-            key:'rowIndex',
-            width:60,
-            align:"center",
-            customRender:function (t,r,index) {
-              return parseInt(index)+1;
-            }
-           },
 		   {
             title: '日期',
             align:"center",
@@ -225,14 +182,8 @@
 		   {
             title: '转化点击率',
             align:"center",
-            dataIndex: 'convertLickRate'
-           },
-          {
-            title: '操作',
-            dataIndex: 'action',
-            align:"center",
-            scopedSlots: { customRender: 'action' },
-          }
+            dataIndex: 'convertClickRate'
+           }
         ],
 		url: {
           list: "/report/kuaishouReportDailyAgent/list",

+ 2 - 96
src/views/modules/agent/KuaishouReportDailyAgentSumList.vue

@@ -11,36 +11,11 @@
               <a-input placeholder="请输入日期" v-model="queryParam.date"></a-input>
             </a-form-item>
           </a-col>
-          <a-col :md="6" :sm="8">
-            <a-form-item label="账户ID">
-              <a-input placeholder="请输入账户ID" v-model="queryParam.accountId"></a-input>
-            </a-form-item>
-          </a-col>
-        <template v-if="toggleSearchStatus">
-        <a-col :md="6" :sm="8">
-            <a-form-item label="快手ID">
-              <a-input placeholder="请输入快手ID" v-model="queryParam.kid"></a-input>
-            </a-form-item>
-          </a-col>
-          <a-col :md="6" :sm="8">
-            <a-form-item label="广告主名称">
-              <a-input placeholder="请输入广告主名称" v-model="queryParam.advertiserName"></a-input>
-            </a-form-item>
-          </a-col>
-          <a-col :md="6" :sm="8">
-            <a-form-item label="广告主创建时间">
-              <a-input placeholder="请输入广告主创建时间" v-model="queryParam.advertiserCreateTime"></a-input>
-            </a-form-item>
-          </a-col>
-          </template>
+
           <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>
-              <a @click="handleToggleSearch" style="margin-left: 8px">
-                {{ toggleSearchStatus ? '收起' : '展开' }}
-                <a-icon :type="toggleSearchStatus ? 'up' : 'down'"/>
-              </a>
             </span>
           </a-col>
 
@@ -55,21 +30,10 @@
       <a-upload name="file" :showUploadList="false" :multiple="false" :headers="tokenHeader" :action="importExcelUrl" @change="handleImportExcel">
         <a-button type="primary" icon="import">导入</a-button>
       </a-upload>
-      <a-dropdown v-if="selectedRowKeys.length > 0">
-        <a-menu slot="overlay">
-          <a-menu-item key="1" @click="batchDel"><a-icon type="delete"/>删除</a-menu-item>
-        </a-menu>
-        <a-button style="margin-left: 8px"> 批量操作 <a-icon type="down" /></a-button>
-      </a-dropdown>
     </div>
 
     <!-- table区域-begin -->
     <div>
-      <div class="ant-alert ant-alert-info" style="margin-bottom: 16px;">
-        <i class="anticon anticon-info-circle ant-alert-icon"></i> 已选择 <a style="font-weight: 600">{{ selectedRowKeys.length }}</a>项
-        <a style="margin-left: 24px" @click="onClearSelected">清空</a>
-      </div>
-
       <a-table
         ref="table"
         size="middle"
@@ -79,25 +43,8 @@
         :dataSource="dataSource"
         :pagination="ipagination"
         :loading="loading"
-        :rowSelection="{selectedRowKeys: selectedRowKeys, onChange: onSelectChange}"
         @change="handleTableChange">
 
-        <span slot="action" slot-scope="text, record">
-          <a @click="handleEdit(record)">编辑</a>
-
-          <a-divider type="vertical" />
-          <a-dropdown>
-            <a class="ant-dropdown-link">更多 <a-icon type="down" /></a>
-            <a-menu slot="overlay">
-              <a-menu-item>
-                <a-popconfirm title="确定删除吗?" @confirm="() => handleDelete(record.id)">
-                  <a>删除</a>
-                </a-popconfirm>
-              </a-menu-item>
-            </a-menu>
-          </a-dropdown>
-        </span>
-
       </a-table>
     </div>
     <!-- table区域-end -->
@@ -122,52 +69,17 @@
         description: '代理商日汇总表管理页面',
         // 表头
         columns: [
-          {
-            title: '#',
-            dataIndex: '',
-            key:'rowIndex',
-            width:60,
-            align:"center",
-            customRender:function (t,r,index) {
-              return parseInt(index)+1;
-            }
-           },
 		   {
             title: '日期',
             align:"center",
             dataIndex: 'date'
            },
 		   {
-            title: '账户ID',
-            align:"center",
-            dataIndex: 'accountId'
-           },
-		   {
-            title: '快手ID',
-            align:"center",
-            dataIndex: 'kid'
-           },
-		   {
-            title: '广告主名称',
-            align:"center",
-            dataIndex: 'advertiserName'
-           },
-		   {
-            title: '广告主创建时间',
-            align:"center",
-            dataIndex: 'advertiserCreateTime'
-           },
-		   {
             title: '有消费计划数',
             align:"center",
             dataIndex: 'costCampaignCount'
            },
 		   {
-            title: '总余额',
-            align:"center",
-            dataIndex: 'balance'
-           },
-		   {
             title: '总消耗',
             align:"center",
             dataIndex: 'cost'
@@ -226,13 +138,7 @@
             title: '转化点击率',
             align:"center",
             dataIndex: 'convertClickRate'
-           },
-          {
-            title: '操作',
-            dataIndex: 'action',
-            align:"center",
-            scopedSlots: { customRender: 'action' },
-          }
+           }
         ],
 		url: {
           list: "/report/kuaishouReportDailyAgentSum/list",

+ 168 - 0
src/views/modules/material/VideoMergeTaskList.vue

@@ -0,0 +1,168 @@
+<template>
+  <a-card :bordered="false">
+
+    <!-- 查询区域 -->
+    <div class="table-page-search-wrapper">
+      <a-form layout="inline">
+        <a-row :gutter="24">
+
+          <a-col :md="6" :sm="8">
+            <a-form-item label="jobId">
+              <a-input placeholder="请输入jobId" v-model="queryParam.jobId"></a-input>
+            </a-form-item>
+          </a-col>
+          <a-col :md="6" :sm="8">
+            <a-form-item label="videoId">
+              <a-input placeholder="请输入videoId" v-model="queryParam.videoId"></a-input>
+            </a-form-item>
+          </a-col>
+        <template v-if="toggleSearchStatus">
+        <a-col :md="6" :sm="8">
+            <a-form-item label="status">
+              <a-input placeholder="请输入status" v-model="queryParam.status"></a-input>
+            </a-form-item>
+          </a-col>
+          </template>
+          <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>
+              <a @click="handleToggleSearch" style="margin-left: 8px">
+                {{ toggleSearchStatus ? '收起' : '展开' }}
+                <a-icon :type="toggleSearchStatus ? 'up' : 'down'"/>
+              </a>
+            </span>
+          </a-col>
+
+        </a-row>
+      </a-form>
+    </div>
+
+    <!-- 操作按钮区域 -->
+    <div class="table-operator">
+      <a-button @click="handleAdd" type="primary" icon="plus">新增</a-button>
+      <a-button type="primary" icon="download" @click="handleExportXls('视频合成任务')">导出</a-button>
+      <a-upload name="file" :showUploadList="false" :multiple="false" :headers="tokenHeader" :action="importExcelUrl" @change="handleImportExcel">
+        <a-button type="primary" icon="import">导入</a-button>
+      </a-upload>
+      <a-dropdown v-if="selectedRowKeys.length > 0">
+        <a-menu slot="overlay">
+          <a-menu-item key="1" @click="batchDel"><a-icon type="delete"/>删除</a-menu-item>
+        </a-menu>
+        <a-button style="margin-left: 8px"> 批量操作 <a-icon type="down" /></a-button>
+      </a-dropdown>
+    </div>
+
+    <!-- table区域-begin -->
+    <div>
+      <div class="ant-alert ant-alert-info" style="margin-bottom: 16px;">
+        <i class="anticon anticon-info-circle ant-alert-icon"></i> 已选择 <a style="font-weight: 600">{{ selectedRowKeys.length }}</a>项
+        <a style="margin-left: 24px" @click="onClearSelected">清空</a>
+      </div>
+
+      <a-table
+        ref="table"
+        size="middle"
+        bordered
+        rowKey="id"
+        :columns="columns"
+        :dataSource="dataSource"
+        :pagination="ipagination"
+        :loading="loading"
+        :rowSelection="{selectedRowKeys: selectedRowKeys, onChange: onSelectChange}"
+        @change="handleTableChange">
+
+        <span slot="action" slot-scope="text, record">
+          <a @click="handleEdit(record)">编辑</a>
+
+          <a-divider type="vertical" />
+          <a-dropdown>
+            <a class="ant-dropdown-link">更多 <a-icon type="down" /></a>
+            <a-menu slot="overlay">
+              <a-menu-item>
+                <a-popconfirm title="确定删除吗?" @confirm="() => handleDelete(record.id)">
+                  <a>删除</a>
+                </a-popconfirm>
+              </a-menu-item>
+            </a-menu>
+          </a-dropdown>
+        </span>
+
+      </a-table>
+    </div>
+    <!-- table区域-end -->
+
+    <!-- 表单区域 -->
+    <videoMergeTask-modal ref="modalForm" @ok="modalFormOk"></videoMergeTask-modal>
+  </a-card>
+</template>
+
+<script>
+  import VideoMergeTaskModal from './modules/VideoMergeTaskModal'
+  import { JeecgListMixin } from '@/mixins/JeecgListMixin'
+
+  export default {
+    name: "VideoMergeTaskList",
+    mixins:[JeecgListMixin],
+    components: {
+      VideoMergeTaskModal
+    },
+    data () {
+      return {
+        description: '视频合成任务管理页面',
+        // 表头
+        columns: [
+          {
+            title: '#',
+            dataIndex: '',
+            key:'rowIndex',
+            width:60,
+            align:"center",
+            customRender:function (t,r,index) {
+              return parseInt(index)+1;
+            }
+           },
+		   {
+            title: 'jobId',
+            align:"center",
+            dataIndex: 'jobId'
+           },
+		   {
+            title: 'videoId',
+            align:"center",
+            dataIndex: 'videoId'
+           },
+		   {
+            title: 'status',
+            align:"center",
+            dataIndex: 'status'
+           },
+          {
+            title: '操作',
+            dataIndex: 'action',
+            align:"center",
+            scopedSlots: { customRender: 'action' },
+          }
+        ],
+		url: {
+          list: "/ctop/videoMergeTask/list",
+          delete: "/ctop/videoMergeTask/delete",
+          deleteBatch: "/ctop/videoMergeTask/deleteBatch",
+          exportXlsUrl: "ctop/videoMergeTask/exportXls",
+          importExcelUrl: "ctop/videoMergeTask/importExcel",
+       },
+    }
+  },
+  computed: {
+    importExcelUrl: function(){
+      return `${window._CONFIG['domianURL']}/${this.url.importExcelUrl}`;
+    }
+  },
+    methods: {
+     
+    }
+  }
+</script>
+<style scoped>
+  @import '~@assets/less/common.less'
+</style>

+ 157 - 0
src/views/modules/material/VideoPartList.vue

@@ -0,0 +1,157 @@
+<template>
+  <a-card :bordered="false">
+
+    <!-- 查询区域 -->
+    <div class="table-page-search-wrapper">
+      <a-form layout="inline">
+        <a-row :gutter="24">
+
+          <a-col :md="6" :sm="8">
+            <a-form-item label="videoId">
+              <a-input placeholder="请输入videoId" v-model="queryParam.videoId"></a-input>
+            </a-form-item>
+          </a-col>
+          <a-col :md="6" :sm="8">
+            <a-form-item label="partId">
+              <a-input placeholder="请输入partId" v-model="queryParam.partId"></a-input>
+            </a-form-item>
+          </a-col>
+          </template>
+          <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>
+              <a @click="handleToggleSearch" style="margin-left: 8px">
+                {{ toggleSearchStatus ? '收起' : '展开' }}
+                <a-icon :type="toggleSearchStatus ? 'up' : 'down'"/>
+              </a>
+            </span>
+          </a-col>
+
+        </a-row>
+      </a-form>
+    </div>
+
+    <!-- 操作按钮区域 -->
+    <div class="table-operator">
+      <a-button @click="handleAdd" type="primary" icon="plus">新增</a-button>
+      <a-button type="primary" icon="download" @click="handleExportXls('视频片段')">导出</a-button>
+      <a-upload name="file" :showUploadList="false" :multiple="false" :headers="tokenHeader" :action="importExcelUrl" @change="handleImportExcel">
+        <a-button type="primary" icon="import">导入</a-button>
+      </a-upload>
+      <a-dropdown v-if="selectedRowKeys.length > 0">
+        <a-menu slot="overlay">
+          <a-menu-item key="1" @click="batchDel"><a-icon type="delete"/>删除</a-menu-item>
+        </a-menu>
+        <a-button style="margin-left: 8px"> 批量操作 <a-icon type="down" /></a-button>
+      </a-dropdown>
+    </div>
+
+    <!-- table区域-begin -->
+    <div>
+      <div class="ant-alert ant-alert-info" style="margin-bottom: 16px;">
+        <i class="anticon anticon-info-circle ant-alert-icon"></i> 已选择 <a style="font-weight: 600">{{ selectedRowKeys.length }}</a>项
+        <a style="margin-left: 24px" @click="onClearSelected">清空</a>
+      </div>
+
+      <a-table
+        ref="table"
+        size="middle"
+        bordered
+        rowKey="id"
+        :columns="columns"
+        :dataSource="dataSource"
+        :pagination="ipagination"
+        :loading="loading"
+        :rowSelection="{selectedRowKeys: selectedRowKeys, onChange: onSelectChange}"
+        @change="handleTableChange">
+
+        <span slot="action" slot-scope="text, record">
+          <a @click="handleEdit(record)">编辑</a>
+
+          <a-divider type="vertical" />
+          <a-dropdown>
+            <a class="ant-dropdown-link">更多 <a-icon type="down" /></a>
+            <a-menu slot="overlay">
+              <a-menu-item>
+                <a-popconfirm title="确定删除吗?" @confirm="() => handleDelete(record.id)">
+                  <a>删除</a>
+                </a-popconfirm>
+              </a-menu-item>
+            </a-menu>
+          </a-dropdown>
+        </span>
+
+      </a-table>
+    </div>
+    <!-- table区域-end -->
+
+    <!-- 表单区域 -->
+    <videoPart-modal ref="modalForm" @ok="modalFormOk"></videoPart-modal>
+  </a-card>
+</template>
+
+<script>
+  import VideoPartModal from './modules/VideoPartModal'
+  import { JeecgListMixin } from '@/mixins/JeecgListMixin'
+
+  export default {
+    name: "VideoPartList",
+    mixins:[JeecgListMixin],
+    components: {
+      VideoPartModal
+    },
+    data () {
+      return {
+        description: '视频片段管理页面',
+        // 表头
+        columns: [
+          {
+            title: '#',
+            dataIndex: '',
+            key:'rowIndex',
+            width:60,
+            align:"center",
+            customRender:function (t,r,index) {
+              return parseInt(index)+1;
+            }
+           },
+		   {
+            title: 'videoId',
+            align:"center",
+            dataIndex: 'videoId'
+           },
+		   {
+            title: 'partId',
+            align:"center",
+            dataIndex: 'partId'
+           },
+          {
+            title: '操作',
+            dataIndex: 'action',
+            align:"center",
+            scopedSlots: { customRender: 'action' },
+          }
+        ],
+		url: {
+          list: "/ctop/videoPart/list",
+          delete: "/ctop/videoPart/delete",
+          deleteBatch: "/ctop/videoPart/deleteBatch",
+          exportXlsUrl: "ctop/videoPart/exportXls",
+          importExcelUrl: "ctop/videoPart/importExcel",
+       },
+    }
+  },
+  computed: {
+    importExcelUrl: function(){
+      return `${window._CONFIG['domianURL']}/${this.url.importExcelUrl}`;
+    }
+  },
+    methods: {
+     
+    }
+  }
+</script>
+<style scoped>
+  @import '~@assets/less/common.less'
+</style>

+ 188 - 0
src/views/modules/material/VideoWatermarkTaskList.vue

@@ -0,0 +1,188 @@
+<template>
+  <a-card :bordered="false">
+
+    <!-- 查询区域 -->
+    <div class="table-page-search-wrapper">
+      <a-form layout="inline">
+        <a-row :gutter="24">
+
+          <a-col :md="6" :sm="8">
+            <a-form-item label="userId">
+              <a-input placeholder="请输入userId" v-model="queryParam.userId"></a-input>
+            </a-form-item>
+          </a-col>
+          <a-col :md="6" :sm="8">
+            <a-form-item label="jobId">
+              <a-input placeholder="请输入jobId" v-model="queryParam.jobId"></a-input>
+            </a-form-item>
+          </a-col>
+        <template v-if="toggleSearchStatus">
+        <a-col :md="6" :sm="8">
+            <a-form-item label="videoId">
+              <a-input placeholder="请输入videoId" v-model="queryParam.videoId"></a-input>
+            </a-form-item>
+          </a-col>
+          <a-col :md="6" :sm="8">
+            <a-form-item label="videoUrl">
+              <a-input placeholder="请输入videoUrl" v-model="queryParam.videoUrl"></a-input>
+            </a-form-item>
+          </a-col>
+          <a-col :md="6" :sm="8">
+            <a-form-item label="status">
+              <a-input placeholder="请输入status" v-model="queryParam.status"></a-input>
+            </a-form-item>
+          </a-col>
+          </template>
+          <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>
+              <a @click="handleToggleSearch" style="margin-left: 8px">
+                {{ toggleSearchStatus ? '收起' : '展开' }}
+                <a-icon :type="toggleSearchStatus ? 'up' : 'down'"/>
+              </a>
+            </span>
+          </a-col>
+
+        </a-row>
+      </a-form>
+    </div>
+
+    <!-- 操作按钮区域 -->
+    <div class="table-operator">
+      <a-button @click="handleAdd" type="primary" icon="plus">新增</a-button>
+      <a-button type="primary" icon="download" @click="handleExportXls('水印任务表')">导出</a-button>
+      <a-upload name="file" :showUploadList="false" :multiple="false" :headers="tokenHeader" :action="importExcelUrl" @change="handleImportExcel">
+        <a-button type="primary" icon="import">导入</a-button>
+      </a-upload>
+      <a-dropdown v-if="selectedRowKeys.length > 0">
+        <a-menu slot="overlay">
+          <a-menu-item key="1" @click="batchDel"><a-icon type="delete"/>删除</a-menu-item>
+        </a-menu>
+        <a-button style="margin-left: 8px"> 批量操作 <a-icon type="down" /></a-button>
+      </a-dropdown>
+    </div>
+
+    <!-- table区域-begin -->
+    <div>
+      <div class="ant-alert ant-alert-info" style="margin-bottom: 16px;">
+        <i class="anticon anticon-info-circle ant-alert-icon"></i> 已选择 <a style="font-weight: 600">{{ selectedRowKeys.length }}</a>项
+        <a style="margin-left: 24px" @click="onClearSelected">清空</a>
+      </div>
+
+      <a-table
+        ref="table"
+        size="middle"
+        bordered
+        rowKey="id"
+        :columns="columns"
+        :dataSource="dataSource"
+        :pagination="ipagination"
+        :loading="loading"
+        :rowSelection="{selectedRowKeys: selectedRowKeys, onChange: onSelectChange}"
+        @change="handleTableChange">
+
+        <span slot="action" slot-scope="text, record">
+          <a @click="handleEdit(record)">编辑</a>
+
+          <a-divider type="vertical" />
+          <a-dropdown>
+            <a class="ant-dropdown-link">更多 <a-icon type="down" /></a>
+            <a-menu slot="overlay">
+              <a-menu-item>
+                <a-popconfirm title="确定删除吗?" @confirm="() => handleDelete(record.id)">
+                  <a>删除</a>
+                </a-popconfirm>
+              </a-menu-item>
+            </a-menu>
+          </a-dropdown>
+        </span>
+
+      </a-table>
+    </div>
+    <!-- table区域-end -->
+
+    <!-- 表单区域 -->
+    <videoWatermarkTask-modal ref="modalForm" @ok="modalFormOk"></videoWatermarkTask-modal>
+  </a-card>
+</template>
+
+<script>
+  import VideoWatermarkTaskModal from './modules/VideoWatermarkTaskModal'
+  import { JeecgListMixin } from '@/mixins/JeecgListMixin'
+
+  export default {
+    name: "VideoWatermarkTaskList",
+    mixins:[JeecgListMixin],
+    components: {
+      VideoWatermarkTaskModal
+    },
+    data () {
+      return {
+        description: '水印任务表管理页面',
+        // 表头
+        columns: [
+          {
+            title: '#',
+            dataIndex: '',
+            key:'rowIndex',
+            width:60,
+            align:"center",
+            customRender:function (t,r,index) {
+              return parseInt(index)+1;
+            }
+           },
+		   {
+            title: 'userId',
+            align:"center",
+            dataIndex: 'userId'
+           },
+		   {
+            title: 'jobId',
+            align:"center",
+            dataIndex: 'jobId'
+           },
+		   {
+            title: 'videoId',
+            align:"center",
+            dataIndex: 'videoId'
+           },
+		   {
+            title: 'videoUrl',
+            align:"center",
+            dataIndex: 'videoUrl'
+           },
+		   {
+            title: 'status',
+            align:"center",
+            dataIndex: 'status'
+           },
+          {
+            title: '操作',
+            dataIndex: 'action',
+            align:"center",
+            scopedSlots: { customRender: 'action' },
+          }
+        ],
+		url: {
+          list: "/ctop/videoWatermarkTask/list",
+          delete: "/ctop/videoWatermarkTask/delete",
+          deleteBatch: "/ctop/videoWatermarkTask/deleteBatch",
+          exportXlsUrl: "ctop/videoWatermarkTask/exportXls",
+          importExcelUrl: "ctop/videoWatermarkTask/importExcel",
+       },
+    }
+  },
+  computed: {
+    importExcelUrl: function(){
+      return `${window._CONFIG['domianURL']}/${this.url.importExcelUrl}`;
+    }
+  },
+    methods: {
+     
+    }
+  }
+</script>
+<style scoped>
+  @import '~@assets/less/common.less'
+</style>

+ 188 - 0
src/views/modules/material/VideoWatermarkTemplateList.vue

@@ -0,0 +1,188 @@
+<template>
+  <a-card :bordered="false">
+
+    <!-- 查询区域 -->
+    <div class="table-page-search-wrapper">
+      <a-form layout="inline">
+        <a-row :gutter="24">
+
+          <a-col :md="6" :sm="8">
+            <a-form-item label="name">
+              <a-input placeholder="请输入name" v-model="queryParam.name"></a-input>
+            </a-form-item>
+          </a-col>
+          <a-col :md="6" :sm="8">
+            <a-form-item label="width">
+              <a-input placeholder="请输入width" v-model="queryParam.width"></a-input>
+            </a-form-item>
+          </a-col>
+        <template v-if="toggleSearchStatus">
+        <a-col :md="6" :sm="8">
+            <a-form-item label="height">
+              <a-input placeholder="请输入height" v-model="queryParam.height"></a-input>
+            </a-form-item>
+          </a-col>
+          <a-col :md="6" :sm="8">
+            <a-form-item label="templateId">
+              <a-input placeholder="请输入templateId" v-model="queryParam.templateId"></a-input>
+            </a-form-item>
+          </a-col>
+          <a-col :md="6" :sm="8">
+            <a-form-item label="templatePath">
+              <a-input placeholder="请输入templatePath" v-model="queryParam.templatePath"></a-input>
+            </a-form-item>
+          </a-col>
+          </template>
+          <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>
+              <a @click="handleToggleSearch" style="margin-left: 8px">
+                {{ toggleSearchStatus ? '收起' : '展开' }}
+                <a-icon :type="toggleSearchStatus ? 'up' : 'down'"/>
+              </a>
+            </span>
+          </a-col>
+
+        </a-row>
+      </a-form>
+    </div>
+
+    <!-- 操作按钮区域 -->
+    <div class="table-operator">
+      <a-button @click="handleAdd" type="primary" icon="plus">新增</a-button>
+      <a-button type="primary" icon="download" @click="handleExportXls('水印模板')">导出</a-button>
+      <a-upload name="file" :showUploadList="false" :multiple="false" :headers="tokenHeader" :action="importExcelUrl" @change="handleImportExcel">
+        <a-button type="primary" icon="import">导入</a-button>
+      </a-upload>
+      <a-dropdown v-if="selectedRowKeys.length > 0">
+        <a-menu slot="overlay">
+          <a-menu-item key="1" @click="batchDel"><a-icon type="delete"/>删除</a-menu-item>
+        </a-menu>
+        <a-button style="margin-left: 8px"> 批量操作 <a-icon type="down" /></a-button>
+      </a-dropdown>
+    </div>
+
+    <!-- table区域-begin -->
+    <div>
+      <div class="ant-alert ant-alert-info" style="margin-bottom: 16px;">
+        <i class="anticon anticon-info-circle ant-alert-icon"></i> 已选择 <a style="font-weight: 600">{{ selectedRowKeys.length }}</a>项
+        <a style="margin-left: 24px" @click="onClearSelected">清空</a>
+      </div>
+
+      <a-table
+        ref="table"
+        size="middle"
+        bordered
+        rowKey="id"
+        :columns="columns"
+        :dataSource="dataSource"
+        :pagination="ipagination"
+        :loading="loading"
+        :rowSelection="{selectedRowKeys: selectedRowKeys, onChange: onSelectChange}"
+        @change="handleTableChange">
+
+        <span slot="action" slot-scope="text, record">
+          <a @click="handleEdit(record)">编辑</a>
+
+          <a-divider type="vertical" />
+          <a-dropdown>
+            <a class="ant-dropdown-link">更多 <a-icon type="down" /></a>
+            <a-menu slot="overlay">
+              <a-menu-item>
+                <a-popconfirm title="确定删除吗?" @confirm="() => handleDelete(record.id)">
+                  <a>删除</a>
+                </a-popconfirm>
+              </a-menu-item>
+            </a-menu>
+          </a-dropdown>
+        </span>
+
+      </a-table>
+    </div>
+    <!-- table区域-end -->
+
+    <!-- 表单区域 -->
+    <videoWatermarkTemplate-modal ref="modalForm" @ok="modalFormOk"></videoWatermarkTemplate-modal>
+  </a-card>
+</template>
+
+<script>
+  import VideoWatermarkTemplateModal from './modules/VideoWatermarkTemplateModal'
+  import { JeecgListMixin } from '@/mixins/JeecgListMixin'
+
+  export default {
+    name: "VideoWatermarkTemplateList",
+    mixins:[JeecgListMixin],
+    components: {
+      VideoWatermarkTemplateModal
+    },
+    data () {
+      return {
+        description: '水印模板管理页面',
+        // 表头
+        columns: [
+          {
+            title: '#',
+            dataIndex: '',
+            key:'rowIndex',
+            width:60,
+            align:"center",
+            customRender:function (t,r,index) {
+              return parseInt(index)+1;
+            }
+           },
+		   {
+            title: 'name',
+            align:"center",
+            dataIndex: 'name'
+           },
+		   {
+            title: 'width',
+            align:"center",
+            dataIndex: 'width'
+           },
+		   {
+            title: 'height',
+            align:"center",
+            dataIndex: 'height'
+           },
+		   {
+            title: 'templateId',
+            align:"center",
+            dataIndex: 'templateId'
+           },
+		   {
+            title: 'templatePath',
+            align:"center",
+            dataIndex: 'templatePath'
+           },
+          {
+            title: '操作',
+            dataIndex: 'action',
+            align:"center",
+            scopedSlots: { customRender: 'action' },
+          }
+        ],
+		url: {
+          list: "/ctop/videoWatermarkTemplate/list",
+          delete: "/ctop/videoWatermarkTemplate/delete",
+          deleteBatch: "/ctop/videoWatermarkTemplate/deleteBatch",
+          exportXlsUrl: "ctop/videoWatermarkTemplate/exportXls",
+          importExcelUrl: "ctop/videoWatermarkTemplate/importExcel",
+       },
+    }
+  },
+  computed: {
+    importExcelUrl: function(){
+      return `${window._CONFIG['domianURL']}/${this.url.importExcelUrl}`;
+    }
+  },
+    methods: {
+     
+    }
+  }
+</script>
+<style scoped>
+  @import '~@assets/less/common.less'
+</style>

+ 112 - 21
src/views/modules/material/checkMatemal.vue

@@ -8,6 +8,7 @@
     position: relative;
     height: 250px;
     border: 1px solid #f2f2f2;
+    list-style: none;
     img,
     video {
       width: 100%;
@@ -22,32 +23,50 @@
 }
 </style>
 <template>
-  <a-model title="选择素材" v-model="visibleMatemal" @ok="handleOk" @cancel="close">
-    <div>
-      <ul class="actor-photo-list">
-        <li v-for="(item, index) of photoList" :key="index">
-          <video :src="item.url" />
-        </li>
-      </ul>
-    </div>
-    <div style="text-align:right">
-      <a-pagination showQuickJumper :total="total" @change="pageChange" :pageSize.sync="pageSize" />
-    </div>
-  </a-model>
+  <div>
+    <a-modal title="选择素材" v-model="visibleMatemal" @ok="handleOk" @cancel="close" :width="800">
+      <div>
+        <ul class="actor-photo-list">
+          <a-checkbox-group
+            v-model="checkArr"
+            style="width:100%;  display: flex;padding-left: 0;"
+            @change="onChangeCheck"
+          >
+            <li v-for="(item, index) of dataSource" :key="index">
+              <a-checkbox :value="item.url" style="position:absolute"></a-checkbox
+              ><video class="video" :src="item.url" controls="controls" style="min-height:160px">
+                您的浏览器不支持 video 标签。
+              </video>
+            </li>
+          </a-checkbox-group>
+        </ul>
+      </div>
+      <div style="text-align:right">
+        <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>
+    </a-modal>
+  </div>
 </template>
 
 <script>
 import { getAction, postAction, postFile } from '@/api/manage'
 import { JeecgListMixin } from '@/mixins/JeecgListMixin'
 import { mapGetters } from 'vuex'
+import { stopOtherVideo, closeAllVideoFun } from '@/utils/videoControl' // 停止除当前外的其他视频播放,及停止所有视频播放的方法
 export default {
   name: 'check-matemal',
   mixins: [JeecgListMixin],
-  components: {
-    JEllipsis,
-    UploadToAli,
-    accountCheck
-  },
+  components: {},
 
   data() {
     return {
@@ -55,20 +74,92 @@ export default {
         list: '/ctop/materialInfo/list'
       },
       visibleMatemal: false,
-      dataSource: []
+      dataSource: [],
+      columns: [],
+      checkArr: [],
+      active: '',
+      joinVideo: {
+        head: '',
+        content: [],
+        foot: '',
+        key: 1
+      }
     }
   },
   watch: {},
+  updated() {
+    stopOtherVideo()
+  },
   methods: {
-    showCheck(typeName) {
+    showCheck(typeName, keyNumber, item) {
+      this.dataSource = []
+      console.log(keyNumber)
       this.visibleMatemal = true
       this.queryParam.userId = this.userInfo().id
       this.queryParam.type = typeName
+      this.active = typeName
+
+      if (typeName == 'VIDEO_PART') {
+        this.checkArr = item.VIDEO_PART
+        this.joinVideo = {
+          head: '',
+          content: item.VIDEO_PART,
+          foot: '',
+          key: keyNumber
+        }
+      } else {
+        this.checkArr = []
+        this.joinVideo = {
+          head: '',
+          content: [],
+          foot: '',
+          key: keyNumber
+        }
+      }
+
       this.loadData()
     },
     ...mapGetters(['nickname', 'avatar', 'userInfo']),
-    handleOk() {},
-    close() {}
+    handleOk() {
+      this.visibleMatemal = false
+      this.checkArr = []
+      this.$emit('showVideo', this.joinVideo, this.active)
+    },
+    close() {},
+    getDataSource(page, pageSize) {
+      this.ipagination.current = page
+      this.loadData()
+    },
+    onChangeCheck(checkedList) {
+      console.log(checkedList)
+      //  { value: 'VIDEO_HEAD', tab: '片头' },
+      // { value: 'VIDEO_PART', tab: '片段' },
+      // { value: 'VIDEO_TAIL', tab: '片尾' }
+      if (this.active == 'VIDEO_HEAD') {
+        //片头
+        if (this.checkArr.length > 1) {
+          this.checkArr.shift()
+          this.joinVideo.head = checkedList[0]
+        } else if (this.checkArr.length == 1) {
+          this.joinVideo.head = checkedList[0]
+        } else if (this.checkArr.length == 0) {
+          this.joinVideo.head = ''
+        }
+      } else if (this.active == 'VIDEO_TAIL') {
+        //片尾
+        if (this.checkArr.length > 1) {
+          this.checkArr.shift()
+          this.joinVideo.foot = checkedList[0]
+        } else if (this.checkArr.length == 1) {
+          this.joinVideo.foot = checkedList[0]
+        } else if (this.checkArr.length == 0) {
+          this.joinVideo.foot = ''
+        }
+      } else {
+        //内容
+        this.joinVideo.content = checkedList
+      }
+    }
   }
 }
 </script>

+ 124 - 16
src/views/modules/material/fragmentMatemal.vue

@@ -289,18 +289,66 @@ a {
           </div>
         </div>
         <div v-else>
+          <div style="margin-bottom:20px">
+            <a-button @click="addMatemal" type="primary" icon="plus" style="margin-right:15px">新增一行</a-button>
+            <a-button type="primary">开始拼接</a-button>
+          </div>
+
           <a-table :columns="columns" :dataSource="dataList" :pagination="false">
-            <span slot="VIDEO_HEAD" slot-scope="text">
-              <div v-if="text != ''"></div>
-              <a-button @click="dirVideoGet" type="primary" icon="plus" v-else>选择素材</a-button>
+            <span slot="action" slot-scope="text, record, index">
+              <a @click="removeMatemal(index)">删除</a>
             </span>
-            <span slot="VIDEO_PART" slot-scope="text">
-              <div v-if="text.length > 0"></div>
-              <a-button @click="dirVideoGet" type="primary" icon="plus" v-else>选择素材</a-button>
+            <span slot="VIDEO_HEAD" slot-scope="text, record, index">
+              <div v-if="text != ''" style="position:relative">
+                <video class="video" :src="text" controls="controls" style="height:160px">
+                  您的浏览器不支持 video 标签。
+                </video>
+                <a-icon
+                  type="close-circle"
+                  style="position:absolute;top:-5px;right:30%;color:red;z-index:10;cursor: pointer;"
+                  @click="deteleVideo('VIDEO_HEAD', record)"
+                />
+              </div>
+              <a-button @click="checkMatemal('VIDEO_HEAD', index, record)" type="primary" icon="plus" v-else
+                >选择素材</a-button
+              >
             </span>
-            <span slot="VIDEO_TAIL" slot-scope="text">
-              <div v-if="text != ''"></div>
-              <a-button @click="dirVideoGet" type="primary" icon="plus" v-else>选择素材</a-button>
+            <span slot="VIDEO_PART" slot-scope="text, record, index">
+              <div>
+                <video
+                  class="video"
+                  :src="item"
+                  controls="controls"
+                  style="height:160px"
+                  v-for="item of text"
+                  :key="item"
+                  draggable="true"
+                  @dragstart="handleDragStart($event, item)"
+                  @dragover.prevent="handleDragOver($event, item)"
+                  @dragenter="handleDragEnter($event, item)"
+                  @dragend="handleDragEnd($event, item)"
+                >
+                  > 您的浏览器不支持 video 标签。
+                </video>
+              </div>
+              <a-button @click="checkMatemal('VIDEO_PART', index, record)" type="primary" icon="plus"
+                >选择素材</a-button
+              >
+            </span>
+            <span slot="VIDEO_TAIL" slot-scope="text, record, index">
+              <div v-if="text != ''" style="position:relative">
+                <video class="video" :src="text" controls="controls" style="height:160px">
+                  您的浏览器不支持 video 标签。
+                </video>
+                <a-icon
+                  type="close-circle"
+                  style="position:absolute;top:-5px;right:30%;color:red;z-index:10;cursor: pointer;"
+                  @click="deteleVideo('VIDEO_TAIL', record)"
+                />
+              </div>
+              <a-button @click="checkMatemal('VIDEO_TAIL', index, record)" type="primary" icon="plus" v-else
+                >选择素材</a-button
+              >
             </span>
           </a-table>
         </div>
@@ -466,8 +514,8 @@ a {
       </div>
     </a-modal>
 
-
     <account-check ref="check" @synchro="implement"></account-check>
+    <check-matemal ref="matemal" @showVideo="showVideoFun" />
   </a-card>
 </template>
 
@@ -477,48 +525,55 @@ import JEllipsis from '@/components/jeecg/JEllipsis'
 import UploadToAli from '@femessage/upload-to-ali'
 import { fileCheck, fileInsert, fileEdit } from '@/api/actor'
 import { getAction, postAction, postFile } from '@/api/manage'
-
+import { stopOtherVideo, closeAllVideoFun } from '@/utils/videoControl' // 停止除当前外的其他视频播放,及停止所有视频播放的方法
 import { mapGetters } from 'vuex'
 import moment from 'moment'
 
 import BMF from 'browser-md5-file'
 
 import accountCheck from './accountCheck'
+import checkMatemal from './checkMatemal'
 export default {
   name: 'YardList',
   mixins: [JeecgListMixin],
   components: {
     JEllipsis,
     UploadToAli,
-    accountCheck
+    accountCheck,
+    checkMatemal
   },
 
   data() {
     return {
+      dragging: null,
+      dataKey: 0,
       columns: [
         {
           title: '片头',
           dataIndex: 'VIDEO_HEAD',
-          key: 1,
           scopedSlots: { customRender: 'VIDEO_HEAD' },
           align: 'center'
         },
         {
           title: '内容',
           dataIndex: 'VIDEO_PART',
-          key: 2,
           scopedSlots: { customRender: 'VIDEO_PART' },
           align: 'center'
         },
         {
           title: '片尾',
           dataIndex: 'VIDEO_TAIL',
-          key: 3,
           scopedSlots: { customRender: 'VIDEO_TAIL' },
           align: 'center'
+        },
+        {
+          title: '操作',
+          dataIndex: 'action',
+          scopedSlots: { customRender: 'action' },
+          align: 'center'
         }
       ],
-      dataList: [{ VIDEO_HEAD: '', VIDEO_PART: [], VIDEO_TAIL: '' }],
+      dataList: [{ key: 1, VIDEO_HEAD: '', VIDEO_PART: [], VIDEO_TAIL: '' }],
       inputVisible: false,
       inputValue: '',
       labelCol: {
@@ -600,6 +655,9 @@ export default {
       return y + '-' + MM + '-' + d
     }
   },
+  updated() {
+    stopOtherVideo()
+  },
   computed: {
     dirImg() {
       let date = new Date()
@@ -632,6 +690,44 @@ export default {
     }
   },
   methods: {
+    handleDragStart(e, item) {
+      this.dragging = item
+    },
+    handleDragEnd(e, item) {
+      this.dragging = null
+    },
+    //首先把div变成可以放置的元素,即重写dragenter/dragover
+    handleDragOver(e) {
+      e.dataTransfer.dropEffect = 'move' // e.dataTransfer.dropEffect="move";//在dragenter中针对放置目标来设置!
+    },
+    handleDragEnter(e, item) {
+      e.dataTransfer.effectAllowed = 'move' //为需要移动的元素设置dragstart事件
+      if (item === this.dragging) {
+        return
+      }
+      console.log(this.dataKey)
+      const newItems = [...this.dataList[this.dataKey].VIDEO_PART]
+      console.log(newItems)
+      const src = newItems.indexOf(this.dragging)
+      const dst = newItems.indexOf(item)
+
+      newItems.splice(dst, 0, ...newItems.splice(src, 1))
+
+      this.dataList[this.dataKey].VIDEO_PART = newItems
+    },
+    checkMatemal(type, number, item) {
+      this.$refs.matemal.showCheck(type, number, item)
+    },
+    addMatemal() {
+      var num = this.dataList.length + 1
+      this.dataList.push({ key: num, VIDEO_HEAD: '', VIDEO_PART: [], VIDEO_TAIL: '' })
+    },
+    removeMatemal(index) {
+      this.dataList.splice(index, 1)
+    },
+    deteleVideo(type, item) {
+      item[type] = ''
+    },
     moment,
     a(item) {
       item.showVideo = true
@@ -680,6 +776,18 @@ export default {
       })
       //   /ctop/materialUpload/uploadAccount
     },
+    showVideoFun(data, typeName) {
+      console.log(data)
+      if (typeName == 'VIDEO_HEAD') {
+        //片头
+        this.dataList[data.key].VIDEO_HEAD = data.head
+      } else if (typeName == 'VIDEO_TAIL') {
+        this.dataList[data.key].VIDEO_TAIL = data.foot
+      } else {
+        this.dataList[data.key].VIDEO_PART = data.content
+        this.dataKey = data.key
+      }
+    },
     downloadByBlob() {
       fetch(this.showUrlWater)
         .then(res => res.blob())

+ 2 - 2
src/views/modules/material/materialList.vue

@@ -456,12 +456,12 @@ a {
         </div>
         <div style="flex:3;padding:10px;box-sizing:border-box;">
           <a-form v-if="detail" class="detail">
-            <a-form-item label="尺寸" :label-col="{ span: 6 }" :wrapper-col="{ span: 18 }">
+            <!-- <a-form-item label="尺寸" :label-col="{ span: 6 }" :wrapper-col="{ span: 18 }">
               {{ detail.parameter.width }}*{{ detail.parameter.height }}
             </a-form-item>
             <a-form-item label="大小" :label-col="{ span: 6 }" :wrapper-col="{ span: 18 }">
               {{ detail.parameter.size }}
-            </a-form-item>
+            </a-form-item> -->
             <a-form-item
               label="剪辑"
               :label-col="{ span: 6 }"

+ 139 - 0
src/views/modules/material/modules/VideoMergeTaskModal.vue

@@ -0,0 +1,139 @@
+<template>
+  <a-modal
+    :title="title"
+    :width="800"
+    :visible="visible"
+    :confirmLoading="confirmLoading"
+    @ok="handleOk"
+    @cancel="handleCancel"
+    cancelText="关闭">
+    
+    <a-spin :spinning="confirmLoading">
+      <a-form :form="form">
+      
+        <a-form-item
+          :labelCol="labelCol"
+          :wrapperCol="wrapperCol"
+          label="jobId">
+          <a-input placeholder="请输入jobId" v-decorator="['jobId', validatorRules.jobId ]" />
+        </a-form-item>
+        <a-form-item
+          :labelCol="labelCol"
+          :wrapperCol="wrapperCol"
+          label="videoId">
+          <a-input placeholder="请输入videoId" v-decorator="['videoId', validatorRules.videoId ]" />
+        </a-form-item>
+        <a-form-item
+          :labelCol="labelCol"
+          :wrapperCol="wrapperCol"
+          label="status">
+          <a-input placeholder="请输入status" v-decorator="['status', validatorRules.status ]" />
+        </a-form-item>
+		
+      </a-form>
+    </a-spin>
+  </a-modal>
+</template>
+
+<script>
+  import { httpAction } from '@/api/manage'
+  import pick from 'lodash.pick'
+  import moment from "moment"
+
+  export default {
+    name: "VideoMergeTaskModal",
+    data () {
+      return {
+        title:"操作",
+        visible: false,
+        model: {},
+        labelCol: {
+          xs: { span: 24 },
+          sm: { span: 5 },
+        },
+        wrapperCol: {
+          xs: { span: 24 },
+          sm: { span: 16 },
+        },
+
+        confirmLoading: false,
+        form: this.$form.createForm(this),
+        validatorRules:{
+        jobId:{rules: [{ required: true, message: '请输入jobId!' }]},
+        videoId:{rules: [{ required: true, message: '请输入videoId!' }]},
+        status:{rules: [{ required: true, message: '请输入status!' }]},
+        },
+        url: {
+          add: "/ctop/videoMergeTask/add",
+          edit: "/ctop/videoMergeTask/edit",
+        },
+      }
+    },
+    created () {
+    },
+    methods: {
+      add () {
+        this.edit({});
+      },
+      edit (record) {
+        this.form.resetFields();
+        this.model = Object.assign({}, record);
+        this.visible = true;
+        this.$nextTick(() => {
+          this.form.setFieldsValue(pick(this.model,'jobId','videoId','status'))
+		  //时间格式化
+        });
+
+      },
+      close () {
+        this.$emit('close');
+        this.visible = false;
+      },
+      handleOk () {
+        const that = this;
+        // 触发表单验证
+        this.form.validateFields((err, values) => {
+          if (!err) {
+            that.confirmLoading = true;
+            let httpurl = '';
+            let method = '';
+            if(!this.model.id){
+              httpurl+=this.url.add;
+              method = 'post';
+            }else{
+              httpurl+=this.url.edit;
+               method = 'put';
+            }
+            let formData = Object.assign(this.model, values);
+            //时间格式化
+            
+            console.log(formData)
+            httpAction(httpurl,formData,method).then((res)=>{
+              if(res.success){
+                that.$message.success(res.message);
+                that.$emit('ok');
+              }else{
+                that.$message.warning(res.message);
+              }
+            }).finally(() => {
+              that.confirmLoading = false;
+              that.close();
+            })
+
+
+
+          }
+        })
+      },
+      handleCancel () {
+        this.close()
+      },
+
+
+    }
+  }
+</script>
+
+<style lang="less" scoped>
+
+</style>

+ 132 - 0
src/views/modules/material/modules/VideoPartModal.vue

@@ -0,0 +1,132 @@
+<template>
+  <a-modal
+    :title="title"
+    :width="800"
+    :visible="visible"
+    :confirmLoading="confirmLoading"
+    @ok="handleOk"
+    @cancel="handleCancel"
+    cancelText="关闭">
+    
+    <a-spin :spinning="confirmLoading">
+      <a-form :form="form">
+      
+        <a-form-item
+          :labelCol="labelCol"
+          :wrapperCol="wrapperCol"
+          label="videoId">
+          <a-input placeholder="请输入videoId" v-decorator="['videoId', validatorRules.videoId ]" />
+        </a-form-item>
+        <a-form-item
+          :labelCol="labelCol"
+          :wrapperCol="wrapperCol"
+          label="partId">
+          <a-input placeholder="请输入partId" v-decorator="['partId', validatorRules.partId ]" />
+        </a-form-item>
+		
+      </a-form>
+    </a-spin>
+  </a-modal>
+</template>
+
+<script>
+  import { httpAction } from '@/api/manage'
+  import pick from 'lodash.pick'
+  import moment from "moment"
+
+  export default {
+    name: "VideoPartModal",
+    data () {
+      return {
+        title:"操作",
+        visible: false,
+        model: {},
+        labelCol: {
+          xs: { span: 24 },
+          sm: { span: 5 },
+        },
+        wrapperCol: {
+          xs: { span: 24 },
+          sm: { span: 16 },
+        },
+
+        confirmLoading: false,
+        form: this.$form.createForm(this),
+        validatorRules:{
+        videoId:{rules: [{ required: true, message: '请输入videoId!' }]},
+        partId:{rules: [{ required: true, message: '请输入partId!' }]},
+        },
+        url: {
+          add: "/ctop/videoPart/add",
+          edit: "/ctop/videoPart/edit",
+        },
+      }
+    },
+    created () {
+    },
+    methods: {
+      add () {
+        this.edit({});
+      },
+      edit (record) {
+        this.form.resetFields();
+        this.model = Object.assign({}, record);
+        this.visible = true;
+        this.$nextTick(() => {
+          this.form.setFieldsValue(pick(this.model,'videoId','partId'))
+		  //时间格式化
+        });
+
+      },
+      close () {
+        this.$emit('close');
+        this.visible = false;
+      },
+      handleOk () {
+        const that = this;
+        // 触发表单验证
+        this.form.validateFields((err, values) => {
+          if (!err) {
+            that.confirmLoading = true;
+            let httpurl = '';
+            let method = '';
+            if(!this.model.id){
+              httpurl+=this.url.add;
+              method = 'post';
+            }else{
+              httpurl+=this.url.edit;
+               method = 'put';
+            }
+            let formData = Object.assign(this.model, values);
+            //时间格式化
+            
+            console.log(formData)
+            httpAction(httpurl,formData,method).then((res)=>{
+              if(res.success){
+                that.$message.success(res.message);
+                that.$emit('ok');
+              }else{
+                that.$message.warning(res.message);
+              }
+            }).finally(() => {
+              that.confirmLoading = false;
+              that.close();
+            })
+
+
+
+          }
+        })
+      },
+      handleCancel () {
+        this.close()
+      },
+
+
+    }
+  }
+</script>
+
+<style lang="less" scoped>
+
+</style>

+ 151 - 0
src/views/modules/material/modules/VideoWatermarkTaskModal.vue

@@ -0,0 +1,151 @@
+<template>
+  <a-modal
+    :title="title"
+    :width="800"
+    :visible="visible"
+    :confirmLoading="confirmLoading"
+    @ok="handleOk"
+    @cancel="handleCancel"
+    cancelText="关闭">
+    
+    <a-spin :spinning="confirmLoading">
+      <a-form :form="form">
+      
+        <a-form-item
+          :labelCol="labelCol"
+          :wrapperCol="wrapperCol"
+          label="userId">
+          <a-input placeholder="请输入userId" v-decorator="['userId', validatorRules.userId ]" />
+        </a-form-item>
+        <a-form-item
+          :labelCol="labelCol"
+          :wrapperCol="wrapperCol"
+          label="jobId">
+          <a-input placeholder="请输入jobId" v-decorator="['jobId', validatorRules.jobId ]" />
+        </a-form-item>
+        <a-form-item
+          :labelCol="labelCol"
+          :wrapperCol="wrapperCol"
+          label="videoId">
+          <a-input placeholder="请输入videoId" v-decorator="['videoId', {}]" />
+        </a-form-item>
+        <a-form-item
+          :labelCol="labelCol"
+          :wrapperCol="wrapperCol"
+          label="videoUrl">
+          <a-input placeholder="请输入videoUrl" v-decorator="['videoUrl', {}]" />
+        </a-form-item>
+        <a-form-item
+          :labelCol="labelCol"
+          :wrapperCol="wrapperCol"
+          label="status">
+          <a-input placeholder="请输入status" v-decorator="['status', validatorRules.status ]" />
+        </a-form-item>
+		
+      </a-form>
+    </a-spin>
+  </a-modal>
+</template>
+
+<script>
+  import { httpAction } from '@/api/manage'
+  import pick from 'lodash.pick'
+  import moment from "moment"
+
+  export default {
+    name: "VideoWatermarkTaskModal",
+    data () {
+      return {
+        title:"操作",
+        visible: false,
+        model: {},
+        labelCol: {
+          xs: { span: 24 },
+          sm: { span: 5 },
+        },
+        wrapperCol: {
+          xs: { span: 24 },
+          sm: { span: 16 },
+        },
+
+        confirmLoading: false,
+        form: this.$form.createForm(this),
+        validatorRules:{
+        userId:{rules: [{ required: true, message: '请输入userId!' }]},
+        jobId:{rules: [{ required: true, message: '请输入jobId!' }]},
+        status:{rules: [{ required: true, message: '请输入status!' }]},
+        },
+        url: {
+          add: "/ctop/videoWatermarkTask/add",
+          edit: "/ctop/videoWatermarkTask/edit",
+        },
+      }
+    },
+    created () {
+    },
+    methods: {
+      add () {
+        this.edit({});
+      },
+      edit (record) {
+        this.form.resetFields();
+        this.model = Object.assign({}, record);
+        this.visible = true;
+        this.$nextTick(() => {
+          this.form.setFieldsValue(pick(this.model,'userId','jobId','videoId','videoUrl','status'))
+		  //时间格式化
+        });
+
+      },
+      close () {
+        this.$emit('close');
+        this.visible = false;
+      },
+      handleOk () {
+        const that = this;
+        // 触发表单验证
+        this.form.validateFields((err, values) => {
+          if (!err) {
+            that.confirmLoading = true;
+            let httpurl = '';
+            let method = '';
+            if(!this.model.id){
+              httpurl+=this.url.add;
+              method = 'post';
+            }else{
+              httpurl+=this.url.edit;
+               method = 'put';
+            }
+            let formData = Object.assign(this.model, values);
+            //时间格式化
+            
+            console.log(formData)
+            httpAction(httpurl,formData,method).then((res)=>{
+              if(res.success){
+                that.$message.success(res.message);
+                that.$emit('ok');
+              }else{
+                that.$message.warning(res.message);
+              }
+            }).finally(() => {
+              that.confirmLoading = false;
+              that.close();
+            })
+
+
+
+          }
+        })
+      },
+      handleCancel () {
+        this.close()
+      },
+
+
+    }
+  }
+</script>
+
+<style lang="less" scoped>
+
+</style>

+ 148 - 0
src/views/modules/material/modules/VideoWatermarkTemplateModal.vue

@@ -0,0 +1,148 @@
+<template>
+  <a-modal
+    :title="title"
+    :width="800"
+    :visible="visible"
+    :confirmLoading="confirmLoading"
+    @ok="handleOk"
+    @cancel="handleCancel"
+    cancelText="关闭">
+    
+    <a-spin :spinning="confirmLoading">
+      <a-form :form="form">
+      
+        <a-form-item
+          :labelCol="labelCol"
+          :wrapperCol="wrapperCol"
+          label="name">
+          <a-input placeholder="请输入name" v-decorator="['name', {}]" />
+        </a-form-item>
+        <a-form-item
+          :labelCol="labelCol"
+          :wrapperCol="wrapperCol"
+          label="width">
+          <a-input-number v-decorator="[ 'width', {}]" />
+        </a-form-item>
+        <a-form-item
+          :labelCol="labelCol"
+          :wrapperCol="wrapperCol"
+          label="height">
+          <a-input-number v-decorator="[ 'height', {}]" />
+        </a-form-item>
+        <a-form-item
+          :labelCol="labelCol"
+          :wrapperCol="wrapperCol"
+          label="templateId">
+          <a-input placeholder="请输入templateId" v-decorator="['templateId', {}]" />
+        </a-form-item>
+        <a-form-item
+          :labelCol="labelCol"
+          :wrapperCol="wrapperCol"
+          label="templatePath">
+          <a-input placeholder="请输入templatePath" v-decorator="['templatePath', {}]" />
+        </a-form-item>
+		
+      </a-form>
+    </a-spin>
+  </a-modal>
+</template>
+
+<script>
+  import { httpAction } from '@/api/manage'
+  import pick from 'lodash.pick'
+  import moment from "moment"
+
+  export default {
+    name: "VideoWatermarkTemplateModal",
+    data () {
+      return {
+        title:"操作",
+        visible: false,
+        model: {},
+        labelCol: {
+          xs: { span: 24 },
+          sm: { span: 5 },
+        },
+        wrapperCol: {
+          xs: { span: 24 },
+          sm: { span: 16 },
+        },
+
+        confirmLoading: false,
+        form: this.$form.createForm(this),
+        validatorRules:{
+        },
+        url: {
+          add: "/ctop/videoWatermarkTemplate/add",
+          edit: "/ctop/videoWatermarkTemplate/edit",
+        },
+      }
+    },
+    created () {
+    },
+    methods: {
+      add () {
+        this.edit({});
+      },
+      edit (record) {
+        this.form.resetFields();
+        this.model = Object.assign({}, record);
+        this.visible = true;
+        this.$nextTick(() => {
+          this.form.setFieldsValue(pick(this.model,'name','width','height','templateId','templatePath'))
+		  //时间格式化
+        });
+
+      },
+      close () {
+        this.$emit('close');
+        this.visible = false;
+      },
+      handleOk () {
+        const that = this;
+        // 触发表单验证
+        this.form.validateFields((err, values) => {
+          if (!err) {
+            that.confirmLoading = true;
+            let httpurl = '';
+            let method = '';
+            if(!this.model.id){
+              httpurl+=this.url.add;
+              method = 'post';
+            }else{
+              httpurl+=this.url.edit;
+               method = 'put';
+            }
+            let formData = Object.assign(this.model, values);
+            //时间格式化
+            
+            console.log(formData)
+            httpAction(httpurl,formData,method).then((res)=>{
+              if(res.success){
+                that.$message.success(res.message);
+                that.$emit('ok');
+              }else{
+                that.$message.warning(res.message);
+              }
+            }).finally(() => {
+              that.confirmLoading = false;
+              that.close();
+            })
+
+
+
+          }
+        })
+      },
+      handleCancel () {
+        this.close()
+      },
+
+
+    }
+  }
+</script>
+
+<style lang="less" scoped>
+
+</style>

+ 19 - 6
src/views/modules/material/videoMaterial.vue

@@ -189,10 +189,23 @@ a {
 
     <div class="table-operator" style="position:relative;z-index:100">
       <a-button @click="visible = true" type="primary" icon="plus">新增</a-button>
-      <a-button @click="onCheckAllChange" v-if="queryParam.projectId && active == '1'">{{
-        checkAll ? '取消  (  ' + checkArr.length + '  )' : '全选'
-      }}</a-button>
-      <a-button v-if="queryParam.projectId && active == '1'" :disabled="checkArr.length == 0" @click="tongbu"
+      <a-button
+        @click="onCheckAllChange"
+        v-if="
+          queryParam.projectId &&
+            active == '1' &&
+            (role.roleCode == 'operator' || role.roleCode == 'kuaishouOperationManager' || role.roleCode == 'admin')
+        "
+        >{{ checkAll ? '取消  (  ' + checkArr.length + '  )' : '全选' }}</a-button
+      >
+      <a-button
+        v-if="
+          queryParam.projectId &&
+            active == '1' &&
+            (role.roleCode == 'operator' || role.roleCode == 'kuaishouOperationManager' || role.roleCode == 'admin')
+        "
+        :disabled="checkArr.length == 0"
+        @click="tongbu"
         >一键同步</a-button
       >
     </div>
@@ -500,7 +513,7 @@ a {
         </div>
         <div style="flex:3;padding:10px;box-sizing:border-box;">
           <a-form v-if="detail" class="detail">
-            <a-form-item
+            <!-- <a-form-item
               label="视频时长"
               :label-col="{ span: 6 }"
               :wrapper-col="{ span: 18 }"
@@ -513,7 +526,7 @@ a {
             </a-form-item>
             <a-form-item label="大小" :label-col="{ span: 6 }" :wrapper-col="{ span: 18 }">
               {{ detail.parameter.size }}
-            </a-form-item>
+            </a-form-item> -->
             <a-form-item label="策划" :label-col="{ span: 6 }" :wrapper-col="{ span: 18 }">
               {{ detail.ascription.planName }}
             </a-form-item>