姜瑞修改部分

src/styles/global.scss

@@ -77,8 +77,3 @@
 .el-tabs__item.is-active {
   color: var(--primary-color) !important;
 }
-// .el-switch {
-//   background-color: var(--primary-color);
-//   border-color: var(--primary-color);
-//   color: var(--text-color);
-// }

src/views/admin/cockpitManage/Index.vue

@@ -2,25 +2,34 @@
   <div class="map-ditu">
     <Tmap ref="map" :maplist="maplist" @feature-click="featureClick"></Tmap>
     <div class="ledata">
-      <selecttree placeholder="请选择上级单位" :list="parentOpt" type="1" v-model="companyCode" @change="parentChange"
+      <selecttree
+        placeholder="请选择上级单位"
+        :list="parentOpt"
+        type="1"
+        v-model="companyCode"
+        @change="parentChange"
         :defaultParentProps="{
           children: 'children',
           label: 'companyName',
           value: 'codeNumber',
-        }">
+        }"
+      >
       </selecttree>
 
       <p>
         <span class="SpText">风场总数：</span>{{ totalList.fieldSumNumber }} 个
       </p>
       <p>
-        <span class="SpText">已分析风场：</span>{{ totalList.analysisFinishNumber }} 个
+        <span class="SpText">已完成分析风场：</span
+        >{{ totalList.analysisFinishNumber }} 个
       </p>
       <p>
-        <span class="SpText">未分析风场：</span>{{ totalList.analysisUnFinishedNumber }} 个
+        <span class="SpText">未完成分析风场：</span
+        >{{ totalList.analysisUnFinishedNumber }} 个
       </p>
       <p>
-        <span class="SpText">风机数量：</span>{{ totalList.engineGroupNumber }} 个
+        <span class="SpText">风机数量：</span
+        >{{ totalList.engineGroupNumber }} 个
       </p>
       <p>
         <span class="SpText">风机状态：</span>
@@ -28,7 +37,12 @@
         <span class="yellow"></span>
         <span class="green"></span>
       </p>
-      <el-switch v-model="value1" active-text="显示" inactive-text="隐藏" @change="handleSwitchChange">
+      <el-switch
+        v-model="value1"
+        active-text="显示"
+        inactive-text="隐藏"
+        @change="handleSwitchChange"
+      >
       </el-switch>
     </div>
     <Rightdata v-show="ShowRi" class="ridata"></Rightdata>
@@ -150,7 +164,7 @@ export default {
           this.$refs.map.addMarker({
             point: this.parseCoordinates(data.longitudeAndLatitudeString),
             val: data.analysisState,
-            ...data
+            ...data,
           });
           return;
         }
@@ -160,12 +174,14 @@ export default {
         dataMapList.forEach((element) => {
           console.log(element);
           if (
-            this.parseCoordinates(element.longitudeAndLatitudeString).length > 0 && element.codeType === "field"
+            this.parseCoordinates(element.longitudeAndLatitudeString).length >
+              0 &&
+            element.codeType === "field"
           ) {
             this.$refs.map.addMarker({
               point: this.parseCoordinates(element.longitudeAndLatitudeString),
               val: element.analysisState,
-              ...element
+              ...element,
             });
             return;
           }
@@ -230,7 +246,7 @@ export default {
 
     .SpText {
       display: inline-block;
-      width: 90px;
+      width: 120px;
       text-align: right;
     }
 
@@ -263,4 +279,6 @@ export default {
   left: 10px;
   width: 280px;
 }
+
+
 </style>

src/views/admin/cockpitManage/component/rightdata copy.vue

@@ -0,0 +1,331 @@
+<template>
+  <div class="backbone">
+    <div>
+      <h3>风场分析完成率</h3>
+      <div id="main" style="width: 260px; height: 160px"></div>
+    </div>
+    <div>
+      <h3>异常设备概览</h3>
+      <div class="BOX">
+        <div style="display: flex">
+          <div class="YC01">
+            <strong>4545</strong>
+            <span>异常总数</span>
+          </div>
+          <div class="YC02">
+            <strong>20</strong>
+            <span>本月异常</span>
+          </div>
+        </div>
+
+        <div style="display: flex">
+          <div class="YC02">
+            <strong class="textred">0</strong>
+            <span>未处理异常</span>
+          </div>
+          <div class="YC02">
+            <strong class="texyellow">20</strong>
+            <span>异常设备数</span>
+          </div>
+          <div class="YC03"></div>
+        </div>
+      </div>
+    </div>
+    <div>
+      <h3>异常数据信息</h3>
+      <!-- <Tabroll :table-data="tableData" :shujuloading="shujuloading" :columns="tableColumns" :max-height="150"></Tabroll> -->
+
+      <div @mousemove="move">
+        <div class="table" @mouseleave="leave">
+          <dv-scroll-board
+            :config="config"
+            @mouseover="over"
+            style="width: 260px; height: 150px"
+          />
+          <p
+            v-if="ifShow"
+            class="dv-text"
+            :style="{ top: dvText.keyY, left: dvText.keyX }"
+          >
+            {{ dvText.name }}
+          </p>
+        </div>
+      </div>
+    </div>
+    <div>
+      <h3>近期操作记录</h3>
+      <div @mousemove="move">
+        <div class="table" @mouseleave="leave">
+          <dv-scroll-board
+            :config="JQconfig"
+            @mouseover="over"
+            style="width: 260px; height: 150px ;"
+          />
+          <p
+            v-if="ifShow"
+            class="dv-text"
+            :style="{ top: dvText.keyY, left: dvText.keyX }"
+          >
+            {{ dvText.name }}
+          </p>
+        </div>
+      </div>
+      <!-- <Tabroll
+        :table-data="tableData"
+        :shujuloading="shujuloading"
+        :columns="tableColumns"
+        :max-height="150"
+      ></Tabroll> -->
+    </div>
+  </div>
+</template>
+
+<script>
+import * as echarts from "echarts";
+import Tabroll from "./tabroll.vue";
+export default {
+  components: {
+    Tabroll,
+  },
+
+  data() {
+    return {
+      config: {
+        header: ["风场名称", "风机信息"],
+        data: [
+          ["唐龙三期风电场", "XXXXXX0001号风机"],
+          ["唐龙三期风电场", "XXXXXX0002号风机"],
+          ["唐龙三期风电场", "XXXXXX0003号风机"],
+          ["唐龙三期风电场", "XXXXXX0004号风机"],
+          ["唐龙三期风电场", "XXXXXX0005号风机"],
+          ["唐龙三期风电场", "XXXXXX0005号风机"],
+        ],
+        headerBGC: "#004F5F",
+        oddRowBGC: "#004F5F",
+        evenRowBGC: "#028A8A",
+      },
+      JQconfig: {
+        header: ["姓名", "时间", "操作记录"],
+        data: [
+          ["劳大", "2020-02-20", "进行了性能分析操作编辑"],
+          ["利尔", "2020-02-20", "进行了性能分析操作编辑"],
+          ["笑嘻嘻", "2020-02-20", "进行了性能分析操作编辑"],
+          ["起飞楼", "2020-02-20", "进行了性能分析操作编辑"],
+          ["王强", "2020-02-20", "进行了性能分析操作编辑"],
+          ["李四", "2020-02-20", "进行了性能分析操作编辑"],
+        ],
+        headerBGC: "#004F5F",
+        oddRowBGC: "#004F5F",
+        evenRowBGC: "#028A8A",
+        columnWidth:[65]
+      },
+      dvText: {
+        name: "",
+        keyY: "",
+        keyX: "",
+      },
+      //控制单元格 显示/隐藏
+      ifShow: false,
+
+      myChart: null,
+      tableData: [
+        { name: "王小虎" },
+        { name: "王小虎" },
+        { name: "王小虎" },
+        { name: "王小虎" },
+        { name: "王小虎" },
+        { name: "王小虎" },
+      ],
+      shujuloading: false,
+      tableColumns: [
+        { prop: "name", label: "姓名" },
+        { prop: "date", label: "日期" },
+        { prop: "record", label: "记录" },
+      ],
+    };
+  },
+  mounted() {
+    this.initChart();
+  },
+
+  methods: {
+    initChart() {
+      var chartDom = document.getElementById("main");
+      var myChart = echarts.init(chartDom);
+      var option;
+
+      option = {
+        tooltip: {
+          trigger: "item",
+          formatter: function (params) {
+            var percent = params.percent.toFixed(2) + "%";
+            return `${params.name}: ${params.value} (${percent})`;
+          },
+        },
+        legend: {
+          orient: "vertical",
+          left: "left",
+          top: "30%", // 将图例向下移动一些
+        },
+        series: [
+          {
+            type: "pie",
+            radius: ["40%", "80%"],
+            avoidLabelOverlap: false,
+            label: {
+              show: false,
+              position: "center",
+            },
+            labelLine: {
+              show: false,
+            },
+            center: ["60%", "50%"], // 将饼图往右移动一些
+            data: [
+              { value: 15, name: "已完成", itemStyle: { color: "#7ECF51" } },
+              { value: 50, name: "进行中", itemStyle: { color: "#EECB5F" } },
+              { value: 30, name: "未开始", itemStyle: { color: "#E16757" } },
+            ],
+          },
+        ],
+      };
+
+      option && myChart.setOption(option);
+    },
+
+    over(v) {
+      this.ifShow = true;
+      //v.ceil拿到单元格数据
+      this.dvText.name = v.ceil;
+      //没有值则直接隐藏悬浮框 不然如果设置padding会有背景
+      if (this.dvText.name === undefined) {
+        this.ifShow = false;
+      }
+    },
+    // 鼠标移动
+    move(e) {
+      //将获取的值x轴、y轴的值给悬浮框 用来定位到单元格上.
+      //-1200 -500凭自己感觉调 因为每个表格在页面的位置都不一样
+      this.dvText.keyX = e.pageX - 1400 + "px";
+      this.dvText.keyY = e.pageY - 120 + "px";
+    },
+    // 鼠标离开
+    leave() {
+      //隐藏单元格
+      this.ifShow = false;
+    },
+  },
+};
+</script>
+
+
+<style lang="scss" scoped>
+.backbone {
+  width: 300px;
+  color: #fff;
+  background: #008080;
+  height: 95%;
+  border-radius: 5px;
+  padding: 20px;
+}
+
+.BOX {
+  background: #004f5f;
+  display: flex;
+
+  padding-left: 10px;
+  flex-wrap: wrap;
+  padding-bottom: 15px;
+}
+
+.YC01 {
+  width: 154px;
+  height: 60px;
+  background-image: url("../../../../assets/001.png");
+  background-size: 154px 60px;
+  background-repeat: no-repeat;
+  background-position: center;
+  margin-right: 15px;
+  margin-top: 15px;
+  text-align: center;
+
+  strong {
+    display: block;
+    font-size: 26px;
+    color: #4bffff;
+  }
+
+  span {
+    display: block;
+    font-size: 12px;
+  }
+}
+
+.YC02 {
+  width: 70px;
+  height: 60px;
+  background-image: url("../../../../assets/002.png");
+  background-size: 70px 60px;
+  background-repeat: no-repeat;
+  background-position: center;
+  margin-right: 15px;
+  margin-top: 15px;
+  text-align: center;
+
+  .textred {
+    color: #d9001b;
+  }
+
+  .texyellow {
+    color: #facd91;
+  }
+
+  strong {
+    display: block;
+    font-size: 26px;
+    color: #4bffff;
+  }
+
+  span {
+    display: block;
+    font-size: 12px;
+  }
+}
+
+.YC03 {
+  width: 70px;
+  height: 60px;
+}
+
+.Tabtab {
+  font-size: 12px;
+}
+
+::v-deep.el-table__cell {
+  padding: 2px 0 !important;
+}
+
+::v-deep.el-table .el-table__cell {
+  padding: 2px 0 !important;
+}
+
+::v-deep.el-table--scrollable-y .el-table__body-wrapper {
+  overflow-y: clip !important;
+}
+
+.ceil {
+  position: relative;
+}
+.dv-text {
+  background: #666;
+  padding: 5px;
+  font-size: 14px;
+  z-index: 11;
+  position: absolute;
+  left: 0;
+  top: 0;
+}
+
+.dv-scroll-board{
+    font-size: 12px;
+}
+</style>

src/views/admin/cockpitManage/component/rightdata.vue

@@ -1,240 +1,302 @@
 <template>
-
-
-    <div class="backbone">
-        <div>
-            <h3>风场分析完成率</h3>
-            <div id="main" style="width: 260px; height: 160px;"></div>
-
-        </div>
-        <div>
-            <h3>异常设备概览</h3>
-            <div class="BOX">
-                <div style="display: flex;">
-                    <div class="YC01">
-                        <strong>4545</strong>
-                        <span>异常总数</span>
-                    </div>
-                    <div class="YC02">
-                        <strong>20</strong>
-                        <span>本月异常</span>
-                    </div>
-                </div>
-
-                <div style="display: flex;">
-                    <div class="YC02">
-                        <strong class="textred">0</strong>
-                        <span>未处理异常</span>
-                    </div>
-                    <div class="YC02">
-                        <strong class="texyellow">20</strong>
-                        <span>异常设备数</span>
-                    </div>
-                    <div class="YC03">
-
-                    </div>
-
-                </div>
-            </div>
-        </div>
-        <div>
-            <h3>异常数据信息</h3>
-          <Tabroll :table-data="tableData" :shujuloading="shujuloading" :columns="tableColumns" :max-height="150"></Tabroll>
-        </div>
-        <div>
-            <h3>近期操作记录</h3>
-            <Tabroll :table-data="tableData" :shujuloading="shujuloading" :columns="tableColumns" :max-height="150"></Tabroll>
+  <div class="backbone">
+    <div>
+      <h3>风场分析完成率</h3>
+      <div id="main" style="width: 260px; height: 160px"></div>
+    </div>
+    <div>
+      <h3>异常设备概览</h3>
+      <div class="BOX">
+        <div style="display: flex">
+          <div class="YC01">
+            <strong>4545</strong>
+            <span>异常总数</span>
+          </div>
+          <div class="YC02">
+            <strong>20</strong>
+            <span>本月异常</span>
+          </div>
         </div>
 
+        <div style="display: flex">
+          <div class="YC02">
+            <strong class="textred">0</strong>
+            <span>未处理异常</span>
+          </div>
+          <div class="YC02">
+            <strong class="texyellow">20</strong>
+            <span>异常设备数</span>
+          </div>
+          <div class="YC03"></div>
+        </div>
+      </div>
     </div>
+    <div>
+      <h3>异常数据信息</h3>
+      <p class="titleYC"><span>风场名称</span><span>风机信息</span></p>
+      <Tabroll
+        :table-data="YCtableData"
+        :shujuloading="shujuloading"
+        :columns="YCtableColumns"
+        :column-widths="YCcolumnWidths"
+        :max-height="120"
+      ></Tabroll>
+      <!-- <dv-scroll-board
+        :config="config"
+        :headerBGC="'#666666'"
+        style="height: 150px"
+      /> -->
+    </div>
+    <div>
+      <h3>近期操作记录</h3>
+      <p class="titleJQ">
+        <span>名字</span><span>日期</span><span>操作记录</span>
+      </p>
+      <Tabroll
+        :table-data="tableData"
+        :shujuloading="shujuloading"
+        :columns="tableColumns"
+        :max-height="120"
+        :column-widths="columnWidths"
+      ></Tabroll>
+    </div>
+  </div>
 </template>
 
 <script>
-import * as echarts from 'echarts';
-import Tabroll from './tabroll.vue';
+import * as echarts from "echarts";
+import Tabroll from "./tabroll.vue";
 export default {
-    components: {
-        Tabroll
+  components: {
+    Tabroll,
   },
-    data() {
-        return {
-            myChart: null,
-            tableData: [
-        { name: '王小虎' },
-        { name: '王小虎' },
-        { name: '王小虎' },
-        { name: '王小虎' },
-        { name: '王小虎' },
-        { name: '王小虎' }
+
+  data() {
+    return {
+      // config: {
+      //   header: ["风场名称", "风机信息"],
+      //   data: [
+      //     ["行1列1", "行1列2"],
+      //     ["行2列1", "行2列2"],
+      //     ["行3列1", "行3列2"],
+      //     ["行4列1", "行4列2"],
+      //     ["行5列1", "行5列2"],
+      //     ["行6列1", "行6列2"],
+      //     ["行7列1", "行7列2"],
+      //     ["行8列1", "行8列2"],
+      //     ["行9列1", "行9列2"],
+      //     ["行10列1", "行10列2"],
+      //   ],
+      //   headerBGC: "#004F5F",
+      //   oddRowBGC: "#004F5F",
+      //   evenRowBGC: "#028A8A",
+      // },
+
+      myChart: null,
+      YCtableData: [
+        { name: "唐龙三期风电场", date: "XXXX001号风机" },
+        { name: "唐龙三期风电场", date: "XXXX001号风机" },
+        { name: "唐龙三期风电场", date: "XXXX001号风机" },
+        { name: "唐龙三期风电场", date: "XXXX001号风机" },
+        { name: "唐龙三期风电场", date: "XXXX001号风机" },
+        { name: "唐龙三期风电场", date: "XXXX001号风机" },
+      ],
+      tableData: [
+        { name: "王小虎", date: "2020-02-20", record: "操作了性能分析" },
+        { name: "王小虎", date: "2020-02-20", record: "操作了性能分析" },
+        { name: "王小虎", date: "2020-02-20", record: "操作了性能分析" },
+        { name: "王小虎", date: "2020-02-20", record: "操作了性能分析" },
+        { name: "王小虎", date: "2020-02-20", record: "操作了性能分析" },
+        { name: "王小虎", date: "2020-02-20", record: "操作了性能分析" },
       ],
       shujuloading: false,
       tableColumns: [
-        { prop: 'name', label: '姓名' },
-        { prop: 'date', label: '日期' },
-        { prop: 'record', label: '记录' }
-      ]
-       
-        }
-    },
-    mounted() {
-   
-        this.initChart();
+        { prop: "name", label: "姓名" },
+        { prop: "date", label: "日期" },
+        { prop: "record", label: "记录" },
+      ],
+      YCtableColumns: [
+        { prop: "name", label: "姓名" },
+        { prop: "date", label: "日期" },
 
-    },
+      ],
 
+      columnWidths: {
+        // 列宽度信息
+        name: 60,
+        date: 90,
+      },
+      YCcolumnWidths: {
+        name: 120,
+      },
+    };
+  },
+  mounted() {
+    this.initChart();
+  },
 
-    methods: {
-   
-       
-
-        initChart() {
-            var chartDom = document.getElementById('main');
-            var myChart = echarts.init(chartDom);
-            var option;
-
-            option = {
-                tooltip: {
-                    trigger: 'item',
-                    formatter: function (params) {
-                        var percent = params.percent.toFixed(2) + '%';
-                        return `${params.name}: ${params.value} (${percent})`;
-                    }
-                },
-                legend: {
-                    orient: 'vertical',
-                    left: 'left',
-                    top: '30%' // 将图例向下移动一些
-                },
-                series: [
-                    {
-                        type: 'pie',
-                        radius: ['40%', '80%'],
-                        avoidLabelOverlap: false,
-                        label: {
-                            show: false,
-                            position: 'center'
-                        },
-                        labelLine: {
-                            show: false
-                        },
-                        center: ['60%', '50%'], // 将饼图往右移动一些
-                        data: [
-                            { value: 15, name: '已完成', itemStyle: { color: '#7ECF51' } },
-                            { value: 50, name: '进行中', itemStyle: { color: '#EECB5F' } },
-                            { value: 30, name: '未开始', itemStyle: { color: '#E16757' } },
-                        ]
-                    }
-                ]
-            };
-
-            option && myChart.setOption(option);
-        }
-
-
-
-    }
+  methods: {
+    initChart() {
+      var chartDom = document.getElementById("main");
+      var myChart = echarts.init(chartDom);
+      var option;
+
+      option = {
+        tooltip: {
+          trigger: "item",
+          formatter: function (params) {
+            var percent = params.percent.toFixed(2) + "%";
+            return `${params.name}: ${params.value} (${percent})`;
+          },
+        },
+        legend: {
+          orient: "vertical",
+          left: "left",
+          top: "30%", // 将图例向下移动一些
+        },
+        series: [
+          {
+            type: "pie",
+            radius: ["40%", "80%"],
+            avoidLabelOverlap: false,
+            label: {
+              show: false,
+              position: "center",
+            },
+            labelLine: {
+              show: false,
+            },
+            center: ["60%", "50%"], // 将饼图往右移动一些
+            data: [
+              { value: 1, name: "已完成", itemStyle: { color: "#7ECF51" } },
+              { value: 0, name: "进行中", itemStyle: { color: "#EECB5F" } },
+              { value: 4, name: "未开始", itemStyle: { color: "#E16757" } },
+            ],
+          },
+        ],
+      };
+
+      option && myChart.setOption(option);
+    },
+  },
 };
 </script>
 
 
 <style lang="scss" scoped>
 .backbone {
-    width: 300px;
-    color: #FFF;
-    background: #008080;
-    height: 95%;
-    border-radius: 5px;
-    padding: 20px;
-
+  width: 300px;
+  color: #fff;
+  background: #008080;
+  height: 95%;
+  border-radius: 5px;
+  padding: 20px;
 }
 
 .BOX {
-    background: #004F5F;
-    display: flex;
-
-
-    padding-left: 10px;
-    flex-wrap: wrap;
-    padding-bottom: 15px;
+  background: #004f5f;
+  display: flex;
 
+  padding-left: 10px;
+  flex-wrap: wrap;
+  padding-bottom: 15px;
 }
 
 .YC01 {
-    width: 154px;
-    height: 60px;
-    background-image: url('../../../../assets/001.png');
-    background-size: 154px 60px;
-    background-repeat: no-repeat;
-    background-position: center;
-    margin-right: 15px;
-    margin-top: 15px;
-    text-align: center;
-
-    strong {
-        display: block;
-        font-size: 26px;
-        color: #4BFFFF;
-    }
-
-    span {
-        display: block;
-        font-size: 12px;
-
-    }
+  width: 154px;
+  height: 60px;
+  background-image: url("../../../../assets/001.png");
+  background-size: 154px 60px;
+  background-repeat: no-repeat;
+  background-position: center;
+  margin-right: 15px;
+  margin-top: 15px;
+  text-align: center;
+
+  strong {
+    display: block;
+    font-size: 26px;
+    color: #4bffff;
+  }
+
+  span {
+    display: block;
+    font-size: 12px;
+  }
 }
 
 .YC02 {
-    width: 70px;
-    height: 60px;
-    background-image: url('../../../../assets/002.png');
-    background-size: 70px 60px;
-    background-repeat: no-repeat;
-    background-position: center;
-    margin-right: 15px;
-    margin-top: 15px;
-    text-align: center;
-
-    .textred {
-        color: #D9001B;
-    }
-
-    .texyellow {
-        color: #FACD91;
-    }
-
-    strong {
-        display: block;
-        font-size: 26px;
-        color: #4BFFFF;
-    }
-
-    span {
-        display: block;
-        font-size: 12px;
-
-    }
+  width: 70px;
+  height: 60px;
+  background-image: url("../../../../assets/002.png");
+  background-size: 70px 60px;
+  background-repeat: no-repeat;
+  background-position: center;
+  margin-right: 15px;
+  margin-top: 15px;
+  text-align: center;
+
+  .textred {
+    color: #d9001b;
+  }
+
+  .texyellow {
+    color: #facd91;
+  }
+
+  strong {
+    display: block;
+    font-size: 26px;
+    color: #4bffff;
+  }
+
+  span {
+    display: block;
+    font-size: 12px;
+  }
 }
 
 .YC03 {
-    width: 70px;
-    height: 60px;
-
+  width: 70px;
+  height: 60px;
 }
 
 .Tabtab {
-    font-size: 12px;
+  font-size: 12px;
 }
 
 ::v-deep.el-table__cell {
-    padding: 2px 0 !important
+  padding: 2px 0 !important;
 }
 
 ::v-deep.el-table .el-table__cell {
-    padding: 2px 0 !important
+  padding: 2px 0 !important;
 }
 
-
 ::v-deep.el-table--scrollable-y .el-table__body-wrapper {
-    overflow-y: clip !important
+  overflow-y: clip !important;
+}
+
+.titleYC{
+  font-size: 14px;
+  background: #214e5d;
+  padding: 5px 0;
+  span:nth-child(1) {
+    margin: 0 70px 0 10px;
+  }
+
+  
+}
+.titleJQ {
+  font-size: 14px;
+  background: #214e5d;
+  padding: 5px 0;
+  span:nth-child(1) {
+    margin: 0 15px 0 10px;
+  }
+
+  span:nth-child(2) {
+    margin: 0 45px 0 30px;
+  }
 }
 </style>

src/views/admin/cockpitManage/component/tabroll.vue

@@ -1,9 +1,25 @@
 <template>
   <div>
-    <el-table v-loading="shujuloading" :data="tableData" :max-height="maxHeight" ref="shujuscroll_Table" stripe
-      @mouseenter.native="shujuautoScroll(true)" @mouseleave.native="shujuautoScroll(false)"  class="Tabtab">
-      <el-table-column v-for="(column, index) in columns" :key="index" :prop="column.prop"
-        :label="column.label"></el-table-column>
+    <el-table
+    :show-header="false"
+      v-loading="shujuloading"
+      :data="tableData"
+      :max-height="maxHeight"
+      ref="shujuscroll_Table"
+      strip
+      @mouseenter.native="shujuautoScroll(true)"
+      @mouseleave.native="shujuautoScroll(false)"
+      id="Tabtab"
+      :header-cell-style="{ backgroundColor: 'red' }"
+    >
+      <el-table-column
+        v-for="(column, index) in columns"
+        :key="index"
+        :prop="column.prop"
+        :label="column.label"
+        show-overflow-tooltip
+        :width="getColumnWidth(column.prop)" 
+      ></el-table-column>
     </el-table>
   </div>
 </template>
@@ -13,71 +29,81 @@ export default {
   props: {
     tableData: {
       type: Array,
-      default: () => []
+      default: () => [],
     },
     shujuloading: {
       type: Boolean,
-      default: false
+      default: false,
     },
     tableTitle: {
       type: String,
-      default: ''
+      default: "",
     },
     columns: {
       type: Array,
-      default: () => []
+      default: () => [],
     },
     maxHeight: {
       type: Number,
-      default: 150
-    }
+      default: 150,
+    },
+    columnWidths: {
+      type: Object,
+      default: () => ({}),
+    },
+    YCcolumnWidths: {
+      type: Object,
+      default: () => ({}),
+    },
   },
   mounted() {
-    this.shujuautoScroll()
+    this.shujuautoScroll();
   },
   beforeDestroy() {
-    this.shujuautoScroll(true)
+    this.shujuautoScroll(true);
   },
   methods: {
-
     shujuautoScroll(stop) {
-      const table = this.$refs.shujuscroll_Table
-      const divData = table.$refs.bodyWrapper
+      const table = this.$refs.shujuscroll_Table;
+      const divData = table.$refs.bodyWrapper;
       if (stop) {
-        window.clearInterval(this.scrolltimer)
+        window.clearInterval(this.scrolltimer);
       } else {
         this.scrolltimer = window.setInterval(() => {
-          divData.scrollTop += 1
-          if (divData.clientHeight + divData.scrollTop == divData.scrollHeight) {
-            divData.scrollTop = 0
+          divData.scrollTop += 1;
+          if (
+            divData.clientHeight + divData.scrollTop ==
+            divData.scrollHeight
+          ) {
+            divData.scrollTop = 0;
           }
-        }, 150)
+        }, 150);
       }
     },
-
-    tableRowClassName ({ row, rowIndex }) {
+    getColumnWidth(prop) {
+      return this.columnWidths[prop] + 'px'; // 根据传入的属性(prop)获取对应的列宽度
+      return this.YCcolumnWidths[prop] + 'px'; // 根据传入的属性(prop)获取对应的列宽度
+    },
+    tableRowClassName({ row, rowIndex }) {
       if (rowIndex % 2 === 1) {
-        return 'warning-row'
+        return "warning-row";
       } else {
-        return 'success-row'
+        return "success-row";
       }
     },
-  }
+  },
 };
 </script>
 
 <style lang="scss" scoped>
-.Tabtab {
+#Tabtab {
   font-size: 12px;
 }
 
-
 ::v-deep.el-table .el-table__cell {
   padding: 2px 0 !important;
 }
 
-
-
 /* 去掉最下面的那一条线 */
 .el-table::before {
   height: 0px;
@@ -85,18 +111,16 @@ export default {
 
 /* 滚动条样式 */
 ::v-deep .el-table__body-wrapper::-webkit-scrollbar-track {
-  background-color: #004F5F;
+  background-color: #004f5f;
 }
 
 ::v-deep .el-table__body-wrapper::-webkit-scrollbar {
-  width: 15px;
+  width: 0px;
   opacity: 0.5;
 }
 
 ::v-deep .el-table__body-wrapper::-webkit-scrollbar-thumb {
   border-radius: 15px;
-  background-color: rgba(0, 79, 95, 0.75);
+  // background-color: rgba(0, 79, 95, 0.75);
 }
-
-
 </style>

src/views/home/components/Menu.vue

@@ -108,7 +108,7 @@ import Vue from "vue";
 export default {
   data() {
     return {
-      isCollapse: false,
+      isCollapse: true,
       orgList: orgList,
       searchInputValue: "",
       defaultActive: this.$route.fullPath,
@@ -232,10 +232,7 @@ export default {
   min-height: 400px;
 }
 
-::v-deep .el-submenu__title {
-  display: flex;
-  align-items: center;
-}
+
 
 .asideBox {
   position: relative;
@@ -355,6 +352,7 @@ export default {
   display: flex;
   align-items: center !important;
   justify-content: center !important;
+ 
 }
 
 .foldBox {
@@ -373,6 +371,7 @@ export default {
 ::v-deep .el-submenu__title {
   display: flex;
   align-items: center;
+  margin-left: 15px;
 }
 
 ::v-deep .el-submenu__icon-arrow {

src/views/ledger/anemometer.vue

@@ -292,7 +292,7 @@ export default {
         anemometerName: this.formInline.anemometerName || undefined,
         beginTime: this.startDate || undefined,
         endTime: this.endDate || undefined,
-        pageNum: this.formInline.pageNum,
+        pageNum: this.formInline.pageNum || 1,
         pageSize: this.formInline.pageSize,
       };
       getAnemometerTowerPage(paramsData).then((res) => {

src/views/ledger/draught.vue

@@ -416,7 +416,7 @@ export default {
         engineName: this.formInline.engineName || undefined,
         beginTime: this.startDate || undefined,
         endTime: this.endDate || undefined,
-        pageNum: 1,
+        pageNum: this.formInline.pageNum || 1,
         pageSize: 10
       }
       windEngineGrouPage(paramsData).then((res) => {

src/views/ledger/milltype.vue

@@ -314,7 +314,7 @@ export default {
         machineTypeCode: this.formInline?.machineTypeCode || undefined,
         beginTime: this.startDate || undefined,
         endTime: this.endDate || undefined,
-        pageNum: 1,
+        pageNum: this.formInline.pageNum || 1,
         pageSize: 10
       }
       windEngineMillPage(paramsData).then((res) => {

src/views/ledger/windsite.vue

@@ -545,7 +545,7 @@ export default {
         fieldName: this.formInline?.fieldName || undefined,
         beginTime: this.startDate || undefined,
         endTime: this.endDate || undefined,
-        pageNum: 1,
+        pageNum: this.formInline.pageNum || 1,
         pageSize: 10,
       };
       WindFieldListPage(paramsData).then((res) => {