@@ -90,6 +97,7 @@
size: { type: String, default: "default" },
border: { type: Boolean, default: false },
stripe: { type: Boolean, default: false },
+ columnSetting: { type: Boolean, default: false },
pageSize: { type: Number, default: config.pageSize },
pageSizes: { type: Array, default: config.pageSizes },
rowKey: { type: String, default: "" },
@@ -145,7 +153,6 @@
tableHeight:'100%',
tableParams: this.params,
column: [],
- columnSetting: false,
customColumnShow: false,
summary: {},
config: {
@@ -175,12 +182,10 @@
},
methods: {
getImg(o){
-
if (!o) {
return ;
}
-
- return typeof o === 'string'?o: o.url;
+ return typeof o === 'string'? o : o.url;
},
//获取数据
async getData(){
@@ -213,7 +218,7 @@
this.emptyText = response.message;
}else{
this.emptyText = "暂无数据";
- this.tableData = (this.hidePagination? response.data:response.rows) || [];
+ this.tableData = (this.hidePagination? response.data : response.rows) || [];
this.total = response.total || 0;
this.summary = response.summary || {};
this.loading = false;
diff --git a/src/layout/components/userbar.vue b/src/layout/components/userbar.vue
index a1ece89..51cee33 100644
--- a/src/layout/components/userbar.vue
+++ b/src/layout/components/userbar.vue
@@ -6,7 +6,7 @@
-
+
{{ username }}
diff --git a/src/utils/request.js b/src/utils/request.js
index dcce7e4..e3b9f17 100644
--- a/src/utils/request.js
+++ b/src/utils/request.js
@@ -83,9 +83,9 @@ var http = {
get: function(url, params = {}, config = {}) {
return new Promise((resolve, reject) => {
// 缓存存在, 优先使用缓存
- const cacheKey = '';
+ var cacheKey = '';
if (typeof config.cache !== 'undefined' && !isNaN(config.cache) && config.cache > 0) {
- let cacheKey = tool.crypto.MD5(url);
+ cacheKey = tool.crypto.MD5(url + (new URLSearchParams(params)).toString());
const cachedData = tool.data.get(cacheKey);
if (cachedData) {
return resolve(cachedData);
@@ -97,7 +97,7 @@ var http = {
params: params,
...config
}).then((response) => {
- if (cacheKey) {
+ if (cacheKey && typeof config.cache !== 'undefined' && !isNaN(config.cache) && config.cache > 0) {
tool.data.set(cacheKey, response.data, config.cache);
}
resolve(response.data);
diff --git a/src/views/system/menu/save.vue b/src/views/system/menu/save.vue
index 27e4bee..37b98cc 100644
--- a/src/views/system/menu/save.vue
+++ b/src/views/system/menu/save.vue
@@ -55,9 +55,12 @@
-
+
+
+
+
diff --git a/src/views/system/stat/index.vue b/src/views/system/stat/index.vue
index d82e922..b257a88 100644
--- a/src/views/system/stat/index.vue
+++ b/src/views/system/stat/index.vue
@@ -1,107 +1,32 @@
-
+
-
-
-
-
-
+
+
-
+
-
+
-
-
浏览量(PV)
-
-
-
- 即通常说的Page View(PV),用户每打开一个网站页面就被记录1次。用户多次打开同一页面,浏览量值累计。
-
-
-
-
-
-
65,715
-
-
-
访客数(UV)
-
-
-
- 一天之内您网站的独立访客数(以Cookie为依据),一天内同一访客多次访问您网站只计算1个访客。
-
-
-
-
-
-
8,936
-
-
-
IP数
-
-
-
- 一天之内您网站的独立访问ip数。
-
-
-
-
-
-
10,279
-
-
-
跳出率
-
-
-
- 只浏览了一个页面便离开了网站的访问次数占总的访问次数的百分比。
-
-
-
-
-
-
27.92%
-
-
-
平均访问时长
-
-
-
- 访客在一次访问中,平均打开网站的时长。即每次访问中,打开第一个页面到关闭最后一个页面的平均值,打开一个页面时计算打开关闭的时间差。
-
-
-
-
-
-
00:19:05
-
+
+
+
+
+
-
+
-
-
-
-
-
+
+
-
-
-
-
-
-
-
-
-
-
-
+
+
@@ -110,112 +35,92 @@