投手数据对接口

.idea/workspace.xml

@@ -2,17 +2,14 @@
 <project version="4">
   <component name="ChangeListManager">
     <list default="true" id="326b77ef-a0bc-4d8a-bd1c-34c4541ee400" name="Changes" comment="">
-      <change afterPath="$PROJECT_DIR$/project/src/components/assembly/conTwo.vue" afterDir="false" />
-      <change afterPath="$PROJECT_DIR$/project/src/components/customOperate/createFriendsCircle.vue" afterDir="false" />
-      <change afterPath="$PROJECT_DIR$/project/src/components/customOperate/friendsCircle/fcList.vue" afterDir="false" />
-      <change afterPath="$PROJECT_DIR$/project/src/components/customOperate/friendsCircle/index.vue" afterDir="false" />
+      <change afterPath="$PROJECT_DIR$/project/src/components/assembly/screen/customerServiceFC.vue" afterDir="false" />
+      <change afterPath="$PROJECT_DIR$/project/src/components/dataBoard/throwPerson/index.vue" afterDir="false" />
       <change beforePath="$PROJECT_DIR$/.idea/workspace.xml" beforeDir="false" afterPath="$PROJECT_DIR$/.idea/workspace.xml" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/project/src/components/Index/index.vue" beforeDir="false" afterPath="$PROJECT_DIR$/project/src/components/Index/index.vue" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/project/src/components/assembly/screen/channel.vue" beforeDir="false" afterPath="$PROJECT_DIR$/project/src/components/assembly/screen/channel.vue" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/project/src/assets/config/interface_api.js" beforeDir="false" afterPath="$PROJECT_DIR$/project/src/assets/config/interface_api.js" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/project/src/components/assembly/screen/customerService.vue" beforeDir="false" afterPath="$PROJECT_DIR$/project/src/components/assembly/screen/customerService.vue" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/project/src/components/customOperate/createFriendsCircle.vue" beforeDir="false" afterPath="$PROJECT_DIR$/project/src/components/customOperate/createFriendsCircle.vue" afterDir="false" />
       <change beforePath="$PROJECT_DIR$/project/src/components/dataBoard/thePublic.vue" beforeDir="false" afterPath="$PROJECT_DIR$/project/src/components/dataBoard/thePublic.vue" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/project/src/components/dataBoard/throwPerson.vue" beforeDir="false" afterPath="$PROJECT_DIR$/project/src/components/dataBoard/throwPerson.vue" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/project/src/components/manage/memberManage.vue" beforeDir="false" afterPath="$PROJECT_DIR$/project/src/components/manage/memberManage.vue" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/project/src/components/orderManage/charge.vue" beforeDir="false" afterPath="$PROJECT_DIR$/project/src/components/orderManage/charge.vue" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/project/src/components/dataBoard/throwPerson.vue" beforeDir="false" />
       <change beforePath="$PROJECT_DIR$/project/src/router/allRouter.js" beforeDir="false" afterPath="$PROJECT_DIR$/project/src/router/allRouter.js" afterDir="false" />
     </list>
     <option name="SHOW_DIALOG" value="false" />
@@ -81,15 +78,16 @@
     <property name="RunOnceActivity.OpenProjectViewOnStart" value="true" />
     <property name="RunOnceActivity.ShowReadmeOnStart" value="true" />
     <property name="WebServerToolWindowFactoryState" value="false" />
-    <property name="last_opened_file_path" value="$PROJECT_DIR$/project/src/components/customOperate/friendsCircle" />
+    <property name="last_opened_file_path" value="$PROJECT_DIR$/project/src/components/assembly/screen" />
     <property name="nodejs_package_manager_path" value="npm" />
     <property name="ts.external.directory.path" value="C:\Program Files (x86)\webstorm\WebStorm 2021.2.1\plugins\JavaScriptLanguage\jsLanguageServicesImpl\external" />
     <property name="vue.rearranger.settings.migration" value="true" />
   </component>
   <component name="RecentsManager">
     <key name="CopyFile.RECENT_KEYS">
-      <recent name="C:\projectCode\playlet\project\src\components\customOperate\friendsCircle" />
+      <recent name="C:\projectCode\playlet\project\src\components\assembly\screen" />
       <recent name="C:\projectCode\playlet\project\src\components\dataBoard" />
+      <recent name="C:\projectCode\playlet\project\src\components\customOperate\friendsCircle" />
       <recent name="C:\projectCode\playlet\project\src\components\detials" />
     </key>
   </component>
@@ -129,6 +127,7 @@
       <workItem from="1652406821567" duration="19587000" />
       <workItem from="1652617577799" duration="43000" />
       <workItem from="1652617650540" duration="272000" />
+      <workItem from="1653271650799" duration="18349000" />
     </task>
     <servers />
   </component>
@@ -158,7 +157,7 @@
     </layout>
   </component>
   <component name="TypeScriptGeneratedFilesManager">
-    <option name="version" value="1" />
+    <option name="version" value="3" />
   </component>
   <component name="Vcs.Log.Tabs.Properties">
     <option name="TAB_STATES">

project/src/assets/config/interface_api.js

@@ -114,7 +114,9 @@ var api = {
   officialTrendTotal: "/api/stat/officialTrendTotal",
   officialTrendList: "/api/stat/officialTrendList",
   activeFansData: "/api/statistics/activeFansData",
-  statistics_playletDataTrend: "/api/statistics/playletDataTrend"
+  statistics_playletDataTrend: "/api/statistics/playletDataTrend",
+  pitcherData: "/api/stat/pitcherData",
+
 };
 
 export { api };

project/src/components/assembly/screen/customerService.vue

@@ -2,8 +2,14 @@
   <div class="common-screen-item">
     <label class="common-screen-label" v-if="title&&title!=''">{{title}}</label>
     <el-popover placement="bottom" trigger="click" v-model="visible" :disabled="disabled">
-      <div :style="width?'width:'+width:''" :class="['common-screen-self-box','common-input-select',final_result&&final_result.length!=0&&clearable&&!disabled?'common-input-select-hover':'',disabled?'pointer-drop':'']" slot="reference">
-        <div :class="['common-screen-self-con',!final_result||final_result.length==0?'common-screen-self-placeholder':'']">
+      <div :style="width?'width:'+width:''"
+           :class="['common-screen-self-box',
+           'common-input-select',
+           final_result&&final_result.length!=0&&clearable&&!disabled?'common-input-select-hover':'',
+           disabled?'pointer-drop':'']"
+           slot="reference">
+        <div :class="['common-screen-self-con',
+        !final_result||final_result.length==0?'common-screen-self-placeholder':'']">
           <div class="common-screen-self-con-div">
             <span v-if="!final_result||final_result.length==0">请选择</span>
             <template v-else>
@@ -33,7 +39,8 @@
                     </div>
                     <div :class="['checkbox',item.is_select?'checkbox_active':'']"><i class="el-icon-check"></i></div>
                   </div>
-                  <div class="memberItem" :style="item.is_open?'display:none':''" v-for="(item1,user_index) in item.user_list" :key="item1.user_id" @click="selectUserEvent('user',index,user_index)">
+                  <div class="memberItem" :style="item.is_open?'display:none':''"
+                       v-for="(item1,user_index) in item.user_list" :key="item1.user_id" @click="selectUserEvent('user',index,user_index)">
                     <div class="flex" style="flex:1">
                       <img class="memberImg" :src="item1.avatar" alt="">
                       <div class="memberInfo">
@@ -466,4 +473,4 @@ export default {
   text-align: right;
   padding: 20px 0 10px;
 }
-</style>
+</style>

project/src/components/assembly/screen/customerServiceFC.vue

@@ -0,0 +1,137 @@
+<template>
+  <div class="conBox">
+    <el-popover trigger="click">
+      <div class="popCon">
+        <div class="con_left">
+          <el-input placeholder="请搜索" size="mini" v-model="searchWord">
+            <template slot="append"><i class="el-icon-search pointer"></i></template>
+          </el-input>
+          <div class="userTotal">全部成员: ({{userTotal}})</div>
+
+          <div class="userTree">
+            <div class="parentBox" v-for="item in userList" :key="item.department_id">
+              <div class="departInfo">
+                <i class="el-icon-caret-bottom"></i>
+                <div>
+                  <i class="el-icon-s-cooperation"></i>
+                  <span>{{item.department_name}}</span>
+                </div>
+                <span class="check">
+                  <i v-if="false" class="el-icon-check"></i>
+                </span>
+              </div>
+
+              <div class="userInfo" v-for="user in item.user_list" :key="user.user_id">
+                <img :src="user.avatar" alt="" style="width: 40px;margin-right: 10px">
+                <div>
+                  <div>{{user.name}}</div>
+                  <div>
+                    <span v-for="depart in user.department_list">{{depart}}</span>
+                  </div>
+                </div>
+                <span class="check">
+                  <i v-if="false" class="el-icon-check"></i>
+                </span>
+
+              </div>
+            </div>
+          </div>
+        </div>
+        <div class="con_right"></div>
+      </div>
+
+      <div slot="reference">
+        <el-input placeholder="请选择" size="mini" v-model="showSelectUsers_val">
+          <template slot="append"><i class="el-icon-arrow-down pointer"></i></template>
+        </el-input>
+      </div>
+    </el-popover>
+  </div>
+</template>
+<script>
+export default {
+  props: {
+
+  },
+  watch: {
+
+  },
+  data () {
+    return {
+      loading:false,
+      userList:[],
+      userTotal:'',
+      showSelectUsers_val:'',
+      searchWord:''
+    }
+  },
+  created () {
+    this.init()
+
+  },
+  methods: {
+    init () {
+      this.loading = true
+      this.$axios.get(this.URL.BASEURL + this.URL.userList, {
+        params: {
+          // user_name: this.input_keyword
+        }
+      }).then((res) => {
+        var res = res.data
+        this.loading = false
+        if (res && res.errno == 0) {
+          this.userList = res.rst.list;
+          this.userTotal = res.rst.count
+        } else if (res.errno != 4002) {
+          this.$message({
+            message: res.err,
+            type: "warning"
+          })
+        }
+      }).catch((err) => {
+        this.loading = false
+      });
+    },
+  }
+}
+</script>
+<style lang="scss" scoped>
+.popCon{
+  width: 100%;
+  //padding: 30px 22px;
+  font-size: 14px;
+  .con_left{
+    border-right:1px solid #C3CBD6;
+    height: 100%;
+    padding-right: 10px;
+    .userTotal{
+      color: #666666;
+      margin: 17px 0 10px;
+      font-size: 14px;
+    }
+    .userTree{
+      .parentBox{
+        margin-top: 15px;
+        .departInfo{
+          display: flex;
+          align-items: center;
+        }
+        .userInfo{
+          margin-top: 10px;
+          display: flex;
+          align-items: center;
+          margin-left: 20px;
+        }
+      }
+      .check{
+        display: inline-block;
+        width: 14px;
+        height: 14px;
+        border-radius: 50%;
+        border: 1px solid #666;
+        margin-left: auto;
+      }
+    }
+  }
+}
+</style>

project/src/components/customOperate/createFriendsCircle.vue

@@ -26,13 +26,17 @@
 
       <h3 class="bigTitle">编辑朋友圈</h3>
       <div class="regulations">
+        <label><em>*</em>朋友圈主题</label>
+        <el-input placeholder="例：活动推送/拉新等" style="width:300px" v-model.trim="themeName" clearable size="small"></el-input>
+      </div>
+      <div class="regulations">
         <label><em>*</em>发表成员:</label>
         <div>
           <div style="display:flex">
             <el-radio :disabled="!editFlag" v-model="is_for_all" :label="1">全部员工</el-radio>
             <el-radio :disabled="!editFlag" v-model="is_for_all" :label="0">部分员工</el-radio>
           </div>
-          <self-customerservice :disabled="!editFlag" v-if="is_for_all==0" title='' width="300px" :afferent_users='user_id_list' @customerDefine="(val)=>{user_id_list=val;}"></self-customerservice>
+          <self-customerservice-f-c :disabled="!editFlag" v-if="is_for_all==0" title='' width="300px" :afferent_users='user_id_list' @customerDefine="(val)=>{user_id_list=val;}" style="margin-top: 10px"></self-customerservice-f-c>
         </div>
       </div>
       <div class="regulations">
@@ -42,29 +46,8 @@
             <el-radio v-model="customer_filter" :disabled="!editFlag" :label="0" @change="changeEvent">全部客户</el-radio>
             <el-radio v-model="customer_filter" :disabled="!editFlag" :label="1" @change="changeEvent">筛选客户</el-radio>
           </div>
-          <div class="screeningCustomers" v-if="customer_filter==1">
-            <div class="screeningItem">
-              <label>性别：</label>
-              <el-radio v-model="gender" :disabled="!editFlag" :label="3" @change="changeEvent">全部性别</el-radio>
-              <el-radio v-model="gender" :disabled="!editFlag" :label="1" @change="changeEvent">仅男性粉丝</el-radio>
-              <el-radio v-model="gender" :disabled="!editFlag" :label="2" @change="changeEvent">仅女性粉丝</el-radio>
-              <el-radio v-model="gender" :disabled="!editFlag" :label="0" @change="changeEvent">未知性别</el-radio>
-            </div>
-            <div class="screeningItem">
-              <label>添加时间：</label>
-              <date-picker title="" width="355px" :disabled="!editFlag" :timeFlag="true" :afferent_time='afferent_time' :reset='resetFlag' @changeTime="changeTime" style="margin:0"></date-picker>
-            </div>
-            <div class="screeningItem">
-              <label>标签：</label>
-              <enterprise-tag title="" width="355px" :disabled="!editFlag" :afferent_obj='afferent_tag_obj' :reset='resetFlag' @tagDefine="tagDefine" style="margin:0"></enterprise-tag>
-            </div>
-            <div class="screeningItem" style="align-items: flex-start;">
-              <label>排除客户：</label>
-              <div style="flex:1">
-                <enterprise-tag title="" width="355px" :disabled="!editFlag" :afferent_obj='afferent_exclude_tag_obj' :excludeFlag="true" :reset='resetFlag' @tagDefine="exclude_tagDefine" style="margin:0"></enterprise-tag>
-                <p class="screening-hint">可根据标签选择客户，群发时将不会发送给该标签内的客户。若选择了排除的客户，需要较长时间创建本条群发消息哦～</p>
-              </div>
-            </div>
+          <div class="" v-if="customer_filter==1">
+            <enterprise-tag title="" width="300px" :disabled="!editFlag" :afferent_obj='afferent_tag_obj' :reset='resetFlag' @tagDefine="tagDefine" style="margin:0;margin-top: 10px"></enterprise-tag>
           </div>
           <div class="customer_all">将群发消息给{{customer_filter==0?'全部客户的':customer_filter==1?'筛选客户的':''}}
             <span @click="massMsg_customerMatchCount" v-if="isLookCount" class="pointer"><i class="el-icon-loading" v-if="customerMatchCountLoading"></i> {{!customerMatchCountLoading?'查看':''}}</span>
@@ -131,7 +114,7 @@
   </div>
 </template>
 <script>
-import selfCustomerservice from '@/components/assembly/screen/customerService.vue'
+import selfCustomerserviceFC from '@/components/assembly/screen/customerServiceFC.vue'
 import editCon from '@/components/assembly/editCon.vue'
 import welcomEdit from '@/components/assembly/welcom_edit.vue'
 import enterpriseTag from '@/components/assembly/screen/enterpriseTag.vue'
@@ -139,7 +122,7 @@ import datePicker from '@/components/assembly/screen/datePicker.vue'
 import conTwo from '@/components/assembly/conTwo.vue'
 export default {
   name:'createFriendsCircle',
-  components: { selfCustomerservice, editCon, welcomEdit, enterpriseTag, datePicker, conTwo },
+  components: { selfCustomerserviceFC, editCon, welcomEdit, enterpriseTag, datePicker, conTwo },
   data () {
     return {
       loading: false,
@@ -173,16 +156,12 @@ export default {
       customerMatchCountLoading: false,
       isLookCount: true,//是否查看群发的客户数
       msg_count: '',
-      afferent_exclude_tag_obj: {
-        tag_id_list: [],
-        tag: 1
-      },
+
       afferent_tag_obj: {
         tag_id_list: [],
         tag: 1
       },
       resetFlag: false,
-      afferent_time: [],
       send_type:1,
       processFlag: false,
       send_time: {
@@ -216,7 +195,8 @@ export default {
         }]
       },
       content1:'',
-      con_type:0
+      con_type:0,
+      themeName:''
     }
   },
   created () {
@@ -230,14 +210,6 @@ export default {
     changeEvent () {
       this.isLookCount = true
     },
-    changeTime (time) {//筛选时间变化
-      this.isLookCount = true
-      if (!time || time && time.length == 0) {
-        this.afferent_time = [];
-      } else {
-        this.afferent_time = time;
-      }
-    },
     tagDefine (data) {//标签选择回调
       this.isLookCount = true
       if (data.tag == 1 || data.tag == 2) {
@@ -259,27 +231,6 @@ export default {
         }
       }
     },
-    exclude_tagDefine (data) {//排除标签回掉
-      this.isLookCount = true
-      if (data.tag == 1 || data.tag == 2) {
-        if (data.tag_id_list && data.tag_id_list.length != 0) {
-          this.exclude_tag_info = {
-            tag_id_list: data.tag_id_list,
-            tag_type: data.tag
-          }
-        } else {
-          this.exclude_tag_info = {
-            tag_id_list: [],
-            tag_type: 0
-          }
-        }
-      } else {
-        this.exclude_tag_info = {
-          tag_id_list: [],
-          tag_type: data.tag
-        }
-      }
-    },
     massMsg_customerMatchCount () {//群发规则匹配客户数查询
       if (this.customerMatchCountLoading) return;
       this.customerMatchCountLoading = true;
@@ -287,14 +238,14 @@ export default {
         senders: this.is_for_all == 0 ? this.user_id_list.join(',') : '',
         customer_filter: this.customer_filter
       }
-      if (this.customer_filter == 1) {//筛选客户
-        params.gender = this.gender;
-        params.add_time_start = this.afferent_time && this.afferent_time.length > 1 ? this.afferent_time[0] : '';
-        params.add_time_end = this.afferent_time && this.afferent_time.length > 1 ? this.afferent_time[1] : '';
-        params.tag_screen_type = this.tag_info && this.tag_info.tag_type ? this.tag_info.tag_type : 0;
-        params.tag_list = this.tag_info && this.tag_info.tag_id_list ? this.tag_info.tag_id_list.join(',') : '';
-        params.exclude_tag_list = this.exclude_tag_info && this.exclude_tag_info.tag_id_list ? this.exclude_tag_info.tag_id_list.join(',') : '';
-      }
+      // if (this.customer_filter == 1) {//筛选客户
+      //   params.gender = this.gender;
+      //   params.add_time_start = this.afferent_time && this.afferent_time.length > 1 ? this.afferent_time[0] : '';
+      //   params.add_time_end = this.afferent_time && this.afferent_time.length > 1 ? this.afferent_time[1] : '';
+      //   params.tag_screen_type = this.tag_info && this.tag_info.tag_type ? this.tag_info.tag_type : 0;
+      //   params.tag_list = this.tag_info && this.tag_info.tag_id_list ? this.tag_info.tag_id_list.join(',') : '';
+      //   params.exclude_tag_list = this.exclude_tag_info && this.exclude_tag_info.tag_id_list ? this.exclude_tag_info.tag_id_list.join(',') : '';
+      // }
       this.$axios.get(this.URL.BASEURL + this.URL.massMsg_customerMatchCount, {
         params
       }).then((res) => {

project/src/components/dataBoard/thePublic.vue

@@ -80,9 +80,11 @@
       </div>
     </div>
     <ux-grid ref="plxTable" :border="false" @row-click="()=>{return}" :header-cell-style="()=>{return { backgroundColor: '#FFFFFF !important', border: 'none!important' }}" :height="height" show-footer-overflow="tooltip" show-overflow="tooltip" size="mini">
-      <ux-table-column v-for="item in desCol" :key="item.prop" :resizable="true" :field="item.prop" :title="item.label" :min-width="item.min_width?item.min_width:120" :fixed="item.fixed?item.fixed:''" align="center">
+      <ux-table-column v-for="item in desCol" :key="item.prop" :resizable="true" :field="item.prop" :title="item.label"
+                       :min-width="item.min_width?item.min_width:120" :fixed="item.fixed?item.fixed:''" align="center">
         <template #header>
-          <div :class="['flex-align-jus-center',item.sort?'pointer':'',sort_field==item.prop?'sortFieldStyle':'']"
+          <div
+            :class="['flex-align-jus-center',item.sort?'pointer':'',sort_field==item.prop?'sortFieldStyle':'']"
                @click="item.sort?sortFieldEvent(item.prop):''">
             {{item.label}}
             <i class="el-icon-caret-bottom" v-if="item.sort"></i>

project/src/components/dataBoard/throwPerson/index.vue

@@ -0,0 +1,35 @@
+<template>
+  <div>
+    <div class="topTagBox flex">
+      <div class="left flex-align-center">
+        <div :class="['tagItem',tagType==2?'tagItem_active':'']" @click="changeType(2);">投手投放数据</div>
+        <div :class="['tagItem',tagType==1?'tagItem_active':'']" @click="changeType(1);">投手数据</div>
+      </div>
+    </div>
+    <throwPersonPuton v-if="tagType==2"></throwPersonPuton>
+    <throwPersonSon v-if="tagType==1"></throwPersonSon>
+  </div>
+</template>
+
+<script>
+import throwPersonSon from './throwPersonSon.vue'
+import throwPersonPuton from './throwPersonPuton.vue'
+export default {
+  components: { throwPersonSon, throwPersonPuton },
+  name: "index",
+  data () {
+    return {
+      tagType:2,
+    }
+  },
+  methods:{
+    changeType(type){
+      this.tagType = type
+    },
+  }
+}
+</script>
+
+<style scoped>
+
+</style>

project/src/components/dataBoard/throwPerson.vue

@@ -1,12 +1,6 @@
 <template>
-  <div>
-    <div class="topTagBox flex">
-      <div class="left flex-align-center">
-        <div :class="['tagItem',tagType==2?'tagItem_active':'']" @click="changeType(2);">投手投放数据</div>
-        <div :class="['tagItem',tagType==1?'tagItem_active':'']" @click="changeType(1);">投手数据</div>
-      </div>
-    </div>
-    <div class="screenBox flex" v-loading="gl_loading">
+  <div v-loading="loading">
+    <div class="screenBox flex">
       <div class="flex">
         <date-picker title="自定义" :quickFlag='true' :afferent_time="default_time" :clearFlag='false' @changeTime="changeTime"></date-picker>
         <self-channel title="投手" type='pitcher' :labelWidth="true" :afferent_params="{corp_id:''}" @channelDefine="(val)=>{user_id = val;stat_throwPersonData();init(1)}"></self-channel>
@@ -51,47 +45,24 @@
         <div class="dataItem-data">{{dataInfo&&(dataInfo.recall_rate||dataInfo.recall_rate==0)?dataInfo.recall_rate+'%':'-'}}</div>
       </div>
     </div>
-    <div v-if="tagType==2" v-loading="loading">
-      <ux-grid class="uxGridBox" ref="plxTable" :border="false" @row-click="()=>{return}" :header-cell-style="headerColor" :height="height" show-footer-overflow="tooltip" show-overflow="tooltip" size="mini">
-        <ux-table-column v-for="item in desCol" :key="item.prop" :resizable="true" :field="item.prop" :title="item.label" :min-width="item.min_width?item.min_width:120" :fixed="item.fixed?item.fixed:''" align="center">
-          <template #header>
-            <div class="flex-align-jus-center" >
-              {{item.label}}
-              <el-tooltip v-if="item.notes" :content="item.notes" placement="top">
-                <div><i class="el-icon-question"></i></div>
-              </el-tooltip>
-            </div>
-          </template>
-          <template v-slot="{ row }">
-            <span>{{row[item.prop]||row[item.prop]==0?$formatNum(row[item.prop]):'-' }}</span>
-          </template>
-        </ux-table-column>
-      </ux-grid>
-      <div class="pagination" v-show="total>0">
-        <el-pagination background :current-page="page" @current-change="handleCurrentChange" layout="prev, pager, next" :page-count='Number(pages)'>
-        </el-pagination>
-      </div>
-    </div>
-    <div v-if="tagType==1" v-loading="loading">
-      <ux-grid class="uxGridBox" ref="plxTable" :border="false" @row-click="()=>{return}" :header-cell-style="headerColor" :height="height" show-footer-overflow="tooltip" show-overflow="tooltip" size="mini">
-        <ux-table-column v-for="item in desCol" :key="item.prop" :resizable="true" :field="item.prop" :title="item.label" :min-width="item.min_width?item.min_width:120" :fixed="item.fixed?item.fixed:''" align="center">
-          <template #header>
-            <div class="flex-align-jus-center" >
-              {{item.label}}
-              <el-tooltip v-if="item.notes" :content="item.notes" placement="top">
-                <div><i class="el-icon-question"></i></div>
-              </el-tooltip>
-            </div>
-          </template>
-          <template v-slot="{ row }">
-            <span>{{row[item.prop]||row[item.prop]==0?$formatNum(row[item.prop]):'-' }}</span>
-          </template>
-        </ux-table-column>
-      </ux-grid>
-      <div class="pagination" v-show="total>0">
-        <el-pagination background :current-page="page" @current-change="handleCurrentChange" layout="prev, pager, next" :page-count='Number(pages)'>
-        </el-pagination>
-      </div>
+    <ux-grid class="uxGridBox" ref="plxTable" :border="false" @row-click="()=>{return}" :header-cell-style="headerColor" :height="height" show-footer-overflow="tooltip" show-overflow="tooltip" size="mini">
+      <ux-table-column v-for="item in desCol" :key="item.prop" :resizable="true" :field="item.prop" :title="item.label" :min-width="item.min_width?item.min_width:120" :fixed="item.fixed?item.fixed:''" align="center">
+        <template #header>
+          <div class="flex-align-jus-center" >
+            {{item.label}}
+            <el-tooltip v-if="item.notes" :content="item.notes" placement="top">
+              <div><i class="el-icon-question"></i></div>
+            </el-tooltip>
+          </div>
+        </template>
+        <template v-slot="{ row }">
+          <span>{{row[item.prop]||row[item.prop]==0?$formatNum(row[item.prop]):'-' }}</span>
+        </template>
+      </ux-table-column>
+    </ux-grid>
+    <div class="pagination" v-show="total>0">
+      <el-pagination background :current-page="page" @current-change="handleCurrentChange" layout="prev, pager, next" :page-count='Number(pages)'>
+      </el-pagination>
     </div>
   </div>
 </template>
@@ -114,10 +85,7 @@ export default {
       user_id: '',
       drama_id: '',
       gl_loading: false,
-      desCol: [],
-      height: '',
-      tagType:2,
-      tagType2:[
+      desCol: [
         { prop: "playletTitle", label: "剧集", min_width: 160, fixed: 'left' },
         { prop: "account_name", label: "公众号", min_width: 160 },
         { prop: "user_name", label: "投手", min_width: 160 },
@@ -129,34 +97,17 @@ export default {
         { prop: "profile", label: "总毛利额", notes: '总毛利额=累计充值-累计消耗' },
         { prop: "recall_rate", label: "回本率%", notes: '回本率=累计充值/累计消耗' },
       ],
-      tagType1:[
-        { prop: "user_name", label: "投手", min_width: 160, fixed: 'left'  },
-        { prop: "playletTitle", label: "投放天数", min_width: 160, sort: true},
-        { prop: "account_name", label: "投放公众号数", min_width: 160, sort: true },
-        { prop: "cost", label: "累计消耗",sort: true },
-        { prop: "pay_money", label: "累计充值",sort: true },
-        { prop: "first_day_roi", label: "首日ROI", notes: '首日ROI=当日新用户充值之和/累计消耗',sort: true },
-        { prop: "profile", label: "总毛利额", notes: '总毛利额=累计充值-累计消耗',sort: true },
-        { prop: "recall_rate", label: "回本率%", notes: '回本率=累计充值/累计消耗',sort: true },
-      ]
+      height: '',
+      tagType:2,
     }
   },
   created () {
-    this.desCol = this.tagType2
-    this.height = document.documentElement.clientHeight - 280 > 400 ? document.documentElement.clientHeight - 280 : 400
+    this.height = document.documentElement.clientHeight - 340 > 400 ? document.documentElement.clientHeight - 340 : 400
     this.time = this.default_time
     this.stat_throwPersonData()
     this.init(1)
   },
   methods: {
-    changeType(type){
-      this.tagType = type
-      // this.desCol = []
-      // this.desCol = type == 2 ?this.tagType2 :this.tagType1
-      // this.init(1)
-      // console.log(this.desCol);
-      // this.$forceUpdate()
-    },
     headerColor ({ row, column, rowIndex, columnIndex }) {
       return { backgroundColor: '#FFFFFF !important', border: 'none!important' }
     },
@@ -260,7 +211,7 @@ export default {
           sheetName: ''// 表一的sheet名字
         }
       ]
-      this.$exportOrder({ excelDatas, name: `投手数据（导出时间：${this.$getDay(0)}）` })
+      this.$exportOrder({ excelDatas, name: `投手投放数据（导出时间：${this.$getDay(0)}）` })
     }
   }
 }

project/src/components/dataBoard/throwPerson/throwPersonSon.vue

@@ -0,0 +1,237 @@
+<template>
+  <div v-loading="loading">
+    <div class="screenBox flex" v-loading="gl_loading">
+      <div class="flex">
+        <date-picker title="自定义" :quickFlag='true' :afferent_time="default_time" :clearFlag='false' @changeTime="changeTime"></date-picker>
+        <self-channel title="投手" type='pitcher' :labelWidth="true" :afferent_params="{corp_id:''}" @channelDefine="(val)=>{user_id = val;init(1)}"></self-channel>
+      </div>
+      <el-button type="primary" size="mini" @click="init(1,'export')">导出Excel</el-button>
+    </div>
+    <div class="dataInfoBox">
+      <div class="dataInfoItem">
+        <div class="dataItemTitle">
+          <img src="@/assets/img/icon/累计消耗@2x.png" style="height:14px" class="titleIcon" alt="">
+          <span>累计消耗</span>
+        </div>
+        <div class="dataItem-data">{{dataInfo&&(dataInfo.sum_paid||dataInfo.sum_paid==0)?$formatNum(dataInfo.sum_paid):'-'}}</div>
+      </div>
+      <div class="dataInfoItem">
+        <div class="dataItemTitle">
+          <img src="@/assets/img/icon/累计充值@2x.png" style="height:18px" class="titleIcon" alt="">
+          <span>累计充值</span>
+        </div>
+        <div class="dataItem-data">{{dataInfo&&(dataInfo.sum_charge||dataInfo.sum_charge==0)?$formatNum(dataInfo.sum_charge):'-'}}</div>
+      </div>
+      <div class="dataInfoItem">
+        <div class="dataItemTitle">
+          <img src="@/assets/img/icon/roi@2x.png" class="titleIcon" alt="">
+          <span>首日ROI</span>
+        </div>
+        <div class="dataItem-data">{{dataInfo&&(dataInfo.sum_roi||dataInfo.sum_roi==0)?dataInfo.sum_roi:'-'}}</div>
+      </div>
+      <div class="dataInfoItem">
+        <div class="dataItemTitle">
+          <img src="@/assets/img/icon/总毛利润额@2x.png" style="height:14px" class="titleIcon" alt="">
+          <span>总毛利润额</span>
+        </div>
+        <div class="dataItem-data">{{dataInfo&&(dataInfo.sum_profit||dataInfo.sum_profit==0)?$formatNum(dataInfo.sum_profit):'-'}}</div>
+      </div>
+      <div class="dataInfoItem">
+        <div class="dataItemTitle">
+          <img src="@/assets/img/icon/回本率@2x.png" class="titleIcon" alt="">
+          <span>回本率</span>
+        </div>
+        <div class="dataItem-data">{{dataInfo&&(dataInfo.sum_recover_rate||dataInfo.sum_recover_rate==0)?dataInfo.sum_recover_rate+'%':'-'}}</div>
+      </div>
+    </div>
+    <ux-grid class="uxGridBox" ref="plxTable" :border="false" @row-click="()=>{return}" :header-cell-style="headerColor" :height="height" show-footer-overflow="tooltip" show-overflow="tooltip" size="mini">
+      <ux-table-column v-for="item in desCol" :key="item.prop"
+                       :resizable="true" :field="item.prop" :title="item.label"
+                       :min-width="item.min_width?item.min_width:120"
+                       :fixed="item.fixed?item.fixed:''" align="center">
+        <template #header>
+          <div
+            :class="['flex-align-jus-center',item.sort?'pointer':'',sort_field==item.prop?'sortFieldStyle':'']"
+            @click="item.sort?sortFieldEvent(item.prop):''">
+            {{item.label}}
+            <i class="el-icon-caret-bottom" v-if="item.sort"></i>
+            <el-tooltip v-if="item.notes" :content="item.notes" placement="top">
+              <div><i class="el-icon-question"></i></div>
+            </el-tooltip>
+          </div>
+        </template>
+        <template v-slot="{ row }">
+          <span :class="sort_field==item.prop?'sortFieldStyle':''">{{row[item.prop]||row[item.prop]==0?$formatNum(row[item.prop]):'-' }}</span>
+        </template>
+      </ux-table-column>
+    </ux-grid>
+    <div class="pagination" v-show="total>0">
+      <el-pagination background :current-page="page" @current-change="handleCurrentChange" layout="prev, pager, next" :page-count='Number(pages)'>
+      </el-pagination>
+    </div>
+  </div>
+</template>
+<script>
+import datePicker from '@/components/assembly/screen/datePicker.vue'
+import selfChannel from '@/components/assembly/screen/channel.vue'
+export default {
+  components: { datePicker, selfChannel },
+  data () {
+    return {
+      loading: false,
+      page: 1,
+      pages: 0,
+      total: 0,
+      page_size: 20,
+      sort_field: 'roi',
+      dataInfo: {},
+      default_time: [this.$getDay(-30, false), this.$getDay(0, false)],
+      time: [],
+      user_id: '',
+      drama_id: '',
+      gl_loading: false,
+      desCol: [
+        { prop: "user_name", label: "投手", min_width: 160, fixed: 'left'  },
+        { prop: "date_num", label: "投放天数", min_width: 160, sort: true},
+        { prop: "app_num", label: "投放公众号数", min_width: 160, sort: true },
+        { prop: "day_paid", label: "累计消耗",sort: true },
+        { prop: "charge_total", label: "累计充值",sort: true },
+        { prop: "roi", label: "首日ROI", notes: '首日ROI=当日新用户充值之和/累计消耗',sort: true },
+        { prop: "profit", label: "总毛利额", notes: '总毛利额=累计充值-累计消耗',sort: true },
+        { prop: "recover_rate", label: "回本率%", notes: '回本率=累计充值/累计消耗',sort: true },
+      ],
+      height: '',
+    }
+  },
+  created () {
+    this.height = document.documentElement.clientHeight - 340 > 400 ? document.documentElement.clientHeight - 340 : 400
+    this.time = this.default_time
+    this.init(1)
+  },
+  methods: {
+    headerColor ({ row, column, rowIndex, columnIndex }) {
+      return { backgroundColor: '#FFFFFF !important', border: 'none!important' }
+    },
+    changeTime (time) {//筛选时间变化
+      if (!time || time && time.length == 0) {
+        this.time = []
+      } else {
+        this.time = time
+      }
+      this.init(1)
+    },
+    init (page, type) {
+      if (type != 'export') {
+        this.page = page ? page : this.page;
+      } else {
+        if (this.total == 0) {
+          this.$message({
+            message: '暂无数据可导出',
+            type: "warning"
+          })
+          return
+        }
+      }
+      this.loading = true
+      this.$axios.get(this.URL.BASEURL + this.URL.pitcherData, {
+        params: {
+          user_id: this.user_id,
+          st_date: this.time[0],
+          en_date: this.time[1],
+          sort_field: this.sort_field,
+          page: type == 'export' ? 1 : this.page,
+          page_size: type == 'export' ? this.$store.state.exportNumber : this.page_size,
+        }
+      }).then((res) => {
+        var res = res.data
+        this.loading = false
+        if (res && res.errno == 0) {
+          if (type == 'export') {
+            this.exportEvent(res.rst.data.list)
+          } else {
+            this.datas = res.rst.data.list // 知道为啥datas不在 data()方法里面定义吗？嘻嘻
+            this.$refs.plxTable.reloadData(this.datas)
+            this.dataInfo = res.rst.data.summary
+            this.total = res.rst.pageInfo.total;
+            this.pages = res.rst.pageInfo.pages;
+          }
+        } else if (res.errno != 4002) {
+          this.$message({
+            message: res.err,
+            type: "warning"
+          })
+        }
+      }).catch((err) => {
+        this.loading = false
+      });
+    },
+    handleCurrentChange (val) {
+      this.init(val)
+    },
+    sortFieldEvent (type) {
+      this.sort_field = type;
+      this.init(1)
+    },
+    exportEvent (data) {
+      let list = data;
+      let tHeader = this.desCol.map((v) => {
+        return v.label;
+      })
+      let filterVal = this.desCol.map((v) => {
+        return v.prop
+      })
+      let excelDatas = [
+        {
+          tHeader: tHeader, // sheet表一头部
+          filterVal: filterVal, // 表一的数据字段
+          tableDatas: list, // 表一的整体json数据
+          sheetName: ''// 表一的sheet名字
+        }
+      ]
+      this.$exportOrder({ excelDatas, name: `投手数据（导出时间：${this.$getDay(0)}）` })
+    }
+  }
+}
+</script>
+<style lang="scss" scoped>
+.screenBox {
+  background: #fff;
+  padding: 5px 20px;
+}
+.dataInfoBox {
+  display: flex;
+  margin-top: 10px;
+  flex-wrap: wrap;
+  .dataInfoItem {
+    background: #ffffff;
+    border-radius: 8px;
+    margin-right: 10px;
+    margin-bottom: 10px;
+    padding: 0 19px;
+    height: 70px;
+    display: flex;
+    flex-direction: column;
+    justify-content: center;
+    align-items: center;
+    .dataItemTitle {
+      display: flex;
+      align-items: center;
+      color: #6f6f6f;
+      font-size: 13px;
+      line-height: 17px;
+      font-weight: bold;
+      .titleIcon {
+        height: 16px;
+        margin-right: 4px;
+      }
+    }
+    .dataItem-data {
+      color: #000000;
+      font-size: 19px;
+      line-height: 28px;
+      font-weight: bold;
+      margin-top: 2px;
+    }
+  }
+}
+</style>

project/src/router/allRouter.js

@@ -26,7 +26,7 @@ const thePublic = () => import(/* webpackChunkName: 'thePublic' */ '@/components
 const playletData = () => import(/* webpackChunkName: 'playletData' */ '@/components/dataBoard/playletData.vue')
 const operateDayRetrieve = () => import(/* webpackChunkName: 'operateDayRetrieve' */ '@/components/dataBoard/operateDayRetrieve.vue')
 const populariz = () => import(/* webpackChunkName: 'populariz' */ '@/components/dataBoard/populariz.vue')
-const throwPerson = () => import(/* webpackChunkName: 'throwPerson' */ '@/components/dataBoard/throwPerson.vue')
+const throwPerson = () => import(/* webpackChunkName: 'throwPerson' */ '@/components/dataBoard/throwPerson/index.vue')
 const regRangeReport = () => import(/* webpackChunkName: 'regRangeReport' */ '@/components/dataBoard/regRangeReport.vue')
 const dramaManage = () => import(/* webpackChunkName: 'dramaManage' */ '@/components/dataBoard/dramaManage.vue')
 const charge = () => import(/* webpackChunkName: 'charge' */ '@/components/orderManage/charge.vue')