Merge remote-tracking branch 'origin/master'

riis-web/src/assets/sytlechange/treeBack.svg

@@ -0,0 +1,12 @@
+<?xml version="1.0" encoding="utf-8"?>
+<svg version="1.1" xmlns:xlink="http://www.w3.org/1999/xlink" width="260px" height="36px" xmlns="http://www.w3.org/2000/svg">
+  <defs>
+    <linearGradient gradientUnits="userSpaceOnUse" x1="15" y1="286" x2="275" y2="286" id="LinearGradient1483">
+      <stop id="Stop1484" stop-color="#00ffff" stop-opacity="0.2" offset="0" />
+      <stop id="Stop1485" stop-color="#00ffff" stop-opacity="0" offset="1" />
+    </linearGradient>
+  </defs>
+  <g transform="matrix(1 0 0 1 -15 -268 )">
+    <path d="M 15 268  L 275 268  L 275 304  L 15 304  L 15 268  Z " fill-rule="nonzero" fill="url(#LinearGradient1483)" stroke="none" />
+  </g>
+</svg>

riis-web/src/components/seccmsdialog/eldialog.vue

@@ -49,9 +49,7 @@ const isdialog = true
       <div  style="position: relative;z-index: 20;">
         <slot name="PopFrameContent"></slot>
       </div>
-      <div class="tuanchubottombox">
+      
-        <img src="@/assets/tankuang/tk_xia.png" style="width:192px;height: 10px;" alt="">
-      </div>
     </el-dialog>
 </template>
 
@@ -59,8 +57,8 @@ const isdialog = true
 <style>
 .newType{
   position: relative;
-  background: #131a25;
+  background: #001e55;
-  border: 1px solid rgba(152, 224, 255,0.3);
+  border: 1px solid #008eaa;
   border-radius: 40px;
   /* background-image: url(@/assets/index/xsjk_yl_1.png); */
   /* background-size:100% 100% ; */
@@ -110,11 +108,10 @@ const isdialog = true
     font-size: 18px;
     color: #FFFFFF;
     text-align: center;
-    background:rgb(19,26,37) ;
+    background:#001e55 ;
     border-top:1px solid rgba(152, 224, 255,0.3);
     border-bottom:1px solid rgba(152, 224, 255,0.3);
   }
-
 </style>
 
 

riis-web/src/layout/components/Navbar.vue

@@ -1,25 +1,16 @@
-
 <template>
   <div class="navbar" @mouseleave="mouseovernav">
     <div class="header-nav">
       <div class="nav-box">
-        <div style="margin-right: 20px;">
+        <div style="margin-right: 420px;"></div>
-          <div class="header-left-title">
+        <div title="首页" class="homeImgBox" @mousemove="mousemoveNav(navlist[0], 0)"
-            变电站远程智能巡视系统
+          :class="{ 'homeImgActive': activeIndex == 0 }" @click="navClick(navlist[0], 0)">首页</div>
-          </div>
-          <div class="header-left-time" style="padding-bottom: 10px;">
-            当前时间：{{ dates }}  {{ times }}
-          </div>
-        </div>
-        <div title="首页" class="homeImgBox" @mousemove="mousemoveNav(navlist[0], 0)"  :class="{'homeImgActive':activeIndex == 0}"   @click="navClick(navlist[0], 0)"></div>
         <div class="nav-list" v-for="(item, index) in navlist" v-show="index != 0"
           :class="{ 'nav-active': activeIndex == index }" @click.stop="navClick(item, index)">
-            <div class="nav-imgleft"></div>
           <div class="nav-imgtitle">{{ item.name }}</div>
-          <div class="nav-imgright"></div>
           <div class="nav-sonbox" v-if="item.children != undefined && item.hide == true">
-              <div class="nav-son-list" v-for="(items, indexs) in item.children"  @click.stop="navSonClick(item, index, items)"
+            <div class="nav-son-list" v-for="(items, indexs) in item.children"
-               >{{ items.name }}
+              @click.stop="navSonClick(item, index, items)">{{ items.name }}
             </div>
           </div>
         </div>
@@ -27,57 +18,16 @@
       <div class="nav-right-box">
         <div class="nav-right-text" style="margin-right: 20px;">
           <div class="header-left-time" style="padding: 0;">用户名：{{ userStore.username }}</div>
-          <div class="header-left-time" style="padding-top: 10px;">变电站：{{ userStore.regionName }}</div>
+          <!-- <div class="header-left-time" style="padding-top: 10px;">变电站：{{ userStore.regionName }}</div> -->
         </div>
-        <!-- <div  v-for="(item, index) in navlist" v-show="item.name == '系统管理'"
+        <img src="@/assets/navigation/qvan1.png" @click="toggle" v-if="!isFullscreen"
-          @click.stop="navClick(item, index)"  @mousemove="mousemoveNav(item, index)">
+          style="margin-right: 10px;cursor: pointer">
-          <img title="系统菜单" v-if="activeIndex != index" src="@/assets/newimg/top_xtgl.png" style="width:20px ;margin-right: 10px;cursor: pointer" >
+        <img src="@/assets/navigation/qvan.png" @click="toggle" v-if="isFullscreen"
-          <img title="系统菜单" v-else src="@/assets/header/top_xtgl.png" style="width:20px ;margin-right: 10px;cursor: pointer" >
+          style="margin-right: 10px;cursor: pointer">
-        </div> -->
+        <img src="@/assets/navigation/top_tc.png" style="margin-right: 5px;cursor: pointer" @click="logout">
-        <img title="告警信息" src="@/assets/newimg/top_gj.png" style="margin-right: 10px;cursor: pointer"
-          @click="alarmInfoClick">
-        <div style="position:relative ;" class="versionbox">
-          <img title="查看版本" src="@/assets/newimg/top_bb.png" style="margin-right: 10px;cursor: pointer">
-          <div class="versionsonbox">
-            <div class="stationintroducebox">
-              <div class="introduceboxtext1">变电站远程智能巡视系统</div>
-              <div class="introduceboxtext2">{{ systemInfo.version }}</div>
-              <div style="display: flex;align-items: center;padding-bottom: 8px;">
-                <div class="introduceboxline"></div>
-                <div class="introduceboxtext3">系统功能介绍</div>
-              </div>
-              <div class="introduceboxtext4 lineclamp">{{ systemInfo.sysdesc }}</div>
-              <div style="display: flex;align-items: center;padding-bottom: 8px;">
-                <div class="introduceboxline"></div>
-                <div class="introduceboxtext3">系统更新说明</div>
-              </div>
-              <div class="introduceboxtext4 lineclamp" style="height:60px; ">{{ systemInfo.custom1 }}</div>
-              <div class="texthover" @click="leadingOut">下载系统操作手册</div>
-              <div style="display: flex;align-items: center;padding-bottom: 8px;">
-                <div class="introduceboxline"></div>
-                <div class="introduceboxtext3">更新时间</div>
-              </div>
-              <div class="introduceboxtext4" style="padding-bottom: 0;">{{ dateFormat(systemInfo.lastmodifydate) }}</div>
       </div>
     </div>
   </div>
-       
-
-        <img src="@/assets/newimg/top_qp.png"  @click="toggle" v-if="!isFullscreen" style="margin-right: 10px;cursor: pointer">
-        <img src="@/assets/header/top_qp1.png"  @click="toggle" v-if="isFullscreen" style="margin-right: 10px;cursor: pointer">
-        <img src="@/assets/newimg/top_tc.png" style="margin-right: 5px;cursor: pointer" @click="logout">
-      </div>
-    </div>
-    <!-- <div class="header2-nav" v-if="navlist[activeIndex] != null && navlist[activeIndex].children != null && navlist[activeIndex].children.length != 0&& navlist[activeIndex].children.length != 1">
-      <div class="header2-navlist"  :class="{ 'nav-active': activeSonIndex == indexs }" 
-      v-for="(items, indexs) in navlist[activeIndex].children" @click.stop="navSonClick(navOneInfo, activeIndex, items,indexs)"
-      @mousemove="mousemoveSonNav(navOneInfo, activeIndex, items,indexs)">
-        <div class="header2-imgleft"></div>
-          <div class="header2-imgtitle">{{ items.name }}</div>
-        <div class="header2-imgright"></div>
-      </div>
-    </div> -->
-  </div>
 </template>
 <script setup lang="ts">
 import { ref, onMounted, onBeforeUnmount, nextTick, watch } from 'vue';
@@ -372,21 +322,12 @@ watch(() => props.CloseNav, (newValue, oldValue) => {
 
 <style lang="scss" scoped>
 .navbar {
-
+  // padding:0 15px;
-  padding:0 15px;
   padding-top: 9px;
   width: 100%;
   position: relative;
-  background-color: rgb(19, 26, 37);
-  // display: -webkit-flex;
-  // display: flex;
-  // align-items: center;
-  // -webkit-align-items: center;
-  // justify-content: space-between;
-  // -webkit-justify-content: space-between; 
-  // box-shadow: 0px 0px 10px rgb(219 225 236);
-  // z-index: 98;
 }
+
 .header-box {
   position: relative;
   z-index: 1002;
@@ -435,29 +376,27 @@ watch(() => props.CloseNav, (newValue, oldValue) => {
   font-family: "汉仪综艺体简";
   font-weight: bold;
 }
+
 .header-left-time {
   padding-top: 5px;
   font-family: "MicrosoftYaHei Regular", MicrosoftYaHei;
   font-weight: 400;
   font-style: normal;
   font-size: 12px;
-    color: rgb(181, 215, 255);
+  color: #ffffff;
   line-height: 9px;
   font-kerning: normal;
 }
+
 .header-nav {
   position: relative;
   display: flex;
   align-items: center;
   justify-content: space-between;
-  // padding-top: 20px;
+  background-image: url(@/assets/navigation/top_bj.png);
-  // align-items: center;
-  background-image:url(@/assets/newimg/top_bj.png);
   background-size: 100% 100%;
   width: 100%;
-  height: 81px;
+  height: 62px;
-  // padding-left: 11px;
-  
 
   .times {
     font-family: '微软雅黑';
@@ -484,13 +423,15 @@ watch(() => props.CloseNav, (newValue, oldValue) => {
   .nav-box {
     display: flex;
     align-items: center;
+    margin-bottom: 10px;
     // padding-left: 20px;
 
     .nav-list {
       display: flex;
       /* align-items: center; */
       position: relative;
-    height: 37px;
+      height: 31px;
+      width: 98px;
       line-height: 40px;
       font-family: "Arial Normal", "Arial";
       font-weight: 400;
@@ -500,18 +441,22 @@ watch(() => props.CloseNav, (newValue, oldValue) => {
       text-align: center;
       margin-right: 18px;
       cursor: pointer;
+      background: url(@/assets/navigation/top_cd.png);
       // background: url(@/assets/newimg/nav.png);
     }
+
     .nav-imgleft {
       width: 9px;
       height: 37px;
       background: url(@/assets/header/cd_zuo.png);
     }
+
     .nav-imgright {
       width: 26px;
       height: 37px;
       background: url(@/assets/header/cd_yuo.png);
     }
+
     .nav-sonbox {
       width: 120px;
       background-image: linear-gradient(#001f5a 1%, #001f5b 90%, transparent);
@@ -538,28 +483,31 @@ watch(() => props.CloseNav, (newValue, oldValue) => {
         background-color: rgba(255, 255, 255, 0.2);
       }
     }
+
     .nav-imgtitle {
-      height: 34px;
+      height: 31px;
-      line-height: 34px;
+      width: 98px;
-      padding-left: 12px;
+      line-height: 31px;
-      background: rgba(152, 224, 255, 0.2);
-      border-top: 1px solid rgba(181, 215, 255, 0.3);
-      border-bottom: 1px solid rgba(181, 215, 255, 0.3);
-      margin-top: 3px;
       cursor: pointer;
     }
+
     .nav-active .nav-imgleft {
       background: url(@/assets/header/cd_zuo.png);
       background: url(@/assets/header/cd_zuo1.png);
     }
+
     .nav-active .nav-imgright {
       background: url(@/assets/header/cd_yuo.png);
       background: url(@/assets/header/cd_yuo1.png);
 
     }
+
     .nav-active .nav-imgtitle {
-      background:rgba(21, 69, 119,0.8) ;
+      // background: rgba(21, 69, 119, 0.8);\
+      
+
     }
+
     .nav-list:hover {
       color: rgb(255, 255, 255);
     }
@@ -569,13 +517,16 @@ watch(() => props.CloseNav, (newValue, oldValue) => {
       color: rgb(255, 255, 255);
       // background: url(@/assets/newimg/navactive.png) !important;
       // background-size: 100% 100%;
+      background: url(@/assets/navigation/top_cd1.png);
     }
   }
 }
+
 .header2-nav {
   height: 60px;
   display: flex;
   align-items: center;
+
   .header2-navlist {
     display: flex;
     height: 30px;
@@ -594,16 +545,19 @@ watch(() => props.CloseNav, (newValue, oldValue) => {
     text-align: center;
     cursor: pointer;
   }
+
   .header2-imgleft {
     width: 4px;
     height: 30px;
     background: url(@/assets/header/cd_er_zuo.png);
   }
+
   .header2-imgright {
     width: 4px;
     height: 30px;
     background: url(@/assets/header/cd_er_you.png);
   }
+
   .header2-imgtitle {
     height: 30px;
     line-height: 30px;
@@ -612,20 +566,25 @@ watch(() => props.CloseNav, (newValue, oldValue) => {
     border-top: 1px solid rgba(181, 215, 255, 0.2);
     border-bottom: 1px solid rgb(181, 215, 255, 0.2);
   }
+
   .nav-active .header2-imgleft {
     background: url(@/assets/header/cd_er_zuo1.png);
   }
+
   .nav-active .header2-imgright {
     background: url(@/assets/header/cd_er_you1.png);
   }
+
   .nav-active .header2-imgtitle {
     background: rgba(21, 69, 119, 0.8);
   }
+
   .nav-active {
     background-color: rgb(21, 69, 119);
     color: #fff;
   }
 }
+
 .header-right {
   position: absolute;
   top: 0;
@@ -717,12 +676,14 @@ watch(() => props.CloseNav, (newValue, oldValue) => {
 .homeactive {
   background-color: rgba(0, 249, 162, 0.2) !important;
 }
+
 .versionsonbox {
   display: none;
   position: absolute;
   top: 10px;
   right: -80px;
 }
+
 .stationintroducebox {
   position: relative;
   top: 10px;
@@ -946,22 +907,36 @@ watch(() => props.CloseNav, (newValue, oldValue) => {
 :deep(.el-input__inner) {
   color: #fff;
 }
+
 .homeImgBox {
-  width: 34px;
+  width: 98px;
-  height: 34px;
+  height: 31px;
-  background: url(@/assets/newimg/top_sy.png);
+  background: url(@/assets/navigation/top_cd.png);
   background-size: 100% 100%;
   margin-right: 20px;
   cursor: pointer;
+  font-family: "Arial Normal", "Arial";
+    font-weight: 400;
+    font-style: normal;
+    font-size: 14px;
+    text-align: center;
+    line-height: 31px;
+    color: #fff;
 }
+
 .homeImgActive {
-  background: url(@/assets/header/home.png);
+  background: url(@/assets/navigation/top_cd1.png);
   background-size: 100% 100%;
 }
+
 .nav-right-box {
   display: flex;
   align-items: center;
+  margin-right: 10px;
+  margin-bottom: 10px;
+  color:#ffffff;
 }
+
 .iscursorinitial {
   cursor: initial !important;
 }

riis-web/src/layout/index.vue

@@ -75,7 +75,7 @@ function closeClick() {
 
     <!-- <Sidebar class="sidebar-container" /> -->
     <navbar :class="{ 'fixed-header': fixedHeader }"  :CloseNav="CloseNav" />
-    <div v-show="fixedHeader" style="height:90px"></div>
+    <div v-show="fixedHeader" style="height:70px"></div>
     <!-- <hamburger
       :is-active="appStore.sidebar.opened"
       @toggleClick="toggleSideBar"
@@ -103,8 +103,7 @@ function closeClick() {
   position: relative;
   height: 100%;
   width: 100%;
-  background-color: rgba(19, 26, 37, 1);
+  background-color: #001b4a;
-
   &.mobile.openSidebar {
     position: fixed;
     top: 0;

riis-web/src/main.ts

@@ -25,7 +25,7 @@ Object.keys(directive).forEach(key => {
 for (const [key, component] of Object.entries(ElementPlusIconsVue)) {
   app.component(key, component)
 }
-app.config.globalProperties.tableBg = { background: '#253b51', color: '#b5d7ff', height: '50px' }  //  table背影颜色
+app.config.globalProperties.tableBg = { background: '#002b6a', color: '#B5D7FF', height: '50px'}  //  table背影颜色
 // 全局方法
 import { getDictionaries } from '@/api/dict';
 app.config.globalProperties.$getDictionaries = getDictionaries;

riis-web/src/styles/index.scss

@@ -11,7 +11,7 @@ body,
 
 .modeltopbox {
   width: 100%;
-  height: 60px;
+  height: 17px;
 }
 
 // main-container global css
@@ -582,9 +582,7 @@ input {
   border: none;
 }
 
-.el-loading-mask {
+
-  background-color: #131a25c9;
-}
 
 
 .el-select:hover:not(.el-select--disabled) .el-input__wrapper {
@@ -599,9 +597,7 @@ input {
   color: #B5D7FF !important;
 }
 
-.el-loading-mask {
+
-  background: #1b2838 !important;
-}
 
 .el-range-separator {
   color: #fff !important;
@@ -622,7 +618,7 @@ input {
 }
 
 .el-loading-mask {
-  background-color: #131a25c9;
+  background-color: #00205ad8 !important;
 }
 
 .el-scrollbar__wrap {
@@ -761,9 +757,9 @@ input {
 }
 
 .searchButton {
-  border: #409eff solid 1px !important;
+ 
-  background-color: rgb(18,28,37) !important;
+  background-color: #0099ff !important;
-  color: #409eff !important;
+  color: #ffffff !important;
   // margin-top: 15px;
   // margin-left: 10px;
 }
@@ -827,9 +823,9 @@ input {
   --el-switch-off-color:#40a0ff50 !important;
 }
 .el-button:hover{
-  background-color: #ffffff00 !important;
+  background-color: #0099ff !important;
-  color: #009bff !important;
+  color: #fff !important;
-  border: 1px solid #009BFF !important;
+  border: 1px solid #0099ff !important;
 
 }
 .el-button.is-disabled{
@@ -842,3 +838,21 @@ input {
       border: 1px solid #ffffff00 !important;
   
 }
+//左侧树统一样式
+.el-tree-node.is-current > .el-tree-node__content {
+  background: none !important;
+  background-image: url(@/assets/sytlechange/treeBack.svg) !important;
+  background-size: 100% 100%;
+  color: #00ffff !important;
+  background-repeat: no-repeat !important;
+}
+.el-tree-node__content:hover{
+  color:#00ffff;
+}
+//
+.silderRight {
+  height: calc(90vh) !important;
+  background: url(@/assets/navigation/ty_1614x988.png) !important;
+  background-size: 100% 100% !important;
+  background-color: #00205a !important;
+}

riis-web/src/styles/sidebar.scss

@@ -375,11 +375,11 @@ body[layout="mix"] {
 }
 //表格多选样式
 .el-table .success-row {
-  background: #1b2838 !important;
+  background: #0c2a62 !important;
   color: #fff !important;
 }
 .el-table .warning-row {
-  background: #17212e !important;
+  background: #001f5a !important;
   color: #fff !important;
 }
 .el-table .success-row .el-table-fixed-column--right {
@@ -500,3 +500,4 @@ color:#fff !important;
 .el-transfer-panel__item.el-checkbox .el-checkbox__label{
 color: #fff;
 }
+////

riis-web/src/views/basedata/3DModelSet/index.vue

@@ -18,10 +18,6 @@
           <el-option label="摄像机设置" value="01"></el-option>
           <el-option label="巡视点设置" value="02"></el-option>
           <el-option label="设备/部件设置" value="05"></el-option>
-          <el-option label="无人车设置" value="04"></el-option>
-          <el-option label="无人车巡视路线设置" value="03"></el-option>
-          <el-option label="无人机设置" value="06"></el-option>
-          <el-option label="无人机巡视路线设置" value="07"></el-option>
         </el-select>
       </span>
       <!-- 操作按钮 -->
@@ -5546,7 +5542,7 @@ ws1.onclose = () => {
 .three-top {
   position: absolute;
   left: 15px;
-  top: 60px;
+  top: 15px;
   z-index: 1001;
 }
 
@@ -5557,7 +5553,7 @@ ws1.onclose = () => {
   z-index: 1001;
   width: 320px;
   height: calc(100% - 18px);
-  background: url('@/assets/3d/spjk_ytbj.png') no-repeat;
+  background: url(@/assets/navigation/ty_260x988.png);
   background-size: 100% 100%;
 
   .three-right-list-title {
@@ -5766,13 +5762,7 @@ ws1.onclose = () => {
   background-color: transparent !important;
 }
 
-:deep(.el-tree-node.is-current>.el-tree-node__content) {
+
-  width: 100%;
-  height: 40px;
-  color: #009bff !important;
-  background: url('@/assets/3d/right_list_hov.png') no-repeat !important;
-  background-size: 100% 100%;
-}
 
 :deep(.el-tree-node__content) {
   width: 100% !important;

riis-web/src/views/basedata/alarminterval/index.vue

@@ -291,7 +291,7 @@ const tableRowClassName = ({
 </script>
 
 <template>
-    <div style="height: 60px;padding:0px 15px;"></div>
+    <div style="height: 10px;padding:0px 15px;"></div>
     <div class="faulttemplate-box">
         <!-- 设置阈值弹窗 -->
         <!-- <div class="custom2" v-if="dialogVisible == true">
@@ -353,10 +353,10 @@ const tableRowClassName = ({
                 </div>
             </div>
             <div class="draggable">
-                <el-table v-loading="loading" :data="tableData" style="width: 100%;height: calc(100vh - 280px);
+                <el-table v-loading="loading" :data="tableData" style="width: 100%;height: calc(75vh);
                 overflow: auto;margin-bottom: 15px;" row-key="deviceId" @selection-change="handleSelectionChange"
                     default-expand-all :row-class-name="tableRowClassName"
-                    :header-cell-style="{ background: '#253b51', color: '#b5d7ff', height: '50px' }">
+                    :header-cell-style="{ background: '#002b6a', color: '#B5D7FF', height: '50px'}">
                     <el-table-column type="selection" width="30" align="center" />
                     <el-table-column type="index" label="序号" width="50px" align="center" />
                     <el-table-column label="巡视点位名称" prop="deviceName" width="140" show-overflow-tooltip></el-table-column>
@@ -525,13 +525,9 @@ const tableRowClassName = ({
 //     color: #009bff !important;
 //     background-repeat: no-repeat !important;
 // }
-:deep(.el-loading-mask) {
-    background-color: #131a25c9;
-}
 
-:deep(.el-scrollbar__wrap) {
+
-    background: #17212e;
+
-}
 
 :deep(.el-input__wrapper) {
     background-color: rgba(19, 26, 37, 0);

riis-web/src/views/basedata/device/index.vue

@@ -1298,7 +1298,7 @@ const isGaoliang: any = ref("")
 </script>
 
 <template>
-    <div style="height: 60px;"></div>
+    <div style="height: 10px;"></div>
     <div class="faulttemplate-box">
         <Eldialog v-if="dialogVisible" :title="title" :zIndex="2000" :width="'1180px'" :height="'600px'"
             @before-close="handleClose">
@@ -1549,7 +1549,7 @@ const isGaoliang: any = ref("")
                 <el-option v-for="item in optionSelect" :key="item.stationId" :label="item.stationName"
                     :value="item.stationId" style="width:100%" />
             </el-select>
-            <el-scrollbar height="calc(100vh - 270px)" style="width:99%">
+            <el-scrollbar height="calc(78vh)" style="width:99%">
                 <el-tree ref="treeRef" :class="useAppStore().size === 'default' ? 'silderLeft-large' : 'silderLeft-default'"
                     node-key="bayId" :data="treedata" :current-node-key="currentNodeKey" :highlight-current="true"
                     :props="defaultProps" v-loading="treeloading" @node-click="handleNodeClick">
@@ -1597,10 +1597,10 @@ const isGaoliang: any = ref("")
                 </div>
             </div>
             <div class="draggable">
-                <el-table v-loading="loading" :data="tableData" style="width: 100%;height: calc(100vh - 280px);
+                <el-table v-loading="loading" :data="tableData" style="width: 100%;height: calc(78vh);
                 overflow: auto;;margin-bottom: 15px;" row-key="id" @selection-change="handleSelectionChange"
                     default-expand-all :row-class-name="tableRowClassName"
-                    :header-cell-style="{ background: '#253b51', color: '#b5d7ff', height: '50px' }">
+                    :header-cell-style="{ background: '#002b6a', color: '#B5D7FF', height: '50px'}">
                     <el-table-column type="selection" width="30" align="center" />
                     <el-table-column type="index" label="序号" width="50px" align="center" />
                     <el-table-column label="巡视点位编号" prop="deviceCode" width="140"></el-table-column>
@@ -2431,7 +2431,7 @@ const isGaoliang: any = ref("")
     box-sizing: border-box;
     border-radius: 3px;
     position: relative;
-    background: url(@/assets/newimg/jcpz_260.png);
+    background: url(@/assets/navigation/ty_260x988.png);
     background-size: 100% 100%;
     padding: 0px 10px;
 
@@ -2459,22 +2459,12 @@ const isGaoliang: any = ref("")
     border: none;
 }
 
-:deep(.el-tree-node.is-current > .el-tree-node__content) {
-    background: none !important;
-    background-image: url(@/assets/images/u324.png) !important;
-    background-size: 100% 100%;
-    color: #009bff !important;
-    background-repeat: no-repeat !important;
-}
-
-:deep(.el-loading-mask) {
-    background-color: #131a25c9;
-}
 
 
-:deep(.el-scrollbar__wrap) {
+
-    background: #17212e;
+
-}
+
+
 
 :deep(.el-tree) {
     background-color: #ffffff00 !important;

riis-web/src/views/basedata/equipment/index.vue

@@ -539,7 +539,7 @@ const tableRowClassName = ({
 </script>
 
 <template>
-    <div style="height: 60px;"></div>
+    <div style="height: 15px;"></div>
     <div class="faulttemplate-box">
         <!-- 主设备 -->
         <!-- <div class="custom2" v-if="dialogMain == true || dialogcom == true">
@@ -626,7 +626,7 @@ const tableRowClassName = ({
                 <el-option v-for="item in optionSelect" :key="item.stationId" :label="item.stationName"
                     :value="item.stationId" style="width:100%" />
             </el-select>
-            <el-scrollbar height="calc(100vh - 275px)" style="width:99%;">
+            <el-scrollbar height="calc(80vh)" style="width:99%;">
                 <el-tree ref="treeRef" :class="useAppStore().size === 'default' ? 'silderLeft-large' : 'silderLeft-default'"
                     node-key="bayId" :data="treedata" :current-node-key="currentNodeKey" :highlight-current="true"
                     :props="defaultProps" v-loading="treeloading" @node-click="handleNodeClick">
@@ -662,8 +662,8 @@ const tableRowClassName = ({
             </div>
             <!-- <div class="draggable1"> -->
             <el-table v-loading="loading" ref="multipleTable" :data="tableData" default-expand-all tooltip-effect="dark"
-                style="width: 100%;height: calc(100vh - 230px)" row-key="id" :row-class-name="tableRowClassName"
+                style="width: 100%;height: calc(82vh)" row-key="id" :row-class-name="tableRowClassName"
-                :header-cell-style="{ background: '#253b51', color: '#b5d7ff', height: '50px' }">
+                :header-cell-style="{ background: '#002b6a', color: '#B5D7FF', height: '50px'}">
                 <el-table-column label="名称" show-overflow-tooltip>
                     <template #default="scope">
                         <span v-if="scope.row.type == '主设备'">{{ scope.row.mainDeviceName }}({{ scope.row.count
@@ -763,9 +763,7 @@ const tableRowClassName = ({
     background-size: 100% 100%;
 }
 
-:deep(.el-scrollbar__wrap) {
+
-    background: #17212e;
-}
 
 .avatar {
     width: 86px;
@@ -843,7 +841,7 @@ const tableRowClassName = ({
     // background: #ffffff00;
     border-radius: 3px;
     position: relative;
-    background: url(@/assets/newimg/jcpz_260.png);
+    background: url(@/assets/navigation/ty_260x988.png);
     background-size: 100% 100%;
     padding:0px 10px;
 
@@ -869,17 +867,9 @@ const tableRowClassName = ({
     border: none;
 }
 
-:deep(.el-tree-node.is-current > .el-tree-node__content) {
-    background: none !important;
-    background-image: url(@/assets/images/u324.png) !important;
-    background-size: 100% 100%;
-    color: #009bff !important;
-    background-repeat: no-repeat !important;
-}
 
-:deep(.el-loading-mask) {
+
-    background-color: #131a25c9;
+
-}
 
 :deep(.el-input__wrapper) {
     background-color: rgba(19, 26, 37, 0);

riis-web/src/views/basedata/maintenancePlan/index.vue

@@ -1140,7 +1140,7 @@ function getrobotUAV() {
       <div class="draggable">
         <el-table stripe :header-cell-style="tableBg" v-loading="planLoading" :data="tableData" style="
             width: 100%;
-            height: calc(100vh - 280px);
+            height: calc(75vh);
             overflow: auto;
           " row-key="id" @selection-change="handleSelectionChange" default-expand-all>
           <el-table-column type="selection" width="30" align="center" :selectable="checkSelectable" />
@@ -1453,7 +1453,7 @@ function getrobotUAV() {
 
 .faulttemplate-box {
   padding: 0 15px;
-  padding-top: 60px;
+  padding-top: 17px;
   height: 100%;
 
 }
@@ -1473,13 +1473,13 @@ function getrobotUAV() {
 
 .silderBox {
   width: 100%;
-  height: calc(100vh - 160px);
+  height: calc(89vh);
   background-color: #131a25;
   border: none;
   border-radius: 3px;
   padding: 5px 20px 0px;
   box-sizing: border-box;
-  background: url(@/assets/newimg/cjrw_1890.png);
+  background: url(@/assets/navigation/ty_1614x988.png);
   background-size: 100% 100%;
 
 }

riis-web/src/views/basedata/substation/index.vue

@@ -558,7 +558,7 @@ const tableRowClassName = ({
 
 </script>
 <template>
-    <div style="height: 60px;"></div>
+    <div style="height: 17px;"></div>
     <div class="collectiontemplate-box">
         <section class="detail-box">
             <div
@@ -579,8 +579,8 @@ const tableRowClassName = ({
             </div>
             <div class="draggable">
                 <el-table v-loading="loading" ref="multipleTable" :data="tableData" default-expand-all tooltip-effect="dark"
-                    style="width: 100%;height: calc(100vh - 245px)" row-key="id" :row-class-name="tableRowClassName"
+                    style="width: 100%;height: calc(80vh)" row-key="id" :row-class-name="tableRowClassName"
-                    :header-cell-style="{ background: '#253b51', color: '#b5d7ff', height: '50px' }">
+                    :header-cell-style="{ background: '#002b6a', color: '#B5D7FF', height: '50px'}">
                     <el-table-column label="名称" prop="stationName" show-overflow-tooltip>
                         <template #default="scope">
                             <span v-if="scope.row.type == '变电站'">{{ scope.row.stationName }}<span
@@ -855,14 +855,14 @@ const tableRowClassName = ({
 
 .detail-box {
     width: 100%;
-    height: calc(100vh - 170px);
+    height: calc(89vh);
     // overflow: auto;
     background-color: #131a25;
     border: none;
     border-radius: 3px;
     padding: 5px 20px 0px;
     box-sizing: border-box;
-    background: url(@/assets/newimg/cjrw_1890.png);
+    background: url(@/assets/navigation/ty_1614x988.png) ;
     background-size: 100% 100%;
 }
 
@@ -874,9 +874,7 @@ const tableRowClassName = ({
     position: relative;
 }
 
-:deep(.el-scrollbar__wrap) {
+
-    background: #17212e;
-}
 
 .delicon {
     width: 20px;
@@ -934,7 +932,5 @@ const tableRowClassName = ({
     background-color: rgba(19, 26, 37, 0);
 }
 
-:deep(.el-loading-mask) {
+
-    background-color: #131a25c9;
-}
 </style>

riis-web/src/views/dashboard/3DModelSet.vue

@@ -311,7 +311,7 @@ onBeforeUnmount(() => {
   left: 0;
   right: 0;
   bottom: 0;
-  background: #131a25;
+  background: #001b4a;
   display: flex;
   align-items: center;
   justify-content: center;

riis-web/src/views/dashboard/index.vue

@@ -7,7 +7,7 @@
         <div style="width: calc(100vw);
           height: 100vh;
           position: fixed;
-          top: 20px;
+          top: 60px;
           ">
           <Modelset v-if="isModelset" :isautoRotate="isautoRotate" />
         </div>
@@ -290,12 +290,12 @@
             <div class="right2_box_left">
               <div class="box_text">
                 <div class="box_text1">告警总数</div>
-                <div class="box_text3"> <img src="@/assets/sytlechange/right_two1.svg" alt=""></div>
+                <div class="box_text3"> <img src="@/assets/navigation/sysy_gjl2.png" alt=""></div>
                 <div class="box_text2">1000 <span class="span">件</span></div>
               </div>
               <div class="box_text" style="margin-top: 30px;">
                 <div class="box_text1">告警总数</div>
-                <div class="box_text3"> <img src="@/assets/sytlechange/right_two1.svg" alt=""></div>
+                <div class="box_text3"> <img src="@/assets/navigation/sysy_gjl2.png" alt=""></div>
                 <div class="box_text2">1000 <span class="span">件</span></div>
               </div>
             </div>
@@ -706,7 +706,7 @@ const tabs = ref(1)
   left: 15px;
   width: 450px;
   height: 458px;
-  background: url(@/assets/sytlechange/u206.svg);
+  background: url(@/assets/navigation/sy_zsb.png);
   background-size: 100% 100%;
   background-color: #001f59d7;
   box-sizing: border-box;
@@ -774,7 +774,7 @@ const tabs = ref(1)
   left: 15px;
   width: 450px;
   height: 247px;
-  background: url(@/assets/sytlechange/u206.svg);
+  background: url(@/assets/navigation/sy_zz.png);
   background-size: 100% 100%;
   background-color: #001f59d7;
   box-sizing: border-box;
@@ -871,7 +871,7 @@ const tabs = ref(1)
   left: 15px;
   width: 450px;
   height: 253px;
-  background: url(@/assets/sytlechange/u206.svg);
+  background: url(@/assets/navigation/sy_gj.png);
   background-size: 100% 100%;
   background-color: #001f59d7;
   box-sizing: border-box;
@@ -886,7 +886,7 @@ const tabs = ref(1)
     .three_box {
       width: 125px;
       height: 80px;
-      background: url(@/assets/sytlechange/three.svg);
+      background: url(@/assets/navigation/sy_qx.png);
       background-size: 100% 100%;
       padding: 13px 15px;
       box-sizing: border-box;
@@ -941,7 +941,7 @@ const tabs = ref(1)
   right: 15px;
   width: 450px;
   height: 318px;
-  background: url(@/assets/sytlechange/u206.svg);
+  background: url(@/assets/navigation/sy_gj.png);
   background-size: 100% 100%;
   background-color: #001f59d7;
   box-sizing: border-box;
@@ -955,7 +955,7 @@ const tabs = ref(1)
   right: 15px;
   width: 450px;
   height: 317px;
-  background: url(@/assets/sytlechange/u206.svg);
+  background: url(@/assets/navigation/sy_bjl.png);
   background-size: 100% 100%;
   background-color: #001f59d7;
   box-sizing: border-box;
@@ -1047,7 +1047,7 @@ const tabs = ref(1)
   right: 15px;
   width: 450px;
   height: 323px;
-  background: url(@/assets/sytlechange/u206.svg);
+  background: url(@/assets/navigation/sy_rw.png);
   background-size: 100% 100%;
   background-color: #001f59d7;
   box-sizing: border-box;
@@ -1576,9 +1576,7 @@ const tabs = ref(1)
   color: rgb(0, 249, 162);
 }
 
-:deep(.el-loading-mask) {
+
-  background-color: rgba(17, 61, 49, 0.8);
-}
 
 .wqxsjtext1 {
   position: absolute;

riis-web/src/views/ledgermanagement/monitordevice/index.vue

@@ -1350,7 +1350,7 @@ const isGaoliang: any = ref("")
 </script>
 
 <template>
-    <div style="height: 60px;"></div>
+    <div style="height: 15px;"></div>
     <div class="faulttemplate-box">
         <Eldialog v-if="dialogVisible" :title="title" :zIndex="2000" :width="'1180px'" :height="'600px'"
             @before-close="handleClose">
@@ -1705,8 +1705,6 @@ const isGaoliang: any = ref("")
 
             </template>
         </Eldialog>
-
-
         <aside id="silderLeft">
             <div class="displayflex" style="margin: 0;padding-left: 8px;height: 30px;margin-top:10px;margin-bottom:10px;">
                 <div class="line"></div>
@@ -1717,7 +1715,7 @@ const isGaoliang: any = ref("")
                 <el-option v-for="item in optionSelect" :key="item.stationId" :label="item.stationName"
                     :value="item.stationId" style="width:100%" />
             </el-select>
-            <el-scrollbar height="calc(100vh - 280px)" style="width:99%;">
+            <el-scrollbar height="calc(80vh)" style="width:99%;">
                 <el-tree ref="treeRef" :class="useAppStore().size === 'default' ? 'silderLeft-large' : 'silderLeft-default'"
                     node-key="areaId" :data="treedata" :current-node-key="currentNodeKey" :highlight-current="true"
                     :props="defaultProps" v-loading="treeloading" @node-click="handleNodeClick">
@@ -1761,10 +1759,10 @@ const isGaoliang: any = ref("")
                 </div>
             </div>
             <div class="draggable">
-                <el-table v-loading="loading" :data="tableData" style="width: 100%;height: calc(100vh - 280px);
+                <el-table v-loading="loading" :data="tableData" style="width: 100%;height: calc(75vh);
                         overflow: auto;margin-bottom: 15px;" row-key="id" @selection-change="handleSelectionChange"
                     default-expand-all :row-class-name="tableRowClassName"
-                    :header-cell-style="{ background: '#253b51', color: '#b5d7ff', height: '50px' }">
+                    :header-cell-style="{ background: '#002b6a', color: '#B5D7FF', height: '50px'}">
                     <el-table-column type="selection" width="30" align="center" :selectable="checkSelectable" />
                     <el-table-column type="index" label="序号" width="50px" align="center" />
                     <el-table-column label="设备编码" prop="patroldeviceCode"></el-table-column>
@@ -2859,7 +2857,7 @@ const isGaoliang: any = ref("")
     border-radius: 3px;
     position: relative;
     background: #17212e;
-    background: url(@/assets/newimg/jcpz_260.png);
+    background: url(@/assets/navigation/ty_260x988.png);
     background-size: 100% 100%;
     padding: 0px 10px;
 
@@ -2874,21 +2872,11 @@ const isGaoliang: any = ref("")
     border: none;
 }
 
-:deep(.el-tree-node.is-current > .el-tree-node__content) {
-    background: none !important;
-    background-image: url(@/assets/images/u324.png) !important;
-    background-size: 100% 100%;
-    color: #009bff !important;
-    background-repeat: no-repeat !important;
-}
 
-:deep(.el-loading-mask) {
-    background-color: #131a25c9;
-}
 
-:deep(.el-scrollbar__wrap) {
+
-    background: #17212e;
+
-}
+
 
 :deep(.el-tree) {
     background-color: #ffffff00 !important;

riis-web/src/views/ledgermanagement/voiceprint/index.vue

@@ -545,7 +545,7 @@ function currency(list: any, itemcode: any) {
 </script>
 
 <template>
-    <div style="height: 60px;"></div>
+    <div style="height: 15px;"></div>
     <div class="faulttemplate-box">
         <Eldialog v-if="dialogVisible" :title="title" :zIndex="2000" :width="'1180px'" :height="'600px'"
             @before-close="handleClose">
@@ -635,7 +635,7 @@ function currency(list: any, itemcode: any) {
                 <div class="line"></div>
                 <div class="title" style="font-size: 14px;">分类导航</div>
             </div>
-            <el-scrollbar height="calc(100vh - 280px)">
+            <el-scrollbar height="calc(84vh)">
                 <el-tree ref="treeRef" :class="useAppStore().size === 'default' ? 'silderLeft-large' : 'silderLeft-default'"
                     node-key="stationId" :data="treedata" :current-node-key="currentNodeKey" :highlight-current="true"
                     :props="defaultProps" v-loading="treeloading" @node-click="handleNodeClick" style="padding:10px 15px 0px;">
@@ -675,10 +675,10 @@ function currency(list: any, itemcode: any) {
                 </div>
             </div>
             <div class="draggable">
-                <el-table v-loading="loading" :data="tableData" style="width: 100%;height: calc(100vh - 280px);
+                <el-table v-loading="loading" :data="tableData" style="width: 100%;height: calc(75vh);
-                            overflow: auto;;margin-bottom: 15px;" row-key="id"
+                            overflow: auto;margin-bottom: 15px;" row-key="id"
                     @selection-change="handleSelectionChange" default-expand-all :row-class-name="tableRowClassName"
-                    :header-cell-style="{ background: '#253b51', color: '#b5d7ff', height: '50px' }">
+                    :header-cell-style="{ background: '#002b6a', color: '#B5D7FF', height: '50px'}">
                     <el-table-column type="selection" width="30" align="center" :selectable="checkSelectable" />
                     <el-table-column type="index" label="序号" width="50px" align="center" />
                     <el-table-column label="设备编码" prop="patroldeviceCode"></el-table-column>
@@ -867,7 +867,7 @@ function currency(list: any, itemcode: any) {
 :deep(.el-tree-node.is-current>.el-tree-node__content) {
     width: 100%;
     height: 40px;
-    color: #fff !important;
+    // color: #fff !important;
 }
 
 :deep(.el-tree-node__content) {
@@ -1148,7 +1148,7 @@ function currency(list: any, itemcode: any) {
     box-sizing: border-box;
     border-radius: 3px;
     position: relative;
-    background: url(@/assets/newimg/jcpz_260.png);
+    background: url(@/assets/navigation/ty_260x988.png);
     background-size: 100% 100%;
     // padding:0px 10px;
     &:hover {
@@ -1162,21 +1162,11 @@ function currency(list: any, itemcode: any) {
     border: none;
 }
 
-:deep(.el-tree-node.is-current > .el-tree-node__content) {
-    background: none !important;
-    background-image: url(@/assets/images/u324.png) !important;
-    background-size: 100% 100%;
-    color: #009bff !important;
-    background-repeat: no-repeat !important;
-}
 
-:deep(.el-loading-mask) {
-    background-color: #131a25c9;
-}
 
-:deep(.el-scrollbar__wrap) {
+
-    background: #17212e;
+
-}
+
 
 :deep(.el-tree) {
     background-color: #ffffff00 !important;

riis-web/src/views/linkagecontrol/Intelligentlinkage/index.vue

@@ -632,11 +632,7 @@ function switchImg(index: any) {
   border: 2px solid transparent;
 }
 
-:deep(.el-tree-node.is-current > .el-tree-node__content) {
 
-  background-color: transparent !important;
-  border: 2px solid #0a5a92;
-}
 
 .addCamerabox {
   width: 100%;
@@ -879,13 +875,9 @@ function switchImg(index: any) {
   // display: none;
 }
 
-:deep(.el-scrollbar__wrap) {
-  background: transparent;
-}
 
-:deep(.el-loading-mask) {
+
-  background-color: rgb(19 66 51) !important;
+
-}
 
 :deep(.el-input__wrapper) {
   background-color: transparent !important;

riis-web/src/views/linkagecontrol/ordercontrol/index.vue

@@ -538,9 +538,6 @@ onMounted(() => {
 }
 
 
-:deep(.el-loading-mask) {
-  background-color: #131a25c7 !important;
-}
 
 :deep(.el-input__wrapper) {
   background-color: #0a242000 !important;
@@ -570,11 +567,7 @@ onMounted(() => {
   --el-tree-text-color: #fff !important;
 }
 
-:deep(.el-tree-node.is-current > .el-tree-node__content) {
+
-  background-color: #209f8400 !important;
-  border: #008fd4 1px solid;
-  height: 30px;
-}
 
 :deep(.el-tree-node__content) {
   height: 30px !important;

riis-web/src/views/linkagecontrol/sequentialcontrol/index.vue

@@ -516,12 +516,7 @@ onBeforeUnmount(() => {
     --el-tree-text-color: #fff !important;
 }
 
-:deep(.el-tree-node.is-current > .el-tree-node__content) {
+
-    background-color: #209f8400 !important;
-    border: #0f5e91 1px solid;
-    height: 45px;
-    // padding: 0px 5px !important;
-}
 
 :deep(.el-tree-node__content) {
     height: 45px !important;

riis-web/src/views/monitorsystem/stationboard/index.vue

@@ -1160,9 +1160,7 @@ function closeAlarm(type:any){
   color: rgb(0, 249, 162);
 }
 
-:deep(.el-loading-mask){
+
-  background-color: rgba(17,61,49,0.8);
-}
 </style>
 
 

riis-web/src/views/reliabilitystatistic/index.vue

@@ -707,11 +707,6 @@ function currency(list: any, itemcode: any) {
   color: rgb(0, 249, 162);
 }
 
-:deep(.el-tree-node.is-current > .el-tree-node__content) {
-
-  background: linear-gradient(to right, rgb(9, 79, 58), transparent) !important;
-  color: rgb(0, 249, 162);
-}
 
 :deep(.el-table__header-wrapper) {
   border-left: #00F9A2 3px solid;
@@ -742,13 +737,9 @@ function currency(list: any, itemcode: any) {
   // display: none;
 }
 
-:deep(.el-scrollbar__wrap) {
-  background: transparent;
-}
 
-:deep(.el-loading-mask) {
+
-  background-color: rgb(19 66 51) !important;
+
-}
 
 :deep(.el-input__wrapper) {
   background-color: #0a2420 !important;

riis-web/src/views/reliabilitystatistic/reliabilitystatistic/index.vue

@@ -662,10 +662,7 @@ function currency(list: any, itemcode: any) {
   color: #009BFF;
 }
 
-:deep(.el-tree-node.is-current > .el-tree-node__content) {
+
-  background: linear-gradient(to right, rgba(0, 155, 255, .2), transparent) !important;
-  color: #009BFF;
-}
 
 
 :deep(.el-table__body-wrapper) {
@@ -690,9 +687,7 @@ function currency(list: any, itemcode: any) {
   background: transparent;
 }
 
-:deep(.el-loading-mask) {
+
-  background-color: #253b51 !important;
-}
 
 :deep(.el-input__wrapper) {
   background-color: transparent !important;

riis-web/src/views/system/TaskSetting/index.vue

@@ -846,7 +846,7 @@ onMounted(() => {
 });
 </script>
 <template>
-    <div style="padding:60px 15px 8px 15px;">
+    <div style="padding:17px 15px 8px 15px;">
         <div class="setting-box">
             <div
                 style="display: flex;display: -webkit-flex; justify-content: space-between;-webkit-justify-content: space-between; margin-bottom: 20px;">
@@ -862,10 +862,10 @@ onMounted(() => {
                 </div>
             </div>
             <div class="draggable">
-                <el-table ref="multipleTableRef" :data="tableData" style="width: 100%;margin-bottom: 20px;height: calc(100vh - 295px);
+                <el-table ref="multipleTableRef" :data="tableData" style="width: 100%;margin-bottom: 20px;height: calc(72vh);
                 overflow: auto;" border :row-class-name="tableRowClassName" row-key="id"
                     @selection-change="handleSelectionChange"
-                    :header-cell-style="{ background: '#253b51', color: '#b5d7ff', height: '50px' }">
+                    :header-cell-style="{ background: '#002b6a', color: '#B5D7FF', height: '50px'}">
                     <el-table-column type="selection" width="30" align="center" />
                     <el-table-column label="排序号" width="90">
                         <template #default="scope">
@@ -1293,13 +1293,13 @@ onMounted(() => {
     padding: 20px;
     padding-bottom: 8px;
     width: 100%;
-    height: calc(100vh - 160px);
+    height: calc(88vh);
     overflow: auto;
     background-color: rgba(255, 255, 255, 0);
     border: none;
     border-radius: 3px;
     box-sizing: border-box;
-    background: url(@/assets/newimg/cjrw_1890.png);
+    background: url(@/assets/navigation/ty_1614x988.png) ;
   background-size: 100% 100%;
 }
 

riis-web/src/views/system/backup/index.vue

@@ -279,13 +279,9 @@ const tableRowClassName = ({
   color: #fff;
 }
 
-:deep(.el-loading-mask) {
-  background-color: #131a25c9;
-}
 
-:deep(.el-scrollbar__wrap) {
+
-  background: #17212e;
+
-}
 
 :deep(.el-tree) {
   background-color: #ffffff00 !important;

riis-web/src/views/system/dept/index.vue

@@ -499,7 +499,7 @@ function inputCLOse() {
 </script>
 
 <template>
-  <div style="padding: 0px 15px;">
+  <div style="padding: 15px 15px 0px; ">
     <div class="faulttemplate-box">
       <aside id="silderLeft">
         <!-- <div v-hasPerm="['add:org']" class="p-[15px]"><el-button  class="w-full searchButton buttonhover"
@@ -509,7 +509,7 @@ function inputCLOse() {
         <el-tree :class="useAppStore().size === 'default' ? 'silderLeft-large' : 'silderLeft-default'"
           v-loading="treeloading" ref="treeRef" node-key="id" :data="treedata" :highlight-current="true"
           :props="defaultProps" @node-click="handleNodeClick"
-          style="height: calc(100vh - 250px); overflow: auto;margin-top: 15px;">
+          style="height: calc(88vh); overflow: auto;margin-top: 15px;">
           <template #default="{ node, data }">
             <span class="custom-tree-node">
               <span>{{ node.label }}</span>
@@ -546,7 +546,7 @@ function inputCLOse() {
         </el-row>
         <el-table v-loading="loading" :data="tableData" style="width: 100%; margin-bottom: 20px" row-key="id"
           @selection-change="handleSelectionChange" default-expand-all :row-class-name="tableRowClassName"
-          :header-cell-style="{ background: '#253b51', color: '#b5d7ff', height: '50px' }">
+          :header-cell-style="{ background: '#002b6a', color: '#B5D7FF', height: '50px'}">
           <el-table-column type="selection" width="30" align="center" />
           <el-table-column prop="orgcode" label="变电站编号"></el-table-column>
           <el-table-column prop="orgname" label="变电站名称" ></el-table-column>
@@ -748,7 +748,6 @@ function inputCLOse() {
   display: -webkit-flex;
   display: flex;
   background-color: #f2f4f900;
-  padding-top: 60px;
 }
 
 #silderLeft {
@@ -756,9 +755,9 @@ function inputCLOse() {
   box-sizing: border-box;
   border-radius: 3px;
   position: relative;
-  background: url(@/assets/newimg/2da8511651d9229f21e93d81537ccd3.png);
+  background: url(@/assets/navigation/ty_260x988.png);
   background-size: 100% 100%;
-  height: calc(100vh - 155px);
+  height: calc(90vh);
 
   &:hover {
     .moveBtn {
@@ -801,38 +800,18 @@ function inputCLOse() {
   flex: 1;
   position: relative;
   width: 100%;
-  height: calc(100vh - 155px);
   overflow: auto;
-  background-color: rgba(255, 255, 255, 0);
   border-radius: 3px;
   padding: 15px;
   padding-bottom: 0px;
   margin-left: 15px;
   box-sizing: border-box;
-  background: url(@/assets/newimg/cjrw_1890.png);
-  background-size: 100% 100%;
 }
-
-:deep(.el-tree-node.is-current > .el-tree-node__content) {
-  background: none !important;
-  background-image: url(@/assets/images/u324.png) !important;
-  background-size: 100% 100%;
-  color: #009bff !important;
-  background-repeat: no-repeat !important;
-}
-
 :deep(.el-table:not(.el-table--border) .el-table__cell) {
   border: none;
   color: #fff;
 }
 
-:deep(.el-loading-mask) {
-  background-color: #131a25c9;
-}
-
-:deep(.el-scrollbar__wrap) {
-  background: #17212e;
-}
 
 :deep(.el-tree-node__content) {
   width: 100%;

riis-web/src/views/system/dict/index.vue

@@ -447,7 +447,7 @@ const total = ref()
           style=" color: #009bff; border: 1px solid #009bff;width:100%;margin-bottom:10px;background-color: #123958;"
           @click="dictAdd">
           新增字典</el-button>
-        <el-scrollbar height="calc(100vh - 275px)">
+        <el-scrollbar height="calc(77vh)">
           <el-tree v-loading="treeloading" ref="treeRef"
             :class="useAppStore().size === 'default' ? 'silderLeft-large' : 'silderLeft-default'" node-key="id"
             :allow-drop="allowDrop" :data="treedata" draggable :highlight-current="true" :props="defaultProps"
@@ -492,10 +492,10 @@ const total = ref()
         </el-col>
       </el-row>
       <div class="draggable">
-        <el-table v-loading="tableloading" :data="tableData" row-key="id" style="width: 100%;margin-bottom: 20px;height: calc(100vh - 270px);
+        <el-table v-loading="tableloading" :data="tableData" row-key="id" style="width: 100%;margin-bottom: 20px;height: calc(77vh);
                 overflow: auto;" border @selection-change="handleSelectionChange" default-expand-all
           :row-class-name="tableRowClassName"
-          :header-cell-style="{ background: '#253b51', color: '#b5d7ff', height: '50px' }">
+          :header-cell-style="{ background: '#002b6a', color: '#B5D7FF', height: '50px'}">
           <el-table-column type="selection" width="30" align="center" />
           <el-table-column prop="orderNo" label="序号" width="50">
             <template #default="scope">
@@ -605,7 +605,7 @@ const total = ref()
   display: flex;
   background-color: #f2f4f900;
   display: -webkit-flex;
-  padding: 60px 15px 8px 15px;
+  padding: 17px 15px 8px 15px;
 }
 
 #silderLeft {
@@ -615,7 +615,7 @@ const total = ref()
   background: #ffffff00;
   border-radius: 3px;
   position: relative;
-  background: url(@/assets/newimg/2da8511651d9229f21e93d81537ccd3.png);
+  background: url(@/assets/navigation/ty_260x988.png);
   background-size: 100% 100%;
 
   &:hover {
@@ -719,12 +719,6 @@ background-size: 100% 100%;
   background-color: #f2f4f900;
 }
 
-:deep(.el-tree-node.is-current > .el-tree-node__content) {
-  width: 100%;
-  height: 40px;
-  font-size: 14px;
-  color: #fff !important;
-}
 
 :deep(.el-tree-node__content) {
   width: 100%;
@@ -773,14 +767,6 @@ background-size: 100% 100%;
   color: #fff !important;
 }
 
-:deep(.el-loading-mask) {
-  background-color: #131a25c9;
-}
-
-:deep(.el-scrollbar__wrap) {
-  background: #17212e;
-}
-
 :deep(.el-tree) {
   background-color: #ffffff00 !important;
   --el-tree-node-hover-bg-color: #0099ff09;

riis-web/src/views/system/menu/index.vue

@@ -641,8 +641,8 @@ onMounted(() => {
       </div>
       <div class="draggable">
         <el-table v-loading="loading" ref="multipleTable" :data="tableData" default-expand-all tooltip-effect="dark"
-          style="width: 100%;height: calc(104vh - 270px)" row-key="id" :row-class-name="tableRowClassName"
+          style="width: 100%;height: calc(80vh)" row-key="id" :row-class-name="tableRowClassName"
-          :header-cell-style="{ background: '#253b51', color: '#b5d7ff', height: '50px' }">
+          :header-cell-style="{ background: '#002b6a', color: '#B5D7FF', height: '50px'}">
           <el-table-column label="菜单标题" width="250" prop="name" show-overflow-tooltip>
             <template #default="scope">
               <div style="position: absolute; left:15px;"><img src="@/assets/MenuIcon/lbcz_td.png" alt=""></div>
@@ -852,19 +852,19 @@ onMounted(() => {
 </template>
 <style scoped lang="scss">
 .collectiontemplate-box {
-  padding: 60px 15px 8px 15px;
+  padding: 17px 15px 8px 15px;
 }
 
 .detail-box {
   width: 100%;
-  height: calc(100vh - 160px);
+  height: calc(89vh);
   overflow: auto;
   background-color: rgba(255, 255, 255, 0);
   border: none;
   border-radius: 3px;
   padding: 25px 20px 0px;
   box-sizing: border-box;
-  background: url(@/assets/newimg/cjrw_1890.png);
+  background: url(@/assets/navigation/ty_1614x988.png) no-repeat;
   background-size: 100% 100%;
 
 }
@@ -915,14 +915,6 @@ onMounted(() => {
   color: #fff;
 }
 
-:deep(.el-loading-mask) {
-  background-color: #131a25c9;
-}
-
-:deep(.el-scrollbar__wrap) {
-  background: #17212e;
-}
-
 :deep(.el-tree) {
   background-color: #ffffff00 !important;
   --el-tree-node-hover-bg-color: #0099ff09;

riis-web/src/views/system/record/index.vue

@@ -187,7 +187,7 @@ const tableRowClassName = ({
 </script>
 
 <template>
-  <div style=" padding: 80px 15px 8px 15px;">
+  <div style=" padding: 17px 15px 8px 15px;">
     <div class="record-box">
       <div style="margin-bottom: 10px;display: flex;align-items: center;justify-content:space-between;">
         <div style=" display:flex;align-items: center;">
@@ -232,8 +232,8 @@ const tableRowClassName = ({
         日志记录数超过10万，请及时清理
       </div> -->
       <el-table v-loading="loading" :data="tableData"
-        style="width: 100%; height: calc(100vh - 300px);margin-bottom: 20px;" :row-class-name="tableRowClassName"
+        style="width: 100%; height: calc(76vh);margin-bottom: 20px;" :row-class-name="tableRowClassName"
-        :header-cell-style="{ background: '#253b51', color: '#b5d7ff', height: '50px' }">
+        :header-cell-style="{ background: '#002b6a', color: '#B5D7FF', height: '50px'}">
         <el-table-column type="index" label="序号" width="50" align="center"></el-table-column>
         <el-table-column prop="usercode" label="操作账户" width="100"></el-table-column>
         <el-table-column prop="username" label="用户姓名" width="180"></el-table-column>
@@ -286,13 +286,13 @@ const tableRowClassName = ({
 .record-box {
   padding:15px 8px 8px;
   width: 100%;
-  height: calc(100vh - 180px);
+  height: calc(89vh);
   overflow: auto;
   background-color: rgba(255, 255, 255, 0);
   border: none;
   border-radius: 3px;
   box-sizing: border-box;
-  background: url(@/assets/newimg/cjrw_1890.png);
+  background: url(@/assets/navigation/ty_1614x988.png) ;
   background-size: 100% 100%;
 }
 

riis-web/src/views/system/role/index.vue

@@ -525,7 +525,7 @@ onMounted(() => {
       </div>
       <el-table v-loading="loading" :data="tableData" style="width: 100%; height: calc(100vh - 250px)"
         @selection-change="handleSelectionChange" :row-class-name="tableRowClassName"
-        :header-cell-style="{ background: '#253b51', color: '#b5d7ff', height: '50px' }">
+        :header-cell-style="{ background: '#002b6a', color: '#B5D7FF', height: '50px'}">
         <el-table-column type="selection" width="30" align="center"></el-table-column>
         <el-table-column prop="rolecode" label="角色编号" width="100"></el-table-column>
         <el-table-column prop="rolename" label="角色名称" width="180"></el-table-column>
@@ -678,7 +678,7 @@ onMounted(() => {
 
 <style scoped lang="scss">
 .invalidcatalogue-box {
-  padding: 60px 15px 8px 15px;
+  padding: 17px 15px 8px 15px;
 }
 
 :deep(.el-tree-node__content) {
@@ -696,13 +696,13 @@ onMounted(() => {
 .conductproject-bg-box {
   padding: 20px;
   width: 100%;
-  height: calc(100vh - 160px);
+  height: calc(89vh);
   overflow: auto;
   background-color: rgba(255, 255, 255, 0);
   border: none;
   border-radius: 3px;
   box-sizing: border-box;
-  background: url(@/assets/newimg/cjrw_1890.png);
+  background: url(@/assets/navigation/ty_1614x988.png);
   background-size: 100% 100%;
 }
 
@@ -760,13 +760,9 @@ onMounted(() => {
   color: #fff;
 }
 
-:deep(.el-loading-mask) {
-  background-color: #131a25c9;
-}
 
-:deep(.el-scrollbar__wrap) {
+
-  background: #17212e;
+
-}
 
 :deep(.el-tree) {
   background-color: #ffffff00 !important;

riis-web/src/views/system/user/index.vue

@@ -534,7 +534,7 @@ function inputCLOse() {
     <aside id="silderLeft">
       <el-tree ref="treeRef" :class="useAppStore().size === 'default' ? 'silderLeft-large' : 'silderLeft-default'"
         node-key="id" :data="treedata" :current-node-key="currentNodeKey" :highlight-current="true" :props="defaultProps"
-        v-loading="treeloading" @node-click="handleNodeClick" style="height: calc(100vh - 170px); overflow: auto">
+        v-loading="treeloading" @node-click="handleNodeClick" style="height: calc(88vh); overflow: auto">
       </el-tree>
       <div class="moveBtn" v-move>
         <div class="moveBtn-line"></div>
@@ -567,10 +567,10 @@ function inputCLOse() {
         </el-col>
       </el-row>
 
-      <el-table :data="tableData" style="width: 100%;margin-bottom: 20px;height: calc(100vh - 275px);
+      <el-table :data="tableData" style="width: 100%;margin-bottom: 20px;height: calc(78vh);
                     overflow: auto;" row-key="id" default-expand-all :v-loading="dialog"
         @selection-change="handleSelectionChange" :row-class-name="tableRowClassName"
-        :header-cell-style="{ background: '#253b51', color: '#b5d7ff', height: '50px' }">
+        :header-cell-style="{ background: '#002b6a', color: '#B5D7FF', height: '50px'}">
         <el-table-column type="selection" width="30" align="center" />
         <el-table-column type="index" label="序号" width="50" align="center" />
         <el-table-column prop="nickname" label="用户姓名" width="100"></el-table-column>
@@ -709,7 +709,7 @@ function inputCLOse() {
   display: flex;
   display: -webkit-flex;
   background-color: #f2f4f900;
-  padding: 60px 15px 0px 15px;
+  padding: 15px 15px 0px 15px;
 
 }
 
@@ -719,7 +719,7 @@ function inputCLOse() {
   box-sizing: border-box;
   border-radius: 3px;
   position: relative;
-  background: url(@/assets/newimg/2da8511651d9229f21e93d81537ccd3.png);
+  background: url(@/assets/navigation/ty_260x988.png);
   background-size: 100% 100%;
 
   &:hover {
@@ -772,7 +772,7 @@ function inputCLOse() {
 :deep(.el-tree-node.is-current>.el-tree-node__content) {
   width: 100%;
   height: 40px;
-  color: #fff !important;
+  // color: #fff !important;
 }
 
 :deep(.el-tree) {
@@ -780,13 +780,7 @@ function inputCLOse() {
   --el-tree-node-hover-bg-color: #0099ff09;
 }
 
-:deep(.el-tree-node.is-current > .el-tree-node__content) {
+
-  background: none !important;
-  background-image: url(@/assets/images/u324.png) !important;
-  background-size: 100% 100%;
-  color: #009bff !important;
-  background-repeat: no-repeat !important;
-}
 
 :deep(.el-tree-node__content) {
   width: 100% !important;
@@ -803,14 +797,6 @@ function inputCLOse() {
   color: #fff;
 }
 
-:deep(.el-loading-mask) {
-  background-color: #131a25c9;
-}
-
-:deep(.el-scrollbar__wrap) {
-  background: #17212e;
-}
-
 :deep(.el-tree) {
   background-color: #ffffff00 !important;
   --el-tree-node-hover-bg-color: #0099ff09;

riis-web/src/views/task/makeTask/index.vue

@@ -2038,7 +2038,8 @@ const open = () => {
                                   C0.7,1,0,1.8,0,2.7v11.4c0,0.9,0.8,1.7,1.7,1.7h8.7c0.4,0,0.6-0.3,0.6-0.6C11,14.8,10.7,14.5,10.3,14.5z"
                     fill="currentColor" />
                   <path class="st0" d="M13,2.3L13,2.3c0.3,0,0.4,0.2,0.4,0.4v6c0,0.4,0.3,0.6,0.6,0.6v0c0.4,0,0.6-0.3,0.6-0.6v-6
-                                  C14.7,1.8,13.9,1,13,1h0c-0.4,0-0.6,0.3-0.6,0.6S12.6,2.3,13,2.3z" fill="currentColor" />
+                                  C14.7,1.8,13.9,1,13,1h0c-0.4,0-0.6,0.3-0.6,0.6S12.6,2.3,13,2.3z"
+                    fill="currentColor" />
                   <rect x="4.8" y="0.7" class="st0" width="4.9" height="1.3" fill="currentColor" />
                   <rect x="2.9" y="-0.2" class="st0" width="1.3" height="2.3" fill="currentColor" />
                   <rect x="10.3" y="-0.2" class="st0" width="1.3" height="2.3" fill="currentColor" />
@@ -2163,10 +2164,8 @@ const open = () => {
 
       </div>
       <div>
-        <el-table ref="multipleTableRef" :data="tableDataList" style="width: 100%;margin-bottom: 10px;height: calc(100vh - 325px);
+        <el-table ref="multipleTableRef" :data="tableDataList" style="width: 100%;margin-bottom: 10px;height: calc(70vh);
-                  overflow: auto;" 
+                  overflow: auto;" :header-cell-style="tableBg" stripe @selection-change="handleSelectionChange" v-loading="treeloading"
-          :header-cell-style="tableBg" stripe
-           @selection-change="handleSelectionChange" v-loading="treeloading"
                   >
           <el-table-column type="selection" width="30" align="center" />
           <el-table-column type="index" label="序号" width="50px" align="center" />
@@ -2210,28 +2209,34 @@ const open = () => {
           </el-table-column>
           <el-table-column label="上报状态" width="100px" align="center">
             <template #default="scope">
-              <span v-if="scope.row.isReport == 1"> <span style="display: flex; align-items: center;justify-content: center;"><img
+              <span v-if="scope.row.isReport == 1"> <span
+                  style="display: flex; align-items: center;justify-content: center;"><img
                     src="@/assets/newimg/u387.png" alt=""> <span
                     style="color: rgb(0, 249, 162);display: inline-block;margin-left:5px ;">已上报</span></span></span>
-              <span v-else><span style="display: flex; align-items: center;justify-content: center;"><img src="@/assets/MenuIcon/u448.png" alt="">
+              <span v-else><span style="display: flex; align-items: center;justify-content: center;"><img
+                    src="@/assets/MenuIcon/u448.png" alt="">
                   <span style="color:#FF9900;display: inline-block;margin-left:5px ;">未上报</span></span></span>
             </template>
           </el-table-column>
           <el-table-column property="deviceList" label="关联状态" width="100px" align="center">
             <template #default="scope">
-              <span v-if="scope.row.deviceList"> <span style="display: flex; align-items: center;justify-content: center;"><img
+              <span v-if="scope.row.deviceList"> <span
+                  style="display: flex; align-items: center;justify-content: center;"><img
                     src="@/assets/newimg/u387.png" alt=""><span
                     style="color: rgb(0, 249, 162);display: inline-block;margin-left:5px ;">已关联</span></span> </span>
-              <span v-else> <span style="display: flex; align-items: center;justify-content: center;"><img src="@/assets/MenuIcon/u448.png"
+              <span v-else> <span style="display: flex; align-items: center;justify-content: center;"><img
-                    alt=""> <span style="color:#FF9900;display: inline-block;margin-left:5px ;">未关联</span></span> </span>
+                    src="@/assets/MenuIcon/u448.png" alt=""> <span
+                    style="color:#FF9900;display: inline-block;margin-left:5px ;">未关联</span></span> </span>
             </template>
           </el-table-column>
           <el-table-column property="datastatus" label="复核状态" width="110px" align="center">
             <template #default="scope">
-              <span v-if="scope.row.datastatus == 2"><span style="display: flex; align-items: center;justify-content: center;"><img
+              <span v-if="scope.row.datastatus == 2"><span
+                  style="display: flex; align-items: center;justify-content: center;"><img
                     src="@/assets/newimg/u387.png" alt=""><span
                     style="color: rgb(0, 249, 162);display: inline-block;margin-left:5px ;">复核生效</span></span></span>
-              <span v-else-if="scope.row.datastatus == 1"><span style="display: flex; align-items: center;;justify-content: center;"><img
+              <span v-else-if="scope.row.datastatus == 1"><span
+                  style="display: flex; align-items: center;;justify-content: center;"><img
                     src="@/assets/MenuIcon/u455.png" alt=""><span
                     style="color: #409EFF;display: inline-block;margin-left:5px ;">初始创建</span></span></span>
             </template>
@@ -2263,8 +2268,8 @@ const open = () => {
                   @click="handleEdit(scope.row), tabs = 2" style="cursor: pointer;">
                 <img v-if="scope.row.datastatus == 2" src="@/assets/tableIcon/ht_gl1.png" title="关联设置"
                   style="cursor: no-drop;">
-                <img v-if="scope.row.datastatus == 1 && scope.row.deviceList" src="@/assets/tableIcon/ht_sh.png" title="复核"
+                <img v-if="scope.row.datastatus == 1 && scope.row.deviceList" src="@/assets/tableIcon/ht_sh.png"
-                  @click="CheckTask(scope.row)" style="cursor: pointer;">
+                  title="复核" @click="CheckTask(scope.row)" style="cursor: pointer;">
                 <img v-else src="@/assets/tableIcon/ht_sh1.png" title="复核" style="cursor: no-drop;">
 
                 <img src="@/assets/tableIcon/ht_fz.png" title="复制" @click="duplicate(scope.row, 1)"
@@ -2272,8 +2277,8 @@ const open = () => {
 
                 <img v-hasPerm="['del:task']" v-if="scope.row.datastatus == 1" src="@/assets/tableIcon/ht_sc.png"
                   title="删除" @click="deleteTask(scope.row)" style="cursor: pointer;">
-                <img v-hasPerm="['del:task']" v-if="scope.row.datastatus == 2" src="@/assets/tableIcon/ht_sc1.png" title="删除"
+                <img v-hasPerm="['del:task']" v-if="scope.row.datastatus == 2" src="@/assets/tableIcon/ht_sc1.png"
-                  @click="" style="cursor: no-drop;">
+                  title="删除" @click="" style="cursor: no-drop;">
               </span>
             </template>
           </el-table-column>
@@ -2284,7 +2289,8 @@ const open = () => {
         </div>
       </div>
     </section>
-    <Eldialog v-if="dialogVisible" :title="title" :zIndex="2000" :width="'1175px'" :height="'560px'" @before-close="handleClose" >
+    <Eldialog v-if="dialogVisible" :title="title" :zIndex="2000" :width="'1175px'" :height="'560px'"
+      @before-close="handleClose">
       <template v-slot:PopFrameContent>
         <!-- <div class="tabbas">
           <div @click="tabs = 1" :class="tabs == 1 ? 'tabbas1' : 'tabbas-left'">基本信息</div>
@@ -2308,8 +2314,9 @@ const open = () => {
                 :disabled="info.datastatus == 2 && title != '复制巡视任务'"></el-input>
             </el-form-item>
             <el-form-item label="变电站" prop="stationAll" style="width:50%">
-              <el-select v-model="info.stationAll" style="width: 100% !important;  display: flex; justify-content: center"
+              <el-select v-model="info.stationAll"
-                @change="areaTree(), open()" :disabled="info.datastatus == 2 && title != '复制巡视任务' ">
+                style="width: 100% !important;  display: flex; justify-content: center" @change="areaTree(), open()"
+                :disabled="info.datastatus == 2 && title != '复制巡视任务'">
                 <el-option v-for="item in optionSelect" :key="item.stationId" :label="item.stationName"
                   :value="item.stationId" style="width:100%" />
               </el-select>
@@ -2328,12 +2335,14 @@ const open = () => {
               </el-select>
             </el-form-item>
             <el-form-item label="任务优先级" style="width:50%">
-              <el-select :disabled="info.taskType == '' || (info.datastatus == 2 && title != '复制巡视任务') " v-model="info.priority" placeholder="请选择任务优先级" style="width: 100%">
+              <el-select :disabled="info.taskType == '' || (info.datastatus == 2 && title != '复制巡视任务')"
+                v-model="info.priority" placeholder="请选择任务优先级" style="width: 100%">
                 <el-option v-for="item in priority" :key="item.id" :label="item.dictname" :value="item.itemcode" />
               </el-select>
             </el-form-item>
             <el-form-item label="执行方式" style="width:50%">
-              <el-select v-model="info.taskTodoType" placeholder="请选择执行方式" style="width: 100%" :disabled="info.datastatus == 2 && title != '复制巡视任务'">
+              <el-select v-model="info.taskTodoType" placeholder="请选择执行方式" style="width: 100%"
+                :disabled="info.datastatus == 2 && title != '复制巡视任务'">
                 <el-option v-for="item in ExecutionMethod" :key="item.label" :label="item.label" :value="item.value" />
               </el-select>
             </el-form-item>
@@ -2358,7 +2367,8 @@ const open = () => {
             </el-form-item>
             <el-form-item label="备注信息" style="width:100%;display:flex;align-items:flex-start !important;">
               <el-input type="textarea" v-model="info.custom1" :autosize="{ minRows: 5, maxRows: 8 }"
-                style="width: 100% ;margin-left: 8px;height  " placeholder="请输入备注信息" :disabled="info.datastatus == 2 && title != '复制巡视任务'"></el-input>
+                style="width: 100% ;margin-left: 8px;height  " placeholder="请输入备注信息"
+                :disabled="info.datastatus == 2 && title != '复制巡视任务'"></el-input>
             </el-form-item>
           </el-form>
           <span class="dialog-footer" v-if="info.datastatus == 1 || title == '复制巡视任务'"
@@ -2371,8 +2381,8 @@ const open = () => {
           <div class="essential">
             <div class="essential-top">
               <div style="margin-bottom: 20px;">
-                <el-button class="searchButton" style="margin-left:0" type="primary" v-if="info.datastatus == 1 || title == '复制巡视任务'"
+                <el-button class="searchButton" style="margin-left:0" type="primary"
-                  @click="associationInterval">关联间隔</el-button>
+                  v-if="info.datastatus == 1 || title == '复制巡视任务'" @click="associationInterval">关联间隔</el-button>
                 <el-button class="searchButton" type="primary" v-if="info.datastatus == 1 || title == '复制巡视任务'"
                   @click="associateMasterDevice">关联主设备</el-button>
                 <el-button class="searchButton" type="primary" v-if="info.datastatus == 1 || title == '复制巡视任务'"
@@ -2389,10 +2399,9 @@ const open = () => {
                 </div>
                 <div v-if="deviceLevel == 1">
 
-                  <el-table :data="allData" style="width: 100%;height: calc(100vh - 650px);overflow:auto;margin-bottom: 15px;"
+                  <el-table :data="allData"
-                    row-key="id" default-expand-all
+                    style="width: 100%;height: calc(100vh - 650px);overflow:auto;margin-bottom: 15px;" row-key="id"
-                    :header-cell-style="tableBg"
+                    default-expand-all :header-cell-style="tableBg" :row-class-name="tableRowClassName">
-                    :row-class-name="tableRowClassName">
                     <el-table-column label="序号" type="index" align="center" width="50px" />
                     <el-table-column label="间隔名称" prop="bayName" width="110"></el-table-column>
                     <el-table-column label="所属变电站" prop="stationName"></el-table-column>
@@ -2406,10 +2415,9 @@ const open = () => {
                   </el-table>
                 </div>
                 <div v-if="deviceLevel == 2">
-                  <el-table :data="allData" style="width: 100%;height: calc(100vh - 650px);overflow:auto;margin-bottom: 15px;"
+                  <el-table :data="allData"
-                    row-key="id" default-expand-all
+                    style="width: 100%;height: calc(100vh - 650px);overflow:auto;margin-bottom: 15px;" row-key="id"
-                    :header-cell-style="tableBg"
+                    default-expand-all :header-cell-style="tableBg" :row-class-name="tableRowClassName">
-                    :row-class-name="tableRowClassName">
                     <el-table-column label="序号" type="index" align="center" width="50px" />
                     <el-table-column label="主设备名称" prop="mainDeviceName" width="110"></el-table-column>
                     <el-table-column label="所属变电站" prop="stationName"></el-table-column>
@@ -2424,10 +2432,9 @@ const open = () => {
                   </el-table>
                 </div>
                 <div v-if="deviceLevel == 4">
-                  <el-table :data="allData" style="width: 100%;height: calc(100vh - 650px);overflow:auto;margin-bottom: 15px;"
+                  <el-table :data="allData"
-                    row-key="id"  default-expand-all
+                    style="width: 100%;height: calc(100vh - 650px);overflow:auto;margin-bottom: 15px;" row-key="id"
-                    :header-cell-style="tableBg"
+                    default-expand-all :header-cell-style="tableBg" :row-class-name="tableRowClassName">
-                    :row-class-name="tableRowClassName">
                     <el-table-column label="序号" type="index" align="center" width="50px" />
                     <el-table-column label="部件名称" prop="componentName" width="110"></el-table-column>
                     <el-table-column label="所属变电站" prop="stationName"></el-table-column>
@@ -2443,10 +2450,9 @@ const open = () => {
                   </el-table>
                 </div>
                 <div v-if="deviceLevel == 3">
-                  <el-table :data="allData" style="width: 100%;height: calc(100vh - 650px);overflow:auto;margin-bottom: 15px;"
+                  <el-table :data="allData"
-                    row-key="id"  default-expand-all
+                    style="width: 100%;height: calc(100vh - 650px);overflow:auto;margin-bottom: 15px;" row-key="id"
-                    :header-cell-style="tableBg"
+                    default-expand-all :header-cell-style="tableBg" :row-class-name="tableRowClassName">
-                    :row-class-name="tableRowClassName">
                     <el-table-column label="序号" type="index" align="center" width="50px" />
                     <el-table-column label="巡视点位名称" prop="deviceName"></el-table-column>
                     <el-table-column label="所属变电站" prop="stationName" width="170px"></el-table-column>
@@ -2484,8 +2490,9 @@ const open = () => {
               <div class="title" style="font-size: 14px;color: #fff;">数据列表</div>
             </div>
             <el-scrollbar height="calc(100vh - 350px)" style="padding:0px 15px;">
-              <el-tree ref="treeRefbay" :class="useAppStore().size === 'default' ? 'silderLeft-large' : 'silderLeft-default'"
+              <el-tree ref="treeRefbay"
-                node-key="areaId" :data="treedatalist" :current-node-key="currentNodeKeybay" :highlight-current="true"
+                :class="useAppStore().size === 'default' ? 'silderLeft-large' : 'silderLeft-default'" node-key="areaId"
+                :data="treedatalist" :current-node-key="currentNodeKeybay" :highlight-current="true"
                 :props="defaultProps" @node-click="handlelistClick" style="">
               </el-tree>
             </el-scrollbar>
@@ -2503,10 +2510,8 @@ const open = () => {
             </div>
             <div class="draggable">
               <el-table :data="intervalData" ref="multipleTableReflist" v-loading="loadingComponent"
-                style="width: 100%;height:calc(100vh - 370px);" row-key="bayId"
+                style="width: 100%;height:calc(100vh - 370px);" row-key="bayId" @selection-change="handChangeInterval"
-                @selection-change="handChangeInterval" default-expand-all
+                default-expand-all :header-cell-style="tableBg" :row-class-name="tableRowClassName">
-                :header-cell-style="tableBg"
-                    :row-class-name="tableRowClassName">
                 <el-table-column type="selection" width="30" align="center" />
                 <el-table-column label="序号" type="index" width="50"></el-table-column>
                 <el-table-column label="间隔名称" prop="bayName"></el-table-column>
@@ -2527,8 +2532,9 @@ const open = () => {
               <div class="title" style="font-size: 14px;color: #fff;">数据列表</div>
             </div>
             <el-scrollbar height="calc(100vh - 350px)" style="padding:0px 15px;">
-              <el-tree ref="treeRefbay" :class="useAppStore().size === 'default' ? 'silderLeft-large' : 'silderLeft-default'"
+              <el-tree ref="treeRefbay"
-                node-key="bayId" :data="treedatabay" :current-node-key="currentNodeKeybay" :highlight-current="true"
+                :class="useAppStore().size === 'default' ? 'silderLeft-large' : 'silderLeft-default'" node-key="bayId"
+                :data="treedatabay" :current-node-key="currentNodeKeybay" :highlight-current="true"
                 :props="defaultProps" @node-click="handlebayClick" style="">
               </el-tree>
             </el-scrollbar>
@@ -2540,8 +2546,8 @@ const open = () => {
 
                 <el-input clearable v-model="Mainnmae" placeholder="请输入主设备名称" @clear="getMainData()"
                   @keyup.enter="getMainData()" style="margin-right:15px ;width: 200px;" />
-                <el-select clearable v-model="paramsMaintable" placeholder="主设备类型" style="margin-right:15px ;width: 40%;"
+                <el-select clearable v-model="paramsMaintable" placeholder="主设备类型"
-                  @visible-change="getMainType()" @change="getMainData()">
+                  style="margin-right:15px ;width: 40%;" @visible-change="getMainType()" @change="getMainData()">
                   <el-option v-for="item in PatrolEquipmentType" :key="item.id" :label="item.dictname"
                     :value="item.itemcode" />
                 </el-select>
@@ -2551,11 +2557,9 @@ const open = () => {
               <div><el-button class="searchButton" type="primary" @click="addMainBinding">添加</el-button></div>
             </div>
             <div class="draggable">
-              <el-table :data="MainvalData" style="width: 100%;height:calc(100vh - 370px);"
+              <el-table :data="MainvalData" style="width: 100%;height:calc(100vh - 370px);" row-key="mainDeviceId"
-                row-key="mainDeviceId" @selection-change="handMainChange" default-expand-all ref="multipleTableMain"
+                @selection-change="handMainChange" default-expand-all ref="multipleTableMain" v-loading="loadingMain"
-                v-loading="loadingMain"
+                :header-cell-style="tableBg" :row-class-name="tableRowClassName">
-                :header-cell-style="tableBg"
-                    :row-class-name="tableRowClassName">
                 <el-table-column type="selection" width="30" align="center" />
                 <el-table-column label="序号" type="index" width="50"></el-table-column>
                 <el-table-column label="主设备名称" prop="mainDeviceName"></el-table-column>
@@ -2576,8 +2580,9 @@ const open = () => {
               <div class="title" style="font-size: 14px;color: #fff;">数据列表</div>
             </div>
             <el-scrollbar height="calc(100vh - 350px)" style="padding:0px 15px;">
-              <el-tree ref="treeRefbay" :class="useAppStore().size === 'default' ? 'silderLeft-large' : 'silderLeft-default'"
+              <el-tree ref="treeRefbay"
-                node-key="bayId" :data="treedatabay" :current-node-key="currentNodeKeybay" :highlight-current="true"
+                :class="useAppStore().size === 'default' ? 'silderLeft-large' : 'silderLeft-default'" node-key="bayId"
+                :data="treedatabay" :current-node-key="currentNodeKeybay" :highlight-current="true"
                 :props="defaultProps" @node-click="handlebayClick" style="">
               </el-tree>
             </el-scrollbar>
@@ -2601,10 +2606,9 @@ const open = () => {
               <div><el-button class="searchButton" type="primary" @click="addComponentBinding">添加</el-button></div>
             </div>
             <div class="draggable">
-              <el-table :data="componentData" style="width: 100%;height:calc(100vh - 370px);"
+              <el-table :data="componentData" style="width: 100%;height:calc(100vh - 370px);" row-key="componentId"
-                row-key="componentId"  @selection-change="handComponentChange" default-expand-all
+                @selection-change="handComponentChange" default-expand-all ref="multipleTableComponents"
-                ref="multipleTableComponents" v-loading="loadingInterval"
+                v-loading="loadingInterval" :header-cell-style="tableBg" :row-class-name="tableRowClassName">
-                :header-cell-style="tableBg"  :row-class-name="tableRowClassName">
                 <el-table-column type="selection" width="30" align="center" />
                 <el-table-column label="序号" type="index" width="50"></el-table-column>
                 <el-table-column label="部件名称" prop="componentName"></el-table-column>
@@ -2626,8 +2630,9 @@ const open = () => {
               <div class="title" style="font-size: 14px;color: #fff;">数据列表</div>
             </div>
             <el-scrollbar height="calc(100vh - 350px)" style="padding:0px 15px;">
-              <el-tree ref="treeRefbay" :class="useAppStore().size === 'default' ? 'silderLeft-large' : 'silderLeft-default'"
+              <el-tree ref="treeRefbay"
-                node-key="bayId" :data="treedatabay" :current-node-key="currentNodeKeybay" :highlight-current="true"
+                :class="useAppStore().size === 'default' ? 'silderLeft-large' : 'silderLeft-default'" node-key="bayId"
+                :data="treedatabay" :current-node-key="currentNodeKeybay" :highlight-current="true"
                 :props="defaultProps" @node-click="handlebayClick" style="">
               </el-tree>
             </el-scrollbar>
@@ -2655,11 +2660,9 @@ const open = () => {
               <div><el-button class="searchButton" @click="addPointsBinding">添加</el-button></div>
             </div>
             <div class="draggable">
-              <el-table :data="deviceData" style="width: 100%;height:calc(100vh - 370px);"
+              <el-table :data="deviceData" style="width: 100%;height:calc(100vh - 370px);" row-key="deviceId"
-                row-key="deviceId" @selection-change="handPointsChange" default-expand-all ref="multipleTablePoints"
+                @selection-change="handPointsChange" default-expand-all ref="multipleTablePoints"
-                v-loading="loadingPoints"
+                v-loading="loadingPoints" :header-cell-style="tableBg" :row-class-name="tableRowClassName">
-                :header-cell-style="tableBg"
-                :row-class-name="tableRowClassName">
                 <el-table-column type="selection" width="30" align="center" />
                 <el-table-column label="序号" type="index" width="50"></el-table-column>
                 <el-table-column label="巡视点位名称" prop="deviceName"></el-table-column>
@@ -2718,9 +2721,11 @@ const open = () => {
             <el-radio-group v-model="time" @change="rediodtime">
               <el-radio :label="3" :disabled="sun == 4"><span>
                   <span style="color: #ffffff">从</span>
-                  <el-input class="spanmarg" @change="rediodtime(3)" v-model="periodtime.periodInput3" style="width:80px" />
+                  <el-input class="spanmarg" @change="rediodtime(3)" v-model="periodtime.periodInput3"
+                    style="width:80px" />
                   <span class="spanmarg">小时开始，每</span>
-                  <el-input class="spanmarg" @change="rediodtime(3)" v-model="periodtime.periodInput4" style="width:80px" />
+                  <el-input class="spanmarg" @change="rediodtime(3)" v-model="periodtime.periodInput4"
+                    style="width:80px" />
                   <span class="spanmarg">小时执行一次</span>
                 </span></el-radio>
               <el-radio :label="4" style="height: 230px; ">
@@ -2732,7 +2737,8 @@ const open = () => {
                       <div style="margin-top: -3px;">上午：</div>
                       <el-checkbox-group v-model="checkListtime" @change="rediodtime(4)">
                         <div style=" display: flex;flex-wrap: wrap ;align-items: center;justify-content: flex-start;">
-                          <el-checkbox style="display: block;" v-for="item in appointtime1" :label="item" size="large" />
+                          <el-checkbox style="display: block;" v-for="item in appointtime1" :label="item"
+                            size="large" />
                         </div>
                       </el-checkbox-group>
                     </div>
@@ -2740,7 +2746,8 @@ const open = () => {
                       <div style="margin-top: -3px;">下午：</div>
                       <el-checkbox-group v-model="checkListtime" @change="rediodtime(4)">
                         <div style=" display: flex;flex-wrap: wrap ;align-items: center;justify-content: flex-start;">
-                          <el-checkbox style="display: block;" v-for="item in appointtime2" :label="item" size="large" />
+                          <el-checkbox style="display: block;" v-for="item in appointtime2" :label="item"
+                            size="large" />
                         </div>
                       </el-checkbox-group>
 
@@ -2838,8 +2845,7 @@ const open = () => {
         <div style="padding:5px 0">
           <div v-if="inputTrue" style="color:red;">密码错误，请重新输入</div>
         </div>
-        <span class="dialog-footer"
+        <span class="dialog-footer" style="display: flex;justify-content: center;margin-top: 10px;">
-          style="display: flex;justify-content: center;margin-top: 10px;">
           <div class="details-button" @click="inputCLOse">取消</div>
           <div class="details-button" @click="secondPass">确定</div>
         </span>
@@ -2852,11 +2858,13 @@ const open = () => {
 .displayflex {
   display: flex;
   align-items: center;
+
   .line {
     width: 5px;
     height: 14px;
     background: #179f84;
   }
+
   .title {
     padding-left: 10px;
     font-family: 'Arial Negreta', 'Arial Normal', 'Arial';
@@ -2936,6 +2944,7 @@ const open = () => {
   border-bottom: 1px solid #009bff;
   display: flex;
   color: #B5D7FF;
+
   div {
     width: 70px;
     height: 51px;
@@ -3125,11 +3134,12 @@ const open = () => {
   margin-top: 5px;
   background: #fcfcfc;
 }
+
 :deep(.el-scrollbar) {
   height: calc(100vh - 360px);
 }
+
 .draggable {
   padding-top: 15px;
 }
 </style>
-

riis-web/src/views/task/patrolmonitor/index.vue

@@ -353,7 +353,7 @@ function retrunClick(){
       display: flex;
       box-sizing: border-box;
       padding: 15px;
-      padding-top:60px ;
+      padding-top:17px ;
       padding-bottom: 0;">
       <div class="leftNav">
         <el-scrollbar height="calc(100vh - 160px)">
@@ -468,7 +468,7 @@ function retrunClick(){
         <!-- <img src="@/assets/MenuIcon/xsri_lb1.png" alt="" style="width:100%;position: absolute;"> -->
         <!-- <div style="position: relative;"> -->
         <el-table :data="tableData" class="PatrolMonitoring" 
-          style="width: 99%;margin:auto;position: relative; height:calc(100vh - 260px); overflow: auto;margin-top: 10px; "
+          style="width: 99%;margin:auto;position: relative; height:calc(79vh); overflow: auto;margin-top: 10px; "
           stripe :header-cell-style="tableBg">
           <el-table-column type="index" align="center" label="序号" width="50px" />
           <el-table-column prop="taskName" label="任务名称" min-width="140px" align="left" />
@@ -609,18 +609,18 @@ function retrunClick(){
 
   .leftNav {
     min-width: 280px;
-    height: calc(100vh - 160px);
+    height: calc(90vh);
     position: relative;
-    background: url(@/assets/patrolmonitor/xsjk_280.png) no-repeat center center;
+    background: url(@/assets/navigation/ty_260x988.png);
     background-size: 100% 100%;
   }
 
   .rightNav {
     width: calc(100vW - 305px);
-    height: calc(100vh - 160px);
+    height: calc(90vh);
     margin-left: 8px;
     position: relative;
-    background: url(@/assets/patrolmonitor/xsjk_1595.png) no-repeat center center;
+    background: url(@/assets/navigation/ty_1614x988.png) ;
     background-size: 100% 100%;
   }
 

riis-web/src/views/task/patrolmonitorMonth/index.vue

@@ -66,7 +66,7 @@ onMounted(() => {
 })
 const PatrolDetailsInfo:any=ref({})
 const isPatrolDetails = ref(true)
-function clickDetail(row){
+function clickDetail(row:any){
     // :PatrolDetailsInfo="PatrolDetailsInfo" 
     PatrolDetailsInfo.value.taskTodoId =  row.taskTodoId,
     PatrolDetailsInfo.value.isStationFlag = row.isStationFlag
@@ -435,7 +435,5 @@ function retrunClick(){
 :deep(.patrolDetailstopbox){
     padding: 0;
 }
-:deep(.el-scrollbar__wrap--hidden-default){
+
-    background: transparent;
-}
 </style>

riis-web/src/views/task/patrolreport/index.vue

@@ -232,7 +232,7 @@ onMounted(() => {
 </script>
 <template>
   <div style="padding:0 15px ;">
-    <div style="width:100%;height:60px"></div> 
+    <div style="width:100%;height:17px"></div> 
     <div class="rightNav">
       <div style="position: relative;display: flex;align-items: center; justify-content: space-between;">
         <div style="display: flex;align-items: center;">
@@ -278,7 +278,7 @@ onMounted(() => {
 
       <!-- <div style="position: relative;"> -->
       <el-table :data="tableData" v-loading="treeloading"
-        style="width: 100%;margin:auto;position: relative;margin: 5px 0; height:calc(100vh - 270px); overflow: auto "
+        style="width: 100%;margin:auto;position: relative;margin: 5px 0; height:calc(78vh); overflow: auto "
         :header-cell-style="tableBg" stripe
         @selection-change="handleSelectionChange">
         <el-table-column type="selection" width="30" align="center" />
@@ -351,13 +351,13 @@ onMounted(() => {
 
 .rightNav {
   width: 100%;
-  height: calc(100vh - 160px);
+  height: calc(89vh);
   background-color: #131a25;
   border: none;
   border-radius: 3px;
   padding: 10px 15px 0px;
   box-sizing: border-box;
-  background: url(@/assets/newimg/cjrw_1890.png);
+  background: url(@/assets/navigation/ty_1614x988.png) ;
   background-size: 100% 100%;
 
 }