xujuanning hai 1 mes
pai
achega
5537618664
Modificáronse 5 ficheiros con 55 adicións e 20 borrados
  1. 6 4
      .env.development
  2. 9 5
      .env.production
  3. 1 1
      src/utils/request.js
  4. 24 7
      src/views/rateAnalysis/index.vue
  5. 15 3
      vue.config.js

+ 6 - 4
.env.development

@@ -12,20 +12,22 @@ VUE_APP_DIALOG_NUM = 8
 VUE_APP_DIALOG_POINT = contextmenu
 # 综合报警
 # VUE_APP_ALARM=http://123.60.219.66:48080
-VUE_APP_ALARM=https://10.220.1.5:6015
+# VUE_APP_ALARM=https://10.220.1.5:6015
+VUE_APP_ALARM=/api6015
 
 
-VUE_APP_API=https://10.220.1.5:6060
+VUE_APP_API=/api6060
+# VUE_APP_API=https://10.220.1.5:6060
 # VUE_APP_API=http://10.220.1.244:6060
 
 
 VUE_APP_URL=https://10.220.1.5:5300
 # VUE_APP_URL=https://10.112.33.5:5300
 
-VUE_APP_URL2=https://127.0.0.1:8080
+VUE_APP_URL2=https://10.220.1.5:8080
 # VUE_APP_URL2=http://10.112.33.5:8081
 
-VUE_APP_REPORT=https://10.220.1.5:8001
+VUE_APP_REPORT=https://10.220.1.5:8080
 # VUE_APP_REPORT=https://10.112.33.5:8001
 
 VUE_APP_GENERAT_URL=https://10.220.1.5:6060

+ 9 - 5
.env.production

@@ -15,29 +15,33 @@ VUE_APP_DIALOG_NUM = 8
 #趋势对比鼠标点击
 VUE_APP_DIALOG_POINT = contextmenu
 # 综合报警
+VUE_APP_ALARM=/api6015
 # VUE_APP_ALARM=https://10.220.1.5:6015
-VUE_APP_ALARM=https://10.112.33.5:6015
+# VUE_APP_ALARM=https://10.112.33.5:6015
 # VUE_APP_ALARM=http://123.60.219.66:48080
 # 登录
 # VUE_APP_VUE_LOGIN_URL=http://10.220.1.8:48080
 # VUE_APP_VUE_LOGIN_URL=http://123.60.219.66:48080
 
 
+VUE_APP_API=/api6060
 # VUE_APP_API=https://10.220.1.5:6060
-VUE_APP_API=https://10.112.33.5:6060
+# VUE_APP_API=https://10.112.33.5:6060
 # VUE_APP_TEST=http://10.81.3.155:9002
 # VUE_APP_WS='ws://10.81.3.155:9002'
 # VUE_APP_ADAPTERURL=http://10.81.3.155:8011
 
+# VUE_APP_REPORT=https://10.220.1.5:8080
+VUE_APP_REPORT=https://10.112.33.5:8081
+# VUE_APP_REPORT=https://10.220.1.5:8443
+# VUE_APP_REPORT=https://10.112.33.5:8443
+
 # VUE_APP_URL=https://10.220.1.5:5300
 VUE_APP_URL=https://10.112.33.5:5300
 
 # VUE_APP_URL2=https://10.220.1.5:8080
 VUE_APP_URL2=https://10.112.33.5:8081
 
-# VUE_APP_REPORT=https://10.220.1.5:8443
-VUE_APP_REPORT=https://10.112.33.5:8443
-
 # VUE_APP_WS_URL=ws://10.220.1.5:6014
 VUE_APP_WS_URL=ws://10.112.33.5:6014
 

+ 1 - 1
src/utils/request.js

@@ -18,7 +18,7 @@ axios.defaults.headers['Content-Type'] = 'application/json;charset=utf-8'
 // 创建axios实例
 const service = axios.create({
     // axios中请求配置有baseURL选项,表示请求URL公共部分
-    baseURL: process.env.VUE_APP_GENERAT_URL,
+    baseURL: process.env.VUE_APP_API,
     // 超时
     timeout: 180000,
     headers: {

+ 24 - 7
src/views/rateAnalysis/index.vue

@@ -384,6 +384,7 @@ import { useStore } from "vuex";
 import httpRequest from "@/utils/request.js";
 import tools from "@tools/htmlToPdf.js";
 import jsonData from "./components/data.json";
+import axios from "axios"
 // import flowerRes from '@/data/flower.json'
 // import lineChartRes from '@/data/lineNew.json'
 /**配置参数 */
@@ -424,11 +425,21 @@ const funExcelCheckChange = ({ checkArr, data }) => {
 const tableData = ref([]);
 const tableColumn = ref([]);
 const tableDataGet = async () => {
-  const res = await httpRequest.get(`${process.env.VUE_APP_API}/wind/show`, {
-    params: {
+  const res = await axios({
+    method:"GET",
+    baseURL:process.env.VUE_APP_API,
+    url:"/wind/show",
+       params: {
       id: excelCheckIds.value.join(),
     },
   });
+  console.log(111,res)
+  // const res = await httpRequest.get(`${process.env.VUE_APP_API}/wind/show`, {
+  //   params: {
+  //     id: excelCheckIds.value.join(),
+  //   },
+  // });
+  
   tableColumn.value = res.data.title.map((o) => {
     return {
       prop: o.key,
@@ -460,9 +471,15 @@ const funRepeatMap = (arr) => {
   });
 };
 const funGetTree = async () => {
-  const res = await httpRequest.get(
-    `${process.env.VUE_APP_ALARM}/power/process/tree`
-  );
+  const res = await axios({
+    method:"GET",
+    baseURL:process.env.VUE_APP_ALARM,
+    url:"/power/process/tree"
+  });
+  // const res = await httpRequest.get(
+  //   `${process.env.VUE_APP_ALARM}/power/process/tree`
+  // );
+  console.log(222,res)
   actTreeNode.value = null;
   excelList.value = [];
   treeData.value = funRepeatMap(res.data);
@@ -619,10 +636,10 @@ const fsBarSeries = ref([
 /**submit */
 const funSubmit = async () => {
   const rosesRes = await httpRequest.get(
-    `${process.env.VUE_APP_API}/winddirecton/roses?wtid=${deviceId.value}&kssj=${dateTime.value[0]}&jssj=${dateTime.value[1]}`
+    `/winddirecton/roses?wtid=${deviceId.value}&kssj=${dateTime.value[0]}&jssj=${dateTime.value[1]}`
   );
   const lineRes = await httpRequest.get(
-    `${process.env.VUE_APP_API}/winddirecton/deviation/ratio?wtid=${deviceId.value}&kssj=${dateTime.value[0]}&jssj=${dateTime.value[1]}`
+    `/winddirecton/deviation/ratio?wtid=${deviceId.value}&kssj=${dateTime.value[0]}&jssj=${dateTime.value[1]}`
   );
   // const rosesRes = flowerRes
   // const lineRes = lineChartRes

+ 15 - 3
vue.config.js

@@ -192,8 +192,8 @@ module.exports = {
   devServer: {
     //代理配置
     proxy: {
-      "/cbk": {
-        target: "https://h5.caibeike.com.cn/", // 请求地址
+      "/api6060": {
+        target: "https://10.220.1.5:6060", // 请求地址
 
         changeOrigin: true, // 在vue-cli3中,默认changeOrigin的值是true,意味着服务器host设置成target,这与vue-cli2不一致,vue-cli2这个默认值是false
         // changeOrigin的值是true,target是host, request URL是http://baidu.com
@@ -201,8 +201,20 @@ module.exports = {
 
         pathRewrite: {
           // 路径重写,eg:把api接口替换为''
-          "^/cbk": "",
+          "^/api6060": "",
         },
+        "/api6015": {
+          target: "https://10.220.1.5:6015", // 请求地址
+
+          changeOrigin: true, // 在vue-cli3中,默认changeOrigin的值是true,意味着服务器host设置成target,这与vue-cli2不一致,vue-cli2这个默认值是false
+          // changeOrigin的值是true,target是host, request URL是http://baidu.com
+          // 如果设置changeOrigin: false,host就是浏览器发送过来的host,也就是localhost:8082。
+
+          pathRewrite: {
+            // 路径重写,eg:把api接口替换为''
+            "^/api6015": "",
+          },
+        }
       },
     },
     open: false, // 是否打开浏览器