Skip to content

M
marketing
Commit 89c43ff9 by crushh
Options

update: dist

parent 8a33b5a2
Showing with 38 additions and 40 deletions
src/assets/style/base/reset.scss
......@@ -585,4 +585,4 @@ img::after {
font-weight: 400;
color: #909399;
line-height: 17px;
}
\ No newline at end of file
}
\ No newline at end of file
src/components/dm-new-member-group/index.vue
......@@ -22,7 +22,7 @@
<div class="left">
<el-tabs v-model="activeName">
<el-tab-pane :label="item.label" v-for="item in options" :name="item.name" :key="item.name">
<dm-table :ref="`table${item.name}`" :name="item.name" :creatorId="creatorId" :key="visiable" :realTimeType="realTimeType" :activeName="activeName" :selected="selectedArray" @handleSelectionChange="handleSelectionChange" @deleteRow="deleteRow" />
<tableComponent :ref="`table${item.name}`" :name="item.name" :creatorId="creatorId" :key="visiable" :realTimeType="realTimeType" :activeName="activeName" :selected="selectedArray" @handleSelectionChange="handleSelectionChange" @deleteRow="deleteRow" />
</el-tab-pane>
</el-tabs>
</div>
......@@ -96,7 +96,7 @@ export default {
}
},
components: {
'dm-table': table
tableComponent: table
},
data() {
return {
......@@ -137,7 +137,11 @@ export default {
mounted() {
document.addEventListener('visibilitychange', () => {
if (!document.hidden) {
this && this.$refs[`table${this.activeName}`] && this.$refs[`table${this.activeName}`][0].getGroupList();
try {
this.$refs[`table${this.activeName}`][0].getGroupList();
} catch (e) {
return null;
}
}
});
},
......@@ -277,7 +281,7 @@ export default {
width: 100%;
background: #f7f8fa;
border-radius: 4px;
padding: 12px 15px;
padding: 0 16px 16px;
box-sizing: border-box;
.echoLine {
margin-bottom: 8px;
......@@ -292,10 +296,9 @@ export default {
}
.groupName {
font-weight: 400;
margin-left: 5px;
}
&:first-child {
margin-top: 20px;
&:last-child {
margin-bottom: 0;
}
}
}
......@@ -304,10 +307,11 @@ export default {
display: flex;
.left {
width: 666px;
height: 582px;
height: 560px;
border-radius: 4px;
border: 1px solid #dcdfe6;
padding: 5px 17px;
box-sizing: border-box;
}
.right {
......@@ -346,7 +350,6 @@ export default {
display: inline-flex;
width: 100%;
justify-content: space-between;
padding: 0 4px;
align-items: center;
box-sizing: border-box;
......
src/components/dm-new-member-group/table.vue
......@@ -10,20 +10,20 @@
<div class="btn"><el-button size="small" type="primary" @click="addGroup">新增分组</el-button></div>
</div>
</div>
<el-table :data="tableData" ref="table" v-loading="loading" @select="handleSelect" @selection-change="handleSelectionChange" row-key="memberTagGroupId" @row-click="selectRow">
<el-table :data="tableData" ref="table" style="width:100%" v-loading="loading" @select="handleSelect" @selection-change="handleSelectionChange" row-key="memberTagGroupId" @row-click="selectRow">
<el-table-column type="selection" width="55" :selectable="selectable"> </el-table-column>
<el-table-column label="分组名称" min-width="180px" prop="groupName">
<template slot-scope="{ row }">
<el-tooltip :disabled="row.readyStatus == 1" content="当前分组还未更新完成">
<div>
<el-tag size="mini" :type="!row.isRealTime ? 'warning' : ''"> {{ !row.isRealTime ? '非实时' : '实时' }}</el-tag>
<el-tag size="mini" v-show="activeName != 2" :type="!row.isRealTime ? 'warning' : ''"> {{ !row.isRealTime ? '非实时' : '实时' }}</el-tag>
{{ row.groupName }}
</div>
</el-tooltip>
</template>
</el-table-column>
<el-table-column label="覆盖人群" prop="memberCount" />
<el-table-column label="最近更新时间" min-width="120px" prop="latestUpdateTime">
<el-table-column label="最近更新时间" v-if="activeName != 2" min-width="120px" prop="latestUpdateTime">
<template slot-scope="scope">
<p class="h-18">{{ scope.row.latestUpdateTime | formatTimeYMD }}</p>
<p class="h-18">{{ scope.row.latestUpdateTime | formatTimeHMS }}</p>
......@@ -175,7 +175,6 @@ export default {
res.data.result.result.forEach(item => (item.activeName = this.activeName));
this.tableData = res.data.result.result;
this.totalCount = res.data.result.totalCount;
console.log(this.tableData);
return;
}
this.$message.error({
......@@ -221,11 +220,14 @@ export default {
display: flex;
justify-content: space-between;
margin-bottom: 15px;
/deep/ .el-input__inner {
border-color: #dcdfe6 !important;
}
}
}
.pageBtn {
float: right;
margin: 13px 0 18px 0;
margin: 10px 0;
}
.h-18 {
line-height: 18px;
......
src/components/dm-new-rule/ruleFilter.vue
......@@ -5,7 +5,7 @@
<div class="line"></div>
<div class="text">
<div class="space-between">
已选分组
已选条件
<span v-if="!onlyRead"><el-button type="text" class="delBtn" @click="delAll">删除</el-button><el-button type="text" @click="edit">编辑</el-button></span>
</div>
</div>
......
src/views/ai/manage.vue
......@@ -18,7 +18,7 @@
</div>
<div class="temp-info">
<p class="temp-info-text">话术ID：{{ el.thirdTemplateId }}</p>
<p class="temp-info-text">更新时间：{{ formatDateTimeByType(el.updateTime) || '--' }}</p>
<p class="temp-info-text">发布时间：{{ formatDateTimeByType(el.publishTime) || '--' }}</p>
<el-button class="temp-check-btn" type="text" @click="showTempDetail(el)">查看</el-button>
</div>
<div :class="['temp-status', { publish: el.status == -1 || el.status == 0 || el.status == 1 || el.status == 2 || el.status == 3 }, { reject: el.status == 4 }, { published: el.status == 5 }]">
......
src/views/ai/task/components/defineTime.vue
......@@ -158,7 +158,7 @@ export default {
width: 400px;
background: #f7f8fa;
border-radius: 4px;
padding: 16px;
padding: 16px 16px 6px 16px;
box-sizing: border-box;
margin-top: 10px;
.flex {
......
src/views/ai/task/components/holidayActiveTime.vue
......@@ -5,10 +5,10 @@
<el-radio v-model="form.holiday_type" :label="1">推荐节日</el-radio>
<el-radio v-model="form.holiday_type" :label="2">自定义节日</el-radio>
</el-radio-group>
<span class="tips">为保证触达率，节日活动需要提前创建，不支持创建节日日期为活动创建日的活动</span>
<span class="tips ml20">为保证触达率，节日活动需要提前创建，不支持创建节日日期为活动创建日的活动</span>
<div v-if="form.holiday_type == 1">
<el-tag type="mini" v-if="form.holiday_name1">{{ form.holiday_name1 }}</el-tag>
<el-button type="text" @click="visible = true">{{ !form.holiday_name1 ? '选择节日' : '重新选择' }}</el-button>
<el-button type="text" @click="visible = true" class="ml16">{{ !form.holiday_name1 ? '选择节日' : '修改节日' }}</el-button>
</div>
<div v-if="form.holiday_type == 2">
<el-form-item prop="holiday_name2" :rules="[{ required: true, message: '请输入节日名称' }]">
......@@ -17,7 +17,7 @@
</div>
</el-form-item>
<el-form-item label="节日日期" prop="holiday_date1" v-show="form.holiday_type == 1">
<span class="tips" v-if="!form.holiday_date1">未选择节日</span>
<span class="tips fz14" v-if="!form.holiday_date1">未选择节日</span>
<span v-else>{{ form.holiday_date1 }}</span>
</el-form-item>
<el-form-item label="节日日期" prop="holiday_date2" v-show="form.holiday_type == 2">
......@@ -27,7 +27,7 @@
节日前
<el-input-number class="w100" style="margin:0 5px;" v-model="form.holiday_day" @change="hanldeHolidayDay" controls-position="right" :max="30" :min="1" size="small" />
天内外呼完成
<span class="tips">由于外呼线路有限，为保证外呼触达率，建议外呼时间周期不小于5</span>
<span class="tips ml20">由于外呼线路有限，为保证外呼触达率，建议外呼时间周期不小于5</span>
</el-form-item>
<el-form-item label="外呼时段" required>
<el-radio v-model="form.callFlag" :label="0">默认时段</el-radio>
......@@ -38,7 +38,7 @@
<defineTime v-show="form.callFlag == 1" ref="defineTime" :data="form.callTime" />
</el-form-item>
<el-form-item label="外呼周期" required>
<span v-if="!activeTime" class="tips" style="font-size: 14px;margin:0">设置【节日日期】和【外呼时间】后自动生成</span>
<span v-if="!activeTime" class="tips fz14">设置【节日日期】和【外呼时间】后自动生成</span>
<span v-else>{{ activeTime }}</span>
</el-form-item>
<el-dialog title="选择节日" :visible.sync="visible" width="700px" :before-close="close">
......@@ -272,13 +272,6 @@ export default {
</script>
<style lang="scss" scoped>
.tips {
font-size: 12px;
font-weight: 400;
color: #909399;
line-height: 17px;
margin-left: 20px;
}
.radioLine {
padding: 12px 0 24px 0;
display: flex;
......
src/views/ai/task/info.vue
......@@ -89,7 +89,7 @@
<td class="cell" style="width:50%;">
<el-tag type="mini">{{ item.title }}</el-tag>
<el-popover placement="top-start" width="200" trigger="hover" :content="item.smsContent">
<el-button slot="reference" type="text">查看短信内容 </el-button>
<el-button slot="reference" type="text" class="ml10">查看短信内容 </el-button>
</el-popover>
</td>
</tr>
......@@ -398,7 +398,7 @@ export default {
margin: 10px 20px;
}
.section {
padding: 20px 0 40px 0;
padding: 20px 0 18px 0;
}
.card {
margin-top: 20px;
......@@ -412,7 +412,7 @@ export default {
border-radius: 4px;
margin-top: 10px;
box-sizing: border-box;
padding: 0 16px;
padding: 16px 16px;
table {
width: 100%;
}
......@@ -422,11 +422,10 @@ export default {
line-height: 20px;
color: #303133;
font-size: 14px;
height: 52px;
line-height: 52px;
line-height: 20px;
}
.cell {
padding: 0 30px 12px 0;
padding: 10px 0 0 0;
}
}
}
......
src/views/ai/task/tagPop.vue
......@@ -133,7 +133,7 @@ export default {
<style lang="scss" scoped>
.rightContent {
padding: 15px 18px;
padding: 4px 0 0 16px;
box-sizing: border-box;
}
.searchWrap {
......@@ -145,6 +145,7 @@ export default {
height: 521px;
border-radius: 4px;
border: 1px solid #dcdfe6;
padding: 11px 17px 0 0;
}
.radioContainer {
height: 400px;
......@@ -158,6 +159,7 @@ export default {
font-weight: bolder;
margin-bottom: 12px;
width: 100%;
color: #303030;
}
display: flex;
flex-wrap: wrap;
......
src/views/ai/task/task.vue
......@@ -94,8 +94,7 @@ import { page, rechargeCenter, stopActivityPlan, startActivityPlan, pageStatisti
import { formatDateTimeByType } from '@/utils/index.js';
import filterAvater from '@/mixins/filterAvater.js';
import dmDropdown from '@/components/dm-drop-down/dm-drop-down';
let maxTime = null;
let minTime = null;
export default {
mixins: [filterAvater],
data() {
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment