版本更新v1.0.21

src/assets/styles/el-override/el-table.less

@@ -26,6 +26,11 @@
       line-height: 27px;
       font-size: 12px;
       color: @gray-l;
+
+      &.light,
+      &.always-light {
+        color: @green !important;
+      }
     }
 
     th {
@@ -36,10 +41,16 @@
       font-weight: normal;
       text-align: center;
       color: @gray-l;
+      cursor: pointer;
 
       &.is-leaf {
         border: 0px;
       }
+
+      &.light,
+      &.always-light {
+        color: @green !important;
+      }
     }
 
     th,

src/components/coms/panel/panel-sand-toolbar.vue

@@ -24,7 +24,7 @@ export default {
 </script>
 <style lang="less">
 .com-panel-sand {
-    background: #53626826;
+    background: #1a1f2fCC;
     padding: 0 1.481vh 1.481vh 1.481vh;
     border-top: 1px solid #15a952;
     position: relative;

src/components/coms/panel/panel-sand.vue

@@ -29,7 +29,7 @@ export default {
 </script>
 <style lang="less">
 .com-panel-sand {
-    background: #53626826;
+    background: #1a1f2fCC;
     padding: 0 1.481vh 1.481vh 1.481vh;
     border-top: 1px solid #15a952;
     position: relative;

src/components/coms/table/group-table.vue

@@ -1,10 +1,12 @@
 <template>
   <el-table class="custom-table" :class="customClass" stripe :data="data.data" :height="height" style="width: 100%" @cell-click="onClick" @header-click="onHeaderClick">
-    <template v-for="col in data.column" :key="col">
+    <template v-for="(col, cIndex) in data.column" :key="col">
       <el-table-column v-if="col.child && col.child.length > 0" :label="col.name" :key="col">
         <el-table-column
-          v-for="sub in col.child"
+          v-for="(sub, sindex) in col.child"
           :key="sub"
+          :index="cIndex"
+          :class-name="getClassName(cIndex, sindex)"
           :label="sub.name"
           :prop="sub.field"
           :width="sub.width"
@@ -89,6 +91,10 @@ export default {
         };
       },
     },
+    isColumnLight: {
+      type: Boolean,
+      default: true,
+    },
   },
   emits: {
     onPagging: null,
@@ -98,6 +104,8 @@ export default {
   data() {
     return {
       currentPage: 1,
+      headerIndex: -1,
+      subIndex: -1,
     };
   },
   computed: {
@@ -142,6 +150,10 @@ export default {
       if (column.rawColumnKey.click) column.rawColumnKey.click(event, row);
     },
     onHeaderClick(column, event) {
+      if (column.level == 2) {
+        this.headerIndex = column.index;
+        this.subIndex = column.no;
+      }
       this.$emit("headerClick", { event: event, col: column.rawColumnKey, data: this.data.data });
     },
     handleCurrentChange(val) {
@@ -153,6 +165,10 @@ export default {
         end: this.endRow,
       });
     },
+    getClassName(cindex, sindex) {
+      if (this.isColumnLight == true && cindex == this.headerIndex && sindex == this.subIndex) return "light";
+      return "";
+    },
   },
   // 生命周期钩子
   beforeCreate() {

src/views/SandTable/SandTable.vue

@@ -326,7 +326,7 @@ export default {
 
     .sand-table-bottom {
         position: absolute;
-        right: calc(50vw - 50.463vh);
+        right: calc(50vw - 545px);
         bottom: 0;
         z-index: 2;
         display: flex;
@@ -365,6 +365,7 @@ export default {
         .com-table thead tr th,
         .com-table tr td {
             padding: 0.556vh 0;
+            color: #fff;
         }
     }
 

src/views/SandTable/component/ThreeModel1.vue

@@ -244,7 +244,7 @@ export default {
             };
             let fanAnimateFunction = function() {
                 // fanAnimateObj.fan.rotateOnAxis(new THREE.Vector3(0, 1, 0), fanAnimateObj.speed);
-                fanAnimateObj.fan.rotateY(-fanAnimateObj.speed);
+                fanAnimateObj.fan.rotateY(fanAnimateObj.speed);
                 // fanAnimateObj.fan1.rotateZ(fanAnimateObj.speed);
                 // fanAnimateObj.fan2.rotateZ(fanAnimateObj.speed);
                 // fanAnimateObj.fan3.rotateZ(fanAnimateObj.speed);

src/views/SandTable/component/p-panel.vue

@@ -123,7 +123,7 @@ export default {
 
 <style lang="less">
 .p-panel {
-    background: #272e3d66;
+    background: #1a1f2fCC;
 
     .font-sm {
         font-size: 12px;