From 1173ed722818fcf36b942bdb2d15647d981f610b Mon Sep 17 00:00:00 2001 From: "Mr.Dong" <1756465965@qq.com> Date: Fri, 14 Feb 2025 15:26:46 +0800 Subject: [PATCH] =?UTF-8?q?20250214=E4=BB=A3=E7=A0=81=E6=8F=90=E4=BA=A4?= =?UTF-8?q?=E5=A4=87=E4=BB=BD?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- public/config/config.js | 2 +- src/components/orderSearch/index.vue | 5 ++ src/components/ration/qualitative/index.vue | 3 +- src/config/config.js | 5 +- src/lib/request-microwave.js | 2 +- .../Daichuli/Feedback/Inspection/index.vue | 5 +- src/views/Daichuli/Feedback/index.vue | 54 ++++++++----------- src/views/Daichuli/index.vue | 1 + vue.config.js | 8 +-- 9 files changed, 44 insertions(+), 41 deletions(-) diff --git a/public/config/config.js b/public/config/config.js index 12bbdd9..3d1bf74 100644 --- a/public/config/config.js +++ b/public/config/config.js @@ -23,5 +23,5 @@ const YICHULI_URL = "https://caplos.aircas.ac.cn/lxyweb/kjwebAdmin/#/Order/YJYOr const DAISHENHE_URL = "https://caplos.aircas.ac.cn/lxyweb/kjwebAdmin/#/Order/DSHOrder"; const YISHENHE_URL = "https://caplos.aircas.ac.cn/lxyweb/kjwebAdmin/#/Order/YSHOrder"; // const DQYSERVER_URL = "https://caplos.aircas.ac.cn/dqweb"; -const DQYSERVER_URL = "http://192.168.1.205:8089"; +const DQYSERVER_URL = "http://192.168.1.243:8089"; const LXYSERVER_URL = "https://caplos.aircas.ac.cn/lxyweb"; \ No newline at end of file diff --git a/src/components/orderSearch/index.vue b/src/components/orderSearch/index.vue index 8616147..99f1f8e 100644 --- a/src/components/orderSearch/index.vue +++ b/src/components/orderSearch/index.vue @@ -17,6 +17,7 @@ popper-class="date-style" value-format=" yyyy-MM-dd HH:mm:ss" format="yyyy-MM-dd HH:mm:ss" + @change="getDate" > @@ -241,6 +242,10 @@ export default { }; }, methods: { + getDate(){ + this.searchForm.submitDate = this.searchForm.submitDate.join(','); + console.log(this.searchForm.submitDate,'this.searchForm.submitDate'); + }, // 根据卫星选择载荷 bindLoad(val) { const item = this.loadOptions.filter( diff --git a/src/components/ration/qualitative/index.vue b/src/components/ration/qualitative/index.vue index e53b9b6..3010a45 100644 --- a/src/components/ration/qualitative/index.vue +++ b/src/components/ration/qualitative/index.vue @@ -141,6 +141,7 @@ // getSamplesByLayer, // } from "@/api/pendingOrder"; import { + getCoverTypes, getSamplesList, getSampleData, getSamplesByLayer, @@ -258,7 +259,7 @@ export default { } this.funcOpt = this.configration.funcOpt; - // this.getCoverType(); + this.getCoverType(); this.getSqlData(); this.initParam(); }, diff --git a/src/config/config.js b/src/config/config.js index c8e2f76..1f1406f 100644 --- a/src/config/config.js +++ b/src/config/config.js @@ -14,7 +14,8 @@ const prefix = "D:/deveEnvironment/nginx-1.18.0/html/microwaveData/sampleExcel"; //旧版本地址 // const newPrefix = "D:/deveEnvironment/nginx-1.18.0/html/microwaveData/sampleExcelNew"; //新版本地址 -const newPrefix = "D:/WorkTools/apache-tomcat-9.0.93/webapps/microwaveData/sampleExcel"; +// const newPrefix = "D:/WorkTools/apache-tomcat-9.0.93/webapps/microwaveData/sampleExcel"; +const newPrefix = "D:/WorkTools/JDK8/apache-tomcat-8/webapps/microwaveData/sampleExcel"; const url = { otgSamplesPath: `${newPrefix}/otgSamples.xlsx`, //正射1 @@ -34,7 +35,7 @@ const serverUrl = DQYSERVER_URL; const langServerUrl = LXYSERVER_URL; const urlprefix = { // pdfUrlPrefix: `${serverUrl}/microwaveData/pdf/`, - pdfUrlPrefix: `http://192.168.1.205:8081/microwaveData/pdf/`, + pdfUrlPrefix: `http://192.168.1.243:8081/microwaveData/pdf/`, samePoiImgsUrl: `${serverUrl}/microwaveData/samePoiImgs/`, geoserverUrl: `${serverUrl}/geoserver/gwc/service/wmts`, otgGeoServerUrl: `${serverUrl}/geoserver/gwc/service/wmts`, diff --git a/src/lib/request-microwave.js b/src/lib/request-microwave.js index 1c2f005..420c0fe 100644 --- a/src/lib/request-microwave.js +++ b/src/lib/request-microwave.js @@ -4,7 +4,7 @@ import { Message } from "element-ui"; // create an axios instance const service = axios.create({ baseURL: process.env.VUE_APP_MICROWAVE_API, // url = base url + request url - // baseURL: 'http://192.168.1.205:8086/macApi/', // url = base url + request url + // baseURL: 'http://192.168.1.243:8086/macApi/', // url = base url + request url timeout: 5000000 // request timeout }); diff --git a/src/views/Daichuli/Feedback/Inspection/index.vue b/src/views/Daichuli/Feedback/Inspection/index.vue index f73f2a7..ef0b78c 100644 --- a/src/views/Daichuli/Feedback/Inspection/index.vue +++ b/src/views/Daichuli/Feedback/Inspection/index.vue @@ -339,7 +339,9 @@ export default { var smpVal = undefined; var featureMapData = []; const pdType = this.productSubType; - + console.log(this.$refs.otgCorrectionPanel,'$refs.otgCorrectionPanel'); + console.log(this.$refs.qualitativePanel,'$refs.qualitativePanel'); + console.log(this.$refs.soilMositurePanel,'$refs.soilMositurePanel'); if (pdType === productSubTypeVal.ACS_ORTHOPHOTO) { smpVal = this.$refs.otgCorrectionPanel; } else if ( @@ -353,6 +355,7 @@ export default { } this.sampleList = smpVal.multipleSelection; + // if (featureMapData !== [] || featureMapData.length !== 0) // this.updateCoverType(featureMapData); const orderId = this.orderId; diff --git a/src/views/Daichuli/Feedback/index.vue b/src/views/Daichuli/Feedback/index.vue index 3bc5c6c..4682612 100644 --- a/src/views/Daichuli/Feedback/index.vue +++ b/src/views/Daichuli/Feedback/index.vue @@ -87,7 +87,7 @@
{{ - orderMsg.productSubClassId == 39 + orderMsg.productSubClassId == 6 ? "地表覆盖类型表" : "植被物候类型表" }} @@ -150,17 +150,8 @@