修改用户传参

tykong-cidian
duxiaoning 2023-01-16 14:30:08 +08:00
parent bf29d13557
commit 1fd06fefa6
4 changed files with 23 additions and 12 deletions

View File

@ -1,2 +1,3 @@
const DAICHULI_URL = "http://10.0.3.157:18030/kjwebAdmin/#/Order/DJYOrder";
const YUNGUAN_SERVER_URL = "http://10.0.3.157:18030/yunguan-app";
// const JCTOKEN = "WEB%2a1673425993482%40L3W7_ZZX-yg000087_06848633de364ec7b63c8f53f9e43b19";

View File

@ -226,7 +226,6 @@ export default {
pdfPath: "", // pdf
sampleData: [],
rpDataMsg: {
user: "",
satellite: "5米光学卫星",
load: "可见/近红外相机",
spatialRes: "0.00000307°",
@ -406,12 +405,12 @@ export default {
categoryType: productTypeSplMap(self.pdSubType),
product: productTypeMap(self.pdSubType),
orderID: asmo.orderCode,
reportMaker: "dxn",
reportMaker: rpm.userName,
orderCreateTime: asmo.createDate,
orderStartTime: crTime.startTime,
orderEndTime: crTime.endTime,
reportCreateTime: asmo.createDate,
inspectorName: "dxn",
inspectorName: rpm.userName,
productFileName: asmp.fileName,
resolution: asmm.resRatio + "",
productCreateTime: asmp.collectDate,
@ -501,7 +500,7 @@ export default {
type: "success",
message: "订单处理成功",
});
window.location.href =`${DAICHULI_URL}?orderid=${this.reportMsg.orderId}&token=WEB%2a1673425993482%40L3W7_ZZX-yg000087_06848633de364ec7b63c8f53f9e43b19`;
window.location.href =`${DAICHULI_URL}?orderid=${rpm.orderId}&token=${rpm.token}`;
}
});
}
@ -512,16 +511,16 @@ export default {
reExamine() {
const os = 0;
this.updateOrder(os);
window.location.href =`${DAICHULI_URL}?orderid=${this.reportMsg.orderId}&token=WEB%2a1673425993482%40L3W7_ZZX-yg000087_06848633de364ec7b63c8f53f9e43b19`;
window.location.href =`${DAICHULI_URL}?orderid=${this.reportMsg.orderId}&token=${this.reportMsg.token}`;
},
//
updateOrder(orderStatus) {
updateOrderStage(
qs.stringify(
{
orderId: this.orderId,
orderId: this.reportMsg.orderId,
orderStatus: orderStatus,
userId: this.userId,
userId: this.reportMsg.userId,
},
{ indices: false }
)

View File

@ -381,6 +381,8 @@ export default {
featureMapData: [],
orderId: undefined,
userId: null,
userName:null,
token:null,
formInline: {
truthCheckFun: [],
satellite: "", //
@ -414,6 +416,8 @@ export default {
let self = this;
const am = (self.allMsg = this.queryParams);
self.userId = localStorage.userId;
self.userName = localStorage.userName;
self.token = localStorage.token;
const om = (self.orderMsg = self.allMsg.orderMsg);
self.orderId = om.orderId;
@ -485,7 +489,7 @@ export default {
}
},
todaichuli() {
window.location.href =`${DAICHULI_URL}?orderid=${this.orderId}&token=WEB%2a1673425993482%40L3W7_ZZX-yg000087_06848633de364ec7b63c8f53f9e43b19`;
window.location.href =`${DAICHULI_URL}?orderid=${this.orderId}&token=${this.token}`;
},
changepage() {
if (this.hasPixelFun && this.pixelFun === "") {
@ -562,6 +566,8 @@ export default {
sampleList: this.sampleList,
orderId: this.orderId,
userId: this.userId,
userName:this.userName,
token:this.token,
orderMsg: this.orderMsg,
productMsg: this.productMsg,
};

View File

@ -189,6 +189,8 @@ export default {
queryParams: null,
orderMsg: "",
userId: null,
userName:null,
token:null,
orderId: null,
productMsg: "",
pageshow: true,
@ -270,10 +272,11 @@ export default {
methods: {
async initOrderMsg() {
const self = this;
const token = this.$route.query.token;
const userMsg = await getUserInfo(token);
self.token = this.$route.query.token;
const userMsg = await getUserInfo(self.token);
if (userMsg.code === 200) {
self.userId = userMsg.data.userid;
self.userName = userMsg.data.username;
}
const orderId = (self.orderId = this.$route.query.orderId);
getOrderMsg(orderId).then((res) => {
@ -338,7 +341,9 @@ export default {
},
inspection() {
let param = {
userId: this.userId,
userId:this.userId,
userName:this.userName,
token: this.token,
orderMsg: this.orderMsg,
productMsg: this.productMsg,
orderData: this.orderData,
@ -354,7 +359,7 @@ export default {
this.isShow = !this.isShow;
},
todaichuli() {
window.location.href =`${DAICHULI_URL}?orderid=${this.orderId}&token=WEB%2a1673425993482%40L3W7_ZZX-yg000087_06848633de364ec7b63c8f53f9e43b19`;
window.location.href =`${DAICHULI_URL}?orderid=${this.orderId}&token=${this.token}`;
},
backpage() {
this.$router.go(-1);