diff --git a/.env.development b/.env.development
index 0a6098f..06ba23c 100644
--- a/.env.development
+++ b/.env.development
@@ -1,4 +1,4 @@
NODE_ENV=development
-VUE_APP_API_BASE_URL=http://rcproject.natapp1.cc/jeecg-boot
+VUE_APP_API_BASE_URL=http://192.168.148.248:8082/jeecg-boot
VUE_APP_CAS_BASE_URL=http://cas.example.org:8443/cas
VUE_APP_ONLINE_BASE_URL=http://fileview.jeecg.com/onlinePreview
\ No newline at end of file
diff --git a/src/api/dblink.js b/src/api/dblink.js
index 955b788..f1f6095 100644
--- a/src/api/dblink.js
+++ b/src/api/dblink.js
@@ -10,6 +10,7 @@ const datasynctestConn = (params)=>getAction("/datasync/testConn",params);
const datasyncsyncOriginalData = (params)=>getAction("/datasync/syncOriginalData",params);
const datasyncgetSyncLog = (params)=>getAction("/datasync/getSyncLog",params);
const datasyncupdateSyncRecord = (params)=>putAction("/datasync/updateSyncRecord",params);
+const deleteById = (params)=>deleteAction("/datasync/deleteById",params);
export {
datasyncqueryPage,
@@ -21,7 +22,8 @@ export {
datasynctestConn,
datasyncsyncOriginalData,
datasyncgetSyncLog,
- datasyncupdateSyncRecord
+ datasyncupdateSyncRecord,
+ deleteById
}
diff --git a/src/views/datalink/dblink.vue b/src/views/datalink/dblink.vue
index e01501e..accb94e 100644
--- a/src/views/datalink/dblink.vue
+++ b/src/views/datalink/dblink.vue
@@ -73,6 +73,10 @@
编辑
详情
+
+ handleDelete(record.id)">
+ 删除
+
@@ -88,7 +92,7 @@
import creatdblink from './modules/creatdblink'
import syncLog from './modules/syncLog'
- import { datasyncqueryPage } from '@/api/dblink'
+ import { datasyncqueryPage,deleteById } from '@/api/dblink'
import {
dataTypePageList,
dataTypeDeleteById } from '@/api/dataType'
@@ -238,6 +242,17 @@
}
});
},
+ handleDelete(id){
+ var that = this;
+ deleteById({id: id}).then((res) => {
+ if (res.success) {
+ that.$message.success(res.message);
+ that.loadData();
+ } else {
+ that.$message.warning(res.message);
+ }
+ });
+ },
handleAdd() {
this.$refs.modalForm.add();
this.$refs.modalForm.title = "添加同步";
@@ -246,7 +261,7 @@
handleEdit(value) {
this.$refs.modalForm.models =1;
this.$refs.modalForm.edit(value);
- this.$refs.modalForm.title = "编辑同步";
+ this.$refs.modalForm.title = "同步数据";
},
getSyncLog(value){
this.$refs.syncLog.edit(value);
diff --git a/src/views/datalink/modules/creatdblink.vue b/src/views/datalink/modules/creatdblink.vue
index 4a31a33..437dc2d 100644
--- a/src/views/datalink/modules/creatdblink.vue
+++ b/src/views/datalink/modules/creatdblink.vue
@@ -210,6 +210,7 @@ import { datasyncqueryPage,
datasyncsyncOriginalData({recordId:this.recordId}).then((res) => {
if (res.success) {
this.$message.success(res.message);
+ this.close();
} else {
this.$message.warning(res.message);
}
diff --git a/src/views/fileManage/modules/SliceUpload.vue b/src/views/fileManage/modules/SliceUpload.vue
index 4a75bd4..7393bfb 100644
--- a/src/views/fileManage/modules/SliceUpload.vue
+++ b/src/views/fileManage/modules/SliceUpload.vue
@@ -2,6 +2,11 @@
+
+
+ {{ d.name }}
+
+
= 0
+ );
+ },
stop (record) {
this.isStop = true
record.uploadStatus = 0
@@ -124,10 +143,19 @@ export default {
setFileList (fileList) {
this.tableDate = fileList
},
-
+ getAllTask() {
+ taskPageList(this.queryParam).then((res) => {
+ if (res.success) {
+ this.allTask = res.result.rows||res.result;
+ } else {
+ this.$message.warning(res.message);
+ }
+ });
+ },
deleteFile () {
this.fileList = []
this.tableDate = []
+ this.taskId =""
},
getFileList () {
return this.tableDate
@@ -243,6 +271,7 @@ export default {
formData.append('shareIndex', shareIndex+1)
formData.append('currShareM5', currShareM5)
formData.append('file', file)
+ formData.append('taskId', this.taskId)
return formData
},
@@ -396,7 +425,6 @@ export default {