同步任务调整

src/App.vue

@@ -22,4 +22,7 @@ body {
 #app {
     height: 100%;
 }
+.mr10{
+    margin-right: 10px;
+}
 </style>

src/api/sync/dataSyncStatus.js

@@ -18,6 +18,16 @@ export function deleteUploadStatus(params) {
 }
 
 
+export function uploadInfoByStatus(query) {
+  return axios({
+    url: "/spssync/basic/udiinfo/uploadInfoByStatus",
+    method: "get",
+    params: query,
+    responseType: 'blob'
+  });
+}
+
+
 //下载任务接口
 export function filterDownloadStatus(params) {
     return axios({
@@ -43,3 +53,12 @@ export function connectUpper(params) {
         params: params
     })
 }
+
+export function infoByStatus(query) {
+  return axios({
+    url: "/spssync/basic/udiinfo/infoByStatus",
+    method: "get",
+    params: query,
+    responseType: 'blob'
+  });
+}

src/views/sync/SysDownloadData.vue

@@ -14,9 +14,8 @@
                     <el-form-item class="query-form-item">
                         <el-select v-model="filterQuery.status" placeholder="处理状态">
                             <el-option label="全部" value=""></el-option>
-                            <el-option label="等待下载" value="3"></el-option>
+                            <el-option label="文件待同步" value="3"></el-option>
-                            <el-option label="已处理" value="1"></el-option>
+                            <el-option label="任务完成" value="4"></el-option>
-                            <el-option label="异常" value="2"></el-option>
                         </el-select>
                     </el-form-item>
 
@@ -29,11 +28,7 @@
                 </el-row>
             </el-form>
 
-            <el-table
+            <el-table v-loading="loading" :data="list" style="width: 100%">
-                v-loading="loading"
-                :data="list"
-                style="width: 100%"
-            >
                 <el-table-column label="序号" type="index"></el-table-column>
                 <!--                <el-table-column-->
                 <!--                    label="记录ID"-->
@@ -42,96 +37,47 @@
                 <!--                    show-overflow-tooltip-->
                 <!--                ></el-table-column>-->
 
-                <el-table-column
+                <el-table-column label="任务ID" prop="taskId" width="140" show-overflow-tooltip></el-table-column>
-                    label="任务ID"
-                    prop="taskId"
-                    width="140"
-                    show-overflow-tooltip
-                ></el-table-column>
 
-                <el-table-column
+                <el-table-column label="任务类型" prop="type" width="140" show-overflow-tooltip>
-                    label="任务类型"
-                    prop="idDatas"
-                    width="140"
-                    show-overflow-tooltip
-                >
                     <template slot-scope="scope">
-                        <span>{{ type[scope.row.idDatas] }}</span>
+                        <span>{{ scope.row.type}}</span>
                     </template>
                 </el-table-column>
-                <el-table-column
+                <el-table-column label="状态" prop="status" width="140" show-overflow-tooltip>
-                    label="状态"
-                    prop="status"
-                    width="140"
-                    show-overflow-tooltip
-                >
                     <template slot-scope="scope">
-                        <el-tag
+                        <el-tag v-if="scope.row.status" :type="statusFilterType(scope.row.status)">{{ status[scope.row.status] }}
-                            :type="statusFilterType(scope.row.status)"
+                        </el-tag>
-                        >{{ status[scope.row.status] }}
-                        </el-tag
-                        >
                     </template>
                 </el-table-column>
-                <el-table-column
+                <el-table-column label="开始时间" width="180" prop="startTime" show-overflow-tooltip></el-table-column>
-                    label="开始时间"
+                <el-table-column label="结束时间" width="180" prop="endTime" show-overflow-tooltip></el-table-column>
-                    width="180"
-                    prop="startTime"
-                    show-overflow-tooltip
-                ></el-table-column>
-                <el-table-column
-                    label="结束时间"
-                    width="180"
-                    prop="endTime"
-                    show-overflow-tooltip
-                ></el-table-column>
 
-                <el-table-column
+                <el-table-column label="同步信息" prop="remark" show-overflow-tooltip></el-table-column>
-                    label="同步信息"
-                    prop="remark"
-                    show-overflow-tooltip
-                ></el-table-column>
-
-                <el-table-column
-                    label="文件路径"
-                    prop="cacheFilePath"
-                    show-overflow-tooltip
-                ></el-table-column>
 
+                <el-table-column label="文件路径" prop="cacheFilePath" show-overflow-tooltip></el-table-column>
                 <el-table-column label="操作" fixed="right" width="160">
                     <template slot-scope="scope">
-                        <el-button
+                        <el-popconfirm @confirm="downFile(scope.row)" confirm-button-text='下载' cancel-button-text='不用了'
-                            type="text"
+                            class="mr10" icon="el-icon-info" icon-color="blck" title="是否确认要下载文件？"
-                            size="small"
+                            v-if="scope.row.cacheFilePath">
-                            @click.native.stop="detailDialog(scope.row.id)"
+                            <el-button type="text" size="small" slot="reference">下载
-                        >详情
+                            </el-button>
-                        </el-button
+                        </el-popconfirm>
-                        >
+                        <el-popconfirm v-if="scope.row.status==4" @confirm="deleteData(scope.row.id)" confirm-button-text='删除'
-                        <el-button
+                            cancel-button-text='不用了' icon="el-icon-info" icon-color="red" title="是否确认要删除这条数据？">
-                            type="text"
+                            <el-button type="text" size="small" slot="reference">删除
-                            size="small"
+                            </el-button>
-                            @click.native.stop="deleteDialog(scope.row.id)"
+                        </el-popconfirm>
-                        >删除
-                        </el-button
-                        >
                     </template>
                 </el-table-column>
             </el-table>
-            <el-pagination
+            <el-pagination :current-page="filterQuery.page" :page-size="filterQuery.limit" @current-change="handleCurrentChange"
-                :page-size="filterQuery.limit"
+                layout="prev, pager, next" :total="total"></el-pagination>
-                @current-change="handleCurrentChange"
-                layout="prev, pager, next"
-                :total="total"
-            ></el-pagination>
         </el-card>
 
-        <el-dialog
+        <el-dialog title="同步信息" width="25%" :close-on-click-modal="false" :close-on-press-escape="false"
-            title="同步信息"
+            :visible.sync="syncVisible">
-            width="25%"
-            :close-on-click-modal="false"
-            :close-on-press-escape="false"
-            :visible.sync="syncVisible"
-        >
             <span v-text="syncInfo" style="white-space:pre-line;" class="syncInfo"></span>
         </el-dialog>
 
@@ -139,277 +85,307 @@
 </template>
 
 <script>
-import {filterDownloadStatus, deleteDownloadStatus, createSchedule, updateConfig} from "../../api/sync/dataSyncStatus";
+    import {
-import store from "@/store";
+        filterDownloadStatus,
-
+        deleteDownloadStatus,
-export default {
+        createSchedule,
-    data() {
+        updateConfig,
-        return {
+        infoByStatus
-            filterQuery: {
+    } from "../../api/sync/dataSyncStatus";
-                taskId: null,
+    import store from "@/store";
-                id: null,
-                status: "3",
-                page: 1,
-                limit: 10,
-                syncTime: null,
-            },
-            list: [],
-            headers: {},
-            detailList: [],
-            thirdSys: [],
-            thirdSysDetail: null,
-            total: 0,
-            currentRow: null,
-            editQuery: null,
-            type: {
-                "AutoDownloadOrder": "扫码单据",
-                "AutoDownloadBusType": "单据类型",
-                "AutoDownloadAllData": "基础信息",
-                "AutoDownloadDiProducts": "国家库DI数据"
-            },
-            status: {
-                0: "等待处理",
-                1: "处理完成",
-                2: "处理异常",
-                3: "等待下载",
-            },
 
-            configQuery: {
+    export default {
-                id: null,
+        data() {
-                typeBus: null,
+            return {
-                typeScan: null,
+                filterQuery: {
-                typeThird: null,
+                    taskId: null,
-                basicProducts: null,
+                    id: null,
-                basicCorp: null,
+                    status: "3",
-                basicInv: null,
+                    page: 1,
-                basicThirdProducts: null,
+                    limit: 10,
-                basicThirdCorp: null,
+                    syncTime: null,
-                basicThirdInv: null,
+                },
-                basicThirdBusOrder: null,
+                list: [],
-                orderScanFinish: null,
+                headers: {},
-                dbDiProducts: null,
+                detailList: [],
-                downstreamEnable: null,
+                thirdSys: [],
+                thirdSysDetail: null,
+                total: 0,
+                currentRow: null,
+                editQuery: null,
+                type: {
+                    "AutoDownloadOrder": "扫码单据",
+                    "AutoDownloadBusType": "单据类型",
+                    "AutoDownloadAllData": "基础信息",
+                    "AutoDownloadDiProducts": "国家库DI数据"
+                },
+                status: {
+                    1: "任务待触发",
+                    2: "文件待生成",
+                    3: "文件待同步",
+                    4: "任务完成",
+                },
 
-            },
+                configQuery: {
-            uploadFileUrl: null,
+                    id: null,
-            uploadData: {
+                    typeBus: null,
-                thirdSys: "thirdId",
+                    typeScan: null,
-            },
+                    typeThird: null,
-            templateDlUrl: null,
+                    basicProducts: null,
-            checked: false,
+                    basicCorp: null,
-            syncTime: null,
+                    basicInv: null,
-            configParms: {},
+                    basicThirdProducts: null,
-            syncInfo: null,
+                    basicThirdCorp: null,
-            syncVisible: false
+                    basicThirdInv: null,
-        };
+                    basicThirdBusOrder: null,
-    },
+                    orderScanFinish: null,
+                    dbDiProducts: null,
+                    downstreamEnable: null,
 
-    methods: {
+                },
-        onReset() {
+                uploadFileUrl: null,
-            this.$router.push({
+                uploadData: {
-                path: "",
+                    thirdSys: "thirdId",
-            });
+                },
-            this.filterQuery = {
+                templateDlUrl: null,
-                id: null,
+                checked: false,
-                page: 1,
+                syncTime: null,
-                limit: 20,
+                configParms: {},
+                syncInfo: null,
+                syncVisible: false
             };
-            this.syncTime = null;
-            this.getList();
-        },
-        getList() {
-            this.loading = true;
-            filterDownloadStatus(this.filterQuery)
-                .then((response) => {
-                    this.loading = false;
-                    if (response.code == 20000) {
-                        this.list = response.data.list || [];
-                        this.total = response.data.total || 0;
-                    } else {
-                        this.$message.error(response.message);
-                    }
-                })
-                .catch(() => {
-                    this.loading = false;
-                    this.list = [];
-                    this.total = 0;
-                });
         },
 
-        saveConfig() {
+        methods: {
-            updateConfig(this.configQuery)
+            onReset() {
-                .then((response) => {
+                this.$router.push({
-                    this.loading = false;
+                    path: "",
-                    if (response.code == 20000) {
-                        this.$message.success("更新成功！");
-                        this.getConfig();
-                    }
-                })
-                .catch(() => {
-                    this.loading = false;
                 });
-        },
+                this.filterQuery = {
-
+                    id: null,
-
+                    page: 1,
-        cancelDialog(val) {
+                    limit: 20,
-            this.udiImportDetailVisible = false;
+                };
-            this.thrCorpSelectVisible = false;
+                this.syncTime = null;
-            if (val) {
                 this.getList();
-            }
+            },
-        }
+            getList() {
-        ,
+                this.loading = true;
-        handleCurrentChange(val) {
+                filterDownloadStatus(this.filterQuery)
-            this.filterQuery.page = val;
+                    .then((response) => {
-            this.getList();
+                        this.loading = false;
-        }
+                        if (response.code == 20000) {
-        ,
+                            this.list = response.data.list || [];
-
+                            this.total = response.data.total || 0;
-        createScheduleDialog(type) {
+                        } else {
-            if (this.$isNotBlank(this.syncTime)) {
+                            this.$message.error(response.message);
-                this.$confirm("此操作将从" + this.syncTime + "开始同步最新数据，是否继续", "提示", {
+                        }
-                    confirmButtonText: "确定",
-                    cancelButtonText: "取消",
-                    type: "warning",
-                })
-                    .then(() => {
-                        this.createSchedule(type);
                     })
                     .catch(() => {
+                        this.loading = false;
+                        this.list = [];
+                        this.total = 0;
                     });
-            } else {
+            },
-                this.createSchedule(type);
-            }
 
-        },
+            saveConfig() {
+                updateConfig(this.configQuery)
+                    .then((response) => {
+                        this.loading = false;
+                        if (response.code == 20000) {
+                            this.$message.success("更新成功！");
+                            // this.getConfig();
+                        }
+                    })
+                    .catch(() => {
+                        this.loading = false;
+                    });
+            },
 
-        createSchedule(type) {
-            let query = {
-                createType: type,
-                syncTime: this.syncTime,
-            }
 
-            createSchedule(query)
+            cancelDialog(val) {
-                .then((response) => {
+                this.udiImportDetailVisible = false;
-                    this.loading = false;
+                this.thrCorpSelectVisible = false;
-                    if (response.code == 20000) {
+                if (val) {
-                        this.$message.success("创建成功！");
+                    this.getList();
-                    } else if (response.code == 501) {
+                }
+            },
+            handleCurrentChange(val) {
+                this.filterQuery.page = val;
+                this.getList();
+            },
 
-                        this.$alert(response.message, '提示', {
+            createScheduleDialog(type) {
-                            confirmButtonText: '确定',
+                if (this.$isNotBlank(this.syncTime)) {
+                    this.$confirm("此操作将从" + this.syncTime + "开始同步最新数据，是否继续", "提示", {
+                            confirmButtonText: "确定",
+                            cancelButtonText: "取消",
                             type: "warning",
-                            callback: action => {
+                        })
-                            }
+                        .then(() => {
-                        });
+                            this.createSchedule(type);
+                        })
+                        .catch(() => {});
+                } else {
+                    this.createSchedule(type);
+                }
 
-                    } else {
+            },
-                        this.$message.error(response.message);
+
-                    }
+            createSchedule(type) {
+                let query = {
+                    createType: type,
+                    syncTime: this.syncTime,
+                }
+
+                createSchedule(query)
+                    .then((response) => {
+                        this.loading = false;
+                        if (response.code == 20000) {
+                            this.$message.success("创建成功！");
+                        } else if (response.code == 501) {
+
+                            this.$alert(response.message, '提示', {
+                                confirmButtonText: '确定',
+                                type: "warning",
+                                callback: action => {}
+                            });
+
+                        } else {
+                            this.$message.error(response.message);
+                        }
+                        this.getList();
+                    })
+                    .catch(() => {
+                        this.loading = false;
+                    });
+            },
+            deleteDialog(rowId) {
+                this.$confirm("此操作将删除该任务信息, 是否继续?", "提示", {
+                        confirmButtonText: "确定",
+                        cancelButtonText: "取消",
+                        type: "warning",
+                    })
+                    .then(() => {
+                        let dQuery = {
+                            id: rowId,
+                        };
+                        deleteDownloadStatus(dQuery)
+                            .then((response) => {
+                                this.loading = false;
+                                if (response.code == 20000) {
+                                    this.$message.success("删除成功");
+                                } else {
+                                    this.$message.error(response.message);
+                                }
+                                this.getList();
+                            })
+                            .catch(() => {
+                                this.loading = false;
+                            });
+                    })
+                    .catch(() => {});
+            },
+            handleChange(response, files, fileList) {
+                console.log(response);
+                if (response.code != 20000) {
+                    this.$message.error(response.message);
+                    this.getList();
+                } else {
+                    // console.log(files[0] + "\n" + this.fileList[0] + "\n" + fileList[0]);
+                    this.$message.success(response.data);
                     this.getList();
+                }
+            },
+            statusFilterType(status) {
+                const statusMap = {
+                    1: "danger",
+                    2: "danger",
+                    3: "danger",
+                    4: "success",
+                };
+                return statusMap[status];
+            },
+            detailDialog(id) {
+                this.syncVisible = true;
+                this.list.forEach(item => {
+                    if (id === item.id) {
+                        this.syncInfo = item.remark;
+                    }
                 })
-                .catch(() => {
+            },
-                    this.loading = false;
+
-                });
+            downFile(rows) {
-        },
+                infoByStatus({
-        deleteDialog(rowId) {
+                    'id': rows.id
-            this.$confirm("此操作将删除该任务信息, 是否继续?", "提示", {
+                }).then(res => {
-                confirmButtonText: "确定",
+                    let blob = new Blob([res])
-                cancelButtonText: "取消",
+                    let fileName = rows.cacheFilePath.substring(rows.cacheFilePath.lastIndexOf('/'))
-                type: "warning",
+                    let link = document.createElement("a")
-            })
+                    link.href = window.URL.createObjectURL(blob)
-                .then(() => {
+                    link.download = fileName
-                    let dQuery = {
+                    link.style.display = 'none'
-                        id: rowId,
+                    document.body.appendChild(link)
-                    };
+                    link.click()
-                    deleteDownloadStatus(dQuery)
+                    window.URL.revokeObjectURL(link.href)
-                        .then((response) => {
+                    document.body.removeChild(link)
-                            this.loading = false;
-                            if (response.code == 20000) {
-                                this.$message.success("删除成功");
-                            } else {
-                                this.$message.error(response.message);
-                            }
-                            this.getList();
-                        })
-                        .catch(() => {
-                            this.loading = false;
-                        });
                 })
-                .catch(() => {
+            },
-                });
+            deleteData(id) {
-        }
+                deleteDownloadStatus({
-        ,
+                        id
-        handleChange(response, files, fileList) {
+                    }).then((response) => {
-            console.log(response);
+                        if (response.code == 20000) {
-            if (response.code != 20000) {
+                            this.filterQuery.page = 1
-                this.$message.error(response.message);
+                            this.$message.success("删除成功");
-                this.getList();
+                        } else {
-            } else {
+                            this.$message.error(response.message);
-                // console.log(files[0] + "\n" + this.fileList[0] + "\n" + fileList[0]);
+                        }
-                this.$message.success(response.data);
+                        this.getList();
-                this.getList();
+                    })
+                    .catch(() => {});
             }
-        }
-        ,
-        statusFilterType(status) {
-            const statusMap = {
-                0: "warning",
-                1: "success",
-                2: "danger",
-            };
-            return statusMap[status];
         },
-        detailDialog(id) {
-            this.syncVisible = true;
-            this.list.forEach(item => {
-                if (id === item.id) {
-                    this.syncInfo = item.remark;
-                }
-            })
-        }
-    },
 
-    mounted() {
+        mounted() {},
-    },
+        components: {},
-    components: {},
+        created() {
-    created() {
+            this.headers = {
-        this.headers = {
+                ADMIN_ID: store.getters.adminId,
-            ADMIN_ID: store.getters.adminId,
+                ADMIN_TOKEN: store.getters.token,
-            ADMIN_TOKEN: store.getters.token,
+            };
-        };
+            this.getList();
-        this.getList();
+            // this.getConfig();
-        this.getConfig();
+        },
-    },
+    };
-};
 </script>
 <style>
-.itemTag {
+    .itemTag {
-    float: left;
+        float: left;
-    text-align: left;
+        text-align: left;
-    margin-top: 10px;
+        margin-top: 10px;
-    width: 100px;
+        width: 100px;
-}
+    }
 
-.text {
+    .text {
-    font-size: 13px;
+        font-size: 13px;
-    font-family: "Microsoft YaHei";
+        font-family: "Microsoft YaHei";
-}
+    }
 
-.el-row {
+    .el-row {
-    display: flex;
+        display: flex;
-    flex-wrap: wrap;
+        flex-wrap: wrap;
 
-}
+    }
 
-.el-col {
+    .el-col {
-    border-radius: 4px;
+        border-radius: 4px;
-    flex-wrap: wrap;
+        flex-wrap: wrap;
-}
+    }
 
-.syncInfo {
+    .syncInfo {
-    font-size: medium;
+        font-size: medium;
-    font-family: "Microsoft YaHei";
+        font-family: "Microsoft YaHei";
-    line-height: 25px;
+        line-height: 25px;
-}
+    }
 </style>

src/views/sync/SysUploadData.vue

@@ -12,14 +12,14 @@
                         <el-input v-model="filterQuery.taskId" placeholder="记录ID" clearable></el-input>
                     </el-form-item>
 
-                    <el-form-item class="query-form-item">
+                    <!-- <el-form-item class="query-form-item">
                         <el-select v-model="filterQuery.status" placeholder="处理状态">
                             <el-option label="全部" value=""></el-option>
                             <el-option label="等待处理" value="0"></el-option>
                             <el-option label="已处理" value="1"></el-option>
                             <el-option label="异常" value="2"></el-option>
                         </el-select>
-                    </el-form-item>
+                    </el-form-item> -->
 
                     <el-form-item>
                         <el-button-group style="display:flex;">
@@ -33,30 +33,16 @@
                 </el-row>
             </el-form>
 
-            <el-table
+            <el-table v-loading="loading" :data="list" style="width: 100%">
-                v-loading="loading"
-                :data="list"
-                style="width: 100%"
-            >
                 <el-table-column label="序号" type="index"></el-table-column>
-                <el-table-column
+                <el-table-column label="任务ID" prop="taskId" width="180" show-overflow-tooltip></el-table-column>
-                    label="任务ID"
-                    prop="taskId"
-                    width="180"
-                    show-overflow-tooltip
-                ></el-table-column>
 
-                <el-table-column
+                <el-table-column label="任务类型" prop="idDatas" width="140" show-overflow-tooltip>
-                    label="任务类型"
-                    prop="idDatas"
-                    width="140"
-                    show-overflow-tooltip
-                >
                     <template slot-scope="scope">
                         <span>{{ type[scope.row.idDatas] }}</span>
                     </template>
                 </el-table-column>
-                <el-table-column
+                <!-- <el-table-column
                     label="状态"
                     prop="status"
                     width="140"
@@ -69,64 +55,39 @@
                         </el-tag
                         >
                     </template>
-                </el-table-column>
+                </el-table-column> -->
-                <el-table-column
+                <el-table-column label="开始时间" width="180" prop="startTime" show-overflow-tooltip></el-table-column>
-                    label="开始时间"
+                <!-- <el-table-column
-                    width="180"
-                    prop="startTime"
-                    show-overflow-tooltip
-                ></el-table-column>
-                <el-table-column
                     label="结束时间"
                     width="180"
                     prop="endTime"
                     show-overflow-tooltip
-                ></el-table-column>
+                ></el-table-column> -->
 
-                <el-table-column
+                <el-table-column label="同步信息" prop="remark" show-overflow-tooltip></el-table-column>
-                    label="同步信息"
+                <el-table-column label="文件路径" prop="cacheFilePath" show-overflow-tooltip></el-table-column>
-                    prop="remark"
-                    show-overflow-tooltip
-                ></el-table-column>
-                <el-table-column
-                    label="文件路径"
-                    prop="cacheFilePath"
-                    show-overflow-tooltip
-                ></el-table-column>
                 <el-table-column label="操作" fixed="right" width="160">
                     <template slot-scope="scope">
-                        <el-button
+                        <el-popconfirm @confirm="downFile(scope.row)" confirm-button-text='下载' cancel-button-text='不用了'
-                            type="text"
+                            class="mr10" icon="el-icon-info" icon-color="blck" title="是否确认要下载文件？"
-                            size="small"
+                            v-if="scope.row.cacheFilePath">
-                            @click.native.stop="detailDialog(scope.row.id)"
+                            <el-button type="text" size="small" slot="reference">下载
-                        >详情
+                            </el-button>
-                        </el-button
+                        </el-popconfirm>
-                        >
+                        <el-popconfirm  @confirm="deleteData(scope.row.id)" confirm-button-text='删除'
-                        <el-button
+                            cancel-button-text='不用了' icon="el-icon-info" icon-color="red" title="是否确认要删除这条数据？">
-                            type="text"
+                            <el-button type="text" size="small" slot="reference">删除
-                            size="small"
+                            </el-button>
-                            @click.native.stop="deleteDialog(scope.row.id)"
+                        </el-popconfirm>
-                        >删除
-                        </el-button
-                        >
                     </template>
                 </el-table-column>
             </el-table>
-            <el-pagination
+            <el-pagination :current-page="filterQuery.page" :page-size="filterQuery.limit" @current-change="handleCurrentChange"
-                :page-size="filterQuery.limit"
+                layout="prev, pager, next" :total="total"></el-pagination>
-                @current-change="handleCurrentChange"
-                layout="prev, pager, next"
-                :total="total"
-            ></el-pagination>
         </el-card>
 
-        <el-dialog
+        <el-dialog title="同步信息" width="25%" :close-on-click-modal="false" :close-on-press-escape="false"
-            title="同步信息"
+            :visible.sync="syncVisible">
-            width="25%"
-            :close-on-click-modal="false"
-            :close-on-press-escape="false"
-            :visible.sync="syncVisible"
-        >
             <span v-text="syncInfo" style="white-space:pre-line;" class="syncInfo"></span>
         </el-dialog>
 
@@ -134,300 +95,325 @@
 </template>
 
 <script>
-import {filterUploadStatus, deleteUploadStatus, updateConfig, connectUpper} from "../../api/sync/dataSyncStatus";
+    import {
-import store from "@/store";
+        filterUploadStatus,
-
+        deleteUploadStatus,
-export default {
+        updateConfig,
-    data() {
+        connectUpper,
-        return {
+        uploadInfoByStatus
-            filterQuery: {
+    } from "../../api/sync/dataSyncStatus";
-                taskId: null,
+    import store from "@/store";
-                id: null,
+
-                status: "0",
+    export default {
-                page: 1,
+        data() {
-                limit: 10,
+            return {
+                filterQuery: {
+                    taskId: null,
+                    id: null,
+                    // status: "0",
+                    page: 1,
+                    limit: 10,
+                    syncTime: null,
+                },
+                list: [],
+                headers: {},
+                detailList: [],
+                thirdSys: [],
+                thirdSysDetail: null,
+                total: 0,
+                currentRow: null,
+                editQuery: null,
+                type: {
+                    "AutoDownloadOrder": "扫码单据",
+                    "AutoDownloadBusType": "单据类型",
+                    "AutoDownloadAllData": "基础信息",
+                    "AutoDownloadDiProducts": "国家库DI数据"
+                },
+                status: {
+                    0: "等待处理",
+                    1: "处理完成",
+                    2: "处理异常",
+                },
+
+                configQuery: {
+                    id: null,
+                    typeBus: null,
+                    typeScan: null,
+                    typeThird: null,
+                    basicProducts: null,
+                    basicCorp: null,
+                    basicInv: null,
+                    basicThirdProducts: null,
+                    basicThirdCorp: null,
+                    basicThirdInv: null,
+                    basicThirdBusOrder: null,
+                    orderScanFinish: null,
+                    dbDiProducts: null,
+                    downstreamEnable: null,
+
+                },
+                uploadFileUrl: null,
+                uploadData: {
+                    thirdSys: "thirdId",
+                },
+                templateDlUrl: null,
+                checked: false,
                 syncTime: null,
-            },
+                syncInfo: null,
-            list: [],
+                syncVisible: false
-            headers: {},
-            detailList: [],
-            thirdSys: [],
-            thirdSysDetail: null,
-            total: 0,
-            currentRow: null,
-            editQuery: null,
-            type: {
-                "AutoDownloadOrder": "扫码单据",
-                "AutoDownloadBusType": "单据类型",
-                "AutoDownloadAllData": "基础信息",
-                "AutoDownloadDiProducts": "国家库DI数据"
-            },
-            status: {
-                0: "等待处理",
-                1: "处理完成",
-                2: "处理异常",
-            },
-
-            configQuery: {
-                id: null,
-                typeBus: null,
-                typeScan: null,
-                typeThird: null,
-                basicProducts: null,
-                basicCorp: null,
-                basicInv: null,
-                basicThirdProducts: null,
-                basicThirdCorp: null,
-                basicThirdInv: null,
-                basicThirdBusOrder: null,
-                orderScanFinish: null,
-                dbDiProducts: null,
-                downstreamEnable: null,
-
-            },
-            uploadFileUrl: null,
-            uploadData: {
-                thirdSys: "thirdId",
-            },
-            templateDlUrl: null,
-            checked: false,
-            syncTime: null,
-            syncInfo: null,
-            syncVisible: false
-        };
-    },
-
-    methods: {
-        onReset() {
-            this.$router.push({
-                path: "",
-            });
-            this.filterQuery = {
-                id: null,
-                page: 1,
-                limit: 20,
             };
-            this.syncTime = null;
-            this.getList();
-        },
-        getList() {
-            this.loading = true;
-            filterUploadStatus(this.filterQuery)
-                .then((response) => {
-                    this.loading = false;
-                    if (response.code == 20000) {
-                        this.list = response.data.list || [];
-                        this.total = response.data.total || 0;
-                    } else {
-                        this.$message.error(response.message);
-                    }
-                })
-                .catch(() => {
-                    this.loading = false;
-                    this.list = [];
-                    this.total = 0;
-                });
         },
 
-        testConnect() {
+        methods: {
-
+            onReset() {
-            let query = {};
+                this.$router.push({
-            connectUpper(query)
+                    path: "",
-                .then((response) => {
-                    this.loading = false;
-                    if (response.code == 20000) {
-                        this.$message.success("连接成功！");
-                    } else {
-                        this.$message.error(response.message);
-                    }
-                })
-                .catch(() => {
-                    this.loading = false;
                 });
+                this.filterQuery = {
+                    id: null,
+                    page: 1,
+                    limit: 10,
+                };
+                this.syncTime = null;
+                this.getList();
+            },
+            getList() {
+                this.loading = true;
+                filterUploadStatus(this.filterQuery)
+                    .then((response) => {
+                        this.loading = false;
+                        if (response.code == 20000) {
+                            this.list = response.data.list || [];
+                            this.total = response.data.total || 0;
+                        } else {
+                            this.$message.error(response.message);
+                        }
+                    })
+                    .catch(() => {
+                        this.loading = false;
+                        this.list = [];
+                        this.total = 0;
+                    });
+            },
 
-        },
+            testConnect() {
+
+                let query = {};
+                connectUpper(query)
+                    .then((response) => {
+                        this.loading = false;
+                        if (response.code == 20000) {
+                            this.$message.success("连接成功！");
+                        } else {
+                            this.$message.error(response.message);
+                        }
+                    })
+                    .catch(() => {
+                        this.loading = false;
+                    });
 
+            },
 
-        saveConfig() {
-            updateConfig(this.configQuery)
-                .then((response) => {
-                    this.loading = false;
-                    if (response.code == 20000) {
-                        this.$message.success("更新成功！");
-                        this.getConfig();
-                    }
-                })
-                .catch(() => {
-                    this.loading = false;
-                });
-        }
-        ,
 
+            saveConfig() {
+                updateConfig(this.configQuery)
+                    .then((response) => {
+                        this.loading = false;
+                        if (response.code == 20000) {
+                            this.$message.success("更新成功！");
+                            // this.getConfig();
+                        }
+                    })
+                    .catch(() => {
+                        this.loading = false;
+                    });
+            },
 
-        cancelDialog(val) {
+
-            this.udiImportDetailVisible = false;
+            cancelDialog(val) {
-            this.thrCorpSelectVisible = false;
+                this.udiImportDetailVisible = false;
-            if (val) {
+                this.thrCorpSelectVisible = false;
+                if (val) {
+                    this.getList();
+                }
+            },
+            handleCurrentChange(val) {
+                this.filterQuery.page = val;
                 this.getList();
-            }
+            },
-        }
+
-        ,
+            /* createScheduleDialog(type) {
-        handleCurrentChange(val) {
+                 if (this.$isNotBlank(this.syncTime)) {
-            this.filterQuery.page = val;
+                     this.$confirm("此操作将从" + this.syncTime + "开始同步最新数据，是否继续", "提示", {
-            this.getList();
+                         confirmButtonText: "确定",
-        }
+                         cancelButtonText: "取消",
-        ,
+                         type: "warning",
-
+                     })
-        /* createScheduleDialog(type) {
+                         .then(() => {
-             if (this.$isNotBlank(this.syncTime)) {
+                             this.createSchedule(type);
-                 this.$confirm("此操作将从" + this.syncTime + "开始同步最新数据，是否继续", "提示", {
+                         })
-                     confirmButtonText: "确定",
+                         .catch(() => {
-                     cancelButtonText: "取消",
+                         });
-                     type: "warning",
+                 } else {
-                 })
+                     this.createSchedule(type);
-                     .then(() => {
+                 }
-                         this.createSchedule(type);
+
+             },
+
+             createSchedule(type) {
+                 let query = {
+                     createType: type,
+                     syncTime: this.syncTime,
+                 }
+
+                 createSchedule(query)
+                     .then((response) => {
+                         this.loading = false;
+                         if (response.code == 20000) {
+                             this.$message.success("创建成功！");
+                         } else if (response.code == 501) {
+
+                             this.$alert(response.message, '提示', {
+                                 confirmButtonText: '确定',
+                                 type: "warning",
+                                 callback: action => {
+                                 }
+                             });
+
+                         } else {
+                             this.$message.error(response.message);
+                         }
+                         this.getList();
                      })
                      .catch(() => {
+                         this.loading = false;
                      });
-             } else {
+             },*/
-                 this.createSchedule(type);
+            deleteDialog(rowId) {
-             }
+                this.$confirm("此操作将删除该任务信息, 是否继续?", "提示", {
-
+                        confirmButtonText: "确定",
-         },
+                        cancelButtonText: "取消",
-
+                        type: "warning",
-         createSchedule(type) {
+                    })
-             let query = {
+                    .then(() => {
-                 createType: type,
+                        let dQuery = {
-                 syncTime: this.syncTime,
+                            id: rowId,
-             }
+                        };
-
+                        deleteUploadStatus(dQuery)
-             createSchedule(query)
+                            .then((response) => {
-                 .then((response) => {
+                                this.loading = false;
-                     this.loading = false;
+                                if (response.code == 20000) {
-                     if (response.code == 20000) {
+                                    this.$message.success("删除成功");
-                         this.$message.success("创建成功！");
+                                } else {
-                     } else if (response.code == 501) {
+                                    this.$message.error(response.message);
-
+                                }
-                         this.$alert(response.message, '提示', {
+                                this.getList();
-                             confirmButtonText: '确定',
+                            })
-                             type: "warning",
+                            .catch(() => {
-                             callback: action => {
+                                this.loading = false;
-                             }
+                            });
-                         });
+                    })
+                    .catch(() => {});
+            },
+            handleChange(response, files, fileList) {
+                console.log(response);
+                if (response.code != 20000) {
+                    this.$message.error(response.message);
+                    this.getList();
+                } else {
+                    // console.log(files[0] + "\n" + this.fileList[0] + "\n" + fileList[0]);
+                    this.$message.success(response.data);
+                    this.getList();
+                }
+            },
+            statusFilterType(status) {
+                const statusMap = {
+                    0: "warning",
+                    1: "success",
+                    2: "danger",
+                };
+                return statusMap[status];
+            },
+            detailDialog(id) {
+                this.syncVisible = true;
+                this.list.forEach(item => {
+                    if (id === item.id) {
+                        this.syncInfo = item.remark;
+                    }
+                })
+            },
 
-                     } else {
+            downFile(rows) {
-                         this.$message.error(response.message);
+                infoByStatus({
-                     }
+                    'id': rows.id
-                     this.getList();
+                }).then(res => {
-                 })
+                    let blob = new Blob([res])
-                 .catch(() => {
+                    let fileName = rows.cacheFilePath.substring(rows.cacheFilePath.lastIndexOf('/'))
-                     this.loading = false;
+                    let link = document.createElement("a")
-                 });
+                    link.href = window.URL.createObjectURL(blob)
-         },*/
+                    link.download = fileName
-        deleteDialog(rowId) {
+                    link.style.display = 'none'
-            this.$confirm("此操作将删除该任务信息, 是否继续?", "提示", {
+                    document.body.appendChild(link)
-                confirmButtonText: "确定",
+                    link.click()
-                cancelButtonText: "取消",
+                    window.URL.revokeObjectURL(link.href)
-                type: "warning",
+                    document.body.removeChild(link)
-            })
-                .then(() => {
-                    let dQuery = {
-                        id: rowId,
-                    };
-                    deleteUploadStatus(dQuery)
-                        .then((response) => {
-                            this.loading = false;
-                            if (response.code == 20000) {
-                                this.$message.success("删除成功");
-                            } else {
-                                this.$message.error(response.message);
-                            }
-                            this.getList();
-                        })
-                        .catch(() => {
-                            this.loading = false;
-                        });
                 })
-                .catch(() => {
+            },
-                });
+            deleteData(id) {
-        }
+                deleteUploadStatus({
-        ,
+                        id
-        handleChange(response, files, fileList) {
+                    }).then((response) => {
-            console.log(response);
+                        if (response.code == 20000) {
-            if (response.code != 20000) {
+                            this.filterQuery.page = 1
-                this.$message.error(response.message);
+                            this.$message.success("删除成功");
-                this.getList();
+                        } else {
-            } else {
+                            this.$message.error(response.message);
-                // console.log(files[0] + "\n" + this.fileList[0] + "\n" + fileList[0]);
+                        }
-                this.$message.success(response.data);
+                        this.getList();
-                this.getList();
+                    })
+                    .catch(() => {});
             }
-        }
+        },
-        ,
+
-        statusFilterType(status) {
+        mounted() {},
-            const statusMap = {
+        components: {},
-                0: "warning",
+        created() {
-                1: "success",
+            this.headers = {
-                2: "danger",
+                ADMIN_ID: store.getters.adminId,
+                ADMIN_TOKEN: store.getters.token,
             };
-            return statusMap[status];
+            this.getList();
-        }
+            // this.getConfig();
-        ,
+        },
-        detailDialog(id) {
+    };
-            this.syncVisible = true;
+</script>
-            this.list.forEach(item => {
+<style>
-                if (id === item.id) {
+    .itemTag {
-                    this.syncInfo = item.remark;
+        float: left;
-                }
+        text-align: left;
-            })
+        margin-top: 10px;
-        }
+        width: 100px;
-    },
+    }
 
-    mounted() {
+    .text {
+        font-size: 13px;
+        font-family: "Microsoft YaHei";
     }
-    ,
+
-    components: {}
+    .el-row {
-    ,
+        display: flex;
-    created() {
+        flex-wrap: wrap;
-        this.headers = {
+
-            ADMIN_ID: store.getters.adminId,
+    }
-            ADMIN_TOKEN: store.getters.token,
+
-        };
+    .el-col {
-        this.getList();
+        border-radius: 4px;
-        this.getConfig();
+        flex-wrap: wrap;
+    }
+
+    .syncInfo {
+        font-size: medium;
+        font-family: "Microsoft YaHei";
+        line-height: 25px;
     }
-    ,
-}
-;
-</script>
-<style>
-.itemTag {
-    float: left;
-    text-align: left;
-    margin-top: 10px;
-    width: 100px;
-}
-
-.text {
-    font-size: 13px;
-    font-family: "Microsoft YaHei";
-}
-
-.el-row {
-    display: flex;
-    flex-wrap: wrap;
-
-}
-
-.el-col {
-    border-radius: 4px;
-    flex-wrap: wrap;
-}
-
-.syncInfo {
-    font-size: medium;
-    font-family: "Microsoft YaHei";
-    line-height: 25px;
-}
 </style>