diff --git a/.env.production b/.env.production
index e13848c..46fe9a0 100644
--- a/.env.production
+++ b/.env.production
@@ -5,6 +5,6 @@ VITE_APP_PORT = 8089
#VITE_APP_WS_API = 'ws://board.heatiot.cn:8001/prod-api' ## websocket地址
#VITE_APP_BASE_API = 'http://board.heatiot.cn:8001/prod-api/' ## 线上接口
#VITE_APP_WS_API = 'ws://${window.location.host}/ws' ## websocket地址 ws://10.10.10.56:9000/websocket/
-VITE_APP_BASE_API = '/prod-api/' ## 正式环境
-# VITE_APP_BASE_API = '/biprod-api/' ## 测试环境
+# VITE_APP_BASE_API = '/prod-api/' ## 正式环境
+VITE_APP_BASE_API = '/biprod-api/' ## 测试环境
diff --git a/src/assets/iconfont/demo_index.html b/src/assets/iconfont/demo_index.html
index 6b7300d..3c0627e 100644
--- a/src/assets/iconfont/demo_index.html
+++ b/src/assets/iconfont/demo_index.html
@@ -55,15 +55,27 @@
-
-
-
编辑
- 
+
+ 换热站
+ 
+
+
+ -
+
+
list
+ 
-
-
-
箭头
- 
+
+ more
+ 
+
+
+ -
+
+
编辑
+ 
-
@@ -408,9 +420,9 @@
@font-face {
font-family: 'iconfont';
- src: url('iconfont.woff2?t=1694485516205') format('woff2'),
- url('iconfont.woff?t=1694485516205') format('woff'),
- url('iconfont.ttf?t=1694485516205') format('truetype');
+ src: url('iconfont.woff2?t=1699254830523') format('woff2'),
+ url('iconfont.woff?t=1699254830523') format('woff'),
+ url('iconfont.ttf?t=1699254830523') format('truetype');
}
第二步:定义使用 iconfont 的样式
@@ -437,20 +449,38 @@
-
-
+
- 编辑
+ 换热站
- .icon-edit-icon
+
.icon-station
+
+
+
+
-
+
+
+ list
+
+ .icon-list
+
+
+
+
-
+
+
+ more
+
+ .icon-more
-
-
+
- 箭头
+ 编辑
- .icon-jiantou
+
.icon-edit-icon
@@ -969,18 +999,34 @@
-
-
编辑
- #icon-edit-icon
+ 换热站
+ #icon-station
-
-
箭头
- #icon-jiantou
+ list
+ #icon-list
+
+
+
-
+
+
more
+ #icon-more
+
+
+
-
+
+
编辑
+ #icon-edit-icon
-
diff --git a/src/assets/iconfont/iconfont.css b/src/assets/iconfont/iconfont.css
index a08eed7..c686537 100644
--- a/src/assets/iconfont/iconfont.css
+++ b/src/assets/iconfont/iconfont.css
@@ -1,8 +1,8 @@
@font-face {
font-family: "iconfont"; /* Project id 3987011 */
- src: url('iconfont.woff2?t=1694485516205') format('woff2'),
- url('iconfont.woff?t=1694485516205') format('woff'),
- url('iconfont.ttf?t=1694485516205') format('truetype');
+ src: url('iconfont.woff2?t=1699254830523') format('woff2'),
+ url('iconfont.woff?t=1699254830523') format('woff'),
+ url('iconfont.ttf?t=1699254830523') format('truetype');
}
.iconfont {
@@ -13,12 +13,20 @@
-moz-osx-font-smoothing: grayscale;
}
-.icon-edit-icon:before {
- content: "\e621";
+.icon-station:before {
+ content: "\e6c5";
+}
+
+.icon-list:before {
+ content: "\e6be";
}
-.icon-jiantou:before {
- content: "\e6e7";
+.icon-more:before {
+ content: "\e83d";
+}
+
+.icon-edit-icon:before {
+ content: "\e621";
}
.icon-arrow-up:before {
diff --git a/src/assets/iconfont/iconfont.js b/src/assets/iconfont/iconfont.js
index d4e4024..67ac2b4 100644
--- a/src/assets/iconfont/iconfont.js
+++ b/src/assets/iconfont/iconfont.js
@@ -1 +1 @@
-window._iconfont_svg_string_3987011='',function(a){var l=(l=document.getElementsByTagName("script"))[l.length-1],c=l.getAttribute("data-injectcss"),l=l.getAttribute("data-disable-injectsvg");if(!l){var h,i,t,o,s,e=function(l,c){c.parentNode.insertBefore(l,c)};if(c&&!a.__iconfont__svg__cssinject__){a.__iconfont__svg__cssinject__=!0;try{document.write("")}catch(l){console&&console.log(l)}}h=function(){var l,c=document.createElement("div");c.innerHTML=a._iconfont_svg_string_3987011,(c=c.getElementsByTagName("svg")[0])&&(c.setAttribute("aria-hidden","true"),c.style.position="absolute",c.style.width=0,c.style.height=0,c.style.overflow="hidden",c=c,(l=document.body).firstChild?e(c,l.firstChild):l.appendChild(c))},document.addEventListener?~["complete","loaded","interactive"].indexOf(document.readyState)?setTimeout(h,0):(i=function(){document.removeEventListener("DOMContentLoaded",i,!1),h()},document.addEventListener("DOMContentLoaded",i,!1)):document.attachEvent&&(t=h,o=a.document,s=!1,m(),o.onreadystatechange=function(){"complete"==o.readyState&&(o.onreadystatechange=null,d())})}function d(){s||(s=!0,t())}function m(){try{o.documentElement.doScroll("left")}catch(l){return void setTimeout(m,50)}d()}}(window);
\ No newline at end of file
+window._iconfont_svg_string_3987011='',function(a){var l=(l=document.getElementsByTagName("script"))[l.length-1],c=l.getAttribute("data-injectcss"),l=l.getAttribute("data-disable-injectsvg");if(!l){var h,i,o,t,s,v=function(l,c){c.parentNode.insertBefore(l,c)};if(c&&!a.__iconfont__svg__cssinject__){a.__iconfont__svg__cssinject__=!0;try{document.write("")}catch(l){console&&console.log(l)}}h=function(){var l,c=document.createElement("div");c.innerHTML=a._iconfont_svg_string_3987011,(c=c.getElementsByTagName("svg")[0])&&(c.setAttribute("aria-hidden","true"),c.style.position="absolute",c.style.width=0,c.style.height=0,c.style.overflow="hidden",c=c,(l=document.body).firstChild?v(c,l.firstChild):l.appendChild(c))},document.addEventListener?~["complete","loaded","interactive"].indexOf(document.readyState)?setTimeout(h,0):(i=function(){document.removeEventListener("DOMContentLoaded",i,!1),h()},document.addEventListener("DOMContentLoaded",i,!1)):document.attachEvent&&(o=h,t=a.document,s=!1,e(),t.onreadystatechange=function(){"complete"==t.readyState&&(t.onreadystatechange=null,m())})}function m(){s||(s=!0,o())}function e(){try{t.documentElement.doScroll("left")}catch(l){return void setTimeout(e,50)}m()}}(window);
\ No newline at end of file
diff --git a/src/assets/iconfont/iconfont.json b/src/assets/iconfont/iconfont.json
index 7b53122..be90b88 100644
--- a/src/assets/iconfont/iconfont.json
+++ b/src/assets/iconfont/iconfont.json
@@ -5,6 +5,27 @@
"css_prefix_text": "icon-",
"description": "",
"glyphs": [
+ {
+ "icon_id": "18911700",
+ "name": "换热站",
+ "font_class": "station",
+ "unicode": "e6c5",
+ "unicode_decimal": 59077
+ },
+ {
+ "icon_id": "8474293",
+ "name": "list",
+ "font_class": "list",
+ "unicode": "e6be",
+ "unicode_decimal": 59070
+ },
+ {
+ "icon_id": "34453016",
+ "name": "more",
+ "font_class": "more",
+ "unicode": "e83d",
+ "unicode_decimal": 59453
+ },
{
"icon_id": "33987167",
"name": "编辑",
@@ -12,13 +33,6 @@
"unicode": "e621",
"unicode_decimal": 58913
},
- {
- "icon_id": "9371505",
- "name": "箭头",
- "font_class": "jiantou",
- "unicode": "e6e7",
- "unicode_decimal": 59111
- },
{
"icon_id": "34453072",
"name": "up",
diff --git a/src/assets/iconfont/iconfont.ttf b/src/assets/iconfont/iconfont.ttf
index 9009738..0f611e0 100644
Binary files a/src/assets/iconfont/iconfont.ttf and b/src/assets/iconfont/iconfont.ttf differ
diff --git a/src/assets/iconfont/iconfont.woff b/src/assets/iconfont/iconfont.woff
index 19f1446..ad4390e 100644
Binary files a/src/assets/iconfont/iconfont.woff and b/src/assets/iconfont/iconfont.woff differ
diff --git a/src/assets/iconfont/iconfont.woff2 b/src/assets/iconfont/iconfont.woff2
index 92ba6d0..88eac03 100644
Binary files a/src/assets/iconfont/iconfont.woff2 and b/src/assets/iconfont/iconfont.woff2 differ
diff --git a/src/types/auto-imports.d.ts b/src/types/auto-imports.d.ts
index 9ea2d5d..67e581d 100644
--- a/src/types/auto-imports.d.ts
+++ b/src/types/auto-imports.d.ts
@@ -4,6 +4,8 @@ declare global {
const EffectScope: typeof import('vue')['EffectScope']
const ElMessage: typeof import('element-plus/es')['ElMessage']
const ElMessageBox: typeof import('element-plus/es')['ElMessageBox']
+ const ElNotification: typeof import('element-plus/es')['ElNotification']
+ const NEllipsis: typeof import('naive-ui')['NEllipsis']
const asyncComputed: typeof import('@vueuse/core')['asyncComputed']
const autoResetRef: typeof import('@vueuse/core')['autoResetRef']
const computed: typeof import('vue')['computed']
@@ -272,6 +274,8 @@ declare module 'vue' {
readonly EffectScope: UnwrapRef
readonly ElMessage: UnwrapRef
readonly ElMessageBox: UnwrapRef
+ readonly ElNotification: UnwrapRef
+ readonly NEllipsis: UnwrapRef
readonly asyncComputed: UnwrapRef
readonly autoResetRef: UnwrapRef
readonly computed: UnwrapRef
diff --git a/src/types/components.d.ts b/src/types/components.d.ts
index d8efe23..f443eaa 100644
--- a/src/types/components.d.ts
+++ b/src/types/components.d.ts
@@ -22,9 +22,11 @@ declare module '@vue/runtime-core' {
ElDropdownMenu: typeof import('element-plus/es')['ElDropdownMenu']
ElForm: typeof import('element-plus/es')['ElForm']
ElFormItem: typeof import('element-plus/es')['ElFormItem']
+ ElIcon: typeof import('element-plus/es')['ElIcon']
ElInput: typeof import('element-plus/es')['ElInput']
ElMenu: typeof import('element-plus/es')['ElMenu']
ElMenuItem: typeof import('element-plus/es')['ElMenuItem']
+ ElMenuItemGroup: typeof import('element-plus/es')['ElMenuItemGroup']
ElOption: typeof import('element-plus/es')['ElOption']
ElPagination: typeof import('element-plus/es')['ElPagination']
ElRow: typeof import('element-plus/es')['ElRow']
diff --git a/src/views/details/index.scss b/src/views/details/index.scss
index a9fc82b..8abceea 100644
--- a/src/views/details/index.scss
+++ b/src/views/details/index.scss
@@ -29,14 +29,30 @@
}
}
.echart {
- .comparisonInfo {
- .stackedLine {
- width: 100%;
- height: 66vh;
- font-size: 1.4rem;
- text-align: center;
- color: #606266;
- line-height: 82vh;
+ :deep(.el-card__body) {
+ display: flex;
+ .sidebar {
+ width: 220px;
+ border: 1px solid #e8eaec;
+ margin-right: 1.5rem;
+ .deviceMenu {
+ border-right: none;
+ .el-menu-item {
+ height: 45px;
+ line-height: 45px;
+ }
+ }
+ }
+ .comparisonInfo {
+ flex: 1;
+ .stackedLine {
+ width: 100%;
+ height: 66vh;
+ font-size: 1.4rem;
+ text-align: center;
+ color: #606266;
+ line-height: 82vh;
+ }
}
}
}
diff --git a/src/views/details/index.vue b/src/views/details/index.vue
index 7ae92ce..f880074 100644
--- a/src/views/details/index.vue
+++ b/src/views/details/index.vue
@@ -98,6 +98,19 @@
+
@@ -1120,6 +1133,13 @@ onMounted(() => {
// chart.setOption(options2);
});
+const handleSelect = (key: string, keyPath: string[], item: object) => {
+ console.log(key, keyPath, item);
+};
+const handleOpen = (key: string, keyPath: string[]) => {
+ console.log(key, keyPath);
+};
+
function lineClick() {
//返回上一页
router.go(-1);
diff --git a/src/views/monitoring/components/header.vue b/src/views/monitoring/components/header.vue
index 5b8b93c..150ef99 100644
--- a/src/views/monitoring/components/header.vue
+++ b/src/views/monitoring/components/header.vue
@@ -342,14 +342,15 @@ function warClose() {
.title {
width: 80%;
+ height: 70px;
+ line-height: 70px;
// background: url(@/assets/images/title-bg.png);
// background-size: 100%;
text-align: center;
- padding-bottom: 38px;
+ // padding-bottom: 22px;
margin: 0 auto;
h3 {
- height: 57px;
font-size: 4.2rem;
font-family: 'YouSheBiaoTiHei';
font-weight: 400;
@@ -365,10 +366,9 @@ function warClose() {
.weather {
position: absolute;
- top: 2.5rem;
+ top: 10px;
left: 7rem;
- font-size: 1.8rem;
- line-height: 2.2rem;
+ font-size: 1.6rem;
font-family: 'AlibabaPuHuiTiRegular';
.timeTips {
display: flex;
@@ -402,7 +402,7 @@ function warClose() {
.seeting {
position: absolute;
- top: 2.5rem;
+ top: 20px;
right: 7rem;
.warningbadge {
diff --git a/src/views/monitoring/components/menu.vue b/src/views/monitoring/components/menu.vue
index b8589b6..0714389 100644
--- a/src/views/monitoring/components/menu.vue
+++ b/src/views/monitoring/components/menu.vue
@@ -226,7 +226,7 @@ function menuUpdateValue(key: string, item: MenuOption) {
}
.n-menu-item-content--selected::before {
- background: -webkit-linear-gradient(left, #c9eaff 0%, #f2f3f5 100%);
+ background: -webkit-linear-gradient(left, #91d3fd 0%, #dedede 100%);
left: 0;
right: 0;
}
@@ -237,7 +237,7 @@ function menuUpdateValue(key: string, item: MenuOption) {
bottom: 0;
width: 100%;
height: 2px;
- background: -webkit-linear-gradient(left, #409eff 0%, #f2f3f5 100%);
+ background: -webkit-linear-gradient(left, #409eff 0%, #dedede 100%);
}
}
diff --git a/src/views/monitoring/screen/index.scss b/src/views/monitoring/screen/index.scss
index ce72444..694730c 100644
--- a/src/views/monitoring/screen/index.scss
+++ b/src/views/monitoring/screen/index.scss
@@ -4,7 +4,7 @@
position: relative;
width: 100%;
height: 100vh;
- background-color: #f2f3f5;
+ background-color: #dedede;
// background: url(@/assets/images/screen.png) no-repeat;
// background-color: var(--tableBg);
// background-size: 100% 100%;
@@ -19,7 +19,7 @@
position: absolute;
top: 118px;
left: 0;
- color: #b1e3ff;
+ color: #1169c0;
text-align: center;
// border: 1px solid #0d55b0;
// background-color: #02072e;
@@ -49,8 +49,9 @@
left: 0;
right: 0;
width: 70%;
+ height: 45px;
text-align: center;
- color: #a2ceff;
+ color: #1169c0;
// background: url(@/assets/images/panelBtn_bg.png) no-repeat center;
// background-size: 100% 100%;
transition: width 0.28s;
@@ -75,10 +76,10 @@
}
.copyright {
width: 100%;
- height: 25px;
- line-height: 25px;
+ // height: 25px;
+ // line-height: 25px;
text-align: center;
- color: #9ca3af;
+ color: #acaeb1;
font-family: Arial;
font-size: 12px;
letter-spacing: 1px;
@@ -172,9 +173,9 @@
.sidebar {
width: 12%;
- height: calc(100vh - 95px - 50px); //屏幕高度-头部header高度-底部高度
+ height: calc(100vh - 70px - 45px); //屏幕高度-头部header高度-底部高度
flex-shrink: 0;
- border: 1px solid var(--vxe-table-border-color);
+ border: 1px solid #b7babf;
padding: 10px 0;
// box-shadow: inset 0px 0px 10px 0px rgb(36, 90, 12);
margin-right: 1vw;
@@ -321,7 +322,8 @@
.mainTable {
// height: calc(100vh - 8rem - 202px);
// height: calc(100% - 162px);
- background-color: #f2f3f5;
+ border: 1px solid #b7babf;
+ background-color: #dedede;
transition: height 0.28s;
overflow: hidden;
@@ -331,15 +333,15 @@
// --vxe-table-footer-background-color: none;
// --vxe-table-border-color: rgba(12, 80, 166, 0.2);
// --vxe-table-border-color: none;
- // --vxe-font-color: #5beff9;
+ --vxe-font-color: #000;
// --vxe-table-header-font-color: #ffffffb3;
- // border: 1px solid var(--vxe-font-color);
+ // border: 1px solid #b7babf;
// box-shadow: inset 0px 0px 10px 0px rgb(36, 90, 124);
:deep(.vxe-table) {
// height: calc(100vh - 5.7rem - 60px) !important;
.vxe-table--body-wrapper {
- background-color: #f2f3f5;
+ background-color: #dedede;
// height: calc(100vh - 5.7rem - 182px) !important;
}
@@ -371,10 +373,10 @@
font-size: 18px;
font-weight: 500;
.tableCellClass {
- background-color: #f2f3f5;
- // border-bottom: 1px solid var(--vxe-font-color) !important;
- // border-right: 1px solid var(--vxe-font-color) !important;
- // border-right-color: var(--vxe-font-color) !important;
+ background-color: #dedede;
+ border-bottom: 1px solid #b7babf !important;
+ border-right: 1px solid #b7babf !important;
+ border-right-color: #b7babf !important;
.vxe-cell {
font-family: 'AlibabaPuHuiTiRegular';
// color: #b1e3ff;
@@ -473,7 +475,7 @@
}
}
.tablePage {
- background-color: #f2f3f5;
+ background-color: #dedede;
// --vxe-pager-background-color: none;
padding: 0 2rem;
// color: #b1e3ff;
@@ -554,7 +556,7 @@
display: flex;
align-items: center;
height: -webkit-fill-available;
- border: 2px solid var(--vxe-table-border-color);
+ border: 2px solid #b7babf;
border-radius: 5px;
color: #000;
// padding: 15px;
@@ -571,7 +573,7 @@
.numValue {
flex: 1;
text-align: center;
- color: #606266;
+ color: #000;
span {
font-size: 5rem;
@@ -595,7 +597,7 @@
span {
font-size: 1.4rem;
line-height: 30px;
- color: #606266;
+ color: #000;
margin-right: 3px;
}
span:nth-child(1) {