2 Revize 34ec781179 ... 4250d263c5

Autor SHA1 Zpráva Datum
  rui.jiang 4250d263c5 首页 华电修改 首页 před 1 měsícem
  rui.jiang 3db49c4228 首页 华电修改 před 1 měsícem

+ 5 - 4
src/components/map/index.vue

@@ -515,13 +515,13 @@ export default {
   padding: 0;
   z-index: 100;
   h3 {
-    background-color: #008080cc;
+    background-color: var(--header-bg);
     width: 240px;
     padding: 5px 10px;
     font-size: 16px;
   }
   div {
-    background-color: #00808097;
+    background-color: var(--content-bg);
     width: 240px;
     font-size: 12px;
     p {
@@ -538,13 +538,13 @@ export default {
   padding: 0;
   z-index: 100;
   h3 {
-    background-color: #027cb4cc;
+    background-color:var(--header-bg);
     width: 240px;
     padding: 5px 10px;
     font-size: 16px;
   }
   div {
-    background-color: #027cb49e;
+    background-color:var(--content-bg);
     width: 240px;
     font-size: 12px;
     p {
@@ -577,4 +577,5 @@ export default {
     }
   }
 }
+
 </style>

+ 5 - 1
src/components/selecttree.vue

@@ -1,7 +1,7 @@
 <template>
   <div class="selectTree">
     <el-select
-
+      :size="size"
       ref="elSelect"
       v-model="newVal"
       :placeholder="placeholder"
@@ -52,6 +52,10 @@ export default {
       type: String,
       default: "0",
     },
+    size: {
+      type: String,
+      default: "", // 可选:'medium' | 'small' | 'mini'
+    },
     defaultParentProps: {
       type: Object,
       default: () => {

+ 4 - 2
src/themes/blue.scss

@@ -1,5 +1,5 @@
-$primary-color: #1B3B7F;
-$background-color: #1B3B7F;
+$primary-color: #1A3B7F;
+$background-color: #1A3B7F;
 $text-color: #ffffff;
 $bgopacity-color: rgba(0, 187, 212, 0.145);
 :root {
@@ -7,4 +7,6 @@ $bgopacity-color: rgba(0, 187, 212, 0.145);
   --background-color: #{$background-color};
   --text-color: #{$text-color};
   --bgopacity-color: #{$bgopacity-color};
+  --header-bg: #1A3B7F;
+  --content-bg: #1a3c7fb4;
 }

+ 2 - 0
src/themes/dark.scss

@@ -7,4 +7,6 @@ $bgopacity-color: #607d8b31;
   --background-color: #{$background-color};
   --text-color: #{$text-color};
   --bgopacity-color: #{$bgopacity-color};
+  --header-bg: #607d8b;
+  --content-bg: #607d8bc2;
 }

+ 2 - 0
src/themes/green.scss

@@ -7,4 +7,6 @@ $bgopacity-color: #00968730;
   --background-color: #{$background-color};
   --text-color: #{$text-color};
   --bgopacity-color: #{$bgopacity-color};
+  --header-bg: #008080;
+  --content-bg: #008080b4;
 }

+ 2 - 0
src/themes/light.scss

@@ -8,4 +8,6 @@ $bgopacity-color: #82780c27;
   --background-color: #{$background-color};
   --bgopacity-color: #{$bgopacity-color};
   --text-color: #{$text-color};
+  --header-bg: #82780c;
+  --content-bg: #82780ca5;
 }

+ 15 - 14
src/views/admin/cockpitManage/HD.vue

@@ -4,18 +4,19 @@
     <bottom-data :maplistArr="maplistArr" :defaultdata="defaultdata" />
     <div class="zuobian">
       <selecttree
-      placeholder="请选择所属公司"
-      :list="parentOpt"
-      type="1"
-      v-model="companyCode"
-      @change="parentChange"
-      :defaultParentProps="{
-        children: 'children',
-        label: 'companyName',
-        value: 'codeNumber',
-      }"
-    >
-    </selecttree>
+        size="mini"
+        placeholder="请选择所属公司"
+        :list="parentOpt"
+        type="1"
+        v-model="companyCode"
+        @change="parentChange"
+        :defaultParentProps="{
+          children: 'children',
+          label: 'companyName',
+          value: 'codeNumber',
+        }"
+      >
+      </selecttree>
     </div>
 
     <router-view></router-view>
@@ -213,10 +214,10 @@ bottom-data {
   flex-shrink: 0; // 防止组件缩小
 }
 
-.zuobian{
+.zuobian {
   width: 180px;
   position: absolute;
-  top: 10px;
+  top: 15px;
   left: 10px;
 }
 </style>

+ 8 - 22
src/views/admin/cockpitManage/component/bottomData.vue

@@ -17,7 +17,7 @@
     </div>
     <div class="Box2">
       <div>
-        <h3 style="margin: 8px 0" >任务统计</h3>
+        <h3 style="margin: 8px 0">任务统计</h3>
         <div class="BOXsan">
           <div class="YC02" @click="getwgl">
             <strong class="texyellow">
@@ -78,7 +78,6 @@
         </div>
       </div>
 
-
       <el-dialog title="待分析任务统计表" :visible.sync="glShow" width="45%">
         <!-- 外部容器设置最大高度和滚动条 -->
         <div style="max-height: 400px; overflow-y: auto">
@@ -283,19 +282,16 @@ export default {
       deep: true, // 深度监听对象内部变化
     },
   },
-  created() {
-
-  },
+  created() {},
   data() {
     return {
       myChart: null,
-      YCtableData: [
-
-      ],
+      YCtableData: [ ],
       shujuloading: false,
       YCtableColumns: [{ prop: "fieldName" }, { prop: "engineName" }],
       YCcolumnWidths: {
         fieldName: 120,
+        engineName:140
       },
       // 。。。。。。。。。。。。。。。。。。。。。。。。。。。。。。。。。
       tableData: [],
@@ -306,7 +302,8 @@ export default {
       ],
       columnWidths: {
         optionByName: 60,
-        createTime: 100,
+        createTime: 120,
+        optionContent: 80,
       },
       equipment: {
         analysisedCount: 0,
@@ -439,8 +436,7 @@ export default {
       };
       queryOptionRecords(DataObject).then((res) => {
         this.tableData = res.data || [];
-        console.log(   this.tableData, );
-        
+        console.log(this.tableData);
       });
     },
 
@@ -611,8 +607,7 @@ export default {
   }
 }
 
-.Box1 {
-}
+
 .Box2 {
   .BOX {
     display: flex;
@@ -630,7 +625,6 @@ export default {
       margin-top: 0px;
       text-align: center;
 
-
       .textred {
         color: #d9001b;
       }
@@ -657,7 +651,6 @@ export default {
     width: 255px;
     display: flex;
     justify-content: space-around;
- 
 
     .YC02 {
       width: 70px;
@@ -691,8 +684,6 @@ export default {
         color: #fff;
       }
     }
-
-
   }
 }
 
@@ -719,7 +710,6 @@ export default {
 
       span:nth-child(1) {
         font-size: 12px;
-
       }
       span:nth-child(2) {
         font-size: 12px;
@@ -769,8 +759,6 @@ export default {
   }
 }
 
-
-
 .Tabtab {
   font-size: 12px;
 }
@@ -787,8 +775,6 @@ export default {
   overflow-y: clip !important;
 }
 
-
-
 .el-date-editor--datetimerange.el-input,
 .el-date-editor--datetimerange.el-input__inner {
   width: 250px;

+ 32 - 14
src/views/admin/cockpitManage/component/tabrollHD.vue

@@ -1,13 +1,13 @@
 <template>
   <div>
     <el-table
-    :show-header="false"
+      :show-header="false"
       v-loading="shujuloading"
       :data="tableData"
       :max-height="maxHeight"
- 
+      :row-class-name="tableRowClassName"
       ref="shujuscroll_Table"
-      strip
+      
       @mouseenter.native="shujuautoScroll(true)"
       @mouseleave.native="shujuautoScroll(false)"
       id="Tabtab"
@@ -19,7 +19,7 @@
         :prop="column.prop"
         :label="column.label"
         show-overflow-tooltip
-        :width="getColumnWidth(column.prop)" 
+        :width="getColumnWidth(column.prop)"
       ></el-table-column>
     </el-table>
   </div>
@@ -86,8 +86,8 @@ export default {
       }
     },
     getColumnWidth(prop) {
-      return this.columnWidths[prop] + 'px'; // 根据传入的属性(prop)获取对应的列宽度
-      return this.YCcolumnWidths[prop] + 'px'; // 根据传入的属性(prop)获取对应的列宽度
+      return this.columnWidths[prop] + "px"; // 根据传入的属性(prop)获取对应的列宽度
+      return this.YCcolumnWidths[prop] + "px"; // 根据传入的属性(prop)获取对应的列宽度
     },
     tableRowClassName({ row, rowIndex }) {
       if (rowIndex % 2 === 1) {
@@ -105,20 +105,36 @@ export default {
   font-size: 12px;
 }
 
-::v-deep.el-table .el-table__cell {
+/* 单元格 padding、去掉底部白线 */
+::v-deep .el-table .el-table__cell {
   padding: 2px 0 !important;
+  border-bottom: none !important;
 }
 
-/* 去掉最下面的那一条线 */
-.el-table::before {
-  height: 0px;
+/* 去掉 el-table 自带底部边框 */
+::v-deep .el-table::before {
+  height: 0 !important;
 }
 
-/* 滚动条样式 */
-::v-deep .el-table__body-wrapper::-webkit-scrollbar-track {
-  background-color: #004f5f;
+/* 设置奇偶行背景色 */
+::v-deep .warning-row {
+
+  background-color: #1b3b7f !important;
+  color: white !important;
+}
+::v-deep .success-row {
+  background-color: #0b255d !important;
+  color: white !important;
 }
 
+/* ✅ 解决 hover 行不变色问题 —— 统一高亮 hover 行为 */
+::v-deep .el-table__body .el-table__row:hover > td {
+  background-color: #50a7e3 !important;
+  color: white !important;
+}
+
+
+
 ::v-deep .el-table__body-wrapper::-webkit-scrollbar {
   width: 0px;
   opacity: 0.5;
@@ -126,6 +142,8 @@ export default {
 
 ::v-deep .el-table__body-wrapper::-webkit-scrollbar-thumb {
   border-radius: 15px;
-  // background-color: rgba(0, 79, 95, 0.75);
 }
+
+
+
 </style>

+ 5 - 1
src/views/home/Index.vue

@@ -4,7 +4,11 @@
       <el-main>
         <el-header>
           <div class="headerHDBox">
-            <div class="headerLeft"></div>
+            <div class="headerLeft">
+
+
+              
+            </div>
             <!-- <HeaderCom class="headerRight" @setLoding="setLoding"></HeaderCom> -->
             <MenuHD class="menuBox"></MenuHD>
             <HeaderCom class="headerRight" @setLoding="setLoding"></HeaderCom>