修改用户传参
parent
bf29d13557
commit
1fd06fefa6
|
@ -1,2 +1,3 @@
|
||||||
const DAICHULI_URL = "http://10.0.3.157:18030/kjwebAdmin/#/Order/DJYOrder";
|
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 YUNGUAN_SERVER_URL = "http://10.0.3.157:18030/yunguan-app";
|
||||||
|
// const JCTOKEN = "WEB%2a1673425993482%40L3W7_ZZX-yg000087_06848633de364ec7b63c8f53f9e43b19";
|
|
@ -226,7 +226,6 @@ export default {
|
||||||
pdfPath: "", // pdf文件地址
|
pdfPath: "", // pdf文件地址
|
||||||
sampleData: [],
|
sampleData: [],
|
||||||
rpDataMsg: {
|
rpDataMsg: {
|
||||||
user: "",
|
|
||||||
satellite: "5米光学卫星",
|
satellite: "5米光学卫星",
|
||||||
load: "可见/近红外相机",
|
load: "可见/近红外相机",
|
||||||
spatialRes: "0.00000307°",
|
spatialRes: "0.00000307°",
|
||||||
|
@ -406,12 +405,12 @@ export default {
|
||||||
categoryType: productTypeSplMap(self.pdSubType),
|
categoryType: productTypeSplMap(self.pdSubType),
|
||||||
product: productTypeMap(self.pdSubType),
|
product: productTypeMap(self.pdSubType),
|
||||||
orderID: asmo.orderCode,
|
orderID: asmo.orderCode,
|
||||||
reportMaker: "dxn",
|
reportMaker: rpm.userName,
|
||||||
orderCreateTime: asmo.createDate,
|
orderCreateTime: asmo.createDate,
|
||||||
orderStartTime: crTime.startTime,
|
orderStartTime: crTime.startTime,
|
||||||
orderEndTime: crTime.endTime,
|
orderEndTime: crTime.endTime,
|
||||||
reportCreateTime: asmo.createDate,
|
reportCreateTime: asmo.createDate,
|
||||||
inspectorName: "dxn",
|
inspectorName: rpm.userName,
|
||||||
productFileName: asmp.fileName,
|
productFileName: asmp.fileName,
|
||||||
resolution: asmm.resRatio + "",
|
resolution: asmm.resRatio + "",
|
||||||
productCreateTime: asmp.collectDate,
|
productCreateTime: asmp.collectDate,
|
||||||
|
@ -501,7 +500,7 @@ export default {
|
||||||
type: "success",
|
type: "success",
|
||||||
message: "订单处理成功",
|
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() {
|
reExamine() {
|
||||||
const os = 0;
|
const os = 0;
|
||||||
this.updateOrder(os);
|
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) {
|
updateOrder(orderStatus) {
|
||||||
updateOrderStage(
|
updateOrderStage(
|
||||||
qs.stringify(
|
qs.stringify(
|
||||||
{
|
{
|
||||||
orderId: this.orderId,
|
orderId: this.reportMsg.orderId,
|
||||||
orderStatus: orderStatus,
|
orderStatus: orderStatus,
|
||||||
userId: this.userId,
|
userId: this.reportMsg.userId,
|
||||||
},
|
},
|
||||||
{ indices: false }
|
{ indices: false }
|
||||||
)
|
)
|
||||||
|
|
|
@ -381,6 +381,8 @@ export default {
|
||||||
featureMapData: [],
|
featureMapData: [],
|
||||||
orderId: undefined,
|
orderId: undefined,
|
||||||
userId: null,
|
userId: null,
|
||||||
|
userName:null,
|
||||||
|
token:null,
|
||||||
formInline: {
|
formInline: {
|
||||||
truthCheckFun: [],
|
truthCheckFun: [],
|
||||||
satellite: "", //卫星
|
satellite: "", //卫星
|
||||||
|
@ -414,6 +416,8 @@ export default {
|
||||||
let self = this;
|
let self = this;
|
||||||
const am = (self.allMsg = this.queryParams);
|
const am = (self.allMsg = this.queryParams);
|
||||||
self.userId = localStorage.userId;
|
self.userId = localStorage.userId;
|
||||||
|
self.userName = localStorage.userName;
|
||||||
|
self.token = localStorage.token;
|
||||||
const om = (self.orderMsg = self.allMsg.orderMsg);
|
const om = (self.orderMsg = self.allMsg.orderMsg);
|
||||||
|
|
||||||
self.orderId = om.orderId;
|
self.orderId = om.orderId;
|
||||||
|
@ -485,7 +489,7 @@ export default {
|
||||||
}
|
}
|
||||||
},
|
},
|
||||||
todaichuli() {
|
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() {
|
changepage() {
|
||||||
if (this.hasPixelFun && this.pixelFun === "") {
|
if (this.hasPixelFun && this.pixelFun === "") {
|
||||||
|
@ -562,6 +566,8 @@ export default {
|
||||||
sampleList: this.sampleList,
|
sampleList: this.sampleList,
|
||||||
orderId: this.orderId,
|
orderId: this.orderId,
|
||||||
userId: this.userId,
|
userId: this.userId,
|
||||||
|
userName:this.userName,
|
||||||
|
token:this.token,
|
||||||
orderMsg: this.orderMsg,
|
orderMsg: this.orderMsg,
|
||||||
productMsg: this.productMsg,
|
productMsg: this.productMsg,
|
||||||
};
|
};
|
||||||
|
|
|
@ -189,6 +189,8 @@ export default {
|
||||||
queryParams: null,
|
queryParams: null,
|
||||||
orderMsg: "",
|
orderMsg: "",
|
||||||
userId: null,
|
userId: null,
|
||||||
|
userName:null,
|
||||||
|
token:null,
|
||||||
orderId: null,
|
orderId: null,
|
||||||
productMsg: "",
|
productMsg: "",
|
||||||
pageshow: true,
|
pageshow: true,
|
||||||
|
@ -270,10 +272,11 @@ export default {
|
||||||
methods: {
|
methods: {
|
||||||
async initOrderMsg() {
|
async initOrderMsg() {
|
||||||
const self = this;
|
const self = this;
|
||||||
const token = this.$route.query.token;
|
self.token = this.$route.query.token;
|
||||||
const userMsg = await getUserInfo(token);
|
const userMsg = await getUserInfo(self.token);
|
||||||
if (userMsg.code === 200) {
|
if (userMsg.code === 200) {
|
||||||
self.userId = userMsg.data.userid;
|
self.userId = userMsg.data.userid;
|
||||||
|
self.userName = userMsg.data.username;
|
||||||
}
|
}
|
||||||
const orderId = (self.orderId = this.$route.query.orderId);
|
const orderId = (self.orderId = this.$route.query.orderId);
|
||||||
getOrderMsg(orderId).then((res) => {
|
getOrderMsg(orderId).then((res) => {
|
||||||
|
@ -339,6 +342,8 @@ export default {
|
||||||
inspection() {
|
inspection() {
|
||||||
let param = {
|
let param = {
|
||||||
userId:this.userId,
|
userId:this.userId,
|
||||||
|
userName:this.userName,
|
||||||
|
token: this.token,
|
||||||
orderMsg: this.orderMsg,
|
orderMsg: this.orderMsg,
|
||||||
productMsg: this.productMsg,
|
productMsg: this.productMsg,
|
||||||
orderData: this.orderData,
|
orderData: this.orderData,
|
||||||
|
@ -354,7 +359,7 @@ export default {
|
||||||
this.isShow = !this.isShow;
|
this.isShow = !this.isShow;
|
||||||
},
|
},
|
||||||
todaichuli() {
|
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() {
|
backpage() {
|
||||||
this.$router.go(-1);
|
this.$router.go(-1);
|
||||||
|
|
Loading…
Reference in New Issue