fix: CN-1592 UI 新增Tag检索界面:1.标签编辑界面增加item信息格式说明信息；2.标签折线图字段名修改；3.标签折线图时间组件修改；

src/components/table/tag/TagTable.vue

@@ -44,7 +44,7 @@
               </el-row>
             </el-popover>
             <span class="expand-observed-entities" :class="{'expand-observed-entities--disabled': disableToEntity}" @click="toEntityList(props.row)">{{countDesc}}&nbsp;<el-icon v-if="!disableToEntity && !showError"><Right /></el-icon></span>
-            <date-time-range
+            <date-time-range v-if="noMinutes"
                 class="date-time-range"
                 :start-time="timeFilter.startTime"
                 :end-time="timeFilter.endTime"
@@ -53,6 +53,14 @@
                 ref="dateTimeRange"
                 @change="reload"
             />
+            <date-time-range v-else
+                    class="date-time-range"
+                    :start-time="timeFilter.startTime"
+                    :end-time="timeFilter.endTime"
+                    :date-range="timeFilter.dateRangeValue"
+                    ref="dateTimeRange"
+                    @change="reload"
+            />
           </div>
           <div class="expand">
             <loading :loading="loadingDown"></loading>
@@ -145,6 +153,7 @@ export default {
       username: localStorage.getItem(storageKey.username),
       curExpendDataType: this.$t('tag.uniqueEntityObserved'),
       curExpendDataTypeVal: 'uniqueEntityObserved',
+      noMinutes: false,
       tableTitle: [ // 原始table列
         {
           label: this.$t('overall.name'),
@@ -381,7 +390,7 @@ export default {
             itemStyle: {
               color: '#35ADDA'
             },
-            data: data.map(t => { return [Number(t.statTime) * 1000, Number(t.ipIndicatorCount)] })
+            data: data.map(t => { return [Number(t.statTime) * 1000, Number(t.ipCount)] })
           })
         }
         if (item.indicatorType && item.indicatorType.indexOf('Domain') > -1) {
@@ -408,7 +417,7 @@ export default {
             itemStyle: {
               color: '#E48F3E'
             },
-            data: data.map(t => { return [Number(t.statTime) * 1000, Number(t.domainIndicatorCount)] })
+            data: data.map(t => { return [Number(t.statTime) * 1000, Number(t.domainCount)] })
           })
         }
         this.chartOption.series = series
@@ -488,6 +497,7 @@ export default {
     uniqueEntityObserved (item) {
       this.curExpendDataType = this.$t('tag.uniqueEntityObserved')
       this.curExpendDataTypeVal = 'uniqueEntityObserved'
+      this.noMinutes = false
       this.disableToEntity = false
       this.$nextTick(() => {
         const totalIndicatorsDom = document.getElementById('totalIndicators' + item.id)
@@ -504,6 +514,7 @@ export default {
     totalIndicators (item) {
       this.curExpendDataType = this.$t('tag.totalIndicators')
       this.curExpendDataTypeVal = 'totalIndicators'
+      this.noMinutes = true
       this.disableToEntity = true
       this.$nextTick(() => {
         const totalIndicatorsDom = document.getElementById('totalIndicators' + item.id)
@@ -708,6 +719,7 @@ export default {
     dropExpandChange (row, expandedRows, flag) {
       this.curExpendDataType = this.$t('tag.uniqueEntityObserved')
       this.curExpendDataTypeVal = 'uniqueEntityObserved'
+      this.noMinutes = false
       this.disableToEntity = false
       this.expandedIds = []
       clearInterval(this.interval)

src/views/tag/TagForm.vue

@@ -128,20 +128,17 @@
             </div>
             <div class="imported-table-box" :class="previewErrorTip ? 'imported-table-box--error' : ''">
               <div class="entity-format-tip">
-                <template v-if="editObject.indicatorType === tagType.find(t => t.name === 'ip').value">
-                  <div><span>{{$t('overall.format')}}:</span></div>
-                  <div><span>IPv4</span>  x.x.x.x</div>
-                  <div><span>IPv4 CIDR</span>   x.x.x.x/n</div>
-                  <div><span>IPv4 {{$t('overall.range')}}</span>   x.x.x.x-y.y.y.y</div>
-                  <div><span>IPv6</span>   x:x:x::x</div>
-                  <div><span>IPv6 CIDR</span>   x:x:x::x/n</div>
-                  <div><span>IPv6 {{$t('overall.range')}}</span>   x:x:x::x-y:y:y::y</div>
-                </template>
-                <template v-else-if="editObject.indicatorType === tagType.find(t => t.name === 'domain').value">
-                  <div><span>{{$t('overall.format')}}:</span></div>
-                  <div><span>{{$t('entities.format.suffix')}}</span>  *example.com</div>
-                  <div><span>{{$t('entities.format.exactly')}}</span>   $www.example.com</div>
-                </template>
+                <div><span>{{$t('overall.ipFormat')}}:</span></div>
+                <div><span>IPv4</span>  x.x.x.x</div>
+                <div><span>IPv4 CIDR</span>   x.x.x.x/n</div>
+                <div><span>IPv4 {{$t('overall.range')}}</span>   x.x.x.x-y.y.y.y</div>
+                <div><span>IPv6</span>   x:x:x::x</div>
+                <div><span>IPv6 CIDR</span>   x:x:x::x/n</div>
+                <div><span>IPv6 {{$t('overall.range')}}</span>   x:x:x::x-y:y:y::y</div>
+                <br/>
+                <div><span>{{$t('overall.domainFormat')}}:</span></div>
+                <div><span>{{$t('entities.format.suffix')}}</span>  *example.com</div>
+                <div><span>{{$t('entities.format.exactly')}}</span>   $www.example.com</div>
               </div>
               <el-form ref="editForm" :model="editTagForm" :rules="editTagFormRules">
                 <table class="imported-table" v-if="!importedDataNoData">