Merge branch 'dev-jcq'

src/views/marketing/statistics/i18n/zh-cn.ts

@@ -3,7 +3,9 @@ export default {
 		ip: 'IP',
 		domain: '域名',
 		content: '访问量',
-		active: '日活',
+		dayActive: '日活',
+		hourActive: '时活',
+		fifteenOnline: '15分钟在线人数',
 		source: '来源',
 		inputIpTip: '请输入IP地址',
 		inputDomainTip: '请输入域名',

src/views/marketing/statistics/index.vue

@@ -3,15 +3,15 @@
 		<div class="layout-padding-auto layout-padding-view">
 			<el-row class="ml10" v-show="showSearch">
 				<el-form :inline="true" :model="state.queryForm" @keyup.enter="getDataList" ref="queryRef">
-					<el-form-item :label="$t('systoken.ip')" prop="ip">
-						<el-input :placeholder="$t('systoken.inputIpTip')" v-model="state.queryForm.ip"></el-input>
+					<el-form-item :label="t('systoken.ip')" prop="ip">
+						<el-input :placeholder="t('systoken.inputIpTip')" v-model="state.queryForm.ip"></el-input>
 					</el-form-item>
-                    <el-form-item :label="$t('systoken.domain')" prop="domain">
-						<el-input :placeholder="$t('systoken.inputDomainTip')" v-model="state.queryForm.domain"></el-input>
+                    <el-form-item :label="t('systoken.domain')" prop="domain">
+						<el-input :placeholder="t('systoken.inputDomainTip')" v-model="state.queryForm.domain"></el-input>
 					</el-form-item>
 					<el-form-item>
-						<el-button @click="getDataList" icon="Search" type="primary">{{ $t('common.queryBtn') }} </el-button>
-						<el-button @click="resetQuery" icon="Refresh">{{ $t('common.resetBtn') }}</el-button>
+						<el-button @click="getDataList" icon="Search" type="primary">{{ t('common.queryBtn') }} </el-button>
+						<el-button @click="resetQuery" icon="Refresh">{{ t('common.resetBtn') }}</el-button>
 					</el-form-item>
 				</el-form>
 			</el-row>
@@ -25,10 +25,13 @@
 				:header-cell-style="tableStyle.headerCellStyle"
 			>
 				<!-- <el-table-column align="center" type="selection" width="40" /> -->
-				<el-table-column :label="$t('systoken.ip')" prop="ip" show-overflow-tooltip></el-table-column>
-				<el-table-column :label="$t('systoken.domain')" prop="domain" show-overflow-tooltip ></el-table-column>
-				<el-table-column :label="$t('systoken.content')" prop="content" show-overflow-tooltip></el-table-column>
-				<el-table-column :label="$t('systoken.active')" prop="active" show-overflow-tooltip></el-table-column>
+				<el-table-column :label="t('systoken.ip')" prop="ip" show-overflow-tooltip></el-table-column>
+				<el-table-column :label="t('systoken.domain')" prop="domain" show-overflow-tooltip ></el-table-column>
+				<el-table-column :label="t('systoken.content')" prop="content" show-overflow-tooltip></el-table-column>
+				<el-table-column :label="t('systoken.dayActive')" prop="dayActive" show-overflow-tooltip></el-table-column>
+				<el-table-column :label="t('systoken.hourActive')" prop="hourActive" show-overflow-tooltip></el-table-column>
+				<el-table-column :label="t('systoken.fifteenOnline')" prop="fifteenOnline" show-overflow-tooltip></el-table-column>
+				<el-table-column :label="t('systoken.source')" prop="source" show-overflow-tooltip></el-table-column>
 			</el-table>
 
 			<pagination @current-change="currentChangeHandle" @size-change="sizeChangeHandle" v-bind="state.pagination"> </pagination>
@@ -39,10 +42,7 @@
 <script lang="ts" setup>
 import { BasicTableProps, useTable } from '/@/hooks/table';
 import { pageList } from '/@/api/marketing/statistics';
-
 import { useI18n } from 'vue-i18n';
-import { useMessage, useMessageBox } from '/@/hooks/message';
-import { Session } from '/@/utils/storage';
 
 const { t } = useI18n();
 // 定义变量内容