diff --git a/src/views/data/dataSearch.vue b/src/views/data/dataSearch.vue index 3869693..0559be6 100644 --- a/src/views/data/dataSearch.vue +++ b/src/views/data/dataSearch.vue @@ -32,8 +32,10 @@ - + + @@ -57,7 +59,7 @@
-
+
@@ -65,7 +67,7 @@
-
+
@@ -160,15 +162,12 @@ export default { if (res.success) { this.allTask = res.result if (res.result.length > 0) { - this.activeTaskId = res.result[0].id - - const start = moment(res.result[0].startTime).set({ hour: 0, minute: 0, second: 0 }) - const end = moment(res.result[0].endTime).set({ hour: 23, minute: 59, second: 59 }) - this.defaultTime = [start, end]; - console.log('riq', this.defaultTime) + this.activeTaskId = res.result[0].id + const start = moment(res.result[0].startTime) + const end = moment(res.result[0].endTime) + this.defaultTime.push(start, end) this.tableParams.startTime = start.format(this.dateFormat); - this.tableParams.endTime = end.format(this.dateFormat) - + this.tableParams.endTime = end.format(this.dateFormat) } } else { this.$message.warning(res.message); @@ -176,12 +175,10 @@ export default { }) }, handleTaskChange(value) { - var curTask = this.allTask.filter(item => item.id == value) - console.log(curTask) - + var curTask = this.allTask.filter(item => item.id == value) const start = moment(curTask.startTime) const end = moment(curTask.endTime) - this.defaultTime = [start, end]; + this.defaultTime.push(start, end) this.tableParams.startTime = start.format(this.dateFormat); this.tableParams.endTime = end.format(this.dateFormat) @@ -273,7 +270,7 @@ export default { }, handelEdit(record) { const filteredColumn = this.columns.filter(item => item.dataIndex != 'operation' && item.dataIndex != 'ROW_ID'); - delete record['ROW_ID']; + delete record['ROW_ID']; this.$refs.editdataseachForm.initForm(this.tableParams.schemaMass, this.tableParams.tableName, filteredColumn, record); }, getTableDataList() { diff --git a/src/views/datalink/files.vue b/src/views/datalink/files.vue index 4444831..540366c 100644 --- a/src/views/datalink/files.vue +++ b/src/views/datalink/files.vue @@ -46,17 +46,19 @@
-
-
- - - -
+
+ +
+ + +
+
+ @@ -69,7 +71,7 @@ import filesModel from './modules/filesModel' import { getSuccessTableInfo, - getTableDataByOri, + getTableDataByOri, } from '@/api/fileDataLink' import { JeecgListMixin } from '@/mixins/JeecgListMixin' import JEllipsis from "@/components/jeecg/JEllipsis";