浏览代码

物料池修改

朱鑫波 4 年之前
父节点
当前提交
cb05cdafe0

+ 0 - 2
src/views/modules/autoLaunch/directional/components/targetedPopulation.vue

@@ -401,8 +401,6 @@ li:hover {
           </ul>
         </div>
         <div style="width: 100%" v-if="optionsAll.length > 0">
-          <a-button @click="clearAll">清空</a-button>
-          <br />
           <a-tag v-for="item of optionsAll" :key="item" closable :afterClose="() => log(item)">
             {{ showAppName(item) ? showAppName(item) : item }}
           </a-tag>

+ 6 - 1
src/views/modules/autoLaunch/directional/components/templateModal.vue

@@ -73,7 +73,7 @@
           </a-col>
         </a-row>
         <a-form-item
-          label="模板名称"
+          label="定向包名称"
           :labelCol="{ lg: { span: 7 }, sm: { span: 7 } }"
           :wrapperCol="{ lg: { span: 12 }, sm: { span: 12 } }"
         >
@@ -230,6 +230,11 @@ export default {
       e.preventDefault()
       this.$refs.population.handleSubmit()
       this.$refs.population.formAll.validateFields((err, value) => {
+        if(this.populationData.allForm.appType == '2') {
+          if(this.populationData.appIds.length==0){
+            this.$message.error('APP名称未选择')
+          }
+        }
         if (!err) {
           this.form.validateFieldsAndScroll((err, values) => {
             if (!err) {

+ 21 - 12
src/views/modules/autoLaunch/directional/directional.vue

@@ -106,7 +106,10 @@
         >
              <!-- @change="handleChange" -->
             <el-collapse v-model="activeKey" accordion>
-                <el-collapse-item :title="item.title" :name="item.key" :key="index" v-for="(item ,index) in finallyRightTree">
+                <el-collapse-item :name="item.key" :key="index" v-for="(item ,index) in finallyRightTree">
+                    <template slot="title">
+                        <h2>{{item.title}}</h2>
+                    </template>
                     <a-form  
                         :wrapperCol="{ lg: { span: 17 }, sm: { span: 17 } }"
                     >
@@ -175,15 +178,15 @@
         >
             <div>
                 <div class="cause-modal-table-class">
-                         <a-select
-                            style="width:200px;margin-bottom:10px"
-                            v-model="resultHistory"
-                            placeholder="请选择"
-                            allow-clear
-                        >
-                            <a-select-option :value="1">推送成功</a-select-option>
-                            <a-select-option :value="0">推送失败</a-select-option>
-                        </a-select>
+                    <a-select
+                        style="width:200px;margin-bottom:10px"
+                        v-model="resultHistory"
+                        placeholder="请选择"
+                        allow-clear
+                    >
+                        <a-select-option :value="1">推送成功</a-select-option>
+                        <a-select-option :value="0">推送失败</a-select-option>
+                    </a-select>
                     <a-table :columns="causeColumns" :data-source="causeData" bordered :pagination="false">
                         <span slot="action" slot-scope="text, record">
                             <a-popconfirm
@@ -524,8 +527,13 @@ export default {
     },
     watch: {
         unitAccountId: function(n,o) {
-            this.handleAcountRelax(this.relaxStatus  ,this.relaxData)
-        }
+            if(this.relaxVisible){
+                this.handleAcountRelax(this.relaxStatus  ,this.relaxData)
+            }
+        },
+        resultHistory: function(n,o) {
+            this.handleCauseTableData(this.tableSelectList.id);
+        },
     },
     computed: {
         hasSelected() {
@@ -865,6 +873,7 @@ export default {
             })
         },
         handleRelaxCancel() {
+            this.unitAccountId = ''
             this.relaxVisible = false;
         },
         handleCause(list) {

+ 45 - 26
src/views/modules/crowd-control/crowd-control-service.js

@@ -11,23 +11,27 @@ class AppMarketService {
         return [
             {
                 title: '账户名称',
-                dataIndex: 'accountName',
-                width: '30%'
+                dataIndex: 'authName',
+                width: '30%',
+                align: 'center'
             },
             {
-                title: '所属项目',
-                dataIndex: 'projectName',
-                width: '30%'
+                title: '覆盖数量',
+                dataIndex: 'coverNum',
+                width: '30%',
+                align: 'center'
             },
             {
                 title: '人群包数量',
                 dataIndex: 'count',
-                width: '20%'
+                width: '20%',
+                align: 'center'
             },
             {
                 title: '状态',
                 dataIndex: 'statusStr',
-                width: '20%'
+                width: '20%',
+                align: 'center'
             }
         ]
     }
@@ -37,39 +41,54 @@ class AppMarketService {
         return [
             {
                 title: '项目名称',
-                dataIndex: 'projectName',
-                width: '30%'
+                dataIndex: 'authName',
+                width: '25%',
+                align: 'center'
             },
             {
-                title: '账户名称',
-                dataIndex: 'accountName',
-                width: '30%'
+                title: '推送结果',
+                dataIndex: 'result',
+                width: '25%',
+                align: 'center'
             },
             {
-                title: '原因',
+                title: '失败原因',
                 dataIndex: 'message',
-                width: '40%'
+                width: '25%',
+                align: 'center',
+                customRender(t) {
+                    if(t === 'OK') {
+                        return '-';
+                    }
+                    else {
+                        return t;
+                    }
+                }
+            },
+            {
+                title: '操作',
+                dataIndex: 'action',
+                scopedSlots: {customRender: 'action'},
+                width: '25%',
+                align: 'center'
             }
         ]
     }
 
-    // 相关项目的table列表
+    // 相关的table列表
     setDepColumns() {
         return [
             {
-                title: '项目名称',
-                dataIndex: 'projectName',
-                width: '40%'
-            },
-            {
-                title: '账户数量',
-                dataIndex: 'accountCount',
-                width: '20%'
+                title: '广告组名称',
+                dataIndex: 'unitName',
+                width: '50%',
+                align: 'center'
             },
             {
-                title: '人群包数量',
-                dataIndex: 'count',
-                width: '20%'
+                title: '所属账户',
+                dataIndex: 'authName',
+                width: '50%',
+                align: 'center'
             }
         ]
     }

+ 5 - 2
src/views/modules/crowd-control/crowd-control.less

@@ -1,13 +1,16 @@
 .crowd-control-content {
     background: #fff;
-    height: calc(100vh - 137px);
+    // height: calc(100vh - 137px);
     padding: 20px;
     overflow-y: auto;
+    .middle-button {
+        margin: 0 8px;
+    }
     .control-con-header {
         margin-bottom: 20px;
         position: relative;
         /deep/ .ant-form-inline .ant-form-item > .ant-form-item-control-wrapper, .ant-form-inline .ant-form-item > .ant-form-item-label {
-            width: 200px !important;
+            width: 100% !important;
         }
         .reset-class {
             margin-right: 10px !important;

+ 253 - 125
src/views/modules/crowd-control/crowd-control.vue

@@ -1,52 +1,52 @@
 <template>
     <div class="crowd-control-content">
-        <div class="control-con-header">
+        <div class="table-page-search-wrapper">
             <a-form
-                class="grid-form" layout="inline"
+                layout="inline"
                 :form="form"
                 hide-required-mark
                 @submit="handleQueryList"
             >
-                <a-row class="grid-form-options">
-                    <a-form-item
-                        class="grid-form-item"
-                        label="名称"
-                        :colon="false"
-                    >
-                        <a-input
-                            v-decorator="['name']" type="text"
-                            placeholder="请输入"
-                        />
-                    </a-form-item>
-                    <a-form-item
-                        class="grid-form-item grid-form-item-account" label="账户"
-                        :colon="false"
-                    >
-                        <acount-search class="acount-search-class" :appId.sync="acountId" :multiple="false"></acount-search>
-                    </a-form-item>
-                    <a-form-item
-                        class="grid-form-item grid-form-type" label="状态"
-                        :colon="false"
-                    >
-                        <a-select
-                            v-decorator="['status']"
-                            placeholder="请选择"
-                            allow-clear
+                <a-row :gutter="24">
+                    <a-col :md="8" :sm="8" :xxl="6">
+                        <selectTable :projectId.sync="projectId" ref="selectTable" :requireCheck="false"></selectTable>
+                    </a-col>
+                    <a-col :md="8" :sm="8" :xxl="6">
+                        <a-form-item
+                            label="名称"
                         >
-                            <a-select-option v-for="item in statusTasks" :key="item.label">
-                                {{ item.value }}
-                            </a-select-option>
-                        </a-select>
-                    </a-form-item>
-                    <a-form-item class="form-handle-btn">
-                        <a-button type="default" class="reset-class" @click="handleResetForm">重置</a-button>
-                        <a-button type="primary" html-type="submit">查询</a-button>
-                    </a-form-item>
+                            <a-input
+                                v-decorator="['name']" type="text"
+                                placeholder="请输入"
+                            />
+                        </a-form-item>
+                    </a-col>
+                    <a-col :md="8" :sm="8" :xxl="6">
+                        <a-form-item label="状态">
+                            <a-select
+                                v-decorator="['status']"
+                                placeholder="请选择"
+                                allow-clear
+                            >
+                                <a-select-option v-for="item in statusTasks" :key="item.label">
+                                    {{ item.value }}
+                                </a-select-option>
+                            </a-select>
+                        </a-form-item>
+                    </a-col>
+                    <a-col :md="8" :sm="8" :xxl="6">
+                        <span style="float: left; overflow: hidden" class="table-page-search-submitButtons">
+                            <a-button type="default" class="reset-class" @click="handleResetForm">重置</a-button>
+                            <a-button type="primary" html-type="submit" class="middle-button">查询</a-button>
+                            <a-button type="primary" @click="handleUploadPerson">
+                                上传人群包
+                            </a-button>
+                        </span>
+                        
+                    </a-col>
                 </a-row>
             </a-form>
-            <a-button type="primary" class="upload-person" @click="handleUploadPerson">
-                上传人群包
-            </a-button>
+            
         </div>
         <div class="control-con-table">
             <a-table
@@ -62,11 +62,15 @@
                     <a-divider type="vertical" />
                     <a @click="handleDelete(record)">删除</a>
                 </span>
+                                
+                <span slot="actionMore" slot-scope="text, record">
+                    <a @click="handleHistory(record)">推送历史</a>
+                </span>
                 <span slot="cause" slot-scope="text, record">
                     <a class="cause-text-class" @click="handleCause(record)">失败原因</a>
                 </span>
                 <span slot="depRelax" slot-scope="text, record">
-                    <a @click="handleAcountRelax('dep', record)">{{ text }}</a>
+                    <a @click="handleAcountRelax('unit', record)">{{ text }}</a>
                 </span>
                 <span slot="acountRelax" slot-scope="text, record">
                     <a @click="handleAcountRelax('acount', record)">{{ text }}</a>
@@ -112,9 +116,16 @@
                             :disabled="personNameDisabled"
                         />
                     </a-form-model-item>
-                    <a-form-model-item label="选择账户" class="grid-form-item-account">
+                    <!-- <a-form-model-item label="选择账户" class="grid-form-item-account">
                         <acount-search class="acount-search-class" :appId.sync="uploadAcountIds" :multiple="false"></acount-search>
-                    </a-form-model-item>
+                    </a-form-model-item> -->
+                    <selectTable
+                        :projectId.sync="uploadProjectId"
+                        :labelCol="labelCol"
+                        :disabled="disabled"
+                        :requireCheck="true"
+                        v-if="!disabled"
+                    ></selectTable>
                     <a-form-model-item label="上传人群包">
                         <a-upload
                             name="file"
@@ -156,7 +167,7 @@
                         </a-radio-group>
                     </div>
                 </div>
-                <tree-select @applyType="handleApplyType"></tree-select>
+                <tree-select @applyType="handleApplyType" :projectId="tableSelectList.projectId" :templateId="tableSelectList.id"></tree-select>
             </div>
         </a-modal>
         <a-modal
@@ -181,7 +192,7 @@
             </div>
         </a-modal>   
         <a-modal
-            :title="relaxStatus === 'dep' ? '相关项目' : '相关账户'"
+            :title="relaxStatus === 'unit' ? '相关组' : '相关账户'"
             v-if="relaxVisible"
             :visible="relaxVisible"
             :confirm-loading="relaxConfirmLoading"
@@ -190,29 +201,57 @@
             @cancel="handleRelaxCancel"
         >
             <div>
-                <div class="acount-title">
-                    <div class="acount-title-left">人群包名称</div>
-                    <div class="acount-title-right">{{ acountRelaxDetail.orientationName }}</div>
-                </div>
-                <div class="acount-title push-plate">
-                    <div class="acount-title-left">目标账户</div>
-                    <div class="acount-title-right">{{ acountRelaxDetail.accountName }}</div>
-                </div>
-                <template v-if="relaxStatus === 'dep'">
-                    <a-table :columns="depColumns" :data-source="depData" bordered>
+                <template v-if="relaxStatus === 'unit'">
+                    <AcountSearch :appId.sync="unitAccountId" :multiple="false"  request="2,4"   ref="treeSelect" style="margin-bottom:8px;width:300px " />   
+                    <a-table :columns="depColumns" :data-source="depData" bordered :pagination="accountIpagination">
                     </a-table>
                 </template>
                 <template v-if="relaxStatus === 'acount'">
-                    <a-table :columns="acountColumns" :data-source="acountData" bordered></a-table>
+                    <a-table :columns="acountColumns" :data-source="acountData" bordered :pagination="accountIpagination"></a-table>
                 </template>
             </div>
         </a-modal>
+
+        <a-modal
+            title="推送历史"
+            v-if="historyVisible"
+            :visible="historyVisible"
+            :confirm-loading="causeConfirmLoading"
+            :footer="null"
+            dialog-class="cause-modal"
+            @cancel="historyVisible = false"
+        >
+            <div>
+                <div class="cause-modal-table-class">
+                    <a-table :columns="causeColumns" :data-source="historyData" bordered :pagination="false">
+                        <span slot="action" slot-scope="text, record">
+                            <a-popconfirm
+                                title="是否重新推送?"
+                                ok-text="是"
+                                cancel-text="否"
+                                @confirm="handleAgian(record)"
+                            >
+                                <a :disabled="record.result==='推送成功'">重新推送</a>
+                            </a-popconfirm>
+                            
+                        </span>
+                    </a-table>
+                </div>
+                <a-pagination
+                    class="pagin-table-class"
+                    :total="totalAllHistory"
+                    size="small"
+                    @change="handleHistorySizeChange"
+                />
+            </div>
+        </a-modal>   
     </div>
 </template>
 <script>
-import TreeSelect from './components/tree-select/tree-select';
+import TreeSelect from '@/views/modules/autoLaunch/directional/components/tree-select.vue';
 import {getAction, postAction} from '@/api/manage';
 import AcountSearch from '@/views/modules/Statistics/components/Treeselect.vue';
+import selectTable from '@/views/modules/Statistics/components/selectPagination.vue';
 import AppMarketService from './crowd-control-service';
 import BMF from 'browser-md5-file';
 
@@ -225,16 +264,20 @@ export default {
     name: 'crowd-control',
     components: {
         TreeSelect,
-        AcountSearch
+        AcountSearch,
+        selectTable
     },
     data() {
         let that = this;
         return {
+            unitAccountId: '',
             personResourceDisabled: false,
             personNameDisabled: false,
             totalAllCause: 0,
             acountId: undefined, // 搜索的账户ID
+            projectId: null,
             uploadAcountIds: '',
+            uploadProjectId: '',
             totalAll: 10,
             finallyRightTree: [],
             fileList: [],
@@ -268,63 +311,54 @@ export default {
                     dataIndex: 'orientationName'
                 },
                 {
-                    title: '人群包类型',
-                    align: 'center',
-                    dataIndex: 'populationType',
-                    customRender(t) {
-                        return t ? that.populationTypeTasks.find(item => item.label === Number(t)).value : '-';
-                    }
-                },
-                {
                     title: '匹配类型',
                     align: 'center',
                     dataIndex: 'typeStr'
                 },
                 {
-                    title: '上传时间',
+                    title: '创建时间',
                     dataIndex: 'statDate',
                     align: 'center'
                 },
                 {
-                    title: '覆盖数量',
-                    dataIndex: 'coverNum',
-                    align: 'center'
-                },
-                {
-                    title: '状态',
-                    dataIndex: 'statusStr',
-                    align: 'center'
-                },
-                {
-                    title: '原因',
-                    dataIndex: '',
+                    title: '关联项目',
+                    dataIndex: 'projectName',
                     align: 'center',
-                    scopedSlots: {customRender: 'cause'}
+                    ellipsis: true,
+                    customRender(t) {
+                        if(t) {
+                            return t
+                        }
+                        else {
+                            return '-'
+                        }
+                    }
                 },
                 {
-                    title: '目标账户',
-                    dataIndex: 'accountName',
+                    title: '相关账户',
+                    dataIndex: 'accountCount',
                     align: 'center',
-                    ellipsis: true
+                    scopedSlots: {customRender: 'acountRelax'}
                 },
                 {
-                    title: '相关项目',
-                    dataIndex: 'projectCount',
+                    title: '相关',
+                    dataIndex: 'unitCount',
                     align: 'center',
                     scopedSlots: {customRender: 'depRelax'}
                 },
                 {
-                    title: '相关账户',
-                    dataIndex: 'accountCount',
-                    align: 'center',
-                    scopedSlots: {customRender: 'acountRelax'}
-                },
-                {
                     title: '操作',
                     dataIndex: 'action',
                     align: 'center',
                     scopedSlots: {customRender: 'action'}
-                }
+                },
+                {
+                    title: '更多',
+                    dataIndex: 'actionMore',
+                    align: 'center',
+                    scopedSlots: {customRender: 'actionMore'},
+                    ellipsis: true
+                },
             ],
             personForm: {
                 name: '',
@@ -340,11 +374,45 @@ export default {
                 page: 1,
                 size: 10
             },
+            historyPag: {
+                page: 1,
+                size: 10
+            },
             tableSelectList: {},
             acountRelaxDetail: {},
-            causeDetailData: {}
+            causeDetailData: {},
+            historyData: [],
+            totalAllHistory: 0,
+            historySelectList: null,
+            historyVisible: false,
+            accountIpagination: {
+                current: 1,
+                pageSize: 10,
+                //   pageSizeOptions: ['10', '20', '30'],
+                showTotal: (total, range) => {
+                    return range[0] + "-" + range[1] + " 共" + total + "条"
+                },
+                showQuickJumper: true,
+                showSizeChanger:false,
+                pageSizeOptions: ['10', '30', '50'],
+                total: 0,
+                onChange: (current, pageSize) => {
+                    // 切换分页时的回调,
+                    // 当在页面定义change事件时,切记要把此处的事件清除,因为这两个事件重叠了,可能到时候会导致一些莫名的bug
+                    this.accountIpagination.current = current;
+                    this.accountIpagination.pageSize= pageSize;
+                    this.handleAcountRelax(this.relaxStatus  ,this.acountRelaxDetail)
+                }
+            },
         };
     },
+    watch: {
+        unitAccountId: function(n,o) {
+            if(this.relaxVisible){
+                this.handleAcountRelax(this.relaxStatus  ,this.acountRelaxDetail)
+            }
+        },
+    },
     created() {
         this.form = this.$form.createForm(this);
     },
@@ -352,6 +420,53 @@ export default {
         this.handleGetTableList({});
     },
     methods: {
+        handleAgian(val) {
+            let params = {};
+            params.id = val.id;
+            params.accountIds = [val.accountId];
+            postAction('/kuaishouPopulationPackage/push' ,params).then(res => {
+                if(res.success) {
+                    this.$message.success(res.message);
+                    this.historyVisible = false;
+                    this.handleGetTableList({});
+                }
+                else {
+                    this.$message.error(res.message);
+                }
+            })
+
+        },
+        handleHistorySizeChange(current, pageSize) {
+            this.historyPag = {
+                page: current,
+                size: pageSize
+            };
+            this.handleHistoryTableData(this.historySelectList.id);
+        },
+        handleHistory(list) {
+            this.historyVisible = true;
+            this.handleHistoryTableData(list.id);
+            this.historySelectList = list;
+        },
+        handleHistoryTableData(id) {
+            const paramsData = {
+                id: id,
+                pageNo: this.historyPag.page,
+                pageSize: this.historyPag.size,
+                status: this.resultHistory
+            };
+            getAction('/kuaishouPopulationPackage/queryPushHistory', paramsData).then(result => {
+                if (result.code === 200) {
+                    this.historyData = result.result.list || [];
+                    this.totalAllHistory = result.result.total || 0;
+                }
+                else {
+                    this.$message.error(result.message);
+                }
+            }).catch(error => {
+                console.log(error, 'eeee');
+            });
+        },
         onShowSizeChange(current, pageSize) {
             const paramsData = this.form.getFieldsValue();
             this.tablePag = {
@@ -370,13 +485,13 @@ export default {
         handleGetTableList(data) {
             const paramsData = {
                 orientationName: data.name,
-                accountId: this.acountId,
+                projectId: this.projectId,
                 status: data.status,
                 pageNo: this.tablePag.page,
                 pageSize: this.tablePag.size
             };
             this.dataSource = []
-            getAction('/kuaishouCrowdPack/queryPageList', paramsData).then(result => {
+            getAction('/kuaishouPopulationPackage/list', paramsData).then(result => {
                 if (result.code === 200) {
                     this.dataSource = result.result.list || [];
                     this.totalAll = result.result.total || 0;
@@ -409,19 +524,24 @@ export default {
             });
         },
         handleAcountRelaxTable() {
-            const paramsData = {
-                signature: this.acountRelaxDetail.signature,
-                accountId: this.acountRelaxDetail.accountId,
-                type: this.relaxStatus === 'dep' ? 1 : 2
-            };
-            getAction('/kuaishouCrowdPack/queryRel', paramsData).then(result => {
+            let url = this.relaxStatus === 'unit' ? '/kuaishouPopulationPackage/getRelatedGroups' : '/kuaishouPopulationPackage/getRelatedAccounts'
+            let paramsData = {};
+            paramsData.id = this.acountRelaxDetail.id;
+            paramsData.pageNo = this.accountIpagination.current;
+            paramsData.pageSize = this.accountIpagination.pageSize;
+            if(this.relaxStatus === 'unit') {
+                paramsData.accountId = this.unitAccountId;
+            }
+                
+            getAction(url, paramsData).then(result => {
                 if (result.code === 200) {
-                    if (this.relaxStatus === 'dep') {
+                    if (this.relaxStatus === 'unit') {
                         this.depData = result.result.list;
                     }
                     else if (this.relaxStatus === 'acount') {
                         this.acountData = result.result.list;
                     }
+                     this.accountIpagination.current = result.result.total;
                 }
                 else {
                     this.$message.error(result.message);
@@ -431,8 +551,8 @@ export default {
             });
         },
         handleAcountRelax(txt, recd) {
-            if (txt === 'dep') {
-                this.relaxStatus = 'dep';
+            if (txt === 'unit') {
+                this.relaxStatus = 'unit';
             }
             else if (txt === 'acount') {
                 this.relaxStatus = 'acount';
@@ -442,6 +562,7 @@ export default {
             this.relaxVisible = true;
         },
         handleRelaxCancel() {
+            this.unitAccountId = '';
             this.relaxVisible = false;
         },
         handleCause(list) {
@@ -478,22 +599,27 @@ export default {
             this.causeVisible = false;
         },
         handlePushSure() {
-            const paramsData = {
-                accountIds: this.finallyRightTree.map(item => item.key),
-                signature: this.tableSelectList.signature,
-                accountId: this.tableSelectList.accountId
-            };
-            postAction('/kuaishouCrowdPack/accountPush', paramsData).then(result => {
-                if (result.code === 200) {
-                    this.pushVisible = false;
-                    this.handleGetTableList({});
-                }
-                else {
-                    this.$message.error(result.message);
-                }
-            }).catch(error => {
-                console.log(error, 'eeeeeee');
-            });
+            if(this.finallyRightTree.length > 0) {
+                const paramsData = {
+                    accountIds: this.finallyRightTree.map(item => item.key),
+                    id: this.tableSelectList.id
+                };
+                postAction('/kuaishouPopulationPackage/push', paramsData).then(result => {
+                    if (result.code === 200) {
+                        this.pushVisible = false;
+                        this.handleGetTableList({});
+                    }
+                    else {
+                        this.$message.error(result.message);
+                    }
+                }).catch(error => {
+                    console.log(error, 'eeeeeee');
+                });
+            }
+            else {
+                this.$message.error("请选择要推送的账户")
+            }
+           
         },
         handlePushCancel() {
             this.pushVisible = false;
@@ -600,6 +726,8 @@ export default {
             this.form.resetFields();
             this.acountId = undefined;
             this.handleGetTableList({});
+            this.$refs.selectTable.keyValue = "";
+            this.$refs.selectTable.getData()
         },
         handleUploadPerson() {
             this.personVisible = true;
@@ -607,8 +735,8 @@ export default {
         handleOk() {
             this.$refs.ruleForm.validate(valid => {
                 if (valid) {
-                    if (!this.uploadAcountIds) {
-                        this.$message.error('请选择账户');
+                    if (!this.uploadProjectId) {
+                        this.$message.error('请选择项目');
                         return;
                     }
                     if (!this.fileList.length) {
@@ -627,10 +755,10 @@ export default {
             const paramsData = {
                 type: this.personForm.resource,
                 orientationName: this.personForm.name,
-                accountId: this.uploadAcountIds,
+                projectId: this.uploadProjectId,
                 url: this.fileList[0].url
             };
-            postAction('/kuaishouCrowdPack/uploadCrowdPack', paramsData).then(result => {
+            postAction('/kuaishouPopulationPackage/add', paramsData).then(result => {
                 this.confirmLoading = false
                 if (result.code === 200) {
                     this.personVisible = false;
@@ -641,7 +769,7 @@ export default {
                     this.fileList = [];
                     this.personForm.name = '';
                     this.personForm.resource = '';
-                    this.uploadAcountIds = undefined;
+                    this.uploadProjectId = undefined;
                 }
                 else {
                     this.$message.error(result.message);
@@ -656,7 +784,7 @@ export default {
             this.personResourceDisabled = false;
             this.personNameDisabled = false;
             this.$refs.ruleForm.resetFields();
-            this.uploadAcountIds = '';
+            this.uploadProjectId = '';
             this.personForm.name = '';
             this.personForm.resource = '';
             this.fileList = [];