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

master
anthonywj 2 years ago
parent dbe997b8ea
commit 5431f5331e

@ -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
outputDir=serve

@ -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
outputDir=SP_SYNC_CLIENT

38423
package-lock.json generated

File diff suppressed because it is too large Load Diff

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

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

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

@ -59,19 +59,35 @@
<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-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>
<el-button
type="text"
size="small"
@click.native.stop="downFile(scope.row)"
>下载
</el-button
>
<el-button
type="text"
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 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>
</el-table-column>
</el-table>
@ -323,35 +339,59 @@ export default {
},
downFile(rows) {
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)
this.$confirm("是否确定下载该文件, 是否继续?", "提示", {
confirmButtonText: "确定",
cancelButtonText: "取消",
type: "warning",
})
.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) {
deleteDownloadStatus({
id
}).then((response) => {
if (response.code == 20000) {
this.filterQuery.page = 1
this.$message.success("删除成功");
} else {
this.$message.error(response.message);
}
this.getList();
this.$confirm("是否确定删除该记录, 是否继续?", "提示", {
confirmButtonText: "确定",
cancelButtonText: "取消",
type: "warning",
})
.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(() => {
});
}
},

@ -66,26 +66,43 @@
<el-table-column label="操作" fixed="right" width="160">
<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="是否确认要下载文件?"
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>
<el-button
type="text"
size="small"
@click.native.stop="downFile(scope.row)"
>下载
</el-button
>
<el-button
type="text"
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>
</el-table-column>
</el-table>
<el-pagination :current-page="filterQuery.page" :page-size="filterQuery.limit" @current-change="handleCurrentChange"
layout="prev, pager, next" :total="total"></el-pagination>
<el-pagination :current-page="filterQuery.page" :page-size="filterQuery.limit"
@current-change="handleCurrentChange"
layout="prev, pager, next" :total="total"></el-pagination>
</el-card>
<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>
</el-dialog>
@ -93,272 +110,292 @@
</template>
<script>
import {
filterUploadStatus,
deleteUploadStatus,
updateConfig,
connectUpper,
uploadInfoByStatus
} from "../../api/sync/dataSyncStatus";
import store from "@/store";
export default {
data() {
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,
import {
filterUploadStatus,
deleteUploadStatus,
updateConfig,
connectUpper,
uploadInfoByStatus, infoByStatus, deleteDownloadStatus
} from "../../api/sync/dataSyncStatus";
import store from "@/store";
export default {
data() {
return {
filterQuery: {
taskId: null,
id: null,
// status: "0",
page: 1,
limit: 10,
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() {
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;
});
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: 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 = {};
connectUpper(query)
.then((response) => {
this.loading = false;
if (response.code == 20000) {
this.$message.success("连接成功!");
} else {
this.$message.error(response.message);
}
})
.catch(() => {
this.loading = false;
});
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;
this.thrCorpSelectVisible = false;
if (val) {
this.getList();
}
},
handleCurrentChange(val) {
this.filterQuery.page = val;
cancelDialog(val) {
this.udiImportDetailVisible = false;
this.thrCorpSelectVisible = false;
if (val) {
this.getList();
},
}
},
handleCurrentChange(val) {
this.filterQuery.page = val;
this.getList();
},
/* createScheduleDialog(type) {
if (this.$isNotBlank(this.syncTime)) {
this.$confirm("此操作将从" + this.syncTime + "开始同步最新数据,是否继续", "提示", {
confirmButtonText: "确定",
cancelButtonText: "取消",
type: "warning",
})
.then(() => {
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();
/* createScheduleDialog(type) {
if (this.$isNotBlank(this.syncTime)) {
this.$confirm("此操作将从" + this.syncTime + "开始同步最新数据,是否继续", "提示", {
confirmButtonText: "确定",
cancelButtonText: "取消",
type: "warning",
})
.then(() => {
this.createSchedule(type);
})
.catch(() => {
this.loading = false;
});
},*/
deleteDialog(rowId) {
this.$confirm("此操作将删除该任务信息, 是否继续?", "提示", {
confirmButtonText: "确定",
cancelButtonText: "取消",
type: "warning",
})
.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(() => {});
},
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 {
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;
});
},*/
deleteDialog(rowId) {
this.$confirm("此操作将删除该任务信息, 是否继续?", "提示", {
confirmButtonText: "确定",
cancelButtonText: "取消",
type: "warning",
})
.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(() => {
});
},
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) {
uploadInfoByStatus({
'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)
downFile(rows) {
this.$confirm("是否确定下载该文件, 是否继续?", "提示", {
confirmButtonText: "确定",
cancelButtonText: "取消",
type: "warning",
})
.then(() => {
uploadInfoByStatus({
'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)
})
})
},
deleteData(id) {
deleteUploadStatus({
.catch(() => {
});
},
deleteData(id) {
this.$confirm("是否确定删除该记录, 是否继续?", "提示", {
confirmButtonText: "确定",
cancelButtonText: "取消",
type: "warning",
})
.then(() => {
deleteUploadStatus({
id
}).then((response) => {
if (response.code == 20000) {
@ -369,49 +406,56 @@
}
this.getList();
})
.catch(() => {});
}
},
.catch(() => {
});
})
.catch(() => {
});
mounted() {},
components: {},
created() {
this.headers = {
ADMIN_ID: store.getters.adminId,
ADMIN_TOKEN: store.getters.token,
};
this.getList();
// this.getConfig();
},
};
}
},
mounted() {
},
components: {},
created() {
this.headers = {
ADMIN_ID: store.getters.adminId,
ADMIN_TOKEN: store.getters.token,
};
this.getList();
// this.getConfig();
},
};
</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;
}
.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>

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

Loading…
Cancel
Save