Merge branch 'sl' of http://61.161.152.110:10101/r/electronic-map into HEAD

src/components/chart/line/multiple-line-chart.vue

@@ -218,19 +218,23 @@ export default {
       type: Boolean,
       default: false,
     },
-    hoverType: {
-      type: String,
-      default: "item",
-    },
+    // hoverType: {
+    //   type: String,
+    //   default: "item",
+    // },
   },
   data() {
     return {
       id: "",
       chart: null,
-      color: ["#05bb4c", "#4b55ae", "#fa8c16", "#f8de5b", "#1a93cf", "#c531c7", "#bd3338", "#05bb4c", "#4b55ae", "#fa8c16", "#f8de5b", "#1a93cf", "#c531c7", "#bd3338"],
+      // color: ["#05bb4c", "#4b55ae", "#fa8c16", "#f8de5b", "#1a93cf", "#c531c7", "#bd3338", "#05bb4c", "#4b55ae", "#fa8c16", "#f8de5b", "#1a93cf", "#c531c7", "#bd3338"],
+       color: ["#05bb4c", "#f8de5b", "#4b55ae", "#fa8c16", "#1DA0D7", "#DD5044"],
     };
   },
   computed: {
+     colorValue() {
+      return partten.getColor(this.color);
+    },
     datas() {
       return this.list.map((t) => {
         return t.value;
@@ -243,11 +247,18 @@ export default {
     },
     xdata() {
       if (this.list.length > 0)
-        return this.list[0].value.map((t) => {
+      console.log('xthis:',this)
+      console.log('xlist:',this.list)
+      
+        return this.list[0].value.map((t,tIndex) => {
           console.log('list0:',this.list[0])
+          console.log('tindex:',tIndex)
+          console.log('t:',t)
           console.log('tvalue:',t.value)
           // return t.text;
-          return t.value
+          let xunit = [tIndex]
+          return xunit
+          // return t.value
         });
       return [];
     },
@@ -264,61 +275,61 @@ export default {
           zlevel: index,
           lineStyle: {
             normal: {
-              // color: index != 0 ? partten.getColor("gray") : this.color[index],
-                color: partten.getColor("gray"), 
+            // color: index != 0 ? partten.getColor("gray") : this.color[index],
+               color: this.color[index],
               width: 1,
             },
-            emphasis: {
-              color: this.color[index],
-            },
-          },
-          areaStyle: {
-            normal: {
-              color:
-                index == 0
-                  ? new echarts.graphic.LinearGradient(
-                      0,
-                      0,
-                      0,
-                      1,
-                      [
-                        {
-                          offset: 0,
-                          color: this.hexToRgba(this.color[index], 0.3),
-                        },
-                        {
-                          offset: 1,
-                          color: this.hexToRgba(this.color[index], 0.1),
-                        },
-                      ],
-                      false
-                    )
-                  : "transparent",
-              shadowColor: this.hexToRgba(this.color[index], 0.1),
-              shadowBlur: 10,
-            },
-            emphasis: {
-              color: new echarts.graphic.LinearGradient(
-                0,
-                0,
-                0,
-                1,
-                [
-                  {
-                    offset: 0,
-                    color: this.hexToRgba(this.color[index], 0.3),
-                  },
-                  {
-                    offset: 1,
-                    color: this.hexToRgba(this.color[index], 0.1),
-                  },
-                ],
-                false
-              ),
-              shadowColor: this.hexToRgba(this.color[index], 0.1),
-              shadowBlur: 10,
-            },
+            // emphasis: {
+            //   color: this.color[index],
+            // },
           },
+          // areaStyle: {
+          //   normal: {
+          //     color:
+          //       index == 0
+          //         ? new echarts.graphic.LinearGradient(
+          //             0,
+          //             0,
+          //             0,
+          //             1,
+          //             [
+          //               {
+          //                 offset: 0,
+          //                 color: this.hexToRgba(this.color[index], 0.3),
+          //               },
+          //               {
+          //                 offset: 1,
+          //                 color: this.hexToRgba(this.color[index], 0.1),
+          //               },
+          //             ],
+          //             false
+          //           )
+          //         : "transparent",
+          //     shadowColor: this.hexToRgba(this.color[index], 0.1),
+          //     shadowBlur: 10,
+          //   },
+          //   emphasis: {
+          //     color: new echarts.graphic.LinearGradient(
+          //       0,
+          //       0,
+          //       0,
+          //       1,
+          //       [
+          //         {
+          //           offset: 0,
+          //           color: this.hexToRgba(this.color[index], 0.3),
+          //         },
+          //         {
+          //           offset: 1,
+          //           color: this.hexToRgba(this.color[index], 0.1),
+          //         },
+          //       ],
+          //       false
+          //     ),
+          //     shadowColor: this.hexToRgba(this.color[index], 0.1),
+          //     shadowBlur: 10,
+          //   },
+          // },
           tooltip: {
             show: true,
             position: [10, 10],

src/router/index.js

@@ -543,7 +543,12 @@ const routes = [{
 	}
 		/***********************************************************安全管控************************************************************* */	
 
-		,
+		,	{
+			path: '/others', // 其他
+			name: 'others',
+			component: () =>
+				import('../views/Others/index.vue'),
+		},
 		{
 			path: "/others/reportPandect", // 报表总览
 			name: "reportPandect",

src/views/Home/Home.vue

@@ -925,7 +925,7 @@ export default {
                 value: [],
               },
               {
-                title: "实时风速",
+                title: "风速",
                 yAxisIndex: 1,
                 value: [],
               },

src/views/Others/index.vue

@@ -0,0 +1,845 @@
+<template>
+  <div class="swiperBox">
+    <el-carousel
+      style="width: 100%; margin: 5vh 0"
+      trigger="click"
+      type="card"
+      height="80vh"
+      :autoplay="false"
+      indicator-position="none"
+      :initial-index="1"
+      arrow="none"
+      @change="changeSwiper"
+    >
+      <!-- card-1 -->
+      <el-carousel-item style="padding: 20px; background: rgb(4, 12, 11)">
+        <div class="itemBox">
+          <p class="itemTitle">
+            原始数据查询
+            <i
+              class="itemMoreBtn el-icon-more"
+              @click="jumpUrl('/realSearch')"
+            ></i>
+          </p>
+          <div class="df-table">
+            <ComTable height="30vh" :data="tableData1" :pageSize="20" >
+            </ComTable>
+             <ComTable height="30vh" :data="tableData2" :pageSize="20">
+            </ComTable>
+          </div>
+          <!-- <div class="imageBox">
+            <div class="imgItem" @click="jumpUrl('/realSearch')">
+              <el-image class="img" src="./static/img/oa日报.png" fit="fill" />
+              <p class="imgTitle">测点数据查询</p>
+            </div>
+            <div class="imgItem" @click="jumpUrl('/historySearch')">
+              <el-image
+                class="img"
+                src="./static/img/新能源日报.png"
+                fit="fill"
+              />
+              <p class="imgTitle">测点历史数据查询</p>
+            </div>
+          </div> -->
+        </div>
+      </el-carousel-item>
+
+      <!-- card-2 -->
+      <el-carousel-item style="padding: 20px; background: rgb(4, 12, 11)">
+        <div class="itemBox">
+          <p class="itemTitle">
+            预警记录
+            <!-- <i class="itemMoreBtn el-icon-more" @click="jumpUrl('/realSearch')"></i> -->
+          </p>
+          <div class="df-table">
+            <ComTable height="30vh" :data="tableData3" :pageSize="20">
+            </ComTable>
+            <ComTable height="30vh" :data="tableData4" :pageSize="20">
+            </ComTable>
+          </div>
+          <!-- <div class="imageBox1">
+            <div class="imgItem1" @click="jumpUrl('/new/alarmcenter')">
+              <el-image class="img1" src="./static/img/oa日报.png" fit="fill" />
+              <p class="imgTitle">预警管理</p>
+            </div>
+            <div class="imgItem1" @click="jumpUrl('/new/tjsj')">
+              <el-image
+                class="img1"
+                src="./static/img/新能源日报.png"
+                fit="fill"
+              />
+              <p class="imgTitle">停机事件管理</p>
+            </div>
+            <div class="imgItem1" @click="jumpUrl('/new/xdgl')">
+              <el-image class="img1" src="./static/img/oa日报.png" fit="fill" />
+              <p class="imgTitle">限电管理</p>
+            </div>
+            <div class="imgItem1" @click="jumpUrl('/alarmCenter/boosterAlarm')">
+              <el-image
+                class="img1"
+                src="./static/img/新能源日报.png"
+                fit="fill"
+              />
+              <p class="imgTitle">升压站报警</p>
+            </div>
+            <div class="imgItem1" @click="jumpUrl('/alarmCenter/scadaAlarm')">
+              <el-image class="img1" src="./static/img/oa日报.png" fit="fill" />
+              <p class="imgTitle">SCADA报警</p>
+            </div>
+            <div class="imgItem1" @click="jumpUrl('/alarmCenter/customAlarm')">
+              <el-image
+                class="img1"
+                src="./static/img/新能源日报.png"
+                fit="fill"
+              />
+              <p class="imgTitle">自定义报警</p>
+            </div>
+          </div> -->
+        </div>
+      </el-carousel-item>
+
+      <!-- card-3 -->
+      <el-carousel-item style="padding: 20px; background: rgb(4, 12, 11)">
+        <div class="itemBox">
+          <p class="itemTitle">
+            专家知识
+            <!-- <i class="itemMoreBtn el-icon-more" @click="jumpUrl('/realSearch')"></i> -->
+          </p>
+           <div class="df-table">
+                <ComTable height="30vh" :data="tableData5" :pageSize="20">
+            </ComTable>
+           </div>
+       
+        </div>
+      </el-carousel-item>
+
+      <!-- card-4 -->
+      <!-- <el-carousel-item style="padding: 20px; background: rgb(4, 12, 11)">
+        <div class="itemBox">
+          <p class="itemTitle">
+            统计分析
+            <i class="itemMoreBtn el-icon-more" @click="jumpUrl('/realSearch')"></i>
+          </p>
+           <ComTable height="30vh" :data="tableData7" :pageSize="20">
+            </ComTable>
+            <ComTable height="30vh" :data="tableData8" :pageSize="20">
+            </ComTable>
+        </div>
+      </el-carousel-item> -->
+      <!-- card-5 -->
+      <el-carousel-item style="padding: 20px; background: rgb(4, 12, 11)">
+        <div class="itemBox">
+          <p class="itemTitle">
+            报表管理
+            <!-- <i class="itemMoreBtn el-icon-more" @click="jumpUrl('/realSearch')"></i> -->
+          </p>
+          <div class="imageBox1">
+            <div class="imgItem1" @click="jumpUrl('/tjfx')">
+              <el-image class="img1" src="./static/img/oa日报.png" fit="fill" />
+              <p class="imgTitle">统计分析</p>
+            </div>
+            <div class="imgItem1" @click="jumpUrl('/bdzcx')">
+              <el-image
+                class="img1"
+                src="./static/img/新能源日报.png"
+                fit="fill"
+              />
+              <p class="imgTitle">表底值查询</p>
+            </div>
+            <div class="imgItem1" @click="jumpUrl('/xnyrb')">
+              <el-image class="img1" src="./static/img/oa日报.png" fit="fill" />
+              <p class="imgTitle">新能源日报</p>
+            </div>
+                     <div class="imgItem1" @click="jumpUrl('/xnyfdscyb')">
+              <el-image
+                class="img1"
+                src="./static/img/新能源日报.png"
+                fit="fill"
+              />
+              <p class="imgTitle">新能源风电生产月报</p>
+            </div>
+            <div class="imgItem1" @click="jumpUrl('/missfdrb')">
+              <el-image
+                class="img1"
+                src="./static/img/新能源日报.png"
+                fit="fill"
+              />
+              <p class="imgTitle">动态报表</p>
+            </div>
+            <div class="imgItem1" @click="jumpUrl('/missgfrb')">
+              <el-image class="img1" src="./static/img/oa日报.png" fit="fill" />
+              <p class="imgTitle">项目动态报表</p>
+            </div>
+   
+          </div>
+        </div>
+      </el-carousel-item>
+      <!-- card-6 -->
+      <el-carousel-item style="padding: 20px; background: rgb(4, 12, 11)">
+        <div class="itemBox">
+          <p class="itemTitle">
+            自定制报表管理
+            <!-- <i class="itemMoreBtn el-icon-more" @click="jumpUrl('/realSearch')"></i> -->
+          </p>
+           <div class="df-table">
+                     <ComTable height="30vh" :data="tableData6" :pageSize="20">
+            </ComTable>
+           </div>
+
+        </div>
+      </el-carousel-item>
+    </el-carousel>
+  </div>
+</template>
+
+<script>
+import $ from "jquery";
+import ComTable from "@com/coms/table/table.vue";
+export default {
+  // 名称
+  name: "cutAnalyse",
+  // 使用组件
+  components: {
+    ComTable,
+  },
+  // 数据
+  data() {
+    const that = this;
+    return {
+      tableData1: {
+        column: [
+          {
+            name: "名称",
+            field: "pointId",
+            is_num: false,
+            is_light: false,
+            sortable: true,
+          },
+          {
+            name: "发电量",
+            field: "pointName",
+            is_num: false,
+            is_light: false,
+            sortable: true,
+          },
+        ],
+        data: [],
+      },
+      tableData2: {
+        column: [
+          {
+            name: "设备结构",
+            field: "pointId",
+            is_num: false,
+            is_light: false,
+            sortable: true,
+          },
+          {
+            name: "关键参数",
+            field: "pointName",
+            is_num: false,
+            is_light: false,
+            sortable: true,
+          },
+        ],
+        data: [],
+      },
+       tableData3: {
+        column: [
+          {
+            name: "状态",
+            field: "pointId",
+            is_num: false,
+            is_light: false,
+            sortable: true,
+          },
+          {
+            name: "当日数量",
+            field: "pointName",
+            is_num: false,
+            is_light: false,
+            sortable: true,
+          },
+      
+        ],
+        data: [],
+      },
+             tableData4: {
+        column: [
+          {
+            name: "类型",
+            field: "pointId",
+            is_num: false,
+            is_light: false,
+            sortable: true,
+          },
+          {
+            name: "当日数量",
+            field: "pointName",
+            is_num: false,
+            is_light: false,
+            sortable: true,
+          },
+      
+        ],
+        data: [],
+      },
+          tableData5: {
+        column: [
+          {
+            name: "名称",
+            field: "pointId",
+            is_num: false,
+            is_light: false,
+            sortable: true,
+          },
+          {
+            name: "数量",
+            field: "pointName",
+            is_num: false,
+            is_light: false,
+            sortable: true,
+          },
+        ],
+        data: [],
+      },
+              tableData6: {
+        column: [
+          {
+            name: "名称",
+            field: "pointId",
+            is_num: false,
+            is_light: false,
+            sortable: true,
+          },
+          {
+            name: "数量",
+            field: "pointName",
+            is_num: false,
+            is_light: false,
+            sortable: true,
+          },
+        ],
+        data: [],
+      },         tableData7: {
+        column: [
+          {
+            name: "名称",
+            field: "pointId",
+            is_num: false,
+            is_light: false,
+            sortable: true,
+          },
+          {
+            name: "数量",
+            field: "pointName",
+            is_num: false,
+            is_light: false,
+            sortable: true,
+          },
+        ],
+        data: [],
+      },
+
+    };
+  },
+
+  // 函数
+  methods: {
+    // 切换走马灯，并重新渲染样式
+    changeSwiper(index) {
+      this.$nextTick(() => {
+        const swiperDom = $(".swiperBox .el-carousel__item");
+        swiperDom
+          .eq(index)
+          .css({ background: "rgb(4, 12, 11)", border: "1px solid #05bb4c" });
+        for (let i = 0; i < swiperDom.length; i++) {
+          if (i !== index) {
+            swiperDom
+              .eq(i)
+              .find(".el-carousel__mask")
+              .css({
+                background: "rgb(4, 12, 11)",
+              });
+            swiperDom.eq(i).css({
+              background: "rgb(4, 12, 11)",
+              border: "1px solid rgba(5, 187, 76, 0.5)",
+            });
+          }
+        }
+      });
+    },
+
+    // 页面跳转
+    jumpUrl(url) {
+      this.$router.push(url);
+    },
+    //获取表格数据
+    getTableData() {
+      let that = this;
+      let tableArr1 = [
+        {
+          index: 1,
+          pointId: "青山风电场",
+          pointName: 3763,
+        },
+        {
+          index: 2,
+          pointId: "石板泉风电场",
+          pointName: 4500,
+        },
+        {
+          index: 3,
+          pointId: "牛首山风电场",
+          pointName: 3863,
+        },
+        {
+          index: 4,
+          pointId: "香山风电场",
+          pointName: 3654,
+        },
+        {
+          index: 5,
+          pointId: "麻黄山风电场",
+          pointName: 1863,
+        },
+      ];
+      that.tableData1.data = tableArr1;
+      console.log("tableData1:", that.tableData1);
+          let tableArr2 = [
+        {
+          index: 1,
+          pointId: "1号机",
+          pointName: 16.93,
+        },
+        {
+          index: 2,
+          pointId: "2号机",
+          pointName: 20.56,
+        },
+        {
+          index: 3,
+          pointId: "3号机",
+          pointName: 38,
+        },
+        {
+          index: 4,
+          pointId: "4号机",
+          pointName: 54,
+        },
+        {
+          index: 5,
+          pointId: "5号机",
+          pointName: 18,
+        },
+      ];
+      that.tableData2.data = tableArr2;
+      console.log("tableData2:", that.tableData2);
+                let tableArr3 = [
+        {
+          index: 1,
+          pointId: "停机事件管理",
+          pointName: 16.93,
+        },
+        {
+          index: 2,
+          pointId: "限电管理",
+          pointName: 20.56,
+        },
+        {
+          index: 3,
+          pointId: "状态转换记录",
+          pointName: 38,
+        },
+        {
+          index: 4,
+          pointId: "操作记录",
+          pointName: 54,
+        },
+      ];
+      that.tableData3.data = tableArr3;
+
+                let tableArr4 = [
+        {
+          index: 1,
+          pointId: "升压站动作",
+          pointName: 16.93,
+        },
+        {
+          index: 2,
+          pointId: "升压站告警",
+          pointName: 20.56,
+        },
+        {
+          index: 3,
+          pointId: "风机告警",
+          pointName: 38,
+        },
+        {
+          index: 4,
+          pointId: "风机预警",
+          pointName: 54,
+        },
+      ];
+      that.tableData4.data = tableArr4;
+
+         let tableArr5 = [
+        {
+          index: 1,
+          pointId: "故障指示列表",
+          pointName: 16.93,
+        },
+        {
+          index: 2,
+          pointId: "安全措施知识",
+          pointName: 20.56,
+        },
+        {
+          index: 3,
+          pointId: "排查检修方案",
+          pointName: 38,
+        },
+        {
+          index: 4,
+          pointId: "预警知识",
+          pointName: 54,
+        },
+             {
+          index: 5,
+          pointId: "特征参数",
+          pointName: 44,
+        },
+             {
+          index: 6,
+          pointId: "风险辨识知识",
+          pointName: 24,
+        },
+             {
+          index: 7,
+          pointId: "作业指导知识",
+          pointName: 14,
+        },
+      ];
+      that.tableData5.data = tableArr5;
+
+      
+         let tableArr6 = [
+        {
+          index: 1,
+          pointId: "风电场站自定义",
+          pointName: 16.93,
+        },
+        {
+          index: 2,
+          pointId: "风电项目自定义",
+          pointName: 20.56,
+        },
+        {
+          index: 3,
+          pointId: "光伏场站自定义",
+          pointName: 38,
+        },
+        {
+          index: 4,
+          pointId: "光伏项目自定义",
+          pointName: 54,
+        },
+      ];
+      that.tableData6.data = tableArr6;
+
+      
+
+    },
+
+  },
+
+  created() {},
+
+  mounted() {
+    let that = this;
+    this.$nextTick(() => {
+      this.changeSwiper(1);
+    });
+    that.getTableData();
+  },
+
+  unmounted() {},
+};
+</script>
+
+<style lang="less" scoped>
+.swiperBox,
+.itemBox {
+  width: 100%;
+  height: 100%;
+  font-size: 20px;
+.df-table{
+  /deep/ .com-table thead tr th {
+    background-color: rgba(83, 98, 104, 0.2);
+    height: 30px;
+    line-height: 30px;
+    color: #9ca5a8;
+    font-weight: 400;
+    font-size: 20px !important;
+    position: sticky;
+    top: 0;
+    cursor: pointer;
+}
+/deep/ .com-table tbody tr td {
+    padding: 4px;
+    color: #393a3a;
+    text-align: center;
+    font-size: 20px !important;
+    white-space: nowrap;
+    overflow: hidden;
+    text-overflow: ellipsis;
+}
+
+
+}
+  .itemTitle {
+    width: 100%;
+    display: flex;
+    justify-content: center;
+    align-items: center;
+    position: relative;
+
+    .itemMoreBtn {
+      cursor: pointer;
+      font-size: 22px;
+      position: absolute;
+      right: 0;
+      top: 0;
+    }
+  }
+
+  .inline {
+    display: flex;
+    justify-content: space-around;
+    align-items: center;
+    font-size: 24px;
+    margin-bottom: 30px;
+    width: 100%;
+    margin: 0 0 30px 0;
+    transition: 0.2s;
+
+    .l {
+      color: #b3bdc0;
+      width: 46%;
+      display: flex;
+      justify-content: flex-end;
+      align-items: center;
+      margin-right: 4%;
+      transition: 0.2s;
+    }
+
+    .r {
+      color: #05bb4c;
+      position: relative;
+      width: 46%;
+      display: flex;
+      justify-content: start;
+      align-items: center;
+      margin-left: 4%;
+
+      &::after {
+        content: "";
+        position: absolute;
+        height: 10px;
+        left: 30px;
+        top: calc(50% - 5px);
+        background-color: #edbf03;
+        border-radius: 2px;
+      }
+    }
+
+    .r1::after {
+      width: 30px;
+    }
+
+    .r2::after {
+      width: 60px;
+    }
+
+    .r3::after {
+      width: 90px;
+    }
+
+    .r4::after {
+      width: 120px;
+    }
+
+    &:hover {
+      width: 80%;
+      margin: 0 10% 30px 10%;
+      color: #05bb4c;
+      transition: 0.2s;
+    }
+
+    &:hover .l {
+      color: #05bb4c;
+      transition: 0.2s;
+    }
+  }
+
+  .imageBox {
+    width: 100%;
+    display: flex;
+    // justify-content: start;
+    justify-content: space-around;
+    align-items: center;
+    flex-wrap: wrap;
+    margin-top: 100px;
+
+    .imgItem {
+      cursor: pointer;
+      border: none;
+      margin-right: 1%;
+      margin-bottom: 20px;
+      display: flex;
+      justify-content: start;
+      align-items: center;
+      flex-direction: column;
+      // width: 32%;
+      width: 45%;
+
+      .img {
+        width: 100%;
+        // height: 150px;
+        height: 300px;
+        border: 1px solid #b3bdc0;
+        transition: 0.2s;
+
+        &:hover {
+          border: 1px solid #05bb4c;
+          transition: 0.2s;
+        }
+      }
+
+      p {
+        width: 100%;
+        font-size: 16px;
+        color: #b3bdc0;
+        text-align: center;
+        transition: 0.2s;
+      }
+
+      &:hover p {
+        transition: 0.2s;
+        color: #05bb4c;
+      }
+    }
+  }
+  .imageBox1 {
+    width: 100%;
+    display: flex;
+    // justify-content: start;
+    justify-content: space-around;
+    align-items: center;
+    flex-wrap: wrap;
+    margin-top: 100px;
+
+    .imgItem1 {
+      cursor: pointer;
+      border: none;
+      margin-right: 1%;
+      margin-bottom: 20px;
+      display: flex;
+      // justify-content: start;
+      justify-content: space-around;
+      align-items: center;
+      flex-direction: column;
+      width: 32%;
+
+      .img1 {
+        width: 100%;
+        height: 150px;
+        border: 1px solid #b3bdc0;
+        transition: 0.2s;
+
+        &:hover {
+          border: 1px solid #05bb4c;
+          transition: 0.2s;
+        }
+      }
+
+      p {
+        width: 100%;
+        font-size: 16px;
+        color: #b3bdc0;
+        text-align: center;
+        transition: 0.2s;
+      }
+
+      &:hover p {
+        transition: 0.2s;
+        color: #05bb4c;
+      }
+    }
+  }
+  .imageBox2 {
+    width: 100%;
+    display: flex;
+    justify-content: space-around;
+    align-items: center;
+    flex-wrap: wrap;
+    margin-top: 100px;
+
+    .imgItem2 {
+      cursor: pointer;
+      border: none;
+      margin-right: 1%;
+      margin-bottom: 20px;
+      display: flex;
+      justify-content: space-around;
+      align-items: center;
+      flex-direction: column;
+      width: 45%;
+
+      .img2 {
+        width: 100%;
+        height: 180px;
+        border: 1px solid #b3bdc0;
+        transition: 0.2s;
+
+        &:hover {
+          border: 1px solid #05bb4c;
+          transition: 0.2s;
+        }
+      }
+
+      p {
+        width: 100%;
+        font-size: 16px;
+        color: #b3bdc0;
+        text-align: center;
+        transition: 0.2s;
+      }
+
+      &:hover p {
+        transition: 0.2s;
+        color: #05bb4c;
+      }
+    }
+  }
+
+  .iframe {
+    border: 0;
+    overflow: scroll;
+    background: #fff;
+  }
+}
+</style>
+
+<style lang="less">
+.itemBox {
+  .el-form-item,
+  .el-form-item__label {
+    font-size: 16px;
+  }
+
+  .el-form-item__label {
+    text-align: left;
+  }
+}
+</style>

src/views/WindSite/pages/Home/Home.vue

@@ -74,9 +74,15 @@
                     运行
                   </span>
                 </div>
+<<<<<<< HEAD
                 <div class="status">
                   <span class="svg-icon svg-icon-pink">
                     <svg-icon svgid="svg-limit-power"/>
+=======
+                <div class="status ">
+                  <span class="svg-icon svg-icon-pink">
+                    <svg-icon svgid="svg-limit-power" style="margin:3px 0.3704vh -3px 0;" />
+>>>>>>> a90e20b975bbd19cc02c24778ace5845c39744dd
                   </span>
                   <span class="text pink">
                     限电

src/views/layout/Header.vue

@@ -67,7 +67,7 @@ export default {
         {
           id: 'others',
           text: '其他',
-          path: '/others/reportPandect',
+          path: '/others',
           isActive: false
         }
       ],

src/views/singleAnalysis/index.vue

@@ -343,11 +343,13 @@ export default {
   }
 
   .df-table {
+    cursor: pointer;
     border: 0.093vh solid fade(@darkgray, 50%);
     position: relative;
     overflow: auto;
     flex-grow: 1;
     margin-top: 1.481vh;
+  
 
     &:before {
       content: "";

src/views/wtSaturability/tab1.vue

@@ -40,7 +40,7 @@ export default {
   // 使用组件
   components: {
     ComTable,
-    Mlc
+    Mlc,
   },
 
   // 数据
@@ -158,10 +158,12 @@ export default {
         },
         success (res) {
           console.log('chartData1:',res)
-          const keyArray = [{
-            key: "value1",
-            title: "风速"
-          }, {
+          const keyArray = [
+          //   {
+          //   key: "value1",
+          //   title: "风速"
+          // }, 
+          {
             key: "value2",
             title: "实际拟合功率"
           }, {
@@ -173,12 +175,13 @@ export default {
           }];
 
           let chartData = [
-            {
-            title: "风速",
-            // yAxisIndex: 1,
-             yAxisIndex: 0,
-            value: []
-          },
+          //   {
+          //   title: "风速",
+          //   // yAxisIndex: 1,
+          //    yAxisIndex: 0,
+          //   value: []
+          // },
+
            {
             title: "实际拟合功率",
             yAxisIndex: 0,
@@ -194,7 +197,11 @@ export default {
           }];
 
           keyArray.forEach((keyEle, keyIndex) => {
+            console.log('keyele:',keyEle,'keyindex:',keyIndex)
+            console.log('resdata:',res.data)
             res.data.forEach(ele => {
+              console.log('ele:',ele)
+              console.log(' chartData[keyIndex].value:', chartData[keyIndex].value)
               chartData[keyIndex].value.push({
                 text: "",
                 value: ele[keyEle.key]

src/views/wtSaturability/tab2.vue

@@ -212,10 +212,12 @@ export default {
         },
         success (res) {
 
-          const keyArray = [{
-            key: "value1",
-            title: "风速"
-          }, {
+          const keyArray = [
+          //   {
+          //   key: "value1",
+          //   title: "风速"
+          // }, 
+          {
             key: "value2",
             title: "实际拟合功率"
           }, {
@@ -226,12 +228,14 @@ export default {
             title: "保证功率"
           }];
 
-          let chartData = [{
-            title: "风速",
-            // yAxisIndex: 1,
-             yAxisIndex: 0,
-            value: []
-          }, {
+          let chartData = [
+          //   {
+          //   title: "风速",
+          //   // yAxisIndex: 1,
+          //    yAxisIndex: 0,
+          //   value: []
+          // },
+           {
             title: "实际拟合功率",
             yAxisIndex: 0,
             value: []

src/views/wtSaturability/tab3.vue

@@ -210,10 +210,12 @@ export default {
         },
         success (res) {
 
-          const keyArray = [{
-            key: "value1",
-            title: "风速"
-          }, {
+          const keyArray = [
+          //   {
+          //   key: "value1",
+          //   title: "风速"
+          // }, 
+          {
             key: "value2",
             title: "实际拟合功率"
           }, {
@@ -224,12 +226,14 @@ export default {
             title: "保证功率"
           }];
 
-          let chartData = [{
-            title: "风速",
-            // yAxisIndex: 1,
-             yAxisIndex: 0,
-            value: []
-          }, {
+          let chartData = [
+          //   {
+          //   title: "风速",
+          //   // yAxisIndex: 1,
+          //    yAxisIndex: 0,
+          //   value: []
+          // }, 
+          {
             title: "实际拟合功率",
             yAxisIndex: 0,
             value: []