diff --git a/.env.development b/.env.development index e6ab5abd..58b17e13 100644 --- a/.env.development +++ b/.env.development @@ -6,7 +6,7 @@ NODE_ENV = development VUE_APP_TITLE = '托克逊能源管理平台' # VUE_APP_TITLE = '中建材光子科技有限公司' # VUE_APP_TITLE = '超低排放系统' -VUE_APP_PJ = 'gx' +VUE_APP_PJ = 'pf' # 接口地址 #VUE_APP_API_BASEURL = http://1.203.161.103:2800/api @@ -16,10 +16,10 @@ VUE_APP_PJ = 'gx' # VUE_APP_API_BASEURL = http://127.0.0.1:2226/api #测试环境 -# VUE_APP_API_BASEURL = http://49.232.14.174:2226/api -VUE_APP_API_BASEURL = http://127.0.0.1:2226/api -# VUE_APP_BASEURL = http://49.232.14.174:2226 -VUE_APP_BASEURL = http://127.0.0.1:2226 + VUE_APP_API_BASEURL = http://49.232.14.174:2226/api +#VUE_APP_API_BASEURL = http://127.0.0.1:2226/api + VUE_APP_BASEURL = http://49.232.14.174:2226 +#VUE_APP_BASEURL = http://127.0.0.1:2226 # #光子 # VUE_APP_API_BASEURL = http://49.232.14.174:2250/api diff --git a/src/style/dark.scss b/src/style/dark.scss index 805614cf..e02a6954 100644 --- a/src/style/dark.scss +++ b/src/style/dark.scss @@ -10,6 +10,14 @@ html.dark { --el-color-primary-light-5: var(--el-color-primary-dark-4) !important; --el-color-primary-light-3: var(--el-color-primary-dark-3) !important; --el-menu-active-color: #ffffff !important; + // --el-bg-color: #1e789a; + // --el-text-color-regular: #ffffff; + .el-dialog__close { + color: #ffffff; + } + .el-dialog__title { + color: #ffffff; + } .el-tag { background-color: #f8f5f5 !important; diff --git a/src/style/fix.scss b/src/style/fix.scss index ab8212f4..58629f17 100644 --- a/src/style/fix.scss +++ b/src/style/fix.scss @@ -375,4 +375,28 @@ body .el-table th.gutter { .el-dialog__footer { padding: 6px 6px 6px; +} + +.aside_one, +.aside_side { + height: 100%; + background: var(--el-bg-color-overlay); + border-color: var(--el-border-color-light); + // border-radius: 4px; + background: rgb(4, 50, 83); + background-color: rgb(4, 50, 83); + box-shadow: inset 0px 0px 30px 15px rgb(7, 79, 109); + border: 1px solid #1279c3; +} +.el-aside:has(> .aside_one) { + padding: 8px; + border-right: none; +} + +.infoLine { + color: #ffffff; +} + +.typeLine { + color: #ffffff; } \ No newline at end of file diff --git a/src/views/bigScreen/enpComponents/carlist.vue b/src/views/bigScreen/enpComponents/carlist.vue new file mode 100644 index 00000000..0edd325a --- /dev/null +++ b/src/views/bigScreen/enpComponents/carlist.vue @@ -0,0 +1,166 @@ + + diff --git a/src/views/bigScreen/index_enp_blue.vue b/src/views/bigScreen/index_enp_blue.vue index dec3753f..68252ea5 100644 --- a/src/views/bigScreen/index_enp_blue.vue +++ b/src/views/bigScreen/index_enp_blue.vue @@ -114,10 +114,12 @@ command="transport" >厂外运输 + @@ -161,9 +163,12 @@