diff --git a/package.json b/package.json index ccafc60..368b761 100644 --- a/package.json +++ b/package.json @@ -3,10 +3,10 @@ "version": "0.1.0", "private": true, "scripts": { - "serve": "SET NODE_OPTIONS=--openssl-legacy-provider && vue-cli-service serve", - "start": "SET NODE_OPTIONS=--openssl-legacy-provider && vue-cli-service serve", - "build": "SET NODE_OPTIONS=--openssl-legacy-provider && vue-cli-service build", - "lint": "SET NODE_OPTIONS=--openssl-legacy-provider && vue-cli-service lint" + "serve": "vue-cli-service serve", + "start": "vue-cli-service serve", + "build": "vue-cli-service build", + "lint": "vue-cli-service lint" }, "dependencies": { "@turf/turf": "^7.1.0", diff --git a/public/config/config.js b/public/config/config.js index 7d2578e..71b61ed 100644 --- a/public/config/config.js +++ b/public/config/config.js @@ -6,11 +6,21 @@ // const DAISHENHE_URL = "http://10.0.3.157:18030/kjwebAdmin-test/#/Order/DSHOrder"; // const YISHENHE_URL = "http://10.0.3.157:18030/kjwebAdmin-test/#/Order/YSHOrder"; // const YUNGUAN_SERVER_URL = "http://10.0.3.157:18030/yunguan-app"; -const LXYLOGIN_URL = "https://124.16.188.131:9699/lxyweb/kjwebAdmin-test/#/login"; -const YUNGUAN_SERVER_URL = "https://124.16.188.131:9699/lxyweb/yunguan-app"; -const DAICHULI_URL = "https://124.16.188.131:9699/lxyweb/kjwebAdmin/#/Order/DJYOrder"; -const YICHULI_URL = "https://124.16.188.131:9699/lxyweb/kjwebAdmin/#/Order/YJYOrder"; -const DAISHENHE_URL = "https://124.16.188.131:9699/lxyweb/kjwebAdmin/#/Order/DSHOrder"; -const YISHENHE_URL = "https://124.16.188.131:9699/lxyweb/kjwebAdmin/#/Order/YSHOrder"; -const DQYSERVER_URL = "https://124.16.188.131:28085"; -const LXYSERVER_URL = "https://124.16.188.131:9699/lxyweb"; + +// const LXYLOGIN_URL = "https://124.16.188.131:9699/lxyweb/kjwebAdmin-test/#/login"; +// const YUNGUAN_SERVER_URL = "https://124.16.188.131:9699/lxyweb/yunguan-app"; +// const DAICHULI_URL = "https://124.16.188.131:9699/lxyweb/kjwebAdmin/#/Order/DJYOrder"; +// const YICHULI_URL = "https://124.16.188.131:9699/lxyweb/kjwebAdmin/#/Order/YJYOrder"; +// const DAISHENHE_URL = "https://124.16.188.131:9699/lxyweb/kjwebAdmin/#/Order/DSHOrder"; +// const YISHENHE_URL = "https://124.16.188.131:9699/lxyweb/kjwebAdmin/#/Order/YSHOrder"; +// const DQYSERVER_URL = "https://124.16.188.131:28085"; +// const LXYSERVER_URL = "https://124.16.188.131:9699/lxyweb"; + +const LXYLOGIN_URL = "https://caplos.aircas.ac.cn/lxyweb/kjwebAdmin-test/#/login"; +const YUNGUAN_SERVER_URL = "https://caplos.aircas.ac.cn/lxyweb/yunguan-app"; +const DAICHULI_URL = "https://caplos.aircas.ac.cn/lxyweb/kjwebAdmin/#/Order/DJYOrder"; +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 LXYSERVER_URL = "https://caplos.aircas.ac.cn/lxyweb"; \ No newline at end of file diff --git a/src/lib/request-file.js b/src/lib/request-file.js index 2c31da3..781f3a8 100644 --- a/src/lib/request-file.js +++ b/src/lib/request-file.js @@ -3,7 +3,7 @@ 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 timeout: 5000000 // request timeout }); diff --git a/src/lib/request-microwave.js b/src/lib/request-microwave.js index 3ef849c..4c3b20e 100644 --- a/src/lib/request-microwave.js +++ b/src/lib/request-microwave.js @@ -3,7 +3,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://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 0f86a8d..9c163ae 100644 --- a/src/lib/request-reality.js +++ b/src/lib/request-reality.js @@ -3,7 +3,7 @@ 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 timeout: 5000000 // request timeout }); diff --git a/src/lib/request.js b/src/lib/request.js index bdb1862..ddd1ddd 100644 --- a/src/lib/request.js +++ b/src/lib/request.js @@ -3,7 +3,7 @@ import { Message } from "element-ui"; // create an axios instance const service = axios.create({ - baseURL: process.env.VUE_APP_BASE_API, // url = base url + request url + baseURL: "https://caplos.aircas.ac.cn/lxyweb/", // url = base url + request url timeout: 5000000 // request timeout }); diff --git a/src/router/index.js b/src/router/index.js index 115c570..74a7830 100644 --- a/src/router/index.js +++ b/src/router/index.js @@ -131,7 +131,7 @@ VueRouter.prototype.push = function push(location) { } const router = new VueRouter({ - mode:'history', + mode:'hash', routes })