Commit a3481128 by caoyanzhi

Merge branch 'feature/7月迭代' into dev

parents 523e9188 8e195bc7
......@@ -38,6 +38,8 @@ export default {
localStorage.setItem('enableAccessControl', enableAccessControl);
if (this.userId !== uId) {
this.userId = uId;
// 切换账号后,不缓存权限数据、菜单数据、面包屑数据
window.notCache = true;
// 串号
this.$confirm('当前登录账号已经发生变化,如果您在其他页面已经登录另一个账号,请重新登录!', '登录账号变更提示', {
confirmButtonText: '重新登录',
......
......@@ -83,7 +83,7 @@
<div class="btnBg" style="margin-left:12px">
<el-tooltip placement="top" :disabled="!row.aiTelRecordText">
<div slot="content">
{{ row.isPlay ? '暂停录音' : '播放录音' }}
{{ row.isPlay ? '暂停播放' : '播放录音' }}
</div>
<el-button size="small" type="text" @click="handleListen(row)" :disabled="!row.aiTelRecordText || (row.aiTelRecordText && !row.aiTelRecordUrl)">
......
......@@ -66,7 +66,7 @@
</div>
</el-form-item>
<el-form-item label="号码导入" prop="phoneList" v-else>
<dm-import-file ref="importFile" :againUploadDisabled="disabled" :options="importFileOption" @change="handleFileChange" :echo="fileEcho"></dm-import-file>
<dm-import-file ref="importFile" style="width:680px" :againUploadDisabled="disabled" :options="importFileOption" @change="handleFileChange" :echo="fileEcho"></dm-import-file>
</el-form-item>
<el-form-item label="预计覆盖人数">
<span class="bold">{{ planMemberCountShow }}</span>
......
......@@ -613,7 +613,7 @@ export default {
gap: 12px;
.card {
min-width: 224px;
width: 16.6%;
width: 16%;
height: 140px;
background: #f0f3fd;
border-radius: 4px;
......
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