@@ -153,6 +154,9 @@ export default {
},
methods: {
+ openlink(url) {
+ window.location.href = url;
+ },
calculateScrollY() {
// 获取父容器高度（需减去表格内其他元素的高度，如分页栏）
const container = this.$refs.tableContainer;
diff --git a/src/views/data/dataSearch.vue b/src/views/data/dataSearch.vue
index e4231c9..faa9fad 100644
--- a/src/views/data/dataSearch.vue
+++ b/src/views/data/dataSearch.vue
@@ -31,7 +31,8 @@
查询
- 导出
+ 导出dmp
+ 导出csv、txt
@@ -57,15 +58,19 @@
+
+
+
\ No newline at end of file
diff --git a/src/views/datalink/Marines.vue b/src/views/datalink/Marines.vue
index a8ce466..70cf794 100644
--- a/src/views/datalink/Marines.vue
+++ b/src/views/datalink/Marines.vue
@@ -53,6 +53,8 @@
解析
+ 卸载
+
删除
@@ -189,6 +191,17 @@
}
});
},
+ clearTableData:function (id){
+ var that = this;
+ deleteAction("/fileDataLink/clearTableData?id="+id,{}).then((res) => {
+ if (res.code == 200) {
+ this.$message.success(res.result);
+ }else{
+ this.$message.warning(res.message)
+ }
+ that.loadData();
+ });
+ },
handleDelete: function (id) {
var that = this;
deleteAction("/fileDataLink/delete?id="+id,{}).then((res) => {
diff --git a/src/views/datalink/carrierBased.vue b/src/views/datalink/carrierBased.vue
index 5a8eab1..b7023da 100644
--- a/src/views/datalink/carrierBased.vue
+++ b/src/views/datalink/carrierBased.vue
@@ -56,6 +56,8 @@
解析
+ 卸载
+
删除
@@ -204,6 +206,17 @@
}
});
},
+ clearTableData:function (id){
+ var that = this;
+ deleteAction("/fileDataLink/clearTableData?id="+id,{}).then((res) => {
+ if (res.code == 200) {
+ this.$message.success(res.result);
+ }else{
+ this.$message.warning(res.message)
+ }
+ that.loadData();
+ });
+ },
handleDelete: function (id) {
var that = this;
deleteAction("/fileDataLink/delete?id="+id,{}).then((res) => {
diff --git a/src/views/datalink/waterDocuments.vue b/src/views/datalink/waterDocuments.vue
index 2a8cfbb..34a721a 100644
--- a/src/views/datalink/waterDocuments.vue
+++ b/src/views/datalink/waterDocuments.vue
@@ -53,6 +53,8 @@
解析
+ 卸载
+
删除
@@ -199,6 +201,17 @@
}
});
},
+ clearTableData:function (id){
+ var that = this;
+ deleteAction("/fileDataLink/clearTableData?id="+id,{}).then((res) => {
+ if (res.code == 200) {
+ this.$message.success(res.result);
+ }else{
+ this.$message.warning(res.message)
+ }
+ that.loadData();
+ });
+ },
handleDelete: function (id) {
var that = this;
deleteAction("/fileDataLink/delete?id="+id,{}).then((res) => {
diff --git a/src/views/system/LogList.vue b/src/views/system/LogList.vue
index 7536b5f..db6cb98 100644
--- a/src/views/system/LogList.vue
+++ b/src/views/system/LogList.vue
@@ -59,6 +59,7 @@
import { filterObj } from '@/utils/util';
import { JeecgListMixin } from '@/mixins/JeecgListMixin'
import JEllipsis from '@/components/jeecg/JEllipsis'
+import moment from 'moment';
export default {
name: "LogList",
@@ -69,6 +70,7 @@ export default {
data() {
return {
description: '这是日志管理页面',
+ dateFormat: 'YYYY-MM-DD HH:mm:ss',
// 查询条件
queryParam: {
ipInfo: '',
@@ -145,6 +147,9 @@ export default {
list: "/sys/log/list",
},
}
+ },
+ created() {
+
},
methods: {
getQueryParams() {
@@ -153,6 +158,17 @@ export default {
param.pageNo = this.ipagination.current;
param.pageSize = this.ipagination.pageSize;
delete param.createTimeRange; // 时间参数不传递后台
+ if(this.queryParam.startTime == null){
+ const start = moment()
+ .subtract(7, 'days')
+ .set({ hour: 0, minute: 0, second: 0 });
+ const end = moment()
+ .set({ hour: 23, minute: 59, second: 59 });
+ this.queryParam.startTime = start.format(this.dateFormat);
+ this.queryParam.endTime = end.format(this.dateFormat);
+ param.startTime = start.format(this.dateFormat);
+ param.endTime = end.format(this.dateFormat);
+ }
if (this.superQueryParams) {
param['superQueryParams'] = encodeURI(this.superQueryParams)
param['superQueryMatchType'] = this.superQueryMatchType
@@ -170,6 +186,13 @@ export default {
logType: '1',
keyWord: '',
}; //清空查询区域参数
+ const start = moment()
+ .subtract(7, 'days')
+ .set({ hour: 0, minute: 0, second: 0 });
+ const end = moment()
+ .set({ hour: 23, minute: 59, second: 59 });
+ that.queryParam.startTime = start.format(this.dateFormat);
+ that.queryParam.endTime = end.format(this.dateFormat);
that.queryParam.logType = logType;
that.loadData(this.ipagination.current);
},
@@ -189,11 +212,6 @@ export default {
that.queryParam.logType = key;
that.loadData();
},
- onDateChange: function (value, dateString) {
- console.log(dateString[0], dateString[1]);
- this.queryParam.createTime_begin = dateString[0];
- this.queryParam.createTime_end = dateString[1];
- },
onDateOk(value) {
console.log(value);
},
diff --git a/src/views/system/OptionLog.vue b/src/views/system/OptionLog.vue
index 911a344..65238e8 100644
--- a/src/views/system/OptionLog.vue
+++ b/src/views/system/OptionLog.vue
@@ -61,6 +61,7 @@
import { filterObj } from '@/utils/util';
import { JeecgListMixin } from '@/mixins/JeecgListMixin'
import JEllipsis from '@/components/jeecg/JEllipsis'
+import moment from 'moment';
export default {
name: "OptionLog",
@@ -71,6 +72,7 @@ export default {
data() {
return {
description: '这是日志管理页面',
+ dateFormat: 'YYYY-MM-DD HH:mm:ss',
// 查询条件
queryParam: {
ipInfo: '',
@@ -160,6 +162,17 @@ export default {
param.pageNo = this.ipagination.current;
param.pageSize = this.ipagination.pageSize;
delete param.createTimeRange; // 时间参数不传递后台
+ if(this.queryParam.startTime == null){
+ const start = moment()
+ .subtract(7, 'days')
+ .set({ hour: 0, minute: 0, second: 0 });
+ const end = moment()
+ .set({ hour: 23, minute: 59, second: 59 });
+ this.queryParam.startTime = start.format(this.dateFormat);
+ this.queryParam.endTime = end.format(this.dateFormat);
+ param.startTime = start.format(this.dateFormat);
+ param.endTime = end.format(this.dateFormat);
+ }
if (this.superQueryParams) {
param['superQueryParams'] = encodeURI(this.superQueryParams)
param['superQueryMatchType'] = this.superQueryMatchType
@@ -173,6 +186,13 @@ export default {
var logType = that.queryParam.logType;
that.queryParam = {}; //清空查询区域参数
that.queryParam.logType = logType;
+ const start = moment()
+ .subtract(7, 'days')
+ .set({ hour: 0, minute: 0, second: 0 });
+ const end = moment()
+ .set({ hour: 23, minute: 59, second: 59 });
+ that.queryParam.startTime = start.format(this.dateFormat);
+ that.queryParam.endTime = end.format(this.dateFormat);
that.loadData(this.ipagination.current);
},
// 日志类型