0017
/
smart-power-ui
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

提交： 修改配置图片 prod-api 问题，以及ws 问题

This commit is contained in:
23688nl 2022-11-08 10:53:47 +08:00
parent ebc346fd3e
commit 7d2935f5a3
2 changed files with 2 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/config/env.js
View File

@ -23,7 +23,7 @@ var iotHost="192.168.10.241:32024"; // 海创iot 平台 host
var hrefHost = window.location.host; var hrefHost = window.location.host;
// let httpProtocol = window.location.protocol; // let httpProtocol = window.location.protocol;
// var hrefHost = '192.168.18.139'; // var hrefHost = '192.168.18.139';
let httpProtocol = 'http'; let httpProtocol = window.dasConfig.protocol ? window.dasConfig.protocol : 'http://';
if (env.NODE_ENV == 'development') { if (env.NODE_ENV == 'development') {

3
src/utils/hciot.js
View File

@ -4,7 +4,7 @@
*/ */
import { Loading } from 'element-ui'; import { Loading } from 'element-ui';
const baseHref = process.env.NODE_ENV === "production" ? `${window.dasConfig.protocol}${window.dasConfig.ip}${window.dasConfig.port ? ':'+window.dasConfig.port : ''}` : process.env.VUE_APP_BASE_API const baseHref = process.env.NODE_ENV === "production" ? `${window.dasConfig.protocol}${window.dasConfig.ip}${window.dasConfig.port ? ':'+window.dasConfig.port : ''}${window.dasConfig.prodApi ? window.dasConfig.prodApi : ''}` : process.env.VUE_APP_BASE_API
const baseURL = process.env.VUE_APP_BASE_API const baseURL = process.env.VUE_APP_BASE_API
@ -41,7 +41,6 @@ export function parseTime(time, pattern) {
s: date.getSeconds(), s: date.getSeconds(),
a: date.getDay() a: date.getDay()
} }
debugger
const time_str = format.replace(/{(y|m|d|h|i|s|a)+}/g, (result, key) => { const time_str = format.replace(/{(y|m|d|h|i|s|a)+}/g, (result, key) => {
let value = formatObj[key] let value = formatObj[key]
// Note: getDay() returns 0 on Sunday // Note: getDay() returns 0 on Sunday