bug修改

.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

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
 }
 
 

src/views/datalink/dblink.vue

@@ -73,6 +73,10 @@
           <a @click="handleEdit(record)" v-has="'cont:btn'">编辑</a>
           <a-divider type="vertical" v-has ="'cont:btn'" />
           <a @click="getSyncLog(record)" v-has="'cont:btn'">详情</a>
+          <a-divider type="vertical" v-has ="'cont:btn'" />
+          <a-popconfirm title="确定删除吗?" @confirm="() => handleDelete(record.id)">
+            <a>删除</a>
+          </a-popconfirm>
         </span>
       </a-table>
     </div>
@@ -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);

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);
             }

src/views/fileManage/modules/SliceUpload.vue

@@ -2,6 +2,11 @@
   <div>
     <a-row type="flex">
       <a-col flex="auto">
+        <a-select show-search placeholder="选择任务" option-filter-prop="children" size="large" v-model="taskId" style="width: 200px;">
+            <a-select-option v-for="d in allTask" :key="d.id">
+              {{ d.name }}
+          </a-select-option>
+        </a-select>
         <a-upload
           class="upload-wrapper"
           :showUploadList="false"
@@ -57,7 +62,7 @@
 import SparkMD5 from 'spark-md5'
 import { postAction,downloadFile2 } from '@/api/manage'
 import { verifyFileExist } from '@/api/fileapi'
-
+import { taskPageList, } from '@/api/task'
 
 export default {
   name: 'SliceUpload',
@@ -95,10 +100,24 @@ export default {
       isStop: false,
       fileList: [],
       tableDate: [],
-      
+      taskId:"",
+      allTask:{},
+      queryParam: {
+        pageNum :1,
+        pageSize:999999999
+      },
     }
   },
+  created () {
+    this.getAllTask();
+    this.deleteFile();
+  },
   methods: {
+    filterOption(input, option) {
+      return (
+        option.componentOptions.children[0].text.toLowerCase().indexOf(input.toLowerCase()) >= 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 {
 <style lang="less" scoped>
 .upload-wrapper{
   display: inline-block;
-  width: calc(100% - 10px);
   /deep/.ant-upload{
     width: 100%;
   }

src/views/fileManage/modules/uploadModal.vue

@@ -53,6 +53,7 @@ import SliceUpload from './SliceUpload'
     methods: {
       add () {
         this.visible =true;
+        this.$refs.technicalUpload.deleteFile();
       },
       onOk(value) {
         this.model.startDate = moment(value[0],dateFormat);