diff --git a/src/assets/css/font/iconfont.css b/src/assets/css/font/iconfont.css index 17ce4dc8..5e1e80c0 100644 --- a/src/assets/css/font/iconfont.css +++ b/src/assets/css/font/iconfont.css @@ -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"; } diff --git a/src/assets/css/font/iconfont.js b/src/assets/css/font/iconfont.js index ebc1a1e2..ffc9ca51 100644 --- a/src/assets/css/font/iconfont.js +++ b/src/assets/css/font/iconfont.js @@ -1 +1 @@ -window._iconfont_svg_string_2614877 = '', (function (l) { var a = (a = document.getElementsByTagName('script'))[a.length - 1]; const c = a.getAttribute('data-injectcss'); var a = a.getAttribute('data-disable-injectsvg'); if (!a) { let h; let o; var i; var v; var m; const z = function (a, c) { c.parentNode.insertBefore(a, c) }; if (c && !l.__iconfont__svg__cssinject__) { l.__iconfont__svg__cssinject__ = !0; try { document.write('') } catch (a) { console && console.log(a) } }h = function () { let a; let c = document.createElement('div'); c.innerHTML = l._iconfont_svg_string_2614877, (c = c.getElementsByTagName('svg')[0]) && (c.setAttribute('aria-hidden', 'true'), c.style.position = 'absolute', c.style.width = 0, c.style.height = 0, c.style.overflow = 'hidden', c = c, (a = document.body).firstChild ? z(c, a.firstChild) : a.appendChild(c)) }, document.addEventListener ? ~['complete', 'loaded', 'interactive'].indexOf(document.readyState) ? setTimeout(h, 0) : (o = function () { document.removeEventListener('DOMContentLoaded', o, !1), h() }, document.addEventListener('DOMContentLoaded', o, !1)) : document.attachEvent && (i = h, v = l.document, m = !1, s(), v.onreadystatechange = function () { v.readyState == 'complete' && (v.onreadystatechange = null, t()) }) } function t () { m || (m = !0, i()) } function s () { try { v.documentElement.doScroll('left') } catch (a) { return void setTimeout(s, 50) }t() } }(window)) +window._iconfont_svg_string_2614877 = '', (function (l) { var a = (a = document.getElementsByTagName('script'))[a.length - 1]; const c = a.getAttribute('data-injectcss'); var a = a.getAttribute('data-disable-injectsvg'); if (!a) { let h; let o; var i; var m; var v; const z = function (a, c) { c.parentNode.insertBefore(a, c) }; if (c && !l.__iconfont__svg__cssinject__) { l.__iconfont__svg__cssinject__ = !0; try { document.write('') } catch (a) { console && console.log(a) } }h = function () { let a; let c = document.createElement('div'); c.innerHTML = l._iconfont_svg_string_2614877, (c = c.getElementsByTagName('svg')[0]) && (c.setAttribute('aria-hidden', 'true'), c.style.position = 'absolute', c.style.width = 0, c.style.height = 0, c.style.overflow = 'hidden', c = c, (a = document.body).firstChild ? z(c, a.firstChild) : a.appendChild(c)) }, document.addEventListener ? ~['complete', 'loaded', 'interactive'].indexOf(document.readyState) ? setTimeout(h, 0) : (o = function () { document.removeEventListener('DOMContentLoaded', o, !1), h() }, document.addEventListener('DOMContentLoaded', o, !1)) : document.attachEvent && (i = h, m = l.document, v = !1, s(), m.onreadystatechange = function () { m.readyState == 'complete' && (m.onreadystatechange = null, t()) }) } function t () { v || (v = !0, i()) } function s () { try { m.documentElement.doScroll('left') } catch (a) { return void setTimeout(s, 50) }t() } }(window)) diff --git a/src/assets/css/font/iconfont.ttf b/src/assets/css/font/iconfont.ttf index 43b6b87c..c84bcd81 100644 Binary files a/src/assets/css/font/iconfont.ttf and b/src/assets/css/font/iconfont.ttf differ diff --git a/src/assets/css/font/iconfont.woff b/src/assets/css/font/iconfont.woff index ab0b4618..b45e84f0 100644 Binary files a/src/assets/css/font/iconfont.woff and b/src/assets/css/font/iconfont.woff differ diff --git a/src/assets/css/font/iconfont.woff2 b/src/assets/css/font/iconfont.woff2 index 2cdeec00..9e9f70a9 100644 Binary files a/src/assets/css/font/iconfont.woff2 and b/src/assets/css/font/iconfont.woff2 differ diff --git a/src/components/common/TimeRange/DateTimeRange.vue b/src/components/common/TimeRange/DateTimeRange.vue index 9898e4e0..381e24cc 100644 --- a/src/components/common/TimeRange/DateTimeRange.vue +++ b/src/components/common/TimeRange/DateTimeRange.vue @@ -2,10 +2,10 @@
-
-
{{ dateFormatByAppearance(getMillisecond(startTime)) }}
-
-
-
{{ dateFormatByAppearance(getMillisecond(endTime)) }}
+
+
{{ dateFormatByAppearance(getMillisecond(startTime)) }}
+
-
+
{{ dateFormatByAppearance(getMillisecond(endTime)) }}
{{ showDetail }} @@ -148,7 +148,7 @@ export default { datePickerVisibleChange () { if (this.showPosition === 'left') { this.leftStyle = this.leftStyleBefore - //this.dropdownFlag = true + // this.dropdownFlag = true } } }, diff --git a/src/views/charts2/charts/entityDetail/EntityDetailBasicInfo.vue b/src/views/charts2/charts/entityDetail/EntityDetailBasicInfo.vue index 92ab5468..98f2a81e 100644 --- a/src/views/charts2/charts/entityDetail/EntityDetailBasicInfo.vue +++ b/src/views/charts2/charts/entityDetail/EntityDetailBasicInfo.vue @@ -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,