diff --git a/.env.development b/.env.development index 77023c95..d6f5aede 100644 --- a/.env.development +++ b/.env.development @@ -6,10 +6,16 @@ VUE_APP_LGOG_URL = 'logo/drgy/logo.png' /** * 蓝白色登录页需要一个banner图(VUE_APP_BANNER_URL)和一个168像素的logo(VUE_APP_LGOG168_URL) */ +# ico图标 +VUE_APP_ICO_URL = 'drgy/favicon.ico' # logo VUE_APP_LGOG168_URL = 'logo/drgy/logo168.png' # banner VUE_APP_BANNER_URL = 'logo/drgy/banner.png' +# 公众号二维码 +VUE_APP_GZGQR_URL = 'images/drgy/gzhqr.jpg' +# 小程序二维码 +VUE_APP_YDXCX_URL = 'images/drgy/ydxcx.jpg' # 系统名称 VUE_APP_SYSTEM_NAME = '数字用电管理系统' # 系统登录页 login-green、login-blue-black、login-blue-white diff --git a/.env.dr b/.env.dr index 4bf1a421..396b8975 100644 --- a/.env.dr +++ b/.env.dr @@ -1,14 +1,31 @@ # 开发环境配置 -ENV = 'drgy' +ENV = 'dr' # logo VUE_APP_LGOG_URL = 'logo/dr/logo.png' +/** + * 蓝白色登录页需要一个banner图(VUE_APP_BANNER_URL)和一个168像素的logo(VUE_APP_LGOG168_URL) + */ +# ico图标 +VUE_APP_ICO_URL = 'dr/favicon.ico' +# logo +VUE_APP_LGOG168_URL = 'logo/dr/logo168.png' +# banner +VUE_APP_BANNER_URL = 'images/banner.png' +# 公众号二维码 +VUE_APP_GZGQR_URL = 'images/dr/gzhqr.jpg' +# 小程序二维码 +VUE_APP_YDXCX_URL = 'images/dr/ydxcx.jpg' # 系统名称 VUE_APP_SYSTEM_NAME = '数字用电管理系统' -# 系统登录页 -VUE_APP_LOGIN_PAGE = 'login-blue-black' -# 系统配色 -VUE_APP_THEME_CLASS = 'theme-blue-black' +# 系统登录页 login-green、login-blue-black、login-blue-white +#VUE_APP_LOGIN_PAGE = 'login-green' +#VUE_APP_LOGIN_PAGE = 'login-blue-black' +VUE_APP_LOGIN_PAGE = 'login-blue-white' +# 系统配色 theme-green、theme-blue-black、theme-blue-white +#VUE_APP_THEME_CLASS = 'theme-green' +#VUE_APP_THEME_CLASS = 'theme-blue-black' +VUE_APP_THEME_CLASS = 'theme-blue-white' # 智慧用电管理系统/开发环境 VUE_APP_BASE_API = '/dev-api' diff --git a/.env.drgy b/.env.drgy index 0fa951bc..cdcab89f 100644 --- a/.env.drgy +++ b/.env.drgy @@ -6,10 +6,16 @@ VUE_APP_LGOG_URL = 'logo/drgy/logo.png' /** * 蓝白色登录页需要一个banner图(VUE_APP_BANNER_URL)和一个168像素的logo(VUE_APP_LGOG168_URL) */ +# ico图标 +VUE_APP_ICO_URL = 'drgy/favicon.ico' # logo VUE_APP_LGOG168_URL = 'logo/drgy/logo168.png' # banner VUE_APP_BANNER_URL = 'logo/drgy/banner.png' +# 公众号二维码 +VUE_APP_GZGQR_URL = 'images/drgy/gzhqr.jpg' +# 小程序二维码 +VUE_APP_YDXCX_URL = 'images/drgy/ydxcx.jpg' # 系统名称 VUE_APP_SYSTEM_NAME = '数字用电管理系统' # 系统登录页 login-green、login-blue-black、login-blue-white diff --git a/.env.drgyprod b/.env.drgyprod index ec36e2a8..c6243a45 100644 --- a/.env.drgyprod +++ b/.env.drgyprod @@ -6,10 +6,16 @@ VUE_APP_LGOG_URL = 'logo/drgy/logo.png' /** * 蓝白色登录页需要一个banner图(VUE_APP_BANNER_URL)和一个168像素的logo(VUE_APP_LGOG168_URL) */ +# ico图标 +VUE_APP_ICO_URL = 'drgy/favicon.ico' # logo VUE_APP_LGOG168_URL = 'logo/drgy/logo168.png' # banner VUE_APP_BANNER_URL = 'logo/drgy/banner.png' +# 公众号二维码 +VUE_APP_GZGQR_URL = 'images/drgy/gzhqr.jpg' +# 小程序二维码 +VUE_APP_YDXCX_URL = 'images/drgy/ydxcx.jpg' # 系统名称 VUE_APP_SYSTEM_NAME = '数字用电管理系统' # 系统登录页 login-green、login-blue-black、login-blue-white diff --git a/.env.drprod b/.env.drprod new file mode 100644 index 00000000..d7dd52b4 --- /dev/null +++ b/.env.drprod @@ -0,0 +1,47 @@ +# 开发环境配置 +ENV = 'drprod' +NODE_ENV = 'drprod' +# logo +VUE_APP_LGOG_URL = 'logo/dr/logo.png' +/** + * 蓝白色登录页需要一个banner图(VUE_APP_BANNER_URL)和一个168像素的logo(VUE_APP_LGOG168_URL) + */ + # ico图标 +VUE_APP_ICO_URL = 'dr/favicon.ico' +# logo +VUE_APP_LGOG168_URL = 'logo/dr/logo168.png' +# banner +VUE_APP_BANNER_URL = 'images/banner.png' +# 公众号二维码 +VUE_APP_GZGQR_URL = 'images/dr/gzhqr.jpg' +# 小程序二维码 +VUE_APP_YDXCX_URL = 'images/dr/ydxcx.jpg' +# 系统名称 +VUE_APP_SYSTEM_NAME = '数字用电管理系统' +# 系统登录页 login-green、login-blue-black、login-blue-white +#VUE_APP_LOGIN_PAGE = 'login-green' +#VUE_APP_LOGIN_PAGE = 'login-blue-black' +VUE_APP_LOGIN_PAGE = 'login-blue-white' +# 系统配色 theme-green、theme-blue-black、theme-blue-white +#VUE_APP_THEME_CLASS = 'theme-green' +#VUE_APP_THEME_CLASS = 'theme-blue-black' +VUE_APP_THEME_CLASS = 'theme-blue-white' + +# 智慧用电管理系统/开发环境 +VUE_APP_BASE_API = '/prod-api' + +# 前端端口 +port= 9988 + +# 服务端地址 +// 陈志荣 本地 +// target = http://192.168.18.140:8899 +// 黄明 本地 +// target = http://192.168.18.134:8899 +//target = http://192.168.18.139:8899 +// target = http://192.168.18.136:8899 + +// 测试端 +// target = http://192.168.10.241:32024 +// 开发端 + target = https://power-core.drgyen.com diff --git a/.env.production b/.env.production index 2d120dbe..c2833578 100644 --- a/.env.production +++ b/.env.production @@ -9,10 +9,16 @@ VUE_APP_LGOG_URL = 'logo/drgy/logo.png' /** * 蓝白色登录页需要一个banner图(VUE_APP_BANNER_URL)和一个168像素的logo(VUE_APP_LGOG168_URL) */ +# ico图标 +VUE_APP_ICO_URL = 'drgy/favicon.ico' # logo VUE_APP_LGOG168_URL = 'logo/drgy/logo168.png' # banner VUE_APP_BANNER_URL = 'logo/drgy/banner.png' +# 公众号二维码 +VUE_APP_GZGQR_URL = 'images/drgy/gzhqr.jpg' +# 小程序二维码 +VUE_APP_YDXCX_URL = 'images/drgy/ydxcx.jpg' # 系统名称 VUE_APP_SYSTEM_NAME = '数字用电管理系统' # 系统登录页 login-green、login-blue-black、login-blue-white diff --git a/package.json b/package.json index c25c949f..7d9c183b 100644 --- a/package.json +++ b/package.json @@ -9,6 +9,7 @@ "dev:drgy": "vue-cli-service serve --mode drgy", "dev:dr": "vue-cli-service serve --mode dr", "build:drgyprod": "vue-cli-service build --mode drgyprod", + "build:drprod": "vue-cli-service build --mode drprod", "build:prod": "vue-cli-service build", "build:stage": "vue-cli-service build --mode staging", "preview": "node build/index.js --preview", diff --git a/public/images/devcie_default.png b/public/images/devcie_default.png index 392d8bbc..50f8bba8 100644 Binary files a/public/images/devcie_default.png and b/public/images/devcie_default.png differ diff --git a/public/images/dr/favicon.ico b/public/images/dr/favicon.ico new file mode 100644 index 00000000..a256e260 Binary files /dev/null and b/public/images/dr/favicon.ico differ diff --git a/public/images/drgy/favicon.ico b/public/images/drgy/favicon.ico new file mode 100644 index 00000000..d7c508a6 Binary files /dev/null and b/public/images/drgy/favicon.ico differ diff --git a/public/index.html b/public/index.html index af83335d..6cd54899 100644 --- a/public/index.html +++ b/public/index.html @@ -5,7 +5,7 @@ - + diff --git a/public/js/config.js b/public/js/config.js index 43d09665..dfc46ea4 100644 --- a/public/js/config.js +++ b/public/js/config.js @@ -1,16 +1,8 @@ // 手动配置的地址 window.dasConfig = { - ip: '192.168.10.241', - port: 30646, + ip: 'power-core.drgyen.com', + port: '', prodApi: '', - protocol: 'http://', - wsProtocol: 'ws://' -} -// 手动配置的地址 -window.dasConfig = { - ip: '192.168.1.17', - port: 8899, - prodApi: '', - protocol: 'http://', - wsProtocol: 'ws://' + protocol: 'https://', + wsProtocol: 'wss://' } diff --git a/src/assets/images/banner.png b/src/assets/images/banner.png new file mode 100644 index 00000000..c043b0c3 Binary files /dev/null and b/src/assets/images/banner.png differ diff --git a/src/assets/images/devcie_default.png b/src/assets/images/devcie_default.png index 392d8bbc..50f8bba8 100644 Binary files a/src/assets/images/devcie_default.png and b/src/assets/images/devcie_default.png differ diff --git a/src/assets/images/dr/gzhqr.jpg b/src/assets/images/dr/gzhqr.jpg new file mode 100644 index 00000000..b7d0eecb Binary files /dev/null and b/src/assets/images/dr/gzhqr.jpg differ diff --git a/src/assets/images/dr/ydxcx.jpg b/src/assets/images/dr/ydxcx.jpg new file mode 100644 index 00000000..d1916659 Binary files /dev/null and b/src/assets/images/dr/ydxcx.jpg differ diff --git a/src/assets/images/drgy/gzhqr.jpg b/src/assets/images/drgy/gzhqr.jpg new file mode 100644 index 00000000..da446552 Binary files /dev/null and b/src/assets/images/drgy/gzhqr.jpg differ diff --git a/src/assets/images/drgy/ydxcx.jpg b/src/assets/images/drgy/ydxcx.jpg new file mode 100644 index 00000000..53f0e93a Binary files /dev/null and b/src/assets/images/drgy/ydxcx.jpg differ diff --git a/src/assets/logo/dr/banner.png b/src/assets/logo/dr/banner.png new file mode 100644 index 00000000..c043b0c3 Binary files /dev/null and b/src/assets/logo/dr/banner.png differ diff --git a/src/assets/logo/dr/logo.png b/src/assets/logo/dr/logo.png index fbbae28a..687e77a3 100644 Binary files a/src/assets/logo/dr/logo.png and b/src/assets/logo/dr/logo.png differ diff --git a/src/assets/logo/dr/logo168.png b/src/assets/logo/dr/logo168.png index fbbae28a..687e77a3 100644 Binary files a/src/assets/logo/dr/logo168.png and b/src/assets/logo/dr/logo168.png differ diff --git a/src/config/env.js b/src/config/env.js index 469c01eb..8856deeb 100644 --- a/src/config/env.js +++ b/src/config/env.js @@ -31,7 +31,7 @@ if (env.NODE_ENV == 'development') { flowIotUrl = 'http://127.0.0.1:1880/#flow/' // hrefHost = "power-tcore.histron.cn" hrefHost = "192.168.1.17" -} else if(env.NODE_ENV == 'production' || env.NODE_ENV == 'drgyprod') { +} else if(env.NODE_ENV == 'production' || env.NODE_ENV == 'drgyprod' || env.NODE_ENV == 'drprod') { // if (hrefHost.indexOf('.gkiiot.com') >= 0) { // iotHost = 'iot.gkiiot.com' // } diff --git a/src/utils/hciot.js b/src/utils/hciot.js index 1b001825..49d6fd6a 100644 --- a/src/utils/hciot.js +++ b/src/utils/hciot.js @@ -5,7 +5,7 @@ */ import { Loading } from 'element-ui'; -const baseHref = (process.env.NODE_ENV === "production" || process.env.NODE_ENV === "drgyprod") ? `${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 baseHref = (process.env.NODE_ENV === "production" || process.env.NODE_ENV === "drgyprod" || process.env.NODE_ENV === "drprod") ? `${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 diff --git a/src/utils/request.js b/src/utils/request.js index 2e39f944..871dc18b 100644 --- a/src/utils/request.js +++ b/src/utils/request.js @@ -9,7 +9,7 @@ axios.defaults.headers['Content-Type'] = 'application/json;charset=utf-8' // 创建axios实例 const service = axios.create({ // axios中请求配置有baseURL选项，表示请求URL公共部分 - baseURL: (process.env.NODE_ENV === "production" || process.env.NODE_ENV === "drgyprod") ? `${window.dasConfig.protocol}${window.dasConfig.ip}${window.dasConfig.port ? ':'+window.dasConfig.port : ''}${window.dasConfig.prodApi ? window.dasConfig.prodApi : ''}` : process.env.VUE_APP_BASE_API, + baseURL: (process.env.NODE_ENV === "production" || process.env.NODE_ENV === "drgyprod" || process.env.NODE_ENV === "drprod") ? `${window.dasConfig.protocol}${window.dasConfig.ip}${window.dasConfig.port ? ':'+window.dasConfig.port : ''}${window.dasConfig.prodApi ? window.dasConfig.prodApi : ''}` : process.env.VUE_APP_BASE_API, // 超时 timeout: 10000 }) diff --git a/src/views/iot/contacts/index.vue b/src/views/iot/contacts/index.vue index 11dfde8e..974184ab 100644 --- a/src/views/iot/contacts/index.vue +++ b/src/views/iot/contacts/index.vue @@ -163,7 +163,7 @@
- + 第一步：扫码关注公众号。
@@ -192,7 +192,7 @@ import { } from "@/api/iot/contacts"; import { getIotFileUrl } from "@/utils/hciot"; import QRCode from "qrcodejs2"; -import gzhqr from "@/assets/images/gzhqr.jpg" +// import gzhqr from "@/assets/images/gzhqr.jpg" import DialogTemplate from "@/components/DialogTemplate"; export default { @@ -200,7 +200,7 @@ export default { components: {DialogTemplate}, data() { return { - gzhqr, + gzhqr:'', qrCodeDialogOpen: false, // 遮罩层 loading: true, @@ -253,6 +253,7 @@ export default { }, created() { this.getList(); + this.gzhqr = require('@/assets/' + process.env.VUE_APP_GZGQR_URL); }, methods: { getIotFileUrl, diff --git a/vue.config.js b/vue.config.js index ecd7ca72..51f6aa0f 100644 --- a/vue.config.js +++ b/vue.config.js @@ -84,7 +84,7 @@ module.exports = { .end() config - .when(process.env.NODE_ENV !== 'development'&&process.env.NODE_ENV !== 'drgy', + .when(process.env.NODE_ENV !== 'development'&&process.env.NODE_ENV !== 'drgy'&&process.env.NODE_ENV !== 'dr', config => { config .plugin('ScriptExtHtmlWebpackPlugin')