diff --git a/public/img/header.png b/public/img/header.png new file mode 100644 index 00000000..4001c2d2 Binary files /dev/null and b/public/img/header.png differ diff --git a/public/index.html b/public/index.html index 8fdc5259..881a32cb 100644 --- a/public/index.html +++ b/public/index.html @@ -32,7 +32,7 @@
<%= VUE_APP_TITLE %>
diff --git a/src/views/bigScreen/index_enm.vue b/src/views/bigScreen/index_enm.vue index 51bd1925..8b2298de 100644 --- a/src/views/bigScreen/index_enm.vue +++ b/src/views/bigScreen/index_enm.vue @@ -659,7 +659,7 @@ export default { header { height: 50px; /* 调整头部高度 */ - background-image: url('/public/img/header_bg.png'); + background-image: url('/public/img/header.png'); /* 替换为实际的背景图片路径 */ background-size: cover; background-position: center; @@ -781,12 +781,18 @@ header { height: 220px; } .dropdown { - top: 20%; + /* top: 20%; font-size: 18px; right: 22%; + position: absolute; */ + bottom: 3%; + font-size: 18px; + left: 50%; position: absolute; + transform: translateX(-50%); } - .dropdown-item { + + /* .dropdown-item { padding: 12px 16px; text-decoration: none; display: block; @@ -796,8 +802,33 @@ header { margin-bottom: 6px; border: 1px solid #99fffe; } +*/ + .dropdown-item { + text-decoration: none; + display: inline-block; + color: white; + width:8vw; + height:3.4vw; + font-size: 1vw; + text-align:center; + background:url(./../../../public/img/menu.png) no-repeat; + background-size:100%; + line-height:3.7vw; + margin: 0 0.1vw 0.1vw 0.1vw; + } .dropdown-item:hover, .dropdown-item.active{ - background-color: #ddd; + /* background-color: #ddd; */ + width:8.2vw; + height:3.5vw; + font-size: 1vw; + line-height:3.7vw; + margin:0; + text-decoration: none; + display: inline-block; + color: white; + text-align:center; + background:url(./../../../public/img/menu_active.png) no-repeat; + background-size:100%; } \ No newline at end of file diff --git a/src/views/enm_slag/power.vue b/src/views/enm_slag/power.vue index 4af356bd..636ce0f0 100644 --- a/src/views/enm_slag/power.vue +++ b/src/views/enm_slag/power.vue @@ -117,6 +117,9 @@ v-if="asynDialog" :type="type" :title="title" + :cate="cate" + :apiObj = "apiObj" + :mgroup="query.mgroup" :modelValue="modelValue" :showClose="showClose" :echartType='echartType' @@ -190,9 +193,10 @@ ['烘干破主电机','','kw.h/t','','',''], ], modelValue:true, - type:'hours', - title:'title', - apiObj:'', + type:'hour_s', + title:'电石渣工段', + cate:'', + apiObj:this.$API.enm.mpointstat, showClose:true, echartType:'line', asynDialog:false,