Explorar el Código

提交,打包

zhuxinbo hace 5 años
padre
commit
325b588c57

+ 49 - 27
src/views/dashboard/Analysis.vue

@@ -1,16 +1,23 @@
-<style>
+<style lang='scss'>
     .only-there .ant-tabs-bar{
         background: white;
     }
     #updateInfo .ant-modal-content,#updateInfo .ant-modal-body {
       
       width: 500px;
-      /* height: 600px; */
       position: relative;
       padding-top:10px;
+      .updateBOX{
+          height: 600px; 
+          overflow: auto;
+      }
     }
-    .Updatecontent{
-          padding: 0 20px 40px;
+    .Updatecontent{       
+        padding: 0 20px 40px;
+        position: relative;
+        .Updateitem{
+          margin-bottom: 30px;
+        }
     }
     .Updatetitle{
         text-align: center;
@@ -47,7 +54,13 @@
       bottom: 3%;
     }
     .updatelist{
-      list-style: disc;
+      .circular{
+        display: inline-block;
+        width: 3px;
+        height: 3px;
+        border-radius: 50%;
+        color: #999;
+      }
     }
 
 </style>
@@ -215,6 +228,7 @@
     </a-tabs>
     <!-- 更新公告 -->
     <a-modal v-model="visible" title="" @ok="handleOk" :closable='false' :footer="null" id="updateInfo">
+      <div class="updateBOX">
       <div class="Updatetitle">
          <a-icon type="notification" theme='twoTone'/> 更新通告
       </div>
@@ -222,56 +236,64 @@
         <div class="Updateitem">
             <div class="Updatetime">
                  <a-icon type="dashboard" theme='twoTone' class="updateicon" />
-                 <span class="updateSpan">{{updateTime[0]}}</span>
+                 <span class="updateSpan">{{updateTime[1]}}</span>
             </div>
             <div class="updateText">
-              <!-- <div class="updateBox">
-                <h3 class="textTitle">1.脚本素材功能迭代</h3>
+              <div class="updateBox">
+                <h3 class="textTitle">1.快手批量工具更新:</h3>
                 <ul class="updatelist">
-                  <li>可使用在线编辑并自动保存</li>
-                  <li>支持项目筛选、文件上传</li>
+                  <li> <span class="circular"></span> 批量更改监测链接;</li>
+                  <li><span class="circular"></span>素材审核驳回在企业微信发消息提醒;</li>
+                  <li><span class="circular"></span>推送失败在企业微信发消息;</li>
+                  <li><span class="circular"></span>广告语加入动态词包;</li>
+                  <li><span class="circular"></span>屏蔽停投的账户;</li>
                 </ul>
-              </div> -->
+              </div>
+              <div class="updateBox">
+                <h3 class="textTitle">2.素材管理--视频素材-加素材名称搜索</h3>
+              </div>
+                      
+            </div>
+        </div>
+        <div class="Updateitem">
+            <div class="Updatetime">
+                 <a-icon type="dashboard" theme='twoTone' class="updateicon" />
+                 <span class="updateSpan">{{updateTime[0]}}</span>
+            </div>
+            <div class="updateText">
               <div class="updateBox">
                 <h3 class="textTitle">1.头条-账户报表上线通知</h3>
                 <ul class="updatelist">
-                  <li>点击“统计报表-头条报表-账户报表”查看模块</li>
-                  <li>可根据项目账户筛选查看数据,支持时间筛选</li>
-                  <li>支持报表导出</li>
+                  <li><span class="circular"></span>点击“统计报表-头条报表-账户报表”查看模块</li>
+                  <li><span class="circular"></span>可根据项目账户筛选查看数据,支持时间筛选</li>
+                  <li><span class="circular"></span>支持报表导出</li>
                 </ul>
               </div>
               <div class="updateBox">
                 <h3 class="textTitle">2.快手批量工具更新</h3>
                 <ul>
-                  <li>在创建创意模块加了时间维度筛选</li>
+                  <li><span class="circular"></span>在创建创意模块加了时间维度筛选</li>
                 </ul>
               </div>
               <div class="updateBox">
                 <h3 class="textTitle">3.视频报表修改</h3>
                 <ul>
-                  <li>添加了视频上传时间字段</li>
+                  <li><span class="circular"></span>添加了视频上传时间字段</li>
                 </ul>
               </div>
                <div class="updateBox">
                 <h3 class="textTitle">4.修复系统bug</h3>
-                <!-- <ul>
-                  <li>在创建创意模块加了时间维度筛选</li>
-                </ul> -->
+                
               </div>
               <div class="updateBox">
                 <h3 class="textTitle">5.更新公告上线</h3>
-                <!-- <ul>
-                  <li>在创建创意模块加了时间维度筛选</li>
-                </ul> -->
-              </div>
-
-
-                
+              </div>             
             </div>
         </div>
          
       </div>
       <a-button type='primary' class="okBtn" @click="handleOk">知道了</a-button>
+       </div>
     </a-modal>
   </div>
 </template>
@@ -340,7 +362,7 @@
         indicator: <a-icon type="loading" style="font-size: 24px" spin />,
         roleCode: localStorage.getItem('roleCode'),
         visible:false,//更新通知消息提示框
-        updateTime:['2020-6-10'],
+        updateTime:['2020-06-10','2020-06-17'],
         versionId:0,//存储版本号 判断通知什么时候显示
       }
     },

+ 16 - 16
src/views/modules/BatchCreate/TouTiaoBatch.vue

@@ -446,21 +446,7 @@ let data=[
     },
 ]
 
-let rowSelection={
-    onChange: (selectedRowKeys, selectedRows) => {
-        console.log(`selectedRowKeys: ${selectedRowKeys}`, 'selectedRows: ', selectedRows);
-        console.log(selectedRowKeys);
-        this.selectedRowKeys=selectedRowKeys;
-    },
-    onSelect: (record, selected, selectedRows) => {
-        console.log(record, selected, selectedRows);
-        
-    },
-    onSelectAll: (selected, selectedRows, changeRows) => {
-        console.log(selected, selectedRows, changeRows);
-        
-    },
-}
+
 export default {
     components: {
         editableCell,
@@ -484,7 +470,21 @@ export default {
             data:[],
             columns,
             selectedRowKeys:[],
-            rowSelection,
+            rowSelection:{
+                onChange: (selectedRowKeys, selectedRows) => {
+                    console.log(`selectedRowKeys: ${selectedRowKeys}`, 'selectedRows: ', selectedRows);
+                    console.log(selectedRowKeys);
+                    this.selectedRowKeys=selectedRowKeys;
+                },
+                onSelect: (record, selected, selectedRows) => {
+                    console.log(record, selected, selectedRows);
+                    
+                },
+                onSelectAll: (selected, selectedRows, changeRows) => {
+                    console.log(selected, selectedRows, changeRows);
+                    
+                },
+            },
             editID:0,
             //批量修改里的表格
             typeValue,

+ 240 - 35
src/views/modules/BatchCreate/crowedPackage.vue

@@ -25,40 +25,48 @@
                 </a-tree-select>
                 </span>
                 <span class="optItem">
-                    <a-date-picker @change="dateChange" />
+                    <a-date-picker v-model="dateValue" @change="dateChange" />
                 </span>
 
             </div>
             <div class="bottom">
                 <div class="optItem">
-                    <a-select :size="size" placeholder='覆盖数量' style="width: 200px" @change="handleChange">
+                    <a-select size="default" placeholder='覆盖数量' v-model="coverageQuantity" style="width: 200px" @change="coverChange">
                         <a-select-option v-for="i in 25" :key="(i + 9).toString(36) + i">
                             {{ (i + 9).toString(36) + i }}
                         </a-select-option>
                     </a-select>
                 </div>
                 <div class="optItem">
-                    <a-select :size="size" placeholder='类别' style="width: 200px" @change="handleChange">
-                        <a-select-option v-for="i in 25" :key="(i + 9).toString(36) + i">
-                            {{ (i + 9).toString(36) + i }}
+                    <a-select size="default" placeholder='类别' v-model="category" style="width: 200px" @change="categoryChange">
+                        <a-select-option value='' > 
+                            全部
+                        </a-select-option>
+                        <a-select-option v-for="(item,index) in categoryArr" :key="index" :value='item.value' > 
+                            {{ item.title }}
                         </a-select-option>
                     </a-select>
                 </div>
                 <div class="optItem">
-                    <a-input-search placeholder="input search text" style="width: 200px" @search="onSearch" />
+                    <a-input-search placeholder="按名称搜索" v-model="nameSearch" style="width: 200px" @search="onSearch" />
                 </div>
                 <div class="optionBtn">
                      <a-button class="search" type='primary' @click="search">查询</a-button>
+                     <a-button class="search" type='link' @click="clearAll">清空全部</a-button>
                 </div>
             </div>
         </div>
         <div class="tableBOX">
             <div class="tableOpt">
-                <a-button class="search" type='primary' @click="search">查询</a-button>
-                <a-button class="search" type='primary' @click="search">同步</a-button>
-                <a-select :size="size" placeholder='批量操作' style="width: 200px" @change="handleChange">
-                    <a-select-option v-for="i in 25" :key="(i + 9).toString(36) + i">
-                        {{ (i + 9).toString(36) + i }}
+                <a-button class="search" type='primary' @click="updatePackage">上传人群包</a-button>
+                <a-button class="search" type='primary' @click="synchro">同步</a-button>
+                <a-select size="default" placeholder='批量操作' v-model="batchValue" style="width: 200px" @change="batchChange">
+                    
+                    <a-select-option  value='push'>
+                        推送
+                    </a-select-option>
+                    <a-select-option  value='delete'>
+                        删除
                     </a-select-option>
                 </a-select>
                 <a-button class="addCol" type='primary' @click="search">自定义列</a-button>
@@ -77,15 +85,22 @@
                        <editableCell :text="text" slotName='groupBudget' @change="onCellChange(record.key, 'groupBudget', $event)" /> 
                     </span>
                     <span slot="status" slot-scope="text,record">
-                        <a-switch size="default" :checked=text  @change="switchChange(text,record)"/>
+                        <span v-if="record.status">
+                            <span style='color:#33CC33'>可用</span>
+                            <span style="display:block">推送完成</span> 
+                        </span>
+                        <span v-else>
+                            <span style='color:#CC3333'>不可用</span>
+                            <span style="display:block">推送失败</span> 
+                        </span>                
                     </span>
-                    <span slot="options" slot-scope="record">
+                    <span slot="operation" slot-scope="text,record">
                         <a href="javascript:;" style="margin-right:10px">推送</a>
                         <a-popconfirm
                             v-if="dataSource.length"
-                            title="Sure to delete?"
+                            title="确定要删除吗?"
                             @confirm="() => onDelete(record.key)"
-                            >
+                        >
                             <a href="javascript:;">删除</a>
                         </a-popconfirm>
                         
@@ -97,9 +112,18 @@
                     <span slot="parentPlan" slot-scope="text">
                         <a href="javascript:;" >{{text}}</a>
                     </span>
+                    <span slot="cost" slot-scope="cost">       
+                        {{cost | formatCurrency }}
+                    </span>
                 </a-table>
             </div>
         </div>
+        <!-- 上传人群包的界面 -->
+        <a-modal v-model="updatePackageVisiable"  @ok="updatePackageOk" width="75%" id="updatePackageOk">
+            <p class="title">上传人群包</p>
+            <p>Some contents...</p>
+            <p>Some contents...</p>
+        </a-modal>
     </div>
 </template>
 
@@ -110,22 +134,99 @@ import editableCell from './editableCell'
 import { TreeSelect } from 'ant-design-vue';
 const SHOW_PARENT = TreeSelect.SHOW_PARENT;
 
-let rowSelection={
-    onChange: (selectedRowKeys, selectedRows) => {
-        console.log(`selectedRowKeys: ${selectedRowKeys}`, 'selectedRows: ', selectedRows);
-        console.log(selectedRowKeys);
-        this.selectedRowKeys=selectedRowKeys;
+
+const columns = [
+  {
+    title: '名称',
+    dataIndex: 'userName',
+    align: 'center',
+    key:'userName',
+    scopedSlots: { customRender: 'userName' }
+  },
+  {
+    title: '类别',
+    dataIndex: 'department',
+    align: 'center', 
+    key: 'department',
+    scopedSlots: { customRender: 'department' }
+  },
+  {
+    title: '创建时间',
+    dataIndex: 'roleName',
+    align: 'center',
+    
+    key: 'roleName',
+    scopedSlots: { customRender: 'roleName' }
+  },
+  
+  {
+    title: '全部覆盖人数',
+    dataIndex: 'cost',
+    align: 'center',
+    scopedSlots: { customRender: 'cost' },
+    sorter:()=>{}
+  },
+  {
+    title: '账户名称',
+    dataIndex: 'accountName',
+    align: 'center',
+    scopedSlots: { customRender: 'accountName' },
+    
+  },
+  {
+    title: '状态',
+    dataIndex: 'status',
+    align: 'center',
+    scopedSlots: { customRender: 'status' },
+    
+  },
+            
+  {
+    title: '操作',
+    dataIndex: 'operation',
+    align: 'center',
+    scopedSlots: { customRender: 'operation' },
+    
+  }
+]
+
+const categoryArr=[
+    {
+        title:'规则',
+        value:'guize',
+        key:'guize'
     },
-    onSelect: (record, selected, selectedRows) => {
-        console.log(record, selected, selectedRows);
-        
+    {
+        title:'运算',
+        value:'yunsuan',
+        key:'yuansuan'
     },
-    onSelectAll: (selected, selectedRows, changeRows) => {
-        console.log(selected, selectedRows, changeRows);
-        
+    {
+        title:'上传',
+        value:'update',
+        key:'update'
     },
-}
-
+    {
+        title:'扩展',
+        value:'extend',
+        key:'extend'
+    },
+    {
+        title:'API',
+        value:'API',
+        key:'API'
+    },
+    {
+        title:'付费',
+        value:'pay',
+        key:'pay'
+    },
+    {
+        title:'主题人群',
+        value:'crowd',
+        key:'crowd'
+    },
+]
 export default {
     components: {
         editableCell,
@@ -133,18 +234,69 @@ export default {
     data() {
         return {
             //treeselect的参数
-            treeValue: [],
+            
             treeData: [],
             SHOW_PARENT,
             accountId:[],
-            dateValue:null,//日期选择器
+            
              //主页的表格
-            dataSource:[],
+            dataSource:[
+                {
+                    userName:'人群纠错包1',
+                    department:'运算',
+                    roleName:'2020-6-10',
+                    cost:16897546322,
+                    accountName:'伊对-01',
+                    status:true,
+                    key:0
+                },
+                {
+                    userName:'人群纠错包2',
+                    department:'运算',
+                    roleName:'2020-6-10',
+                    cost:16897322,
+                    accountName:'伊对-02',
+                    status:false,
+                    key:1
+                },
+                {
+                    userName:'人群纠错包3',
+                    department:'运算',
+                    roleName:'2020-6-10',
+                    cost:16322,
+                    accountName:'伊对-03',
+                    status:true,
+                    key:2
+                },
+            ],
+            categoryArr,
             columns,
             selectedRowKeys:[],
-            rowSelection,
+            rowSelection:{
+                onChange: (selectedRowKeys, selectedRows) => {
+                    console.log(`selectedRowKeys: ${selectedRowKeys}`, 'selectedRows: ', selectedRows);
+                    console.log(selectedRowKeys);
+                    this.selectedRowKeys=selectedRowKeys;
+                },
+                onSelect: (record, selected, selectedRows) => {
+                    console.log(record, selected, selectedRows);
+                    
+                },
+                onSelectAll: (selected, selectedRows, changeRows) => {
+                    console.log(selected, selectedRows, changeRows);
+                    
+                },
+            },
             editID:0,
+            //查询条件
+            treeValue: [],
+            coverageQuantity:undefined,
+            category:undefined,
+            dateValue:null,//日期选择器
+            nameSearch:undefined,
+            batchValue:undefined, //批量操作的选中值
 
+            updatePackageVisiable:false,//上传人群包的弹出框
         }
     },
     methods: {
@@ -237,7 +389,12 @@ export default {
             // console.log(arguments);
             // this.treeValue=arguments[0].value
         },
+        coverChange(){
+
+        },
+        categoryChange(){
 
+        },
         //日期改变
         dateChange(date, dateString) {
             console.log(date, dateString);
@@ -247,16 +404,48 @@ export default {
         onSearch(value) {
             console.log(value);
         },
-
+        //批量操作
+        batchChange(val){
+            console.log(val)
+            this.batchValue=val
+        },
         //查询按钮
         search(){
 
         },
-
+        //清空全部
+        clearAll(){
+            this.treeValue=[];
+            this.coverageQuantity=undefined;
+            this.category=undefined;
+            this.dateValue=null;//日期选择器
+            this.nameSearch=undefined;
+            this.batchValue=undefined; //批量操作的选中值
+        },
         //表格里的删除按钮
         onDelete(key) {
+            console.log(key)
             const dataSource = [...this.dataSource];
             this.dataSource = dataSource.filter(item => item.key !== key);
+
+        },
+        //上传人群包
+        updatePackage(){
+            this.updatePackageVisiable=true;
+        },
+        //同步人群包
+        synchro(){
+
+        },
+        updatePackageOk(){
+            this.updatePackageVisiable = false;
+        },
+
+        filterOption(input, option){
+            console.log(input, option)
+            return (
+                option.componentOptions.children[0].text.toLowerCase().indexOf(input.toLowerCase()) >= 0
+                );
         },
     },
     filters: {
@@ -331,19 +520,33 @@ export default {
     }
 }
 </script>
+<style lang="scss">
+    #updatePackageOk{
+        .title{
+            font-size: 18px;
+            font-weight: 700;
+        }
+        
 
+    }
+</style>
 <style lang="scss" scoped>
 .crowedPackage{
+    
     .optHeader{
         margin: 15px 0;
+        padding: 15px 15px;
         background: #fff;
-        .optinItem{
+        .optItem{
             display: inline-block;
             margin-right: 15px;
             .ok{
                 margin-right: 15px;
             }
         }
+        .top{
+            margin-bottom: 15px;
+        }
         .optionBtn{
         // display: inline-block;
             float: right;
@@ -357,6 +560,8 @@ export default {
         border-radius: 10px;
     }
     .tableBOX{
+        background: #fff;
+        padding: 15px 15px;
         .tableOpt{
             margin-bottom: 10px;
             .search{

+ 6 - 5
src/views/modules/Statistics/performanceRelated/performanceRelated.vue

@@ -116,7 +116,7 @@
         </div>
          <!-- 明细表 -->
         <div class="detailBox">
-            <a-modal v-model="visibleDetail" title="详细信息" width="50%" :footer="null" id="detailBox">
+            <a-modal v-model="visibleDetail" title="详细信息" width="55%" :footer="null" id="detailBox">
                 <!-- <a-button type="default" @click="exportExcel" id="mybtn">导出报表</a-button> -->
                 <div class="myTable">
                     <a-table
@@ -225,7 +225,7 @@ const detailColumns=[
         align: 'center',
         scopedSlots: { customRender: 'quarters' },
         sorter:()=>{},
-        width:150
+        width:120
     },
     {
         title: '项目',
@@ -233,7 +233,7 @@ const detailColumns=[
         align: 'center',
         scopedSlots: { customRender: 'projectName' },
         sorter:()=>{},
-        width:200
+        width:150
     },
     {
         title: '账户名称',
@@ -241,7 +241,7 @@ const detailColumns=[
         align: 'center',
         scopedSlots: { customRender: 'authName' },
         sorter:()=>{},
-        width:350,
+        width:300,
     },
     {
         title: '消耗',
@@ -312,7 +312,8 @@ export default {
                 company:this.company,
                 userName:this.nameValue,
                 roleCode:this.position,
-                mediaType:this.mediaType
+                mediaType:this.mediaType,
+                department:this.department
             }).then(res => {
                 let blob = new Blob([res], {
                     type: 'application/vnd.openxmlformats-officedocument.spreadsheetml.sheet'