From 4c382e6279068ebd6cd0713fa2fe8ba46688b2d4 Mon Sep 17 00:00:00 2001
From: duxiaoning <17621883433@163.com>
Date: Tue, 1 Aug 2023 14:57:18 +0800
Subject: [PATCH] =?UTF-8?q?=E5=90=8C=E6=AD=A5=E5=BB=8A=E4=BF=A1=E9=99=A2?=
=?UTF-8?q?=E4=BF=AE=E6=94=B9=EF=BC=8C=E6=A0=B9=E6=8D=AE=E8=81=94=E8=B0=83?=
=?UTF-8?q?=E6=84=8F=E8=A7=81=E8=BF=9B=E8=A1=8C=E7=95=8C=E9=9D=A2=E9=80=82?=
=?UTF-8?q?=E9=85=8D?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
src/config/config.js | 14 +++++----
.../Feedback/Inspection/Report/index.vue | 30 +++++++++++--------
.../Daichuli/Feedback/Inspection/index.vue | 9 ++++--
3 files changed, 31 insertions(+), 22 deletions(-)
diff --git a/src/config/config.js b/src/config/config.js
index 9ac01d8..ba5f7ff 100644
--- a/src/config/config.js
+++ b/src/config/config.js
@@ -27,15 +27,17 @@ const url = {
srSamplePath: `${newPrefix}/Surface_Roughness_Sample.xlsx`, // 地表粗糙度9
vpSamplePath: `${newPrefix}/Vegetation_Phenology_Sample.xlsx` //Vegetation_Phenology_Sample.xlsx,// 植被物候12
};
- const serverUrl = "http://10.0.36.121";
- const langServerUrl = "http://10.0.3.157"
+ 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 urlprefix = {
- pdfUrlPrefix: `${serverUrl}:8085/microwaveData/pdf/`,
- samePoiImgsUrl: `${serverUrl}:8085/microwaveData/samePoiImgs/`,
- geoserverUrl: `${langServerUrl}:18030/geoserver/gwc/service/wmts`,
- otgGeoServerUrl: `${langServerUrl}:18030/geoserver/gwc/service/wmts`,
+ pdfUrlPrefix: `${serverUrl}/microwaveData/pdf/`,
+ samePoiImgsUrl: `${serverUrl}/microwaveData/samePoiImgs/`,
+ geoserverUrl: `${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 e9feeb0..a3321f3 100644
--- a/src/views/Daichuli/Feedback/Inspection/Report/index.vue
+++ b/src/views/Daichuli/Feedback/Inspection/Report/index.vue
@@ -139,7 +139,7 @@
- {{ pdSubType == 45 ? scope.row.measureLat : scope.row.lng }}
+ {{ pdSubType == 45 ? scope.row.measureLat : scope.row.lat }}
@@ -438,8 +438,12 @@ export default {
};
const pdfName = productTypeMap(self.pdSubType) + "报告";
const localTiffPath = null;
- const httpTiffPath = rpm.tifPath;
- exportWord(pdfMsg, pdfName, localTiffPath, httpTiffPath, psId).then(
+ let rt = rpm.tifPath.split('/');
+ //由于空天院内网服务i无拉取外网资源，先改成内网资源访问
+ 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;
@@ -481,12 +485,12 @@ export default {
},
// 提交检验结果以及报告结果
submitReport() {
- saveValidationRes(this.reportMsg).then((res) => {
- if (res.code === 200) {
- this.$message({
- message: "提交成功，检验完成",
- type: "success",
- });
+ // saveValidationRes(this.reportMsg).then((res) => {
+ // if (res.code === 200) {
+ // this.$message({
+ // message: "提交成功，检验完成",
+ // type: "success",
+ // });
const os = 2; //审核完成
this.updateOrder(os);
// 上传报告
@@ -503,12 +507,12 @@ export default {
type: "success",
message: "订单处理成功",
});
- window.location.href =`${DAICHULI_URL}?orderid=${rpm.orderId}&token=${rpm.token}`;
+ window.location.href =`${DAICHULI_URL}?token=${rpm.token}`;
}
});
}
- }
- });
+ // }
+ // });
},
// 重新检验
reExamine() {
@@ -516,7 +520,7 @@ export default {
this.updateOrder(os);
resetCheck({orderId:this.reportMsg.orderId}).then(res=>{
if(res.code === 200){
- window.location.href =`${DAICHULI_URL}?orderid=${this.reportMsg.orderId}&token=${this.reportMsg.token}`;
+ window.location.href =`${DAICHULI_URL}?&token=${this.reportMsg.token}`;
}
})
},
diff --git a/src/views/Daichuli/Feedback/Inspection/index.vue b/src/views/Daichuli/Feedback/Inspection/index.vue
index 666d644..6488696 100644
--- a/src/views/Daichuli/Feedback/Inspection/index.vue
+++ b/src/views/Daichuli/Feedback/Inspection/index.vue
@@ -243,7 +243,6 @@
@@ -409,7 +408,7 @@ export default {
projection: null,
orderData: [],
sampleList: [],
- pdShow: false,
+ pdShow: true,
};
},
methods: {
@@ -440,7 +439,10 @@ export default {
const pm = (self.productMsg = am.productMsg);
self.geoWorkSpace = pm.geoWorkspace;
self.geoLayerName = pm.geoLayerName;
- self.tifPath = pm.ftpPath;
+ // 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;
// 赋值真实性检验方法
@@ -551,6 +553,7 @@ export default {
formData.append("pixelHandleType", this.pixelFun); //像元级处理方法（正射校正产品不需要）
formData.append("truthCheckFuns", JSON.stringify(tcf)); //真实性校验
formData.append("featureMapping", JSON.stringify(featureMapData));
+ formData.append("polarizationMethod", 'HH');
checkReality(formData).then((res) => {
console.log("真实性校验：", res);
this.checkRealityWait = false;