KJ135
/
microwave-project-unite
mirror of http://172.16.0.12:5000/WBJY/microwave-project-unite.git
4
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

保存联调联试地址修改

tykong-cidian
duxiaoning 2023-10-09 14:33:11 +08:00
parent 31ea18fbc4
commit 616de8d5b4
6 changed files with 67 additions and 60 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
public/config/config.js
View File

@ -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 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 JCTOKEN = "WEB%2a1673425993482%40L3W7_ZZX-yg000087_06848633de364ec7b63c8f53f9e43b19";
// const LXYLOGIN_URL = "http://10.0.3.157:18030/kjwebAdmin-test/#/login"; // 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"; // 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 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 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 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 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 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 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"; 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";

1
src/components/pdfLoad/index.vue
View File

@ -89,7 +89,6 @@ export default {
init(){ init(){
const pos = this.pdfPath.lastIndexOf("/"); const pos = this.pdfPath.lastIndexOf("/");
this.pdfName = this.pdfPath.substr(pos+1) 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; this.pdfUrl = this.configration.urlprefix.pdfUrlPrefix+this.pdfName;
}, },
getNumPages(url) { getNumPages(url) {

10
src/config/config.js
View File

@ -27,17 +27,13 @@ const url = {
srSamplePath: `${newPrefix}/Surface_Roughness_Sample.xlsx`, // 地表粗糙度9 srSamplePath: `${newPrefix}/Surface_Roughness_Sample.xlsx`, // 地表粗糙度9
vpSamplePath: `${newPrefix}/Vegetation_Phenology_Sample.xlsx` //Vegetation_Phenology_Sample.xlsx,// 植被物候12 vpSamplePath: `${newPrefix}/Vegetation_Phenology_Sample.xlsx` //Vegetation_Phenology_Sample.xlsx,// 植被物候12
}; };
const serverUrl = "http://124.16.188.131:18085"; const serverUrl = DQYSERVER_URL;
// const serverUrl = "http://10.0.36.121:8085"; const langServerUrl = LXYSERVER_URL;
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 = { const urlprefix = {
pdfUrlPrefix: `${serverUrl}/microwaveData/pdf/`, pdfUrlPrefix: `${serverUrl}/microwaveData/pdf/`,
samePoiImgsUrl: `${serverUrl}/microwaveData/samePoiImgs/`, samePoiImgsUrl: `${serverUrl}/microwaveData/samePoiImgs/`,
geoserverUrl: `${langServerUrl}/geoserver/gwc/service/wmts`, 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` // otgGeoServerUrl: `${serverUrl}:8087/geoserver/gwc/service/wmts`
}; };

104
src/views/Daichuli/Feedback/Inspection/Report/index.vue
View File

@ -188,7 +188,7 @@ import {
downloadPdf, downloadPdf,
updateOrderStage, updateOrderStage,
exportWord, exportWord,
resetCheck resetCheck,
} from "@/api/lang/pendingOrder"; } from "@/api/lang/pendingOrder";
import { productSubTypeVal, truthFunVal } from "@/lib/contract.js"; import { productSubTypeVal, truthFunVal } from "@/lib/contract.js";
@ -271,7 +271,12 @@ export default {
) { ) {
this.base64Data = this.$refs.reportQT.myCharts.getDataURL(); this.base64Data = this.$refs.reportQT.myCharts.getDataURL();
} else { } 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); this.exportPdf(this.reportMsg);
}, },
@ -303,8 +308,8 @@ export default {
init() { init() {
const self = this; const self = this;
const rpm = (self.reportMsg = this.queryParams); const rpm = (self.reportMsg = this.queryParams);
console.log('1111111',rpm); console.log("1111111", rpm);
self.realRes = rpm.reportResult; self.realRes = rpm.reportResult;
self.pdSubType = rpm.pdSubType; self.pdSubType = rpm.pdSubType;
const rsl = (self.sampleData = rpm.sampleList); const rsl = (self.sampleData = rpm.sampleList);
@ -418,8 +423,7 @@ export default {
resolution: asmm.resRatio + "", resolution: asmm.resRatio + "",
productCreateTime: asmp.collectDate, productCreateTime: asmp.collectDate,
coordinatSeystem: asmm.coordinateSys, coordinatSeystem: asmm.coordinateSys,
sampleTimeRequest: sampleTimeRequest: asmo.queryStartTime + " - " + asmo.queryEndTime,
asmo.simple_start_time + " - " + asmo.simple_end_time,
sampleType: "点", sampleType: "点",
sampleCount: rpm.sampleList.length + "", sampleCount: rpm.sampleList.length + "",
// areaLeftUp: asmm.minLon + "," + asmm.maxLat, // areaLeftUp: asmm.minLon + "," + asmm.maxLat,
@ -438,22 +442,28 @@ export default {
}; };
const pdfName = productTypeMap(self.pdSubType) + "报告"; const pdfName = productTypeMap(self.pdSubType) + "报告";
const localTiffPath = null; const localTiffPath = null;
let rt = rpm.tifPath.split('/'); let rt = rpm.tifPath.split("/");
//由于空天院内网服务i无拉取外网资源，先改成内网资源访问 //由于空天院内网服务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 httpTiffPath = rpm.tifPath;
const polarizationMethod = 'HH' const polarizationMethod = "HH";
exportWord(pdfMsg, pdfName, localTiffPath, httpTiffPath, psId,polarizationMethod).then( exportWord(
(res) => { pdfMsg,
if (res.msg === "success") { pdfName,
const ru = res.pdfUrl; localTiffPath,
const pos = ru.lastIndexOf("/"); httpTiffPath,
const pdfName = ru.substr(pos + 1); psId,
self.pdfPath = this.configration.urlprefix.pdfUrlPrefix + pdfName; polarizationMethod
self.pdfLoading = false; ).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() { downloadReport() {
@ -486,43 +496,43 @@ export default {
// 提交检验结果以及报告结果 // 提交检验结果以及报告结果
submitReport() { submitReport() {
// saveValidationRes(this.reportMsg).then((res) => { // saveValidationRes(this.reportMsg).then((res) => {
// if (res.code === 200) { // if (res.code === 200) {
// this.$message({ // this.$message({
// message: "提交成功，检验完成", // message: "提交成功，检验完成",
// type: "success", // type: "success",
// }); // });
const os = 2; //审核完成 const os = 2; //审核完成
this.updateOrder(os); this.updateOrder(os);
// 上传报告 // 上传报告
const rpm = this.reportMsg; const rpm = this.reportMsg;
const pp = this.pdfPath; const pp = this.pdfPath;
if (pp !== null || pp !== undefined) { if (pp !== null || pp !== undefined) {
const rpMsg = { const rpMsg = {
orderId: rpm.orderId, orderId: rpm.orderId,
path: pp, path: pp,
}; };
saveReport(rpMsg).then((res) => { saveReport(rpMsg).then((res) => {
if (res.code === 200) { if (res.code === 200) {
this.$message({ this.$message({
type: "success", type: "success",
message: "订单处理成功", message: "订单处理成功",
});
window.location.href =`${DAICHULI_URL}?token=${rpm.token}`;
}
}); });
window.location.href = `${DAICHULI_URL}?token=${rpm.token}`;
} }
// } });
}
// }
// }); // });
}, },
// 重新检验 // 重新检验
reExamine() { reExamine() {
const os = 0; const os = 0;
this.updateOrder(os); this.updateOrder(os);
resetCheck({orderId:this.reportMsg.orderId}).then(res=>{ resetCheck({ orderId: this.reportMsg.orderId }).then((res) => {
if(res.code === 200){ if (res.code === 200) {
window.location.href =`${DAICHULI_URL}?&token=${this.reportMsg.token}`; window.location.href = `${DAICHULI_URL}?&token=${this.reportMsg.token}`;
} }
}) });
}, },
// 更新订单状态 // 更新订单状态
updateOrder(orderStatus) { updateOrder(orderStatus) {

2
src/views/Daichuli/Feedback/Inspection/index.vue
View File

@ -440,7 +440,7 @@ export default {
self.geoWorkSpace = pm.geoWorkspace; self.geoWorkSpace = pm.geoWorkspace;
self.geoLayerName = pm.geoLayerName; self.geoLayerName = pm.geoLayerName;
// self.tifPath = pm.ftpPath; // self.tifPath = pm.ftpPath;
//由于空天院内网服务i无拉取外网资源，先改成内网资源访问 //由于空天院内网服务无法拉取外网资源，先改成内网资源访问
let rt = pm.ftpPath.split('/'); let rt = pm.ftpPath.split('/');
self.tifPath ='http://10.0.3.157:18030/inspection/files/' + rt[rt.length - 1]; self.tifPath ='http://10.0.3.157:18030/inspection/files/' + rt[rt.length - 1];
self.projection = pm.projection; self.projection = pm.projection;

2
src/views/Daichuli/index.vue
View File

@ -160,7 +160,7 @@ export default {
}, },
changePage(orderMsg) { changePage(orderMsg) {
// 正射：150424 土水：150208 PL_DF_DF_20220905175209_8648 地表覆盖：150166 PL_DF_DF_20220905112508_4567 叶面积：150533 PL_DF_DF_20230221173349_4569 后向散射系数：152279 // 正射：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");
}, },
}, },
}; };