1.CN-1506 Subscriber详情页基础信息图表开发;2.时间选择器组件选择具体日期时,显示省略号;

This commit is contained in:
hyx
2023-12-07 16:25:14 +08:00
parent ab30ddf49b
commit f54ca30a58
7 changed files with 52 additions and 11 deletions

View File

@@ -1,8 +1,8 @@
@font-face {
font-family: "cn-icon"; /* Project id 2614877 */
src: url('iconfont.woff2?t=1701240781545') format('woff2'),
url('iconfont.woff?t=1701240781545') format('woff'),
url('iconfont.ttf?t=1701240781545') format('truetype');
src: url('iconfont.woff2?t=1701934971951') format('woff2'),
url('iconfont.woff?t=1701934971951') format('woff'),
url('iconfont.ttf?t=1701934971951') format('truetype');
}
.cn-icon {
@@ -13,6 +13,26 @@
-moz-osx-font-smoothing: grayscale;
}
.cn-icon-IMSI:before {
content: "\e812";
}
.cn-icon-APN:before {
content: "\e813";
}
.cn-icon-shoujihaoma:before {
content: "\e814";
}
.cn-icon-IMEI:before {
content: "\e811";
}
.cn-icon-trace-point:before {
content: "\e810";
}
.cn-icon-account-info:before {
content: "\e80e";
}

File diff suppressed because one or more lines are too long

Binary file not shown.

Binary file not shown.

Binary file not shown.

View File

@@ -2,10 +2,10 @@
<div v-ele-click-outside="changeDropdown" style="position: relative;" class="date-range-box">
<div @click="showDropdown" class="date-range-text" :class="myClass" :style="style">
<div class="calendar-popover-text"><i class="cn-icon cn-icon-Data"></i></div>
<div class="calendar-popover-text" style="display: flex" v-if="isCustom">
<div class="calendar-popover-text">{{ dateFormatByAppearance(getMillisecond(startTime)) }}</div>
<div class="calendar-popover-text"> -</div>
<div class="calendar-popover-text">{{ dateFormatByAppearance(getMillisecond(endTime)) }}</div>
<div class="calendar-popover-text" style="display: flex" v-if="isCustom" :title="`${dateFormatByAppearance(getMillisecond(startTime))} -${dateFormatByAppearance(getMillisecond(endTime))}`">
<div class="calendar-popover-text" :style="showPosition === 'left' ? 'width: 90px;text-overflow: ellipsis;overflow: hidden;' : ''" >{{ dateFormatByAppearance(getMillisecond(startTime)) }}</div>
<div class="calendar-popover-text" :style="showPosition === 'left' ? 'display:none;' : ''"> -</div>
<div class="calendar-popover-text" :style="showPosition === 'left' ? 'display:none;' : ''">{{ dateFormatByAppearance(getMillisecond(endTime)) }}</div>
</div>
<div class="calendar-popover-text" v-else>
{{ showDetail }}
@@ -148,7 +148,7 @@ export default {
datePickerVisibleChange () {
if (this.showPosition === 'left') {
this.leftStyle = this.leftStyleBefore
//this.dropdownFlag = true
// this.dropdownFlag = true
}
}
},

View File

@@ -127,9 +127,15 @@ export default {
this.toggleLoading(true)
this.showError = false
this.levelTwoTags = []
const tagRequest = axios.get(`${api.entity.tags}/${this.entity.entityType}?resource=${this.entity.entityName}`)
const basicInfoRequest = axios.get(`${api.entity.basicInfo}/${this.entity.entityType}?resource=${this.entity.entityName}`)
Promise.all([tagRequest, basicInfoRequest]).then(response => {
let requestArray = []
if(this.entity.entityType === entityType.subscriber) {
requestArray = [null,basicInfoRequest]
}else {
const tagRequest = axios.get(`${api.entity.tags}/${this.entity.entityType}?resource=${this.entity.entityName}`)
requestArray = [tagRequest, basicInfoRequest]
}
Promise.all(requestArray).then(response => {
const tagData = response[0]
let tagError = ''
const basicInfoData = response[1]
@@ -203,6 +209,13 @@ export default {
}
break
}
case 'subscriber': {
this.detailCards.find(c => c.name === 'iphoneNumber').value = res.data.phone_number
this.detailCards.find(c => c.name === 'imei').value = res.data.imei
this.detailCards.find(c => c.name === 'imsi').value = res.data.imsi
this.detailCards.find(c => c.name === 'apn').value = res.data.apn
break
}
}
} else {
basicInfoError = this.errorMsgHandler(res)
@@ -465,6 +478,14 @@ export default {
{ icon: 'cn-icon cn-icon-description', name: 'appDescription', label: i18n.global.t('config.dataSource.description'), value: '' }
)
}
case 'subscriber': {
detailCards.value = _.concat(detailCards.value,
{ icon: 'cn-icon cn-icon-shoujihaoma', name: 'iphoneNumber', label: i18n.global.t('entities.iphoneNumber'), value: '' },
{ icon: 'cn-icon cn-icon-IMEI', name: 'imei', label: i18n.global.t('entities.imei'), value: '' },
{ icon: 'cn-icon cn-icon-IMSI', name: 'imsi', label: i18n.global.t('entities.imsi'), value: '' },
{ icon: 'cn-icon cn-icon-APN', name: 'apn', label: i18n.global.t('entities.apn'), value: '' }
)
}
}
return {
entityType,