Browse Source

Merge remote-tracking branch 'origin/master'

syh 5 years ago
parent
commit
e55adca9ac

+ 140 - 115
src/views/modules/appad/AdAnalysis.vue

@@ -1,65 +1,105 @@
 <template>
   <div class="page-header-index-wide">
-    <a-row :gutter="24">
-      <a-col :sm="24" :md="12" :xl="6" :style="{ marginBottom: '24px' }">
-        <chart-card :loading="loading" title="总销售额" total="¥126,560">
-          <a-tooltip title="指标说明" slot="action">
-            <a-icon type="info-circle-o"/>
-          </a-tooltip>
-          <div>
-            <trend flag="up" style="margin-right: 16px;">
-              <span slot="term">周同比</span>
-              12%
-            </trend>
-            <trend flag="down">
-              <span slot="term">日同比</span>
-              11%
-            </trend>
-          </div>
-          <template slot="footer">日均销售额<span>¥ 234.56</span></template>
-        </chart-card>
-      </a-col>
-      <a-col :sm="24" :md="12" :xl="6" :style="{ marginBottom: '24px' }">
-        <chart-card :loading="loading" title="访问量" :total="8846 | NumberFormat">
-          <a-tooltip title="指标说明" slot="action">
-            <a-icon type="info-circle-o"/>
-          </a-tooltip>
-          <div>
-            <mini-area/>
-          </div>
-          <template slot="footer">日访问量<span> {{ '1234' | NumberFormat }}</span></template>
-        </chart-card>
-      </a-col>
-      <a-col :sm="24" :md="12" :xl="6" :style="{ marginBottom: '24px' }">
-        <chart-card :loading="loading" title="支付笔数" :total="6560 | NumberFormat">
-          <a-tooltip title="指标说明" slot="action">
-            <a-icon type="info-circle-o"/>
-          </a-tooltip>
-          <div>
-            <mini-bar :height="40"/>
-          </div>
-          <template slot="footer">转化率 <span>60%</span></template>
-        </chart-card>
+<!--    <a-row :gutter="24">-->
+<!--      <a-col :sm="24" :md="12" :xl="6" :style="{ marginBottom: '24px' }">-->
+<!--        <chart-card :loading="loading" title="总销售额" total="¥126,560">-->
+<!--          <a-tooltip title="指标说明" slot="action">-->
+<!--            <a-icon type="info-circle-o"/>-->
+<!--          </a-tooltip>-->
+<!--          <div>-->
+<!--            <trend flag="up" style="margin-right: 16px;">-->
+<!--              <span slot="term">周同比</span>-->
+<!--              12%-->
+<!--            </trend>-->
+<!--            <trend flag="down">-->
+<!--              <span slot="term">日同比</span>-->
+<!--              11%-->
+<!--            </trend>-->
+<!--          </div>-->
+<!--          <template slot="footer">日均销售额<span>¥ 234.56</span></template>-->
+<!--        </chart-card>-->
+<!--      </a-col>-->
+<!--      <a-col :sm="24" :md="12" :xl="6" :style="{ marginBottom: '24px' }">-->
+<!--        <chart-card :loading="loading" title="访问量" :total="8846 | NumberFormat">-->
+<!--          <a-tooltip title="指标说明" slot="action">-->
+<!--            <a-icon type="info-circle-o"/>-->
+<!--          </a-tooltip>-->
+<!--          <div>-->
+<!--            <mini-area/>-->
+<!--          </div>-->
+<!--          <template slot="footer">日访问量<span> {{ '1234' | NumberFormat }}</span></template>-->
+<!--        </chart-card>-->
+<!--      </a-col>-->
+<!--      <a-col :sm="24" :md="12" :xl="6" :style="{ marginBottom: '24px' }">-->
+<!--        <chart-card :loading="loading" title="支付笔数" :total="6560 | NumberFormat">-->
+<!--          <a-tooltip title="指标说明" slot="action">-->
+<!--            <a-icon type="info-circle-o"/>-->
+<!--          </a-tooltip>-->
+<!--          <div>-->
+<!--            <mini-bar :height="40"/>-->
+<!--          </div>-->
+<!--          <template slot="footer">转化率 <span>60%</span></template>-->
+<!--        </chart-card>-->
+<!--      </a-col>-->
+<!--      <a-col :sm="24" :md="12" :xl="6" :style="{ marginBottom: '24px' }">-->
+<!--        <chart-card :loading="loading" title="运营活动效果" total="78%">-->
+<!--          <a-tooltip title="指标说明" slot="action">-->
+<!--            <a-icon type="info-circle-o"/>-->
+<!--          </a-tooltip>-->
+<!--          <div>-->
+<!--            <mini-progress color="rgb(19, 194, 194)" :target="80" :percentage="78" :height="8"/>-->
+<!--          </div>-->
+<!--          <template slot="footer">-->
+<!--            <trend flag="down" style="margin-right: 16px;">-->
+<!--              <span slot="term">同周比</span>-->
+<!--              12%-->
+<!--            </trend>-->
+<!--            <trend flag="up">-->
+<!--              <span slot="term">日环比</span>-->
+<!--              80%-->
+<!--            </trend>-->
+<!--          </template>-->
+<!--        </chart-card>-->
+<!--      </a-col>-->
+<!--    </a-row>-->
+    <a-row>
+      <a-col :span="24">
+        <a-card :loading="loading" :bordered="false" title="今日新增" :style="{ marginTop: '24px' }">
+          <a-row>
+            <a-col :span="6">
+              <head-info title="广告主" :content="advertiserTodayCount"></head-info>
+            </a-col>
+            <a-col :span="6">
+              <head-info title="广告封面" :content="adTodayCount"></head-info>
+            </a-col>
+            <a-col :span="6">
+              <head-info title="广告视频" :content="videoTodayCount"></head-info>
+            </a-col>
+            <a-col :span="6">
+              <head-info title="推广品" :content="productTodayCount"></head-info>
+            </a-col>
+          </a-row>
+        </a-card>
       </a-col>
-      <a-col :sm="24" :md="12" :xl="6" :style="{ marginBottom: '24px' }">
-        <chart-card :loading="loading" title="运营活动效果" total="78%">
-          <a-tooltip title="指标说明" slot="action">
-            <a-icon type="info-circle-o"/>
-          </a-tooltip>
-          <div>
-            <mini-progress color="rgb(19, 194, 194)" :target="80" :percentage="78" :height="8"/>
-          </div>
-          <template slot="footer">
-            <trend flag="down" style="margin-right: 16px;">
-              <span slot="term">同周比</span>
-              12%
-            </trend>
-            <trend flag="up">
-              <span slot="term">日环比</span>
-              80%
-            </trend>
-          </template>
-        </chart-card>
+    </a-row>
+    <a-row>
+      <a-col :span="24">
+        <a-card :loading="loading" :bordered="false" title="数据总量" :style="{ marginTop: '24px' }">
+          <a-row>
+            <a-col :span="6">
+              <head-info title="广告主" :content="advertiserAllCount"></head-info>
+            </a-col>
+            <a-col :span="6">
+              <head-info title="广告封面" :content="adAllCount"></head-info>
+            </a-col>
+            <a-col :span="6">
+              <head-info title="广告视频" :content="videoAllCount"></head-info>
+            </a-col>
+            <a-col :span="6">
+              <head-info title="推广品" :content="productAllCount"></head-info>
+            </a-col>
+          </a-row>
+        </a-card>
       </a-col>
     </a-row>
 
@@ -75,23 +115,33 @@
             </div>
             <a-range-picker :style="{width: '256px'}"/>
           </div>
-          <a-tab-pane loading="true" tab="销售额" key="1">
+          <a-tab-pane loading="true" tab="行业" key="1">
             <a-row>
               <a-col :xl="16" :lg="12" :md="12" :sm="24" :xs="24">
-                <bar title="销售额排行" :dataSource="barData"/>
+                <bar title="展示排行" :dataSource="barData"/>
               </a-col>
               <a-col :xl="8" :lg="12" :md="12" :sm="24" :xs="24">
-                <rank-list title="门店销售排行榜" :list="rankList"/>
+                <rank-list title="热门素材排行榜" :list="rankList"/>
               </a-col>
             </a-row>
           </a-tab-pane>
-          <a-tab-pane tab="访问量" key="2">
+          <a-tab-pane tab="推广品" key="2">
             <a-row>
               <a-col :xl="16" :lg="12" :md="12" :sm="24" :xs="24">
-                <bar title="销售额趋势" :dataSource="barData"/>
+                <bar title="展示排行" :dataSource="barData"/>
               </a-col>
               <a-col :xl="8" :lg="12" :md="12" :sm="24" :xs="24">
-                <rank-list title="门店销售排行榜" :list="rankList"/>
+                <rank-list title="热门素材排行榜" :list="rankList"/>
+              </a-col>
+            </a-row>
+          </a-tab-pane>
+          <a-tab-pane tab="广告主" key="3">
+            <a-row>
+              <a-col :xl="16" :lg="12" :md="12" :sm="24" :xs="24">
+                <bar title="展示排行" :dataSource="barData"/>
+              </a-col>
+              <a-col :xl="8" :lg="12" :md="12" :sm="24" :xs="24">
+                <rank-list title="热门素材排行榜" :list="rankList"/>
               </a-col>
             </a-row>
           </a-tab-pane>
@@ -99,39 +149,7 @@
       </div>
     </a-card>
 
-    <a-row>
-      <a-col :span="24">
-        <a-card :loading="loading" :bordered="false" title="最近一周访问次数统计" :style="{ marginTop: '24px' }">
-          <a-row>
-            <a-col :span="6">
-              <head-info title="今日访问IP数" :content="loginfo.todayIp"></head-info>
-            </a-col>
-            <a-col :span="2">
-              <a-spin class='circle-cust'>
-                <a-icon slot="indicator" type="environment" style="font-size: 24px"/>
-              </a-spin>
-            </a-col>
-            <a-col :span="6">
-              <head-info title="今日访问次数" :content="loginfo.todayVisitCount"></head-info>
-            </a-col>
-            <a-col :span="2">
-              <a-spin class='circle-cust'>
-                <a-icon slot="indicator" type="team" style="font-size: 24px"/>
-              </a-spin>
-            </a-col>
-            <a-col :span="6">
-              <head-info title="访问总次数" :content="loginfo.totalVisitCount"></head-info>
-            </a-col>
-            <a-col :span="2">
-              <a-spin class='circle-cust'>
-                <a-icon slot="indicator" type="rise" style="font-size: 24px"/>
-              </a-spin>
-            </a-col>
-          </a-row>
-          <line-chart-multid :fields="visitFields" :dataSource="visitInfo"></line-chart-multid>
-        </a-card>
-      </a-col>
-    </a-row>
+
   </div>
 </template>
 
@@ -146,7 +164,7 @@
   import Bar from '@/components/chart/Bar'
   import LineChartMultid from '@/components/chart/LineChartMultid'
   import HeadInfo from '@/components/tools/HeadInfo.vue'
-
+  import {httpAction,getAction} from '@/api/manage'
   import Trend from '@/components/Trend'
   import {getLoginfo, getVisitInfo} from '@/api/api'
 
@@ -183,34 +201,41 @@
       return {
         loading: true,
         center: null,
-        rankList,
-        barData,
-        loginfo: {},
-        visitFields: ['ip', 'visit'],
-        visitInfo: [],
-        indicator: <a-icon type="loading" style = "font-size: 24px" spin />
+        advertiserTodayCount:0,
+        productTodayCount:0,
+        adTodayCount:0,
+        videoTodayCount:0,
+        advertiserAllCount:0,
+        productAllCount:0,
+        adAllCount:0,
+        videoAllCount:0,
+        rankList:[],
+        barData:[],
+        url:{
+          summaryToday:"/ctop/adcover/summary/today",
+          summaryAll:"/ctop/adcover/summary/all"
+        }
     }
     },
     created() {
       setTimeout(() => {
         this.loading = !this.loading
       }, 1000)
-      this.initLogInfo();
+      this.initDataInfo();
     },
     methods: {
-      initLogInfo() {
-        getLoginfo(null).then((res) => {
+      initDataInfo() {
+        this.barData=barData
+        this.rankList=rankList
+
+        getAction(this.url.summaryToday).then((res) => {
           if (res.success) {
-            Object.keys(res.result).forEach(key => {
-              res.result[key] = res.result[key] + ""
-            })
-            this.loginfo = res.result;
+            console.log(res.result)
           }
         })
-        getVisitInfo().then(res => {
+        getAction(this.url.summaryAll).then(res => {
           if (res.success) {
-            console.log("aaaaaa", res.result)
-            this.visitInfo = res.result;
+            console.log(res.result)
           }
         })
       },

+ 40 - 58
src/views/modules/kuaishouapp/KuaiShouCampaignTemplateList.vue

@@ -7,40 +7,26 @@
         <a-row :gutter="24">
 
           <a-col :md="6" :sm="8">
-            <a-form-item label="2:提升应用安装 3:获取电商下单 4:推广品牌活动 5:收集销售线索">
-              <a-input placeholder="请输入2:提升应用安装 3:获取电商下单 4:推广品牌活动 5:收集销售线索" v-model="queryParam.type"></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.appId"></a-input>
-            </a-form-item>
-          </a-col>
-        <template v-if="toggleSearchStatus">
-        <a-col :md="6" :sm="8">
-            <a-form-item label="url类型 当计划类型为 3(获取电商下单)时必填:1 - 淘宝商品短链2 - 淘宝商品 itemID">
-              <a-input placeholder="请输入url类型 当计划类型为 3(获取电商下单)时必填:1 - 淘宝商品短链2 - 淘宝商品 itemID" v-model="queryParam.urlType"></a-input>
-            </a-form-item>
-          </a-col>
-          <a-col :md="6" :sm="8">
-            <a-form-item label="广告计划名称">
-              <a-input placeholder="请输入广告计划名称" v-model="queryParam.campaignName"></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.loginId"></a-input>
+            <a-form-item label="类型">
+              <a-input placeholder="计划类型" v-model="queryParam.type"></a-input>
             </a-form-item>
           </a-col>
+          <template v-if="toggleSearchStatus">
+            <a-col :md="6" :sm="8">
+              <a-form-item label="广告计划名称">
+                <a-input placeholder="请输入广告计划名称" v-model="queryParam.campaignName"></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">
+             <!-- <a @click="handleToggleSearch" style="margin-left: 8px">
                 {{ toggleSearchStatus ? '收起' : '展开' }}
                 <a-icon :type="toggleSearchStatus ? 'up' : 'down'"/>
-              </a>
+              </a>-->
             </span>
           </a-col>
 
@@ -131,42 +117,38 @@
             customRender:function (t,r,index) {
               return parseInt(index)+1;
             }
-           },
-		   {
-            title: '2:提升应用安装 3:获取电商下单 4:推广品牌活动 5:收集销售线索',
+          },
+          {
+            title: '计划类型',
             align:"center",
             dataIndex: 'type'
-           },
-		   {
-            title: '应用创建主键id',
+          },
+          {
+            title: '应用创建id',
             align:"center",
             dataIndex: 'appId'
-           },
-		   {
-            title: 'url类型 当计划类型为 3(获取电商下单)时必填:1 - 淘宝商品短链2 - 淘宝商品 itemID',
+          },
+          {
+            title: 'url类型 ',
             align:"center",
             dataIndex: 'urlType'
-           },
-		   {
+          },
+          {
             title: '广告计划名称',
             align:"center",
             dataIndex: 'campaignName'
-           },
-		   {
-            title: '当前登录人id',
-            align:"center",
-            dataIndex: 'loginId'
-           },
-		   {
-            title: '当计划类型是 3/4/5 时必填',
+          },
+
+          {
+            title: '推广url',
             align:"center",
             dataIndex: 'url'
-           },
-		   {
-            title: '计划单日预算金额 单位:厘 0表示预算不限,不小于500元,不超过100000000',
+          },
+          {
+            title: '计划单日预算金额',
             align:"center",
             dataIndex: 'dayBudget'
-           },
+          },
           {
             title: '操作',
             dataIndex: 'action',
@@ -174,22 +156,22 @@
             scopedSlots: { customRender: 'action' },
           }
         ],
-		url: {
+        url: {
           list: "/kuaishou/kuaiShouCampaignTemplate/list",
           delete: "/kuaishou/kuaiShouCampaignTemplate/delete",
           deleteBatch: "/kuaishou/kuaiShouCampaignTemplate/deleteBatch",
           exportXlsUrl: "kuaishou/kuaiShouCampaignTemplate/exportXls",
           importExcelUrl: "kuaishou/kuaiShouCampaignTemplate/importExcel",
-       },
-    }
-  },
-  computed: {
-    importExcelUrl: function(){
-      return `${window._CONFIG['domianURL']}/${this.url.importExcelUrl}`;
-    }
-  },
+        },
+      }
+    },
+    computed: {
+      importExcelUrl: function(){
+        return `${window._CONFIG['domianURL']}/${this.url.importExcelUrl}`;
+      }
+    },
     methods: {
-     
+
     }
   }
 </script>

+ 9 - 13
src/views/modules/kuaishouapp/KuaiShouCreateAppTemplateList.vue

@@ -7,13 +7,13 @@
         <a-row :gutter="24">
 
           <a-col :md="6" :sm="8">
-            <a-form-item label="app类型 安卓 ios">
+            <a-form-item label="app类型">
               <a-input placeholder="请输入app类型 安卓 ios" v-model="queryParam.appType"></a-input>
             </a-form-item>
           </a-col>
           <a-col :md="6" :sm="8">
-            <a-form-item label="应用类型   : 1 Android 应用下载,2: Android 网页游戏,3: iOS 应用下载, 4:iOS 网页游戏">
-              <a-input placeholder="请输入应用类型   : 1 Android 应用下载,2: Android 网页游戏,3: iOS 应用下载, 4:iOS 网页游戏" v-model="queryParam.platform"></a-input>
+            <a-form-item label="应用类型">
+              <a-input placeholder="请输入应用类型" v-model="queryParam.platform"></a-input>
             </a-form-item>
           </a-col>
         <template v-if="toggleSearchStatus">
@@ -133,12 +133,12 @@
             }
            },
 		   {
-            title: 'app类型 安卓 ios',
+            title: 'app类型',
             align:"center",
             dataIndex: 'appType'
            },
 		   {
-            title: '应用类型   : 1 Android 应用下载,2: Android 网页游戏,3: iOS 应用下载, 4:iOS 网页游戏',
+            title: '应用类型',
             align:"center",
             dataIndex: 'platform'
            },
@@ -158,25 +158,21 @@
             dataIndex: 'packageName'
            },
 		   {
-            title: '上传文件到服务器返回地址',
+            title: 'app地址',
             align:"center",
             dataIndex: 'file'
            },
 		   {
-            title: '上传图片到服务器返回地址',
+            title: '图片地址',
             align:"center",
             dataIndex: 'imageUrl'
            },
 		   {
-            title: '输入应用下载地址',
+            title: '应用下载地址',
             align:"center",
             dataIndex: 'url'
            },
-		   {
-            title: '登录人id',
-            align:"center",
-            dataIndex: 'loginId'
-           },
+
           {
             title: '操作',
             dataIndex: 'action',

+ 8 - 21
src/views/modules/kuaishouapp/KuaiShouGroupCreateLogList.vue

@@ -6,11 +6,7 @@
       <a-form layout="inline">
         <a-row :gutter="24">
 
-          <a-col :md="6" :sm="8">
-            <a-form-item label="广告计划模板ID">
-              <a-input placeholder="请输入广告计划模板ID" v-model="queryParam.campaignTemplateId"></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>
@@ -133,12 +129,12 @@
             }
            },
 		   {
-            title: '广告计划模板ID',
+            title: '广告计划ID',
             align:"center",
             dataIndex: 'campaignTemplateId'
            },
 		   {
-            title: '账户ID',
+            title: '账户',
             align:"center",
             dataIndex: 'accountId'
            },
@@ -173,7 +169,7 @@
             dataIndex: 'ocpxActionType'
            },
 		   {
-            title: '深度转化目标 null',
+            title: '深度转化目标',
             align:"center",
             dataIndex: 'deepConversionType'
            },
@@ -203,7 +199,7 @@
             dataIndex: 'dayBudget'
            },
 		   {
-            title: 'url类型 1:淘宝商品短链 2:淘宝商品 itemID',
+            title: 'url类型',
             align:"center",
             dataIndex: 'urlType'
            },
@@ -212,18 +208,14 @@
             align:"center",
             dataIndex: 'url'
            },
+
 		   {
-            title: 'APP ID',
-            align:"center",
-            dataIndex: 'appId'
-           },
-		   {
-            title: '创意展现方式  1:轮播 2:优选',
+            title: '创意展现方式',
             align:"center",
             dataIndex: 'showModel'
            },
 		   {
-            title: '投放方式 1:快速投放 2:平滑投放',
+            title: '投放方式',
             align:"center",
             dataIndex: 'speed'
            },
@@ -232,11 +224,6 @@
             align:"center",
             dataIndex: 'unitId'
            },
-		   {
-            title: '当前登录人id',
-            align:"center",
-            dataIndex: 'loginId'
-           },
           {
             title: '操作',
             dataIndex: 'action',

+ 10 - 23
src/views/modules/kuaishouapp/KuaiShouImageList.vue

@@ -6,14 +6,10 @@
       <a-form layout="inline">
         <a-row :gutter="24">
 
+
           <a-col :md="6" :sm="8">
-            <a-form-item label="图片保存本地地址">
-              <a-input placeholder="请输入图片保存本地地址" v-model="queryParam.localUrl"></a-input>
-            </a-form-item>
-          </a-col>
-          <a-col :md="6" :sm="8">
-            <a-form-item label="videoName">
-              <a-input placeholder="请输入videoName" v-model="queryParam.videoName"></a-input>
+            <a-form-item label="">
+              <a-input  v-model="queryParam.imageName"></a-input>
             </a-form-item>
           </a-col>
         <template v-if="toggleSearchStatus">
@@ -23,13 +19,8 @@
             </a-form-item>
           </a-col>
           <a-col :md="6" :sm="8">
-            <a-form-item label="登录人id">
-              <a-input placeholder="请输入登录人id" v-model="queryParam.loginId"></a-input>
-            </a-form-item>
-          </a-col>
-          <a-col :md="6" :sm="8">
-            <a-form-item label="图片类型 1-竖版图片 2-横版图片">
-              <a-input placeholder="请输入图片类型 1-竖版图片 2-横版图片" v-model="queryParam.materialType"></a-input>
+            <a-form-item label="图片类型">
+              <a-input placeholder="请输入图片类型" v-model="queryParam.materialType"></a-input>
             </a-form-item>
           </a-col>
           </template>
@@ -133,27 +124,23 @@
             }
            },
 		   {
-            title: '图片保存本地地址',
+            title: '图片保存地址',
             align:"center",
             dataIndex: 'localUrl'
            },
 		   {
-            title: 'imageName',
+            title: '图片名称',
             align:"center",
             dataIndex: 'imageName'
            },
 		   {
-            title: '视频类别',
+            title: '图片类别',
             align:"center",
             dataIndex: 'imageType'
            },
+
 		   {
-            title: '登录人id',
-            align:"center",
-            dataIndex: 'loginId'
-           },
-		   {
-            title: '图片类型 1-竖版图片 2-横版图片',
+            title: '图片类型',
             align:"center",
             dataIndex: 'materialType'
            },

+ 62 - 75
src/views/modules/kuaishouapp/KuaiShouVideoList.vue

@@ -6,34 +6,20 @@
       <a-form layout="inline">
         <a-row :gutter="24">
 
-          <a-col :md="6" :sm="8">
-            <a-form-item label="视频保存本地地址">
-              <a-input placeholder="请输入视频保存本地地址" v-model="queryParam.localUrl"></a-input>
-            </a-form-item>
-          </a-col>
-          <a-col :md="6" :sm="8">
-            <a-form-item label="视频描述">
-              <a-input placeholder="请输入视频描述" v-model="queryParam.videoDesc"></a-input>
-            </a-form-item>
-          </a-col>
-        <template v-if="toggleSearchStatus">
-        <a-col :md="6" :sm="8">
-            <a-form-item label="videoName">
-              <a-input placeholder="请输入videoName" v-model="queryParam.videoName"></a-input>
-            </a-form-item>
-          </a-col>
-          <a-col :md="6" :sm="8">
-            <a-form-item label="视频类别">
-              <a-input placeholder="请输入视频类别" v-model="queryParam.videoType"></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.loginId"></a-input>
-            </a-form-item>
-          </a-col>
+
+          <template v-if="toggleSearchStatus">
+            <a-col :md="6" :sm="8">
+              <a-form-item label="视频名称">
+                <a-input placeholder="请输入视频名称" v-model="queryParam.videoName"></a-input>
+              </a-form-item>
+            </a-col>
+            <a-col :md="6" :sm="8">
+              <a-form-item label="视频类别">
+                <a-input placeholder="请输入视频类别" v-model="queryParam.videoType"></a-input>
+              </a-form-item>
+            </a-col>
           </template>
-          <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>
@@ -52,21 +38,28 @@
     <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-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-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-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>项
+        <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>
 
@@ -85,9 +78,9 @@
         <span slot="action" slot-scope="text, record">
           <a @click="handleEdit(record)">编辑</a>
 
-          <a-divider type="vertical" />
+          <a-divider type="vertical"/>
           <a-dropdown>
-            <a class="ant-dropdown-link">更多 <a-icon type="down" /></a>
+            <a class="ant-dropdown-link">更多 <a-icon type="down"/></a>
             <a-menu slot="overlay">
               <a-menu-item>
                 <a-popconfirm title="确定删除吗?" @confirm="() => handleDelete(record.id)">
@@ -109,15 +102,15 @@
 
 <script>
   import KuaiShouVideoModal from './modules/KuaiShouVideoModal'
-  import { JeecgListMixin } from '@/mixins/JeecgListMixin'
+  import {JeecgListMixin} from '@/mixins/JeecgListMixin'
 
   export default {
     name: "KuaiShouVideoList",
-    mixins:[JeecgListMixin],
+    mixins: [JeecgListMixin],
     components: {
       KuaiShouVideoModal
     },
-    data () {
+    data() {
       return {
         description: '快手-上传视频管理页面',
         // 表头
@@ -125,62 +118,56 @@
           {
             title: '#',
             dataIndex: '',
-            key:'rowIndex',
-            width:60,
-            align:"center",
-            customRender:function (t,r,index) {
-              return parseInt(index)+1;
+            key: 'rowIndex',
+            width: 60,
+            align: "center",
+            customRender: function (t, r, index) {
+              return parseInt(index) + 1;
             }
-           },
-		   {
-            title: '视频保存本地地址',
-            align:"center",
+          },
+          {
+            title: '视频本地地址',
+            align: "center",
             dataIndex: 'localUrl'
-           },
-		   {
+          },
+          {
             title: '视频描述',
-            align:"center",
+            align: "center",
             dataIndex: 'videoDesc'
-           },
-		   {
-            title: 'videoName',
-            align:"center",
+          },
+          {
+            title: '视频名称',
+            align: "center",
             dataIndex: 'videoName'
-           },
-		   {
+          },
+          {
             title: '视频类别',
-            align:"center",
+            align: "center",
             dataIndex: 'videoType'
-           },
-		   {
-            title: '登录人id',
-            align:"center",
-            dataIndex: 'loginId'
-           },
+          },
+
           {
             title: '操作',
             dataIndex: 'action',
-            align:"center",
-            scopedSlots: { customRender: 'action' },
+            align: "center",
+            scopedSlots: {customRender: 'action'},
           }
         ],
-		url: {
+        url: {
           list: "/kuaishou/kuaiShouVideo/list",
           delete: "/kuaishou/kuaiShouVideo/delete",
           deleteBatch: "/kuaishou/kuaiShouVideo/deleteBatch",
           exportXlsUrl: "kuaishou/kuaiShouVideo/exportXls",
           importExcelUrl: "kuaishou/kuaiShouVideo/importExcel",
-       },
-    }
-  },
-  computed: {
-    importExcelUrl: function(){
-      return `${window._CONFIG['domianURL']}/${this.url.importExcelUrl}`;
-    }
-  },
-    methods: {
-     
-    }
+        },
+      }
+    },
+    computed: {
+      importExcelUrl: function () {
+        return `${window._CONFIG['domianURL']}/${this.url.importExcelUrl}`;
+      }
+    },
+    methods: {}
   }
 </script>
 <style scoped>

+ 10 - 10
src/views/modules/kuaishouapp/groupCreate.vue

@@ -682,13 +682,13 @@
       //初始化小时数组
       var time_hour_arr = [];
 
-      for (var x = 0; x < 48; x++) {
+      for (var x = 0; x < 24; x++) {
 
         //获取当前点击元素的位置
         if (y == 0) {
           var index = x;
         } else {
-          var index = (y * 48) + x;
+          var index = (y * 24) + x;
         }
         //获取td对应的二进制值
         var Selected_val = binary.charAt(index);
@@ -721,7 +721,7 @@
           } else if (binary.charAt(index - 1) == 1 && x > 0) {
             //选中的前一个已选中,且此次选中的不是行里第一个,此次选中的元素前加-后加逗号
             time_hour_arr[time_hour_arr.length] = '-' + arr_hour[x] + ', ';
-          } else if (binary.charAt(index + 1) != 1 || x == 47) {
+          } else if (binary.charAt(index + 1) != 1 || x == 23) {
             //选中的后一个没选中,或者此次选中的是行里最后一个,此次选中的元素加逗号
             time_hour_arr[time_hour_arr.length] = arr_hour[x] + ', ';
           } else {
@@ -775,12 +775,12 @@
     var oDate = new Date("2016/07/01 00:00:00"); //实例一个时间对象;
     var oDate_hour = oDate.getHours();
     var oDate_minute = oDate.getMinutes();
-    for (var i = 0; i < 48; i++) {
+    for (var i = 0; i < 24; i++) {
       if (oDate_minute < 10) {
         var oDate_minute = "0" + oDate_minute;
       }
       if (i >= 1) {
-        oDate.setMinutes(oDate.getMinutes() + 30);
+        oDate.setMinutes(oDate.getMinutes() + 60);
         oDate_hour = oDate.getHours();
         oDate_minute = oDate.getMinutes();
         if (oDate_minute < 10) {
@@ -811,7 +811,7 @@
   function binary_selected() {
     var default_time_val = jq('#' + box_id + ' .default_time_val').val();
     if (default_time_val) {
-      for (var i = 0; i < 336; i++) {
+      for (var i = 0; i < 168; i++) {
         var td_selected = default_time_val.charAt(i);
         if (td_selected != 0) {
           jq('#' + box_id + ' table tbody tr td').eq(i).attr('class', 'Selected');
@@ -834,8 +834,8 @@
     html += '<thead>';
     html += '<tr>';
     html += '<th></th>';
-    html += '<th colSpan="24">上午</th>';
-    html += '<th colSpan="24">下午</th>';
+    html += '<th colSpan="12">上午</th>';
+    html += '<th colSpan="12">下午</th>';
     html += '</tr>';
     html += '<tr class="hour">';
     html += '<th></th>';
@@ -854,7 +854,7 @@
     for (var i = 0; i < 7; i++) {
       var week = i + 1;
       html_tbody_td += '<tr>';
-      for (var j = 0; j < 49; j++) {
+      for (var j = 0; j < 25; j++) {
         if (j == 0) {
           html_tbody_td += '<th week="' + week + '">星期' + num[i] + '</th>';
         } else {
@@ -866,7 +866,7 @@
 
     //创建表格小时栏目
     for (var i = 0; i <= 23; i++) {
-      html_thead_td += '<td colSpan="2" hour="' + i + '">' + i + '</td>';
+      html_thead_td += '<td  hour="' + i + '">' + i + '</td>';
     }
     jq('#' + box_id + ' table thead .hour').append(html_thead_td);
     jq('#' + box_id + ' table tbody').html(html_tbody_td);

+ 19 - 26
src/views/template/budget/create.vue

@@ -275,14 +275,6 @@
     }
   }
 
-
-
-
-
-
-
-
-
   var box_id;
   var StartTD = null;
   var StartIndex = null;
@@ -607,8 +599,8 @@
   }
 
 
-  //实例化程序
-  function load_time_table(id){
+  // //实例化程序
+  function load_time_table(id) {
     //包住table的元素id
     box_id = id;
     var html;
@@ -626,29 +618,29 @@
     html += '<tbody></tbody>';
     html += '</table>';
     html += '<input class="focus" style="opacity: 0;">';
-    html += '<div id="'+box_id+'_time_seled"></div>';
-    html += '<input v-model="dateQuantumRange" type="hidden" id="'+box_id+'_time_num" name="time" caption="每日投放时段" switchname="selectTime"  value="">';
-    $('#'+box_id).append(html);
+    html += '<div id="' + box_id + '_time_seled"></div>';
+    html += '<input v-model="dateQuantumRange" type="hidden" id="' + box_id + '_time_num" name="time" caption="每日投放时段" switchname="selectTime"  value="">';
+    $('#' + box_id).append(html);
     var html_tbody_td = '';
     var html_thead_td = '';
 
     //创建表格
     for (var i = 0; i < 7; i++) {
-      var week = i+1;
+      var week = i + 1;
       html_tbody_td += '<tr>';
-      for (var j = 0; j < 49; j++){
-        if (j==0) {
-          html_tbody_td += '<th week="'+week+'">周' + num[i] +  '</th>';
-        }else{
-          html_tbody_td += '<td>'  +  '</td>';
+      for (var j = 0; j < 49; j++) {
+        if (j == 0) {
+          html_tbody_td += '<th week="' + week + '">周' + num[i] + '</th>';
+        } else {
+          html_tbody_td += '<td>' + '</td>';
         }
       }
       html_tbody_td += '</tr>';
     }
 
     //创建表格小时栏目
-    for(var i =0; i<= 23; i++){
-      html_thead_td += '<td colSpan="2" hour="'+i+'">'+ i + '</td>';
+    for (var i = 0; i <= 23; i++) {
+      html_thead_td += '<td colSpan="2" hour="' + i + '">' + i + '</td>';
     }
     $('#' + box_id + ' table thead .hour').append(html_thead_td);
     $('#' + box_id + ' table tbody').html(html_tbody_td);
@@ -658,25 +650,26 @@
 
     //控制器,控制当前在哪个表格进行操作
     $('.plug-timer-grid').hover(function (e) {
-      if(1 != e.which){    //判断是否为左击
+      if (1 != e.which) {    //判断是否为左击
         var id = $(this).parent().attr('id');
         box_id = id;
       }
     });
 
     //清除所有选中项
-    $('.clear').click(function(){
+    $('.clear').click(function () {
       $(this).parent().find('td').removeClass(Selected);
-      var id =$(this).parent().attr('id');
+      var id = $(this).parent().attr('id');
       renewal(id);
     });
 
     //点击小时选中或去掉整列处理块
-    $('#' + box_id + ' table thead tr td').click(function() {
+    $('#' + box_id + ' table thead tr td').click(function () {
       hour = $(this).attr('hour');
       if (hour >= 0) {
         var rows = $('#' + box_id + ' table tbody tr').length;
         Start_x = ($(this).index()) * 2 - 1;
         Start_y = 0;
       }
-    }
+    });
+  }