提交： 调整，服务端地址配置等

.env.development

@@ -11,6 +11,6 @@ VUE_CLI_BABEL_TRANSPILE_MODULES = true
 port= 9988
 
 # 服务端地址
- target = http://192.168.18.134:8899
+  //target = http://192.168.18.134:8899
- //target = http://192.168.18.139:8899
+target = http://192.168.18.139:8899
 // target = http://192.168.18.136:8899

package.json

@@ -75,6 +75,8 @@
     "@vue/cli-service": "4.4.6",
     "babel-eslint": "10.1.0",
     "chalk": "4.1.0",
+    "node-sass": "^4.9.0",
+    "sass-loader": "^7.0.1",
     "connect": "3.6.6",
     "eslint": "7.15.0",
     "eslint-plugin-vue": "7.2.0",

public/config/env.js

@@ -1,7 +1,6 @@
 const env = process.env
 // 项目url 地址
-var iotPlatformUrl = ''; // 第三方云平台url
+var iotPlatformUrl = ''; // 第三方云平台ur
-var iotHost="192.168.18.139"; // 海创iot 平台 host
 // iot.gkiiot.com   192.168.18.139
 var flowIotUrl = '';
 let iotWebSocketBaseUrl = ''
@@ -9,19 +8,26 @@ let devLiveWebSocketBaseUrl = ''
 let sysWebSocket = 'ws://'
 let prodApi = '/prod-api';
 let wsProtocol = 'ws://';
-var hrefHost = window.location.host;
+let iotWebSocketAlarmBaseUrl = ''
-let iotWebSocketAlarmBaseUrl = '';
+let BaseUrl = ''
-let httpProtocol = window.location.protocol;
+
+// 手动配置的地址
+var iotHost="192.168.18.139:8899"; // 海创iot 平台 host
+// var hrefHost = window.location.host;
+// let httpProtocol = window.location.protocol;
+var hrefHost = '192.168.18.139';
+let httpProtocol = 'http';
 
 
 if (env.NODE_ENV == 'development') {
   flowIotUrl = 'http://127.0.0.1:1880/#flow/'
-  iotHost = '192.168.18.139';
   hrefHost = "192.168.18.139"
+  BaseUrl = '/dev-api'
 } else if(env.NODE_ENV == 'production') {
   // if (hrefHost.indexOf('.gkiiot.com') >= 0) {
   //   iotHost = 'iot.gkiiot.com'
   // }
+  BaseUrl = httpProtocol + '//' + iotHost + prodApi
   if(httpProtocol.indexOf("https") > -1){
     sysWebSocket = 'wss://';
   }
@@ -38,5 +44,7 @@ export {
   sysWebSocket,
   iotWebSocketBaseUrl,
   iotWebSocketAlarmBaseUrl,
-  devLiveWebSocketBaseUrl
+  devLiveWebSocketBaseUrl,
+  BaseUrl,
+  prodApi
 }

src/api/thirdApi.js

@@ -1,5 +1,5 @@
 import axios from "axios";
-import { iotPlatformUrl } from '@/config/env'
+import { iotPlatformUrl } from '/public/config/env'
 import { getDevcieApp } from "@/api/app";
 
 var appInfo = {}

src/utils/request.js

@@ -4,12 +4,13 @@ import store from '@/store'
 import { getToken } from '@/utils/auth'
 import errorCode from '@/utils/errorCode'
 import { preventCloseFu } from "@/utils/hciot";
+import { BaseUrl } from '/public/config/env'
 
 axios.defaults.headers['Content-Type'] = 'application/json;charset=utf-8'
 // 创建axios实例
 const service = axios.create({
   // axios中请求配置有baseURL选项，表示请求URL公共部分
-  baseURL: process.env.VUE_APP_BASE_API,
+  baseURL: BaseUrl,
   // 超时
   timeout: 10000
 })

src/views/bigScreen/v1/index.vue

@@ -68,7 +68,7 @@ import TypeDistributionWrap from "./profile/typeDistribution";
 import trendWrap from "./profile/trend";
 import MapWrap from "./profile/mapWrap";
 import MapWrapPersonal from "./profile/personalCenter";
-import { iotWebSocketAlarmBaseUrl } from "@/config/env";
+import { iotWebSocketAlarmBaseUrl } from "/public/config/env";
 
 import { getWarningAnalysis, homeCount, appProjectList } from "@/api/app";
 export default {

src/views/bigScreen/v2/index.vue

@@ -68,7 +68,7 @@ import TypeDistributionWrap from "./profile/typeDistribution";
 import trendWrap from "./profile/trend";
 import MapWrap from "./profile/mapWrap";
 import MapWrapPersonal from "./profile/personalCenter";
-import { iotWebSocketAlarmBaseUrl } from "@/config/env";
+import { iotWebSocketAlarmBaseUrl } from "/public/config/env";
 
 import { getWarningAnalysis, homeCount, appProjectList } from "@/api/app";
 export default {

src/views/bigScreen/v3/index.vue

@@ -81,7 +81,7 @@ import TypeDistributionWrap from "./profile/typeDistribution";
 import trendWrap from "./profile/trend";
 import MapWrap from "./profile/mapWrap";
 import MapWrapPersonal from "./profile/personalCenter";
-import { iotWebSocketAlarmBaseUrl } from "@/config/env";
+import { iotWebSocketAlarmBaseUrl } from "/public/config/env";
 import Cookies from "js-cookie";
 import { NextLoading } from '@/utils/loading';
 

src/views/iot/autocontrol/job/profile/deviceParam.vue

@@ -129,7 +129,7 @@ import SelectTableWrap from "@/components/SelectTable/index";
 
 import axios from "axios";
 import { getToken } from "@/utils/auth";
-import { basePlatformUrl } from '@/config/env'
+import { basePlatformUrl } from '/public/config/env'
 import { getDeviceFunList, getDeviceCmdList } from "@/api/iot/device";
 
 

src/views/iot/device/profile/details.vue

@@ -66,7 +66,7 @@ import InfoWrap from "./info";
 import ChildDevice from "./childDevice";
 import DeviceLog from "@/views/profile/DeviceDetailsView/deviceLog";
 import DeviceRunStartsWrap from "@/views/profile/DeviceRunStarts/index";
-import { iotWebSocketBaseUrl } from "@/config/env";
+import { iotWebSocketBaseUrl } from "/public/config/env";
 import TriggerWrap from "@/views/profile/DeviceTrigger/index";
 export default {
   name: "DetailsWrap",

src/views/personal/device/profile/details.vue

@@ -59,7 +59,7 @@ import InfoWrap from "./info";
 import DeviceLog from "@/views/profile/DeviceDetailsView/deviceLog";
 import ChildDevice from "./childDevice";
 import DeviceRunStartsWrap from "@/views/profile/DeviceRunStarts/index";
-import { iotWebSocketBaseUrl } from "@/config/env";
+import { iotWebSocketBaseUrl } from "/public/config/env";
 export default {
   name: "DetailsWrap",
   props: ["sourceId"],

src/views/personal/device/profile/runStarts.vue

@@ -67,7 +67,7 @@
 </template>
 <script>
 import { getDeviceFunList, getDeviceCmdList } from "@/api/iot/device";
-import { iotWebSocketBaseUrl } from "@/config/env";
+import { iotWebSocketBaseUrl } from "/public/config/env";
 import RunStateTable from "./runStateTable";
 export default {
   name: "RunStartsWrap",

src/views/profile/DeviceDetailsView/deviceSelectNav.vue

@@ -226,7 +226,7 @@
 
 <script>
 import { listChildrenDevice, setSwitchControl } from "@/api/iot/device";
-import { iotWebSocketBaseUrl, devLiveWebSocketBaseUrl } from "@/config/env";
+import { iotWebSocketBaseUrl, devLiveWebSocketBaseUrl } from "/public/config/env";
 import SignalIntensity from "./signalIntensity";
 export default {
   name: "DeviceSelectNav",

src/views/profile/DeviceDetailsView/stateManagement.vue

@@ -13,7 +13,7 @@
 </template>
 <script>
 import DeviceRunStartsWrap from "@/views/profile/DeviceRunStarts/index";
-import { iotWebSocketBaseUrl } from "@/config/env";
+import { iotWebSocketBaseUrl } from "/public/config/env";
 import DeviceSelect from './deviceSelectNav'
 export default {
   name: "StateManagement",

src/views/profile/DeviceRunStarts/index.vue

@@ -67,7 +67,7 @@
 </template>
 <script>
 import { getDeviceFunList, getDeviceCmdList } from "@/api/iot/device";
-import { iotWebSocketBaseUrl } from "@/config/env";
+import { iotWebSocketBaseUrl } from "/public/config/env";
 import RunStateTable from "./table";
 export default {
   name: "RunStartsWrap",

src/views/tenant/device/profile/details.vue

@@ -65,7 +65,7 @@ import InfoWrap from "./info";
 import DeviceLog from "@/views/profile/DeviceDetailsView/deviceLog";
 import ChildDevice from "./childDevice";
 import DeviceRunStartsWrap from "@/views/profile/DeviceRunStarts/index";
-import { iotWebSocketBaseUrl } from "@/config/env";
+import { iotWebSocketBaseUrl } from "/public/config/env";
 import TriggerWrap from "@/views/profile/DeviceTrigger/index";
 export default {
   name: "DetailsWrap",