From bf29d13557c05ccb25a55a8adcafed8df3fd6985 Mon Sep 17 00:00:00 2001 From: duxiaoning <17621883433@163.com> Date: Mon, 16 Jan 2023 13:47:07 +0800 Subject: [PATCH] =?UTF-8?q?=E6=AD=A3=E5=B0=84=E5=90=8C=E5=90=8D=E7=82=B9?= =?UTF-8?q?=E9=80=89=E5=8F=96?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- public/config/config.js | 2 + public/index.html | 1 + src/api/lang/pendingOrder.js | 25 +- src/components/ration/otgCorrection/index.vue | 170 ++++++++-- .../Feedback/Inspection/Report/index.vue | 15 +- .../Daichuli/Feedback/Inspection/index.vue | 297 ++++++++++++++---- src/views/Daichuli/Feedback/index.vue | 4 +- 7 files changed, 394 insertions(+), 120 deletions(-) create mode 100644 public/config/config.js diff --git a/public/config/config.js b/public/config/config.js new file mode 100644 index 0000000..2f4f179 --- /dev/null +++ b/public/config/config.js @@ -0,0 +1,2 @@ +const DAICHULI_URL = "http://10.0.3.157:18030/kjwebAdmin/#/Order/DJYOrder"; +const YUNGUAN_SERVER_URL = "http://10.0.3.157:18030/yunguan-app"; diff --git a/public/index.html b/public/index.html index 2f9f11f..9c84250 100644 --- a/public/index.html +++ b/public/index.html @@ -5,6 +5,7 @@ + 微波 diff --git a/src/api/lang/pendingOrder.js b/src/api/lang/pendingOrder.js index a8fd50e..a696f6b 100644 --- a/src/api/lang/pendingOrder.js +++ b/src/api/lang/pendingOrder.js @@ -1,5 +1,6 @@ import request from "@/lib/request"; import realityRequest from "@/lib/request-reality"; +import fileRequest from "@/lib/request-file"; // 查询订单基本信息 export function getOrderMsg(orderId) { @@ -163,7 +164,7 @@ export function checkReality(data) { // 导出pdf模板 export function exportWord(data, pdfName, localTiffPath, httpTiffPath, productType) { - return realityRequest({ + return fileRequest({ url: "importPDF/importWordAndPDF?reportName=" + pdfName + @@ -195,8 +196,20 @@ export function downloadPdf(url) { */ export async function getUserInfo(token) { return request({ - url: '/app/logincheck?token=' + token, - method: 'get', - baseURL: 'http://10.0.3.157:18030/yunguan-app' - }) -} \ No newline at end of file + url: "/app/logincheck?token=" + token, + method: "get", + baseURL: "http://10.0.3.157:18030/yunguan-app" + }); +} +/** + * 根据proj转换坐标 + * @param {*} options + * @returns + */ +export function getProjPos(options) { + return fileRequest({ + url: "importPDF/zbZh", + method: "post", + data: options + }); +} diff --git a/src/components/ration/otgCorrection/index.vue b/src/components/ration/otgCorrection/index.vue index 949798a..6b88d54 100644 --- a/src/components/ration/otgCorrection/index.vue +++ b/src/components/ration/otgCorrection/index.vue @@ -7,24 +7,54 @@
- - + + - + 确定 - + @@ -113,6 +192,7 @@ import { getSampleData, getSamplesByLayer, setSamePoi, + getProjPos, } from "@/api/lang/pendingOrder"; import otgCesiumUtils from "@/lib/otgCesiumUtils"; @@ -157,6 +237,9 @@ export default { productSubType: { require: true, }, + projection: { + require: true, + }, }, data() { return { @@ -312,7 +395,7 @@ export default { } }); } else { - console.log('111111',st); + console.log("111111", st); const spFrom = new FormData(); spFrom.append("sampleFun", Number(ssf[0])); //抽样方法 spFrom.append("minNum", 0); @@ -348,7 +431,7 @@ export default { this.ckPoint = false; const cus = this.configration.urlprefix.samePoiImgsUrl; if (row.collectPointSignPic !== null) { - console.log('111111', row.collectPointSignPic); + console.log("111111", row.collectPointSignPic); this.collectPointSignPic = row.collectPointSignPic; var alImgDom = document.getElementById("alImg"); alImgDom.src = this.collectPointSignPic; @@ -369,9 +452,32 @@ export default { }, // 保存相同的点 saveSamePoi() { - this.ckPoint = true; - this.savePoint = true; - otgCesiumUtils.stopDrowPoi(); + const rc = this.radioClkMsg; + const samePoi = new FormData(); + samePoi.append("landDataAssociatedID", rc.id); + samePoi.append("sameNamePointLong", rc.sameNameLong); + samePoi.append("sameNamePointLat", rc.sameNameLat); + getProjPos({ + project: this.projection, + lon: rc.sameNameLong, + lat: rc.sameNameLat, + }).then((res) => { + if (res.code === 200) { + samePoi.append("projectionSameNamePointLon", rc.sameNameLong); + samePoi.append("projectionSameNamePointLat", rc.sameNameLat); + setSamePoi(samePoi).then((res) => { + if (res.code === 200) { + this.$message({ + message: "同名点保存成功", + type: "success", + }); + this.ckPoint = true; + this.savePoint = true; + otgCesiumUtils.stopDrowPoi(); + } + }); + } + }); }, changeImg(val) { var alImgDom = document.getElementById("alImg"); @@ -393,7 +499,7 @@ export default { this.multipleSelection = this.allSampleData = this.simpleData = - res.data.list; + res.data.list; this.loading = false; this.$refs.multipleTable.toggleAllSelection(); let min = Number.MAX_SAFE_INTEGER; diff --git a/src/views/Daichuli/Feedback/Inspection/Report/index.vue b/src/views/Daichuli/Feedback/Inspection/Report/index.vue index 2da2f74..60498ae 100644 --- a/src/views/Daichuli/Feedback/Inspection/Report/index.vue +++ b/src/views/Daichuli/Feedback/Inspection/Report/index.vue @@ -182,20 +182,12 @@ import RtReport from "@/components/rtReport"; import QtReport from "@/components/qtReport"; import PdfLoad from "@/components/pdfLoad"; import cu from "@/lib/cesiumUtils"; -import { - // downloadPdf, - // updateOrderStage, - // updateOrderMsg, - // disOrderStatus, - // addReportMsg, - exportWord, -} from "@/api/pendingOrder"; - import { saveValidationRes, saveReport, downloadPdf, updateOrderStage, + exportWord, } from "@/api/lang/pendingOrder"; import { productSubTypeVal, truthFunVal } from "@/lib/contract.js"; @@ -509,7 +501,7 @@ export default { type: "success", message: "订单处理成功", }); - this.$router.push({ name: "待处理的检验订单" }); + window.location.href =`${DAICHULI_URL}?orderid=${this.reportMsg.orderId}&token=WEB%2a1673425993482%40L3W7_ZZX-yg000087_06848633de364ec7b63c8f53f9e43b19`; } }); } @@ -520,8 +512,7 @@ export default { reExamine() { const os = 0; this.updateOrder(os); - this.$router.push({ path: "http://211.157.180.211:18085/" }); - // this.$router.push(`http://10.0.3.157:18030/kjwebAdmin/#/Order/DJYOrder?orderid=${this.reportMsg.orderId}&token=WEB%2a1673425993482%40L3W7_ZZX-yg000087_06848633de364ec7b63c8f53f9e43b19`); + window.location.href =`${DAICHULI_URL}?orderid=${this.reportMsg.orderId}&token=WEB%2a1673425993482%40L3W7_ZZX-yg000087_06848633de364ec7b63c8f53f9e43b19`; }, // 更新订单状态 updateOrder(orderStatus) { diff --git a/src/views/Daichuli/Feedback/Inspection/index.vue b/src/views/Daichuli/Feedback/Inspection/index.vue index dfb1b83..a798e7e 100644 --- a/src/views/Daichuli/Feedback/Inspection/index.vue +++ b/src/views/Daichuli/Feedback/Inspection/index.vue @@ -4,25 +4,65 @@ -
+
订单信息
- - + + - + - + - + - + - + 查看 @@ -35,56 +75,128 @@ 元数据查看
- + - + - + - + - + - + -
+
- + - + - + - + - +
- + - + - +
@@ -92,15 +204,29 @@
- - + +
- 取消 - 确定 + 取消 + 确定
@@ -114,29 +240,50 @@ 目标分辨率：{{ pixelNum }} - + - - - - + + + + @@ -151,8 +298,18 @@
- - + + @@ -160,8 +317,12 @@
- 取消 - 确定 + 取消 + 确定
@@ -194,7 +355,7 @@ export default { if ( Object.keys(this.$route.params).length > 0 && sessionStorage.getItem("prePage") === - this.configration.path.orderUnprocessed + this.configration.path.orderUnprocessed ) { this.queryParams = this.$route.params; } else { @@ -242,6 +403,7 @@ export default { geoLayerName: "", geoLayerPos: [], tifPath: "", + projection: null, orderData: [], sampleList: [], pdShow: false, @@ -258,7 +420,7 @@ export default { const pdType = om.productSubClassId; self.productSubType = pdType; - self.featureMapData = om.landCoverTypeVOList + self.featureMapData = om.landCoverTypeVOList; self.formInline = am.metaMsg; self.orderData = am.orderData; self.pixelNum = am.metaMsg.resRatio; @@ -274,6 +436,7 @@ export default { self.geoWorkSpace = pm.geoWorkspace; self.geoLayerName = pm.geoLayerName; self.tifPath = pm.ftpPath; + self.projection = pm.projection; // 赋值真实性检验方法 getAnalyseMethod(self.orderId).then((res) => { @@ -322,7 +485,7 @@ export default { } }, todaichuli() { - this.$router.push(this.configration.path.daichuli); + window.location.href =`${DAICHULI_URL}?orderid=${this.orderId}&token=WEB%2a1673425993482%40L3W7_ZZX-yg000087_06848633de364ec7b63c8f53f9e43b19`; }, changepage() { if (this.hasPixelFun && this.pixelFun === "") { @@ -363,7 +526,7 @@ export default { } // 关联的样本数据入库 const allSampleData = smpVal.allSampleData; - this.addCotSamples(this.sampleList,allSampleData,orderId) + this.addCotSamples(this.sampleList, allSampleData, orderId); //更新真实性检验方法 this.updateTruthFun(orderId, tcf); @@ -601,7 +764,7 @@ export default { background-color: #354595; } -/deep/.el-radio__input.is-checked+.el-radio__label { +/deep/.el-radio__input.is-checked + .el-radio__label { color: #606266; } diff --git a/src/views/Daichuli/Feedback/index.vue b/src/views/Daichuli/Feedback/index.vue index 7a467f2..63d46af 100644 --- a/src/views/Daichuli/Feedback/index.vue +++ b/src/views/Daichuli/Feedback/index.vue @@ -275,8 +275,6 @@ export default { if (userMsg.code === 200) { self.userId = userMsg.data.userid; } - // userid: "ZZX-yg000087" - // username: "yhhuser@163.com" const orderId = (self.orderId = this.$route.query.orderId); getOrderMsg(orderId).then((res) => { if (res.code === 200) { @@ -356,7 +354,7 @@ export default { this.isShow = !this.isShow; }, todaichuli() { - this.$router.push(this.configration.path.daichuli); + window.location.href =`${DAICHULI_URL}?orderid=${this.orderId}&token=WEB%2a1673425993482%40L3W7_ZZX-yg000087_06848633de364ec7b63c8f53f9e43b19`; }, backpage() { this.$router.go(-1);