From 62910a8e006dbe47af3938779fec171da9868af4 Mon Sep 17 00:00:00 2001 From: zhaorulin <zhaorulin@singsingenglish.com> Date: Thu, 5 Sep 2019 13:49:22 +0800 Subject: [PATCH] update --- src/App.vue | 29 +++++++++++++++++++++-------- src/components/team/dialog.vue | 8 +++++--- src/components/team/index.vue | 20 ++++++++------------ 3 files changed, 34 insertions(+), 23 deletions(-) diff --git a/src/App.vue b/src/App.vue index 2efefc53..cde66caa 100644 --- a/src/App.vue +++ b/src/App.vue @@ -283,6 +283,27 @@ border-radius: 50%; height: 50px; } + + .table-refresh-header { + display: inline-block; + cursor: help; + i { + color: #409eff; + } + } + + .cell-link { + display: inline-block; + margin: 0 -6px; + padding: 0px 8px; + border-radius: 3px; + text-decoration: underline; + transition: color 240ms, background-color 240ms; + &:hover { + background-color: #cce4ff; + color: #007fff; + } + } } .update-time { @@ -313,14 +334,6 @@ } } - .table-refresh-header { - display: inline-block; - cursor: help; - i { - color: #409eff; - } - } - // ä¿®å¤æ ·å¼ .el-tree-node__content { .el-checkbox { diff --git a/src/components/team/dialog.vue b/src/components/team/dialog.vue index bf7d0342..9f0389c6 100644 --- a/src/components/team/dialog.vue +++ b/src/components/team/dialog.vue @@ -129,7 +129,7 @@ </el-table> <!--业绩 结æŸ--> - + <!--todo 分页有问题--> <page v-if="total" :total="total" :limit="limit" @pageChange="onPageChange" @sizeChange="onSizeChange"/> </div> @@ -233,8 +233,10 @@ limit: this.limit } getPhoneRecordApi(json.alias, json).then(res => { - this.list = res.phone_record_list.page_data; - this.total = res.phone_record_list.total; + if (Object.keys(res).length && res.phone_record_list) { + this.list = res.phone_record_list.page_data || []; + this.total = res.phone_record_list.total || 0; + } this.loading = false; }) }, diff --git a/src/components/team/index.vue b/src/components/team/index.vue index da064adf..bfb8cdc1 100644 --- a/src/components/team/index.vue +++ b/src/components/team/index.vue @@ -77,7 +77,7 @@ </el-tooltip> </template> <template slot-scope="scope"> - <el-link @click="dialogToggle(scope.row, 'callback')">{{scope.row.over_visit_num}}</el-link> + <span class="cell-link" @click="dialogToggle(scope.row, 'callback')">{{scope.row.over_visit_num}}</span> </template> </el-table-column> @@ -100,7 +100,7 @@ </el-tooltip> </template> <template slot-scope="scope"> - <el-link @click="dialogToggle(scope.row, 'validchat')">{{scope.row.valid_chat_contact_count}}</el-link> + <span class="cell-link" @click="dialogToggle(scope.row, 'validchat')">{{scope.row.valid_chat_contact_count}}</span> </template> </el-table-column> @@ -113,7 +113,7 @@ </el-tooltip> </template> <template slot-scope="scope"> - <el-link @click="dialogToggle(scope.row, 'phonerecord')">{{scope.row.valid_phone_counts}}</el-link> + <span class="cell-link" @click="dialogToggle(scope.row, 'phonerecord')">{{scope.row.valid_phone_counts}}</span> </template> </el-table-column> @@ -137,7 +137,7 @@ </el-tooltip> </template> <template slot-scope="scope"> - <el-link @click="dialogToggle(scope.row, 'class')">{{scope.row.lately_class_num}}</el-link> + <span class="cell-link" @click="dialogToggle(scope.row, 'class')">{{scope.row.lately_class_num}}</span> </template> </el-table-column> @@ -150,7 +150,7 @@ </el-tooltip> </template> <template slot-scope="scope"> - <el-link @click="dialogToggle(scope.row, 'achievement')">{{scope.row.month_order_num}}</el-link> + <span class="cell-link" @click="dialogToggle(scope.row, 'achievement')">{{scope.row.month_order_num}}</span> </template> </el-table-column> @@ -163,9 +163,9 @@ </el-tooltip> </template> <template slot-scope="scope"> - <el-link @click="dialogToggle(scope.row, 'achievement')"> + <span class="cell-link" @click="dialogToggle(scope.row, 'achievement')"> {{transRate(scope.row.month_trans_order_num, scope.row.month_trans_user_num)}} - </el-link> + </span> </template> </el-table-column> @@ -178,7 +178,7 @@ </el-tooltip> </template> <template slot-scope="scope"> - <el-link @click="dialogToggle(scope.row, 'achievement')">{{scope.row.order_money_count}}</el-link> + <span class="cell-link" @click="dialogToggle(scope.row, 'achievement')">{{scope.row.order_money_count}}</span> </template> </el-table-column> </el-table> @@ -335,10 +335,6 @@ <style lang="less"> .team-table { - .el-link { - font-weight: normal; - text-decoration: underline; - } .primary-row { background: #f5f7fa; } -- 2.21.0