UDI
/
udispsync-vue
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

回退package.json包，解决部署后样式错乱，无法下载问题

Browse Source
master
anthonywj 2 years ago
parent dbe997b8ea
commit 5431f5331e
9 changed files with 436 additions and 38774 deletions
Show Stats Download Patch File Download Diff File

2
.env.development
Unescape Escape View File

@ -1,3 +1,3 @@
VUE_APP_API_BASE=http://192.168.31.140:9998 VUE_APP_API_BASE=http://127.0.0.1:10001
template=./public/index-dev.html template=./public/index-dev.html
outputDir=serve outputDir=serve

2
.env.production
Unescape Escape View File

@ -1,3 +1,3 @@
VUE_APP_API_BASE=http://127.0.0.1:8080/glxp_warehous/ VUE_APP_API_BASE=http://r.jiyuudims.cloud:5009/SP_SYNC_SERVER
template=./public/index.html template=./public/index.html
outputDir=SP_SYNC_CLIENT outputDir=SP_SYNC_CLIENT

38423
package-lock.json generated
View File

File diff suppressed because it is too large Load Diff

6
package.json
Unescape Escape View File

@ -15,13 +15,13 @@
"babel-polyfill": "^6.26.0", "babel-polyfill": "^6.26.0",
"clipboard": "^2.0.8", "clipboard": "^2.0.8",
"element-china-area-data": "^5.0.2", "element-china-area-data": "^5.0.2",
"element-ui": "2.15.8", "element-ui": "2.8.2",
"file-saver": "^2.0.5", "file-saver": "^2.0.5",
"js-cookie": "^2.2.0", "js-cookie": "^2.2.0",
"mockjs": "^1.0.1-beta3", "mockjs": "^1.0.1-beta3",
"nprogress": "^0.2.0", "nprogress": "^0.2.0",
"pinyin": "^2.10.2", "pinyin": "^2.10.2",
"vue": "2.6.12", "vue": "2.5.16",
"vue-router": "^3.0.1", "vue-router": "^3.0.1",
"vue2-verify": "^1.1.5", "vue2-verify": "^1.1.5",
"vuedraggable": "^2.17.0", "vuedraggable": "^2.17.0",
@ -38,7 +38,7 @@
"babel-jest": "^23.0.1", "babel-jest": "^23.0.1",
"sass": "1.32.13", "sass": "1.32.13",
"sass-loader": "10.1.1", "sass-loader": "10.1.1",
"vue-template-compiler": "^2.6.12" "vue-template-compiler": "2.5.16"
}, },
"browserslist": [ "browserslist": [
"> 1%", "> 1%",

6
public/config.json
Unescape Escape View File

@ -1,5 +1,5 @@
{ {
"BASE_URL":"http://127.0.0.1:10002", "BASE_URL": "http://127.0.0.1:10001",
"SERVER_IP": "http://127.0.0.1:8080/", "SERVER_IP": "http://127.0.0.1:10001",
"hosp_name": "诏安县总医院" "hosp_name": "福建省XX市医院"
} }

7
src/main.js
Unescape Escape View File

@ -1,15 +1,16 @@
import "babel-polyfill"; // 解决Ie9 import "babel-polyfill"; // 解决Ie9
import "./assets/icons/iconfont"; import "./assets/icons/iconfont";
import IconSvg from "./components/common/IconSvg.vue"; // svg组件 import IconSvg from "./components/common/IconSvg.vue"; // svg组件\
import "./element";
import Vue from "vue"; import Vue from "vue";
import App from "./App.vue"; import App from "./App.vue";
import "./element";
import router from "./router/index"; import router from "./router/index";
import store from "./store/index"; import store from "./store/index";
import * as filters from "./filtres/index"; // 全局过滤器 import * as filters from "./filtres/index"; // 全局过滤器
import "./role"; // 权限 import "./role"; // 权限
import allTools from "./plugin/allTools"; import allTools from "./plugin/allTools";
// import "./mock"; // 模拟数据 // import "./mock"; // 模拟数据
import { BASE_URL } from "./config/app" import { BASE_URL } from "./config/app"
import axios from "axios"; import axios from "axios";

112
src/views/sync/SysDownloadData.vue
Unescape Escape View File

@ -59,19 +59,35 @@
<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"> <el-table-column label="操作" fixed="right" width="160">
<template slot-scope="scope"> <template slot-scope="scope">
<el-popconfirm @confirm="downFile(scope.row)" confirm-button-text='下载' cancel-button-text='不用了'
class="mr10" icon="el-icon-info" icon-color="blck" title="是否确认要下载文件？" <el-button
v-if="scope.row.cacheFilePath"> type="text"
<el-button type="text" size="small" slot="reference">下载 size="small"
</el-button> @click.native.stop="downFile(scope.row)"
</el-popconfirm> >下载
<el-popconfirm v-if="scope.row.status==4" @confirm="deleteData(scope.row.id)" </el-button
confirm-button-text='删除' >
cancel-button-text='不用了' icon="el-icon-info" icon-color="red" <el-button
title="是否确认要删除这条数据？"> type="text"
<el-button type="text" size="small" slot="reference">删除 size="small"
</el-button> @click.native.stop="deleteData(scope.row.id)"
</el-popconfirm> >删除
</el-button
>
<!-- <el-popconfirm @confirm="downFile(scope.row)" confirm-button-text='下载' cancel-button-text='不用了'-->
<!-- class="mr10" icon="el-icon-info" icon-color="blck" title="是否确认要下载文件？"-->
<!-- v-if="scope.row.cacheFilePath">-->
<!-- <el-button type="text" size="small" slot="reference">下载-->
<!-- </el-button>-->
<!-- </el-popconfirm>-->
<!-- <el-popconfirm v-if="scope.row.status==4" @confirm="deleteData(scope.row.id)"-->
<!-- confirm-button-text='删除'-->
<!-- cancel-button-text='不用了' icon="el-icon-info" icon-color="red"-->
<!-- title="是否确认要删除这条数据？">-->
<!-- <el-button type="text" size="small" slot="reference">删除-->
<!-- </el-button>-->
<!-- </el-popconfirm>-->
</template> </template>
</el-table-column> </el-table-column>
</el-table> </el-table>
@ -323,35 +339,59 @@ export default {
}, },
downFile(rows) { downFile(rows) {
infoByStatus({
'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)
link.download = fileName
link.style.display = 'none'
document.body.appendChild(link)
link.click()
window.URL.revokeObjectURL(link.href)
document.body.removeChild(link)
}) })
.then(() => {
infoByStatus({
'id': rows.id
}).then(res => {
let blob = new Blob([res])
let fileName = rows.cacheFilePath.substring(rows.cacheFilePath.lastIndexOf('/'))
let link = document.createElement("a")
link.href = window.URL.createObjectURL(blob)
link.download = fileName
link.style.display = 'none'
document.body.appendChild(link)
link.click()
window.URL.revokeObjectURL(link.href)
document.body.removeChild(link)
})
})
.catch(() => {
});
}, },
deleteData(id) { deleteData(id) {
deleteDownloadStatus({
id this.$confirm("是否确定删除该记录, 是否继续?", "提示", {
}).then((response) => { confirmButtonText: "确定",
if (response.code == 20000) { cancelButtonText: "取消",
this.filterQuery.page = 1 type: "warning",
this.$message.success("删除成功");
} else {
this.$message.error(response.message);
}
this.getList();
}) })
.then(() => {
deleteDownloadStatus({
id
}).then((response) => {
if (response.code == 20000) {
this.filterQuery.page = 1
this.$message.success("删除成功");
} else {
this.$message.error(response.message);
}
this.getList();
})
.catch(() => {
});
})
.catch(() => { .catch(() => {
}); });
} }
}, },

650
src/views/sync/SysUploadData.vue
Unescape Escape View File

@ -66,26 +66,43 @@
<el-table-column label="操作" fixed="right" width="160"> <el-table-column label="操作" fixed="right" width="160">
<template slot-scope="scope"> <template slot-scope="scope">
<el-popconfirm @confirm="downFile(scope.row)" confirm-button-text='下载' cancel-button-text='不用了'
class="mr10" icon="el-icon-info" icon-color="blck" title="是否确认要下载文件？" <el-button
v-if="scope.row.cacheFilePath"> type="text"
<el-button type="text" size="small" slot="reference">下载 size="small"
</el-button> @click.native.stop="downFile(scope.row)"
</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="是否确认要删除这条数据？"> >
<el-button type="text" size="small" slot="reference">删除 <el-button
</el-button> type="text"
</el-popconfirm> size="small"
@click.native.stop="deleteData(scope.row.id)"
>删除
</el-button
>
<!-- <el-popconfirm @confirm="downFile(scope.row)" confirm-button-text='下载' cancel-button-text='不用了'-->
<!-- class="mr10" icon="el-icon-info" icon-color="blck" title="是否确认要下载文件？"-->
<!-- v-if="scope.row.cacheFilePath">-->
<!-- <el-button type="text" size="small" slot="reference">下载-->
<!-- </el-button>-->
<!-- </el-popconfirm>-->
<!-- <el-popconfirm @confirm="deleteData(scope.row.id)" confirm-button-text='删除'-->
<!-- cancel-button-text='不用了' icon="el-icon-info" icon-color="red" title="是否确认要删除这条数据？">-->
<!-- <el-button type="text" size="small" slot="reference">删除-->
<!-- </el-button>-->
<!-- </el-popconfirm>-->
</template> </template>
</el-table-column> </el-table-column>
</el-table> </el-table>
<el-pagination :current-page="filterQuery.page" :page-size="filterQuery.limit" @current-change="handleCurrentChange" <el-pagination :current-page="filterQuery.page" :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-card>
<el-dialog title="同步信息" width="25%" :close-on-click-modal="false" :close-on-press-escape="false" <el-dialog title="同步信息" width="25%" :close-on-click-modal="false" :close-on-press-escape="false"
:visible.sync="syncVisible"> :visible.sync="syncVisible">
<span v-text="syncInfo" style="white-space:pre-line;" class="syncInfo"></span> <span v-text="syncInfo" style="white-space:pre-line;" class="syncInfo"></span>
</el-dialog> </el-dialog>
@ -93,272 +110,292 @@
</template> </template>
<script> <script>
import { import {
filterUploadStatus, filterUploadStatus,
deleteUploadStatus, deleteUploadStatus,
updateConfig, updateConfig,
connectUpper, connectUpper,
uploadInfoByStatus uploadInfoByStatus, infoByStatus, deleteDownloadStatus
} from "../../api/sync/dataSyncStatus"; } from "../../api/sync/dataSyncStatus";
import store from "@/store"; import store from "@/store";
export default { export default {
data() { data() {
return { return {
filterQuery: { filterQuery: {
taskId: null, taskId: null,
id: null, id: null,
// status: "0", // status: "0",
page: 1, page: 1,
limit: 10, 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, syncTime: null,
syncInfo: null, },
syncVisible: false 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,
methods: {
onReset() {
this.$router.push({
path: "",
});
this.filterQuery = {
id: null,
page: 1,
limit: 10,
};
this.syncTime = null;
this.getList();
}, },
getList() { uploadFileUrl: null,
this.loading = true; uploadData: {
filterUploadStatus(this.filterQuery) thirdSys: "thirdId",
.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;
});
}, },
templateDlUrl: null,
checked: false,
syncTime: null,
syncInfo: null,
syncVisible: false
};
},
methods: {
onReset() {
this.$router.push({
path: "",
});
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() { testConnect() {
let query = {}; let query = {};
connectUpper(query) connectUpper(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 {
this.$message.error(response.message); this.$message.error(response.message);
} }
}) })
.catch(() => { .catch(() => {
this.loading = false; this.loading = false;
}); });
}, },
saveConfig() { saveConfig() {
updateConfig(this.configQuery) updateConfig(this.configQuery)
.then((response) => { .then((response) => {
this.loading = false; this.loading = false;
if (response.code == 20000) { if (response.code == 20000) {
this.$message.success("更新成功！"); this.$message.success("更新成功！");
// this.getConfig(); // this.getConfig();
} }
}) })
.catch(() => { .catch(() => {
this.loading = false; this.loading = false;
}); });
}, },
cancelDialog(val) { cancelDialog(val) {
this.udiImportDetailVisible = false; this.udiImportDetailVisible = false;
this.thrCorpSelectVisible = false; this.thrCorpSelectVisible = false;
if (val) { if (val) {
this.getList();
}
},
handleCurrentChange(val) {
this.filterQuery.page = val;
this.getList(); this.getList();
}, }
},
handleCurrentChange(val) {
this.filterQuery.page = val;
this.getList();
},
/* createScheduleDialog(type) { /* createScheduleDialog(type) {
if (this.$isNotBlank(this.syncTime)) { if (this.$isNotBlank(this.syncTime)) {
this.$confirm("此操作将从" + this.syncTime + "开始同步最新数据，是否继续", "提示", { this.$confirm("此操作将从" + this.syncTime + "开始同步最新数据，是否继续", "提示", {
confirmButtonText: "确定", confirmButtonText: "确定",
cancelButtonText: "取消", cancelButtonText: "取消",
type: "warning", type: "warning",
}) })
.then(() => { .then(() => {
this.createSchedule(type); this.createSchedule(type);
})
.catch(() => {
});
} else {
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(() => { .catch(() => {
this.loading = false;
}); });
},*/ } else {
deleteDialog(rowId) { this.createSchedule(type);
this.$confirm("此操作将删除该任务信息, 是否继续?", "提示", { }
confirmButtonText: "确定",
cancelButtonText: "取消", },
type: "warning",
}) createSchedule(type) {
.then(() => { let query = {
let dQuery = { createType: type,
id: rowId, syncTime: this.syncTime,
}; }
deleteUploadStatus(dQuery)
.then((response) => { createSchedule(query)
this.loading = false; .then((response) => {
if (response.code == 20000) { this.loading = false;
this.$message.success("删除成功"); if (response.code == 20000) {
} else { this.$message.success("创建成功！");
this.$message.error(response.message); } else if (response.code == 501) {
}
this.getList(); this.$alert(response.message, '提示', {
}) confirmButtonText: '确定',
.catch(() => { type: "warning",
this.loading = false; callback: action => {
}); }
}) });
.catch(() => {});
}, } else {
handleChange(response, files, fileList) { this.$message.error(response.message);
console.log(response); }
if (response.code != 20000) { this.getList();
this.$message.error(response.message); })
this.getList(); .catch(() => {
} else { this.loading = false;
// console.log(files[0] + "\n" + this.fileList[0] + "\n" + fileList[0]); });
this.$message.success(response.data); },*/
this.getList(); deleteDialog(rowId) {
} this.$confirm("此操作将删除该任务信息, 是否继续?", "提示", {
}, confirmButtonText: "确定",
statusFilterType(status) { cancelButtonText: "取消",
const statusMap = { type: "warning",
0: "warning", })
1: "success", .then(() => {
2: "danger", let dQuery = {
}; id: rowId,
return statusMap[status]; };
}, deleteUploadStatus(dQuery)
detailDialog(id) { .then((response) => {
this.syncVisible = true; this.loading = false;
this.list.forEach(item => { if (response.code == 20000) {
if (id === item.id) { this.$message.success("删除成功");
this.syncInfo = item.remark; } 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 = {
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;
}
})
},
downFile(rows) { downFile(rows) {
uploadInfoByStatus({
'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 uploadInfoByStatus({
link.style.display = 'none' 'id': rows.id
document.body.appendChild(link) }).then(res => {
link.click() let blob = new Blob([res])
window.URL.revokeObjectURL(link.href) let fileName = rows.cacheFilePath.substring(rows.cacheFilePath.lastIndexOf('/'))
document.body.removeChild(link) let link = document.createElement("a")
link.href = window.URL.createObjectURL(blob)
link.download = fileName
link.style.display = 'none'
document.body.appendChild(link)
link.click()
window.URL.revokeObjectURL(link.href)
document.body.removeChild(link)
})
}) })
}, .catch(() => {
deleteData(id) { });
deleteUploadStatus({
},
deleteData(id) {
this.$confirm("是否确定删除该记录, 是否继续?", "提示", {
confirmButtonText: "确定",
cancelButtonText: "取消",
type: "warning",
})
.then(() => {
deleteUploadStatus({
id id
}).then((response) => { }).then((response) => {
if (response.code == 20000) { if (response.code == 20000) {
@ -369,49 +406,56 @@
} }
this.getList(); this.getList();
}) })
.catch(() => {}); .catch(() => {
} });
}, })
.catch(() => {
});
mounted() {},
components: {}, }
created() { },
this.headers = {
ADMIN_ID: store.getters.adminId, mounted() {
ADMIN_TOKEN: store.getters.token, },
}; components: {},
this.getList(); created() {
// this.getConfig(); this.headers = {
}, ADMIN_ID: store.getters.adminId,
}; ADMIN_TOKEN: store.getters.token,
};
this.getList();
// this.getConfig();
},
};
</script> </script>
<style> <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> </style>

2
vue.config.js
Unescape Escape View File

@ -7,8 +7,8 @@ module.exports = {
config.externals = { config.externals = {
vue: "Vue", vue: "Vue",
vuex: "Vuex", vuex: "Vuex",
"vue-router": "VueRouter",
"element-ui": "ELEMENT", "element-ui": "ELEMENT",
"vue-router": "VueRouter",
devtool: "source-map" devtool: "source-map"
}; };
} else { } else {

Write Preview
Loading…
Cancel
Save