From 616de8d5b4bf67e59941ee85144fef888d0ba446 Mon Sep 17 00:00:00 2001 From: duxiaoning <17621883433@163.com> Date: Mon, 9 Oct 2023 14:33:11 +0800 Subject: [PATCH] =?UTF-8?q?=E4=BF=9D=E5=AD=98=E8=81=94=E8=B0=83=E8=81=94?= =?UTF-8?q?=E8=AF=95=E5=9C=B0=E5=9D=80=E4=BF=AE=E6=94=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- public/config/config.js | 8 +- src/components/pdfLoad/index.vue | 1 - src/config/config.js | 10 +- .../Feedback/Inspection/Report/index.vue | 104 ++++++++++-------- .../Daichuli/Feedback/Inspection/index.vue | 2 +- src/views/Daichuli/index.vue | 2 +- 6 files changed, 67 insertions(+), 60 deletions(-) diff --git a/public/config/config.js b/public/config/config.js index 07fb473..ce16e8c 100644 --- a/public/config/config.js +++ b/public/config/config.js @@ -1,6 +1,4 @@ -const LXYLOGIN_URL = "http://124.16.188.131:18030/kjwebAdmin-test/#/login"; // const DAICHULI_URL = "http://124.16.188.131:18030/kjwebAdmin-test/#/Order/DJYOrder"; -const YUNGUAN_SERVER_URL = "http://124.16.188.131:18030/yunguan-app"; // const JCTOKEN = "WEB%2a1673425993482%40L3W7_ZZX-yg000087_06848633de364ec7b63c8f53f9e43b19"; // const LXYLOGIN_URL = "http://10.0.3.157:18030/kjwebAdmin-test/#/login"; // const DAICHULI_URL = "http://10.0.3.157:18030/kjwebAdmin-test/#/Order/DJYOrder"; @@ -8,7 +6,11 @@ const YUNGUAN_SERVER_URL = "http://124.16.188.131:18030/yunguan-app"; // const DAISHENHE_URL = "http://10.0.3.157:18030/kjwebAdmin-test/#/Order/DSHOrder"; // const YISHENHE_URL = "http://10.0.3.157:18030/kjwebAdmin-test/#/Order/YSHOrder"; // const YUNGUAN_SERVER_URL = "http://10.0.3.157:18030/yunguan-app"; +const LXYLOGIN_URL = "http://124.16.188.131:18030/kjwebAdmin-test/#/login"; +const YUNGUAN_SERVER_URL = "http://124.16.188.131:18030/yunguan-app"; const DAICHULI_URL = "http://124.16.188.131:9599/lxyweb/kjwebAdmin/#/Order/DJYOrder"; const YICHULI_URL = "http://124.16.188.131:9599/lxyweb/kjwebAdmin/#/Order/YJYOrder"; const DAISHENHE_URL = "http://124.16.188.131:9599/lxyweb/kjwebAdmin/#/Order/DSHOrder"; -const YISHENHE_URL = "http://124.16.188.131:9599/lxyweb/kjwebAdmin/#/Order/YSHOrder"; \ No newline at end of file +const YISHENHE_URL = "http://124.16.188.131:9599/lxyweb/kjwebAdmin/#/Order/YSHOrder"; +const DQYSERVER_URL = "http://124.16.188.131:18085"; +const LXYSERVER_URL = "http://124.16.188.131:9599/lxyweb"; diff --git a/src/components/pdfLoad/index.vue b/src/components/pdfLoad/index.vue index f103b87..315c9ab 100644 --- a/src/components/pdfLoad/index.vue +++ b/src/components/pdfLoad/index.vue @@ -89,7 +89,6 @@ export default { init(){ const pos = this.pdfPath.lastIndexOf("/"); this.pdfName = this.pdfPath.substr(pos+1) - // this.pdfUrl = 'http://10.0.35.70:8085/microwaveData/pdf/'+this.pdfName; this.pdfUrl = this.configration.urlprefix.pdfUrlPrefix+this.pdfName; }, getNumPages(url) { diff --git a/src/config/config.js b/src/config/config.js index ba5f7ff..f3608c7 100644 --- a/src/config/config.js +++ b/src/config/config.js @@ -27,17 +27,13 @@ const url = { srSamplePath: `${newPrefix}/Surface_Roughness_Sample.xlsx`, // 地表粗糙度9 vpSamplePath: `${newPrefix}/Vegetation_Phenology_Sample.xlsx` //Vegetation_Phenology_Sample.xlsx,// 植被物候12 }; - const serverUrl = "http://124.16.188.131:18085"; -// const serverUrl = "http://10.0.36.121:8085"; - const langServerUrl = "http://124.16.188.131:9599/lxyweb" -// const langServerUrl = "http://10.0.3.157:18030" -// const serverUrl = "http://192.168.1.104"; -// const serverUrl = "http://211.157.180.211"; +const serverUrl = DQYSERVER_URL; +const langServerUrl = LXYSERVER_URL; const urlprefix = { pdfUrlPrefix: `${serverUrl}/microwaveData/pdf/`, samePoiImgsUrl: `${serverUrl}/microwaveData/samePoiImgs/`, geoserverUrl: `${langServerUrl}/geoserver/gwc/service/wmts`, - otgGeoServerUrl: `${langServerUrl}/geoserver/gwc/service/wmts`, + otgGeoServerUrl: `${langServerUrl}/geoserver/gwc/service/wmts` // otgGeoServerUrl: `${serverUrl}:8087/geoserver/gwc/service/wmts` }; diff --git a/src/views/Daichuli/Feedback/Inspection/Report/index.vue b/src/views/Daichuli/Feedback/Inspection/Report/index.vue index a3321f3..f036bf9 100644 --- a/src/views/Daichuli/Feedback/Inspection/Report/index.vue +++ b/src/views/Daichuli/Feedback/Inspection/Report/index.vue @@ -188,7 +188,7 @@ import { downloadPdf, updateOrderStage, exportWord, - resetCheck + resetCheck, } from "@/api/lang/pendingOrder"; import { productSubTypeVal, truthFunVal } from "@/lib/contract.js"; @@ -271,7 +271,12 @@ export default { ) { this.base64Data = this.$refs.reportQT.myCharts.getDataURL(); } else { - this.base64Data = this.$refs.reportRT.myCharts.getDataURL(); + this.base64Data = this.$refs.reportRT.myCharts.getDataURL({ + type: "png", + pixelRatio: 1.5, //放大两倍下载，之后压缩到同等大小展示。解决生成图片在移动端模糊问题 + backgroundColor: "#fff", + excludeComponents: ["toolbox", "dataZoom"], + }); } this.exportPdf(this.reportMsg); }, @@ -303,8 +308,8 @@ export default { init() { const self = this; const rpm = (self.reportMsg = this.queryParams); - console.log('1111111',rpm); - + console.log("1111111", rpm); + self.realRes = rpm.reportResult; self.pdSubType = rpm.pdSubType; const rsl = (self.sampleData = rpm.sampleList); @@ -418,8 +423,7 @@ export default { resolution: asmm.resRatio + "", productCreateTime: asmp.collectDate, coordinatSeystem: asmm.coordinateSys, - sampleTimeRequest: - asmo.simple_start_time + " - " + asmo.simple_end_time, + sampleTimeRequest: asmo.queryStartTime + " - " + asmo.queryEndTime, sampleType: "点", sampleCount: rpm.sampleList.length + "", // areaLeftUp: asmm.minLon + "," + asmm.maxLat, @@ -438,22 +442,28 @@ export default { }; const pdfName = productTypeMap(self.pdSubType) + "报告"; const localTiffPath = null; - let rt = rpm.tifPath.split('/'); + let rt = rpm.tifPath.split("/"); //由于空天院内网服务i无拉取外网资源，先改成内网资源访问 - const httpTiffPath ='http://10.0.36.121:8085/microwaveData/tif/' + rt[rt.length - 1]; + const httpTiffPath = + "http://10.0.36.121:8085/microwaveData/tif/" + rt[rt.length - 1]; // const httpTiffPath = rpm.tifPath; - const polarizationMethod = 'HH' - exportWord(pdfMsg, pdfName, localTiffPath, httpTiffPath, psId,polarizationMethod).then( - (res) => { - if (res.msg === "success") { - const ru = res.pdfUrl; - const pos = ru.lastIndexOf("/"); - const pdfName = ru.substr(pos + 1); - self.pdfPath = this.configration.urlprefix.pdfUrlPrefix + pdfName; - self.pdfLoading = false; - } + const polarizationMethod = "HH"; + exportWord( + pdfMsg, + pdfName, + localTiffPath, + httpTiffPath, + psId, + polarizationMethod + ).then((res) => { + if (res.msg === "success") { + const ru = res.pdfUrl; + const pos = ru.lastIndexOf("/"); + const pdfName = ru.substr(pos + 1); + self.pdfPath = this.configration.urlprefix.pdfUrlPrefix + pdfName; + self.pdfLoading = false; } - ); + }); }, // 下载报告 downloadReport() { @@ -486,43 +496,43 @@ export default { // 提交检验结果以及报告结果 submitReport() { // saveValidationRes(this.reportMsg).then((res) => { - // if (res.code === 200) { - // this.$message({ - // message: "提交成功，检验完成", - // type: "success", - // }); - const os = 2; //审核完成 - this.updateOrder(os); - // 上传报告 - const rpm = this.reportMsg; - const pp = this.pdfPath; - if (pp !== null || pp !== undefined) { - const rpMsg = { - orderId: rpm.orderId, - path: pp, - }; - saveReport(rpMsg).then((res) => { - if (res.code === 200) { - this.$message({ - type: "success", - message: "订单处理成功", - }); - window.location.href =`${DAICHULI_URL}?token=${rpm.token}`; - } + // if (res.code === 200) { + // this.$message({ + // message: "提交成功，检验完成", + // type: "success", + // }); + const os = 2; //审核完成 + this.updateOrder(os); + // 上传报告 + const rpm = this.reportMsg; + const pp = this.pdfPath; + if (pp !== null || pp !== undefined) { + const rpMsg = { + orderId: rpm.orderId, + path: pp, + }; + saveReport(rpMsg).then((res) => { + if (res.code === 200) { + this.$message({ + type: "success", + message: "订单处理成功", }); + window.location.href = `${DAICHULI_URL}?token=${rpm.token}`; } - // } + }); + } + // } // }); }, // 重新检验 reExamine() { const os = 0; this.updateOrder(os); - resetCheck({orderId:this.reportMsg.orderId}).then(res=>{ - if(res.code === 200){ - window.location.href =`${DAICHULI_URL}?&token=${this.reportMsg.token}`; + resetCheck({ orderId: this.reportMsg.orderId }).then((res) => { + if (res.code === 200) { + window.location.href = `${DAICHULI_URL}?&token=${this.reportMsg.token}`; } - }) + }); }, // 更新订单状态 updateOrder(orderStatus) { diff --git a/src/views/Daichuli/Feedback/Inspection/index.vue b/src/views/Daichuli/Feedback/Inspection/index.vue index 6488696..3fe4b24 100644 --- a/src/views/Daichuli/Feedback/Inspection/index.vue +++ b/src/views/Daichuli/Feedback/Inspection/index.vue @@ -440,7 +440,7 @@ export default { self.geoWorkSpace = pm.geoWorkspace; self.geoLayerName = pm.geoLayerName; // self.tifPath = pm.ftpPath; - //由于空天院内网服务i无拉取外网资源，先改成内网资源访问 + //由于空天院内网服务无法拉取外网资源，先改成内网资源访问 let rt = pm.ftpPath.split('/'); self.tifPath ='http://10.0.3.157:18030/inspection/files/' + rt[rt.length - 1]; self.projection = pm.projection; diff --git a/src/views/Daichuli/index.vue b/src/views/Daichuli/index.vue index 90f3092..2c1f551 100644 --- a/src/views/Daichuli/index.vue +++ b/src/views/Daichuli/index.vue @@ -160,7 +160,7 @@ export default { }, changePage(orderMsg) { // 正射：150424 土水：150208 PL_DF_DF_20220905175209_8648 地表覆盖：150166 PL_DF_DF_20220905112508_4567 叶面积：150533 PL_DF_DF_20230221173349_4569 后向散射系数：152279 - this.$router.push("/orderUnprocessed?orderId=152279&token=WEB*1690781129417@S6Q8_ZZX-yg000087_cffde98b3fab4349a6e488abd7ee9b0f"); + this.$router.push("/orderUnprocessed?orderId=152586&token=WEB*1696828528663@DCLS_ZZX-yg000087_29e20440e8ea4c8692a0f9bc22ad3e0b"); }, }, };