diff --git a/src/components/ration/otgCorrection/index.vue b/src/components/ration/otgCorrection/index.vue index 1c6eb95..dd1f48b 100644 --- a/src/components/ration/otgCorrection/index.vue +++ b/src/components/ration/otgCorrection/index.vue @@ -312,6 +312,7 @@ export default { } }); } else { + console.log('111111',st); const spFrom = new FormData(); spFrom.append("sampleFun", Number(ssf[0])); //抽样方法 spFrom.append("minNum", 0); @@ -406,7 +407,7 @@ export default { if (this.allSampleData.length > 0) { this.$store.commit("setAltRange", min + "," + (max + 1)); } - this.simpleDataTotal = this.total = res.data.length; + this.simpleDataTotal = this.total = res.data.list.length; } }); }, diff --git a/src/config/config.js b/src/config/config.js index 3a7c70d..9ac01d8 100644 --- a/src/config/config.js +++ b/src/config/config.js @@ -28,13 +28,14 @@ const url = { 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://192.168.1.104"; // const serverUrl = "http://211.157.180.211"; const urlprefix = { - pdfUrlPrefix: `${serverUrl}:18085/microwaveData/pdf/`, - samePoiImgsUrl: `${serverUrl}:18085/microwaveData/samePoiImgs/`, - geoserverUrl: `http://10.0.3.157:18030/geoserver/gwc/service/wmts`, - otgGeoServerUrl: `http://10.0.3.157:18030/geoserver/gwc/service/wmts`, + pdfUrlPrefix: `${serverUrl}:8085/microwaveData/pdf/`, + samePoiImgsUrl: `${serverUrl}:8085/microwaveData/samePoiImgs/`, + geoserverUrl: `${langServerUrl}:18030/geoserver/gwc/service/wmts`, + otgGeoServerUrl: `${langServerUrl}:18030/geoserver/gwc/service/wmts`, // otgGeoServerUrl: `${serverUrl}:8087/geoserver/gwc/service/wmts` }; diff --git a/src/views/Daichuli/Feedback/Inspection/index.vue b/src/views/Daichuli/Feedback/Inspection/index.vue index 76598dc..70080b7 100644 --- a/src/views/Daichuli/Feedback/Inspection/index.vue +++ b/src/views/Daichuli/Feedback/Inspection/index.vue @@ -196,7 +196,7 @@ v-else > -
+
真实性检验方法
@@ -433,22 +433,22 @@ export default { self.geoLayerName = pm.geoLayerName; self.tifPath = pm.ftpPath; - // 赋值真实性检验方法 - getAnalyseMethod(self.orderId).then((res) => { - // console.log('真实性检验',res); - if (res.code === 200) { - let truthFun = res.data.default; - if (res.data.selected.length !== 0) truthFun = res.data.selected; - if (truthFun.length !== 0) { - const tfArr = []; - for (let i in truthFun) { - tfArr.push(truthFun[i].id); - } - self.formInline.truthCheckFun = tfArr; - self.truthFun = true; - } - } - }); + // // 赋值真实性检验方法 + // getAnalyseMethod(self.orderId).then((res) => { + // // console.log('真实性检验',res); + // if (res.code === 200) { + // let truthFun = res.data.default; + // if (res.data.selected.length !== 0) truthFun = res.data.selected; + // if (truthFun.length !== 0) { + // const tfArr = []; + // for (let i in truthFun) { + // tfArr.push(truthFun[i].id); + // } + // self.formInline.truthCheckFun = tfArr; + // self.truthFun = true; + // } + // } + // }); // 赋值像元级处理方法 if (om.processMethods !== null) { diff --git a/src/views/Daichuli/Feedback/index.vue b/src/views/Daichuli/Feedback/index.vue index 51d683d..b9c23a7 100644 --- a/src/views/Daichuli/Feedback/index.vue +++ b/src/views/Daichuli/Feedback/index.vue @@ -10,44 +10,19 @@
订单信息
- - + + - + - + - + 查看 @@ -59,37 +34,18 @@ 元数据查看
- + - + - + - + - + @@ -97,100 +53,57 @@ -
+
- + - + - + - + - +
- 待检验产品预览下载 + 待检验产品预览下载
- +
-
+
- {{ + {{ orderMsg.productSubClassId == 39 ? "地表覆盖类型表" : "植被物候类型表" }}
- + - - + +
处理 - 无法处理 + 无法处理 取消
@@ -199,65 +112,35 @@
反馈信息
- + - + - +
- - 上传图片 + + 上传图片
- +
保存 - 取 消 + 取 消
@@ -385,17 +268,16 @@ export default { }; }, methods: { - initOrderMsg() { + async initOrderMsg() { const self = this; const token = this.$route.query.token; - // const userMsg = await getUserInfo(token); - // // userid: "ZZX-yg000087" - // // username: "yhhuser@163.com" + const userMsg = await getUserInfo(token); + if (userMsg.code === 200) { + self.userId = userMsg.data.userid; + } + // userid: "ZZX-yg000087" + // username: "yhhuser@163.com" const orderId = (self.orderId = this.$route.query.orderId); - // if (res.code === 200) { - // self.userId = userMsg.data.userid; - // } - self.userId = this.$route.query.userId; getOrderMsg(orderId).then((res) => { if (res.code === 200) { self.orderMsg = res.data; @@ -430,7 +312,7 @@ export default { pm.productSpaceResolution > 0.01 ? pm.productSpaceResolution + "米" : (pm.productSpaceResolution * 111194.926).toFixed(2) + - "米", + "米", coordinateSys: pm.coordinateSystem, minLat: minLat, maxLat: maxLat, @@ -774,7 +656,7 @@ export default { background-color: #354595; } -/deep/.cstop .el-radio__input.is-checked + .el-radio__label { +/deep/.cstop .el-radio__input.is-checked+.el-radio__label { color: #606266; } diff --git a/src/views/Daichuli/index.vue b/src/views/Daichuli/index.vue index a46b174..232fb59 100644 --- a/src/views/Daichuli/index.vue +++ b/src/views/Daichuli/index.vue @@ -159,20 +159,8 @@ export default { } }, changePage(orderMsg) { - // this.$router.push("/orderUnprocessed"); - this.$router.push("/orderUnprocessed?orderId=150375&token=WEB*1673425993482@L3W7_ZZX-yg000087_06848633de364ec7b63c8f53f9e43b19"); - // localStorage.setItem( - // this.configration.path.daichuli, - // JSON.stringify(orderMsg) - // ); - // updateOrderStatus(orderMsg.id).then((res) => { - // if (res?.code === 401) { - // this.$message.warning(res.msg); - // return false; - // } else { - // this.$router.push({ name: "订单反馈", params: orderMsg }); - // } - // }); + // 正射：150424 土水：150208 + this.$router.push("/orderUnprocessed?orderId=150166&token=WEB*1673425993482@L3W7_ZZX-yg000087_06848633de364ec7b63c8f53f9e43b19"); }, }, };