diff --git a/src/api/lang/pendingOrder.js b/src/api/lang/pendingOrder.js index a4b8473..28fa0ee 100644 --- a/src/api/lang/pendingOrder.js +++ b/src/api/lang/pendingOrder.js @@ -192,7 +192,7 @@ export function downloadPdf(url) { */ export async function getUserInfo(token) { return request({ - url: YUNGUAN_SERVER_URL+"/app/logincheck?token=" + token, + url: YUNGUAN_SERVER_URL + "/app/logincheck?token=" + token, method: "get", }); } @@ -216,4 +216,12 @@ export function resetCheck(data) { method: "post", data }); +} +// 获取地表覆盖类型 +export function getFeatureMap(userId, orderId) { + return request({ + url: "order/order/getLandCoverTypeImageSystemRelation?userId=" + userId + "&orderId=" + orderId, + method: "get", + withCredentials: true, + }); } \ No newline at end of file diff --git a/src/components/ration/qualitative/index.vue b/src/components/ration/qualitative/index.vue index ddafeae..bf68e2b 100644 --- a/src/components/ration/qualitative/index.vue +++ b/src/components/ration/qualitative/index.vue @@ -21,11 +21,11 @@ - - + + - + diff --git a/src/views/Daichuli/Feedback/Inspection/index.vue b/src/views/Daichuli/Feedback/Inspection/index.vue index af3d4e6..25411ee 100644 --- a/src/views/Daichuli/Feedback/Inspection/index.vue +++ b/src/views/Daichuli/Feedback/Inspection/index.vue @@ -263,7 +263,8 @@ export default { self.productSubType = pdType; // self.featureMapData = om.landCoverTypeVOList; - self.featureMapData = pdType === 39 ? om.landCoverTypeVOList : JSON.parse(am.productMsg.microwaveDataJson).vegetationPhenology; + self.featureMapData = am.groudClassData; + // self.featureMapData = pdType === 39 ? om.landCoverTypeVOList : JSON.parse(am.productMsg.microwaveDataJson).vegetationPhenology; self.formInline = am.metaMsg; self.orderData = am.orderData; diff --git a/src/views/Daichuli/Feedback/index.vue b/src/views/Daichuli/Feedback/index.vue index bff33ca..95728c9 100644 --- a/src/views/Daichuli/Feedback/index.vue +++ b/src/views/Daichuli/Feedback/index.vue @@ -157,6 +157,7 @@ import { updateOrderStage, getSamplesList, getUserInfo, + getFeatureMap, } from "@/api/lang/pendingOrder"; import { productSubTypeVal } from "@/lib/contract.js"; @@ -333,9 +334,22 @@ export default { cu.flyToLayerRect(minLon, minLat, maxLon, maxLat); const proSubId = om.productSubClassId; // 加载地物关联信息 - if (proSubId === 39 || proSubId === 47) { + if (proSubId === 39) { self.groudClassShow = true; - self.groudClassData = proSubId === 39 ? om.landCoverTypeVOList : JSON.parse(pm.microwaveDataJson).vegetationPhenology; + document.cookie = 'KJInspect-Token=' + self.token + getFeatureMap(self.userId, orderId, self.token).then(res => { + if (res.code == 200) { + const rd = res.dataList; + const gda = [] + for (let i in rd) { + gda.push({ imageName: rd[i].name, imageValue: rd[i].imageValue, coverId: rd[i].systemCoverList[0].coverId, coverName: rd[i].systemCoverList[0].coverName }); + } + self.groudClassData = gda; + } + }) + } else if (proSubId === 47) { + self.groudClassShow = true; + self.groudClassData = JSON.parse(pm.microwaveDataJson).vegetationPhenology; } } }); @@ -351,6 +365,7 @@ export default { productMsg: this.productMsg, orderData: this.orderData, metaMsg: this.formInline, + groudClassData: this.groudClassData }; localStorage.setItem( this.configration.path.orderUnprocessed, diff --git a/vue.config.js b/vue.config.js index 2bc3a4c..5f935a7 100644 --- a/vue.config.js +++ b/vue.config.js @@ -36,8 +36,7 @@ module.exports = { }, [process.env.VUE_APP_REALITY_API]: { target: "http://124.16.188.131:28092/microwave", - // target: "http://192.168.8.181:28092/microwave", - // target: "http://192.168.1.104:18092/microwave", + // target: "http://192.168.8.181:18092/microwave", changeOrigin: true, pathRewrite: { ["^" + process.env.VUE_APP_REALITY_API]: "" @@ -45,7 +44,7 @@ module.exports = { }, [process.env.VUE_APP_FILE_API]: { target: "http://124.16.188.131:28093/file", - // target: "http://192.168.8.181:28093/file", + // target: "http://192.168.8.181:18093/file", changeOrigin: true, pathRewrite: { ["^" + process.env.VUE_APP_FILE_API]: ""