diff --git a/public/config/config.js b/public/config/config.js index 71b61ed..12bbdd9 100644 --- a/public/config/config.js +++ b/public/config/config.js @@ -22,5 +22,6 @@ const DAICHULI_URL = "https://caplos.aircas.ac.cn/lxyweb/kjwebAdmin/#/Order/DJYO const YICHULI_URL = "https://caplos.aircas.ac.cn/lxyweb/kjwebAdmin/#/Order/YJYOrder"; 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 = "https://caplos.aircas.ac.cn/dqweb"; +const DQYSERVER_URL = "http://192.168.1.205:8089"; const LXYSERVER_URL = "https://caplos.aircas.ac.cn/lxyweb"; \ No newline at end of file diff --git a/src/components/home/parameter/index.vue b/src/components/home/parameter/index.vue index fb2f591..b437000 100644 --- a/src/components/home/parameter/index.vue +++ b/src/components/home/parameter/index.vue @@ -286,7 +286,7 @@ -
+ + + -
+ -->
diff --git a/src/config/config.js b/src/config/config.js index f3608c7..ef8b5fb 100644 --- a/src/config/config.js +++ b/src/config/config.js @@ -6,12 +6,15 @@ const path = { yichuli: "/yichuli", daishenhe: "/daishenhe", yishenhe: "/yishenhe", - login: "/" + login: "/", }; const prefix = "D:/deveEnvironment/nginx-1.18.0/html/microwaveData/sampleExcel"; // const newPrefix = "/home/estar/eStarProject/webProject/microwave-project/microwaveData/sampleData"; -const newPrefix = "D:/deveEnvironment/nginx-1.18.0/html/microwaveData/sampleExcelNew"; +//旧版本地址 +// const newPrefix = "D:/deveEnvironment/nginx-1.18.0/html/microwaveData/sampleExcelNew"; +//新版本地址 +const newPrefix = "D:/WorkTools/apache-tomcat-9.0.93/webapps/microwaveData/sampleExcel"; const url = { otgSamplesPath: `${newPrefix}/otgSamples.xlsx`, //正射1 @@ -25,15 +28,15 @@ const url = { demSamplePath: `${newPrefix}/demSample.xlsx`, // 高程产品2 ssiSamplePath: `${newPrefix}/Soil_Salinity_Inversion_Sample.xlsx`, // 土壤盐碱度8 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 = DQYSERVER_URL; const langServerUrl = LXYSERVER_URL; const urlprefix = { pdfUrlPrefix: `${serverUrl}/microwaveData/pdf/`, samePoiImgsUrl: `${serverUrl}/microwaveData/samePoiImgs/`, - geoserverUrl: `${langServerUrl}/geoserver/gwc/service/wmts`, - otgGeoServerUrl: `${langServerUrl}/geoserver/gwc/service/wmts` + geoserverUrl: `${serverUrl}/geoserver/gwc/service/wmts`, + otgGeoServerUrl: `${serverUrl}/geoserver/gwc/service/wmts`, // otgGeoServerUrl: `${serverUrl}:8087/geoserver/gwc/service/wmts` }; @@ -50,87 +53,87 @@ const subProductName = [ "地表粗糙度", //9 "植被高度", //10 "叶面积指数", //11 - "植被物候" //12 + "植被物候", //12 ]; // 地物类型名称 const groTypeName = [ { value: "城市", - label: "城市" + label: "城市", }, { value: "水体", - label: "水体" + label: "水体", }, { value: "森林", - label: "森林" + label: "森林", }, { value: "灌木地", - label: "灌木地" + label: "灌木地", }, { value: "草地", - label: "草地" + label: "草地", }, { value: "水域", - label: "水域" + label: "水域", }, { value: "山地", - label: "山地" - } + label: "山地", + }, ]; // 植被物候地物类型名称 const vegetationPhenologyGroTypeName = [ { value: "出芽期", - label: "出芽期" + label: "出芽期", }, { value: "分蘖期", - label: "分蘖期" + label: "分蘖期", }, { value: "越冬期", - label: "越冬期" + label: "越冬期", }, { value: "返青期", - label: "返青期" + label: "返青期", }, { value: "起身期", - label: "起身期" + label: "起身期", }, { value: "拔节期", - label: "拔节期" + label: "拔节期", }, { value: "孕穗期", - label: "孕穗期" + label: "孕穗期", }, { value: "抽穗期", - label: "抽穗期" + label: "抽穗期", }, { value: "扬花期", - label: "扬花期" + label: "扬花期", }, { value: "灌浆期", - label: "灌浆期" + label: "灌浆期", }, { value: "成熟期", - label: "成熟期" - } + label: "成熟期", + }, ]; // 抽样方法 @@ -142,25 +145,25 @@ const funcOpt = [ pixelDealFun: [ { name: "均值法", - value: "1" + value: "1", }, { name: "最邻近法", - value: "6" + value: "6", }, { name: "克里格法", - value: "7" + value: "7", }, { name: "块克里格法", - value: "9" + value: "9", }, { name: "MSN法", - value: "10" - } - ] + value: "10", + }, + ], }, { name: "分层抽样", @@ -169,19 +172,19 @@ const funcOpt = [ pixelDealFun: [ { name: "MSN法", - value: "10" - } + value: "10", + }, ], children: [ { value: "0", - label: "深度空间分层" + label: "深度空间分层", }, { value: "1", - label: "场站网空间分层" - } - ] + label: "场站网空间分层", + }, + ], }, { name: "等距抽样", @@ -190,26 +193,26 @@ const funcOpt = [ pixelDealFun: [ { name: "均值法", - value: "1" + value: "1", }, { name: "最邻近法", - value: "6" + value: "6", }, { name: "克里格法", - value: "7" + value: "7", }, { name: "块克里格法", - value: "9" + value: "9", }, { name: "MSN法", - value: "10" - } - ] - } + value: "10", + }, + ], + }, ]; export default { @@ -219,5 +222,5 @@ export default { subProductName, groTypeName, vegetationPhenologyGroTypeName, - funcOpt + funcOpt, }; diff --git a/src/lib/cesiumUtils.js b/src/lib/cesiumUtils.js index 72139fa..46f942b 100644 --- a/src/lib/cesiumUtils.js +++ b/src/lib/cesiumUtils.js @@ -87,6 +87,7 @@ class CesiumUtils { } //添加wms static addlayer(geoWorkspace, layerName) { + console.log(geoWorkspace, layerName); let matrixIds = [ "EPSG:4326:0", "EPSG:4326:1", diff --git a/src/lib/request-file.js b/src/lib/request-file.js index 7741b46..cadddc2 100644 --- a/src/lib/request-file.js +++ b/src/lib/request-file.js @@ -3,8 +3,8 @@ import { Message } from "element-ui"; // create an axios instance const service = axios.create({ - // baseURL: process.env.VUE_APP_FILE_API, // url = base url + request url - baseURL: 'https://caplos.aircas.ac.cn/dqserver3/file/', // url = base url + request url + baseURL: process.env.VUE_APP_FILE_API, // url = base url + request url + // baseURL: 'https://caplos.aircas.ac.cn/dqserver3/file/', // url = base url + request url timeout: 5000000 // request timeout }); diff --git a/src/lib/request-microwave.js b/src/lib/request-microwave.js index 8a739cc..88a19f3 100644 --- a/src/lib/request-microwave.js +++ b/src/lib/request-microwave.js @@ -3,8 +3,8 @@ 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://10.0.31.126:8086/macApi/', // url = base url + request url + baseURL: process.env.VUE_APP_MICROWAVE_API, // url = base url + request url + // baseURL: 'http://10.0.31.126:8086/macApi/', // url = base url + request url timeout: 5000000 // request timeout }); diff --git a/src/lib/request-reality.js b/src/lib/request-reality.js index d98393a..cbb54b2 100644 --- a/src/lib/request-reality.js +++ b/src/lib/request-reality.js @@ -3,8 +3,8 @@ import { Message } from "element-ui"; // create an axios instance const service = axios.create({ - // baseURL: process.env.VUE_APP_REALITY_API, // url = base url + request url - baseURL: 'https://caplos.aircas.ac.cn/dqserver2/microwave/', // url = base url + request url + baseURL: process.env.VUE_APP_REALITY_API, // url = base url + request url + // baseURL: 'https://caplos.aircas.ac.cn/dqserver2/microwave/', // url = base url + request url timeout: 5000000 // request timeout }); diff --git a/src/views/Home.vue b/src/views/Home.vue index a87a189..3154e42 100644 --- a/src/views/Home.vue +++ b/src/views/Home.vue @@ -1,6 +1,6 @@