From 1fd06fefa65921619aeff214ba594da11ce54a4d Mon Sep 17 00:00:00 2001 From: duxiaoning <17621883433@163.com> Date: Mon, 16 Jan 2023 14:30:08 +0800 Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E7=94=A8=E6=88=B7=E4=BC=A0?= =?UTF-8?q?=E5=8F=82?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- public/config/config.js | 1 + .../Daichuli/Feedback/Inspection/Report/index.vue | 13 ++++++------- src/views/Daichuli/Feedback/Inspection/index.vue | 8 +++++++- src/views/Daichuli/Feedback/index.vue | 13 +++++++++---- 4 files changed, 23 insertions(+), 12 deletions(-) diff --git a/public/config/config.js b/public/config/config.js index 2f4f179..007a16c 100644 --- a/public/config/config.js +++ b/public/config/config.js @@ -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"; \ No newline at end of file diff --git a/src/views/Daichuli/Feedback/Inspection/Report/index.vue b/src/views/Daichuli/Feedback/Inspection/Report/index.vue index 60498ae..90afc59 100644 --- a/src/views/Daichuli/Feedback/Inspection/Report/index.vue +++ b/src/views/Daichuli/Feedback/Inspection/Report/index.vue @@ -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 } ) diff --git a/src/views/Daichuli/Feedback/Inspection/index.vue b/src/views/Daichuli/Feedback/Inspection/index.vue index a798e7e..aa1434f 100644 --- a/src/views/Daichuli/Feedback/Inspection/index.vue +++ b/src/views/Daichuli/Feedback/Inspection/index.vue @@ -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, }; diff --git a/src/views/Daichuli/Feedback/index.vue b/src/views/Daichuli/Feedback/index.vue index 63d46af..38ce5b0 100644 --- a/src/views/Daichuli/Feedback/index.vue +++ b/src/views/Daichuli/Feedback/index.vue @@ -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);