Parcourir la source

Merge branch 'master' of http://192.168.50.233:3000/rui.jiang/performance-test

liujiejie il y a 3 semaines
Parent
commit
0a42fd24cd

+ 18 - 1
src/App.vue

@@ -1,5 +1,5 @@
 <template>
-  <div id="app" v-loading="defaultLoading">
+  <div id="app" class="app-wrapper" v-loading="defaultLoading">
     <!-- <transition name="fade" mode="out-in"> -->
     <router-view />
     <!-- </transition> -->
@@ -42,4 +42,21 @@ body {
 #app .theme-picker {
   display: none;
 }
+
+html, body, #app {
+  height: 100%;
+  overflow: hidden;
+}
+
+.app-wrapper {
+  min-height: 100vh;
+  overflow: hidden;
+}
+html::-webkit-scrollbar,
+body::-webkit-scrollbar,
+#app::-webkit-scrollbar {
+  width: 0;
+  height: 0;
+}
+
 </style>

+ 2 - 2
src/components/map/index.vue

@@ -248,12 +248,12 @@ export default {
       layers: [
         new TileLayer({
           source: new XYZ({
-            // url: "http://106.120.102.238:18000/tiles/{z}/{x}/{y}.png", //外网
+            url: "http://106.120.102.238:18000/tiles/{z}/{x}/{y}.png", //外网
             // url: "http://127.0.0.1:8010/tiles/{z}/{x}/{y}.png", //本地
             // url: "http://192.168.50.235/tiles/{z}/{x}/{y}.png", //内网
             // url: "http://10.96.137.5:9080/tiles/{z}/{x}/{y}.png", //大~#@唐
             // url: "http://192.168.0.1/tiles/{z}/{x}/{y}.png", //华电
-            url: "http://192.168.50.235/tiles/{z}/{x}/{y}.png", //中广核
+            // url: "http://192.168.50.235/tiles/{z}/{x}/{y}.png", //中广核
           }),
         }),
         new VectorLayer({

+ 2 - 2
src/router/index.js

@@ -28,8 +28,8 @@ const createRouter = () =>
             iconName: "gps",
             component: () =>
               import(
-                /*webpackChunkName:'home-cockpitManage'*/ "../views/admin/cockpitManage/Index.vue"
-                // /*webpackChunkName:'home-cockpitManage'*/ "../views/admin/cockpitManage/HD.vue"
+                // /*webpackChunkName:'home-cockpitManage'*/ "../views/admin/cockpitManage/Index.vue"
+                /*webpackChunkName:'home-cockpitManage'*/ "../views/admin/cockpitManage/HD.vue"
               ),
           },
           {

+ 3 - 3
src/views/admin/cockpitManage/Index.vue

@@ -243,9 +243,9 @@ export default {
 
 <style lang="scss" scoped>
 .map-ditu {
-  // min-width: 86.9vw;
-  // max-width: 94.9vw;
-  height: 93.3vh;
+  //  min-width: 86.9vw;
+  //  max-width: 94.9vw;
+  height: calc(100vh - 60px);
   // height: 100vh;
   position: relative;
 }

+ 11 - 7
src/views/health/components/envelopecharts.vue

@@ -366,6 +366,12 @@ export default {
           text: this.envelopeList.title || this.envelopeListTwo.title,
           left: "center",
         },
+        grid: {
+          left: 60, // 原来是100,适当缩小左右边距
+          right: 60,
+          bottom: 60, // 给推拽条和坐标轴腾出空间
+          top: 60,
+        },
         toolbox: {
           feature: {
             dataZoom: { yAxisIndex: "none" },
@@ -413,14 +419,12 @@ export default {
           nameLocation: "center", // 标题位置:可选 "start" | "center" | "end"
           nameTextStyle: {
             fontSize: 14,
-            color: "#333", // 标题颜色
-            padding: [10, 0, 0, 0], // 上、右、下、左的间距
+            color: "#333",
+            padding: [15, 0, 0, 0], // 增加X轴标题和轴线的距离
           },
           axisLabel: {
-            formatter: (value) => {
-              // 格式化显示刻度为 5 的倍数
-              return value;
-            },
+            margin: 1, // 增加数值标签和轴线的间距
+            formatter: (value) => value,
           },
           axisTick: {
             show: true, // 显示刻度线
@@ -501,7 +505,7 @@ export default {
 <style lang="scss" scoped>
 .line-chart {
   width: 100%;
-  height: 260px;
+  height: 300px;
 }
 
 .eigenvalue {

+ 0 - 556
src/views/health/components/spectrogramcharts copy.vue

@@ -1,556 +0,0 @@
-<template>
-  <div>
-    <div class="FD">
-      <!-- 光标 -->
-      <div v-if="BGshow" class="eigenvalue">
-        <el-checkbox-group v-model="checkedGB" @change="handlecursor">
-          <el-checkbox v-for="(item, index) in GBcheckList" :key="index" :label="item.val">
-            {{ item.val }}
-          </el-checkbox>
-        </el-checkbox-group>
-      </div>
-      <!-- 特征值 -->
-      <div v-if="PXshow" class="eigenvalue">
-        <el-checkbox-group v-model="checkedValues" @change="handleCheckChange">
-          <el-checkbox v-for="(item, index) in PXcheckList" :key="index" :label="item.val">
-            {{ item.val }}
-          </el-checkbox>
-        </el-checkbox-group>
-      </div>
-    </div>
-    <!-- ECharts 图表容器 -->
-
-    <div class="line-chart" ref="chart"></div>
-  </div>
-</template>
-
-<script>
-import axios from "axios";
-import * as echarts from "echarts"; // 导入 echarts 库
-
-export default {
-  name: "TimedomainCharts", // 组件名称
-  props: {
-    currentIndex: {
-      type: Number,
-      default: 0,
-    },
-    activeIndex: {
-      type: Number,
-      default: 0,
-    },
-    ids: {
-      type: Array,
-      default: () => [],
-    },
-    spectrumListTwo: {
-      type: Object,
-      default: () => ({}),
-    },
-    currentRow: {
-      type: Object,
-      default: () => ({}),
-    },
-    windCode: {
-      type: String,
-      default: "",
-    },
-  },
-  data() {
-    return {
-      chartInstance: null,
-      option: null,
-      TZshow: false,
-      BGshow: false,
-      PXshow: false,
-      spectrumList: {},
-
-      GBcheckList: [
-        { val: "添加光标" , checked: false},
-        { val: "谐波光标" , checked: false},
-        { val: "边带光标" , checked: false},
-        { val: "移动峰值" , checked: false},
-      ],
-      PXcheckList: [
-        { val: "Fr", checked: false },
-        { val: "BPFI", checked: false },
-        { val: "BPFO", checked: false },
-        { val: "BSF", checked: false },
-        { val: "FTF", checked: false },
-        { val: "3P", checked: false },
-      ],
-      Fr: [],
-      BPFI: [],
-      BPFO: [],
-      BSF: [],
-      FTF: [],
-      B3P: [],
-
-      checkedGB: [],
-      checkedValues: [],
-
-
-      cursorLines: [], // 存储添加的光标线
-      cursorPoints: [], // 用于存储参考点(浮动点)数据
-
-    };
-  },
-  watch: {
-    // 监听 chartData 和 chartLabels 的变化,重新绘制图表
-    chartData(newData) {
-      this.updateChart(newData, this.chartLabels);
-    },
-    chartLabels(newLabels) {
-      this.updateChart(this.chartData, newLabels);
-    },
-    spectrumListTwo(newValue) {
-      this.spectrumList = newValue; // 将 spectrumListTwo 的新值赋给 spectrumList
-      if (this.chartInstance) {
-        this.updateChart(this.spectrumList.y, this.spectrumList.x); // 更新图表
-      }
-    },
-    spectrumList: {
-      handler(newValue) {
-        if (!newValue) return;
-        console.log(newValue, "newValue");
-        if (this.chartInstance) {
-          this.updateChart(newValue.y, newValue.x); // 只在 chartInstance 初始化后更新图表
-        }
-      },
-      deep: true, // 深度监听
-    },
-  },
-  destroyed() {
-  if (this.chartInstance) {
-    this.chartInstance.getZr().off('dblclick', this.handleDoubleClick)
-  }
-},
-
-  mounted() {
-    
-    this.$nextTick(() => {
-      setTimeout(() => {
-        this.initializeChart(); // 延迟2秒后调用
-        this.getTime();
-      }, 500); // 500毫秒,即0.5秒
-    });
-  },
-
-  methods: {
-    initializeChart() {
-      const chartDom = this.$refs.chart;
-      if (chartDom && !this.chartInstance) {
-        this.chartInstance = echarts.init(chartDom); // 仅初始化一次
-      }
-
-      // 使用 $nextTick 确保数据更新后再渲染图表
-      this.$nextTick(() => {
-        if (this.chartInstance && this.spectrumList.y && this.spectrumList.x) {
-          this.updateChart(this.spectrumList.y, this.spectrumList.x); // 更新图表
-        }
-      });
-
-       // 绑定双击事件
-    this.chartInstance.getZr().on('dblclick', this.handleDoubleClick)
-    },
-
-    handleDoubleClick(event) {
-    // 只有勾选了“添加光标”时才响应
-    if (!this.checkedGB.includes('添加光标')) return
-    // 转换鼠标位置为图表的 x 轴数值
-    const pointInGrid = this.chartInstance.convertFromPixel({ seriesIndex: 0 }, [event.offsetX, event.offsetY])
-    const xValue = pointInGrid[0]
-    // 添加参考线(使用“光标”命名)
-    this.cursorLines.push({ xAxis: xValue, val: '光标' })
-    // 更新图表:添加参考线
-    this.updateCursorLines()
-    // 自动取消勾选
-    this.checkedGB = this.checkedGB.filter(val => val !== '添加光标')
-    this.handlecursor() // 同步 checked 状态
-  },
-
-
-
-  updateCursorLines() {
-    const cursorLine = {
-      type: 'line',
-      markLine: {
-        silent: true,
-        lineStyle: { color: '#FF0000', type: 'dotted', width: 2 },
-        symbol: ['none', 'none'],
-        label: {
-          show: true,
-          formatter: ({ data }) => `光标`,
-          position: 'end',
-        },
-        data: this.cursorLines.map(({ xAxis, val }) => ({ xAxis, val })),
-      },
-    }
-
-    // 更新图表,仅更新 series
-    if (this.chartInstance) {
-      this.chartInstance.setOption(
-        {
-          series: [
-            {
-              name: '数据系列',
-              type: 'line',
-              data: this.spectrumList.x.map((x, i) => [x, this.spectrumList.y[i]]),
-              symbol: 'none',
-              lineStyle: { color: '#162961', width: 1 },
-              itemStyle: { color: '#162961', borderColor: '#fff', borderWidth: 1 },
-              large: true,
-            },
-            ...this.generateSeries({
-              Fr: this.Fr,
-              BPFI: this.BPFI,
-              BPFO: this.BPFO,
-              BSF: this.BSF,
-              FTF: this.FTF,
-              B3P: this.B3P,
-            }),
-            cursorLine,
-          ],
-        },
-        { replaceMerge: ['series'] }
-      )
-    }
-  },
-
-
-
-    // 更新图表数据
-    updateChart(data, labels) {
-      if (
-        !this.chartInstance ||
-        !Array.isArray(labels) ||
-        !Array.isArray(data) ||
-        labels.length !== data.length
-      ) {
-        console.error("Invalid data or labels");
-        return;
-      }
-
-      const createMarkLine = (dataSource, color) => ({
-        type: "line",
-        markLine: {
-          silent: false,
-          lineStyle: { color, type: "solid", width: 2 },
-          symbol: ["arrow", "none"],
-          label: {
-            show: true,
-            position: "end",
-            formatter: ({ data }) => data.val,
-          },
-          emphasis: {
-            lineStyle: { color: "#FF6A00", width: 4 },
-            label: {
-              show: true,
-              formatter: ({ value }) => `特征值: ${value}`,
-              color: "#000",
-              backgroundColor: "#FFF",
-              padding: [2, 4],
-              borderRadius: 3,
-              fontSize: 12,
-            },
-          },
-          data: dataSource.map(({ Xaxis, val }) => ({ xAxis: Xaxis, val })),
-        },
-      });
-
-      const markLines = [
-        { data: this.Fr, color: "#A633FF" },
-        { data: this.BPFI, color: "#23357e" },
-        { data: this.BPFO, color: "#42a0ae" },
-        { data: this.BSF, color: "#008080" },
-        { data: this.FTF, color: "#af254f" },
-        { data: this.B3P, color: "#FFD700" },
-      ].map(({ data, color }) => createMarkLine(data, color));
-
-      const option = {
-        title: { text: this.spectrumList.title, left: "center" },
-        toolbox: {
-          feature: {
-            dataZoom: { yAxisIndex: "none" },
-            restore: {},
-            saveAsImage: {},
-            myCustomTool: {
-              show: true,
-              title: "上一条",
-              icon: `image://${require("@/assets/analyse/08.png")}`,
-              onclick: () => this.previousRow(),
-            },
-            myCustomTool2: {
-              show: true,
-              title: "下一条",
-              icon: `image://${require("@/assets/analyse/09.png")}`,
-              onclick: () => this.nextRow(),
-            },
-            myCustomTool4: {
-              show: true,
-              title: "光标",
-              icon: `image://${require("@/assets/analyse/12.png")}`,
-              onclick: () => this.Show("2"),
-            },
-            myCustomTool5: {
-              show: true,
-              title: "特征频率",
-              icon: `image://${require("@/assets/analyse/13.png")}`,
-              onclick: () => this.Show("3"),
-            },
-          },
-        },
-        xAxis: {
-          type: "value",
-          name: this.spectrumList.xaxis,
-          nameLocation: "center",
-          nameTextStyle: {
-            fontSize: 14,
-            color: "#333",
-            padding: [10, 0, 0, 0],
-          },
-        },
-        yAxis: {
-          type: "value",
-          name: this.spectrumList.yaxis,
-          nameTextStyle: {
-            fontSize: 14,
-            color: "#333",
-            padding: [10, 0, 0, 0],
-          },
-        },
-        tooltip: {
-          trigger: "axis",
-          formatter: ([
-            {
-              value: [x, y],
-            },
-          ]) => `X: ${x}<br/>Y: ${y}`,
-          axisPointer: { type: "line" },
-        },
-        dataZoom: [
-          { type: "inside", start: 0, end: 10 },
-          {
-            type: "slider",
-            start: 0,
-            end: 10,
-            handleSize: "80%",
-            showDataShadow: false,
-          },
-        ],
-        series: [
-          {
-            name: "数据系列",
-            type: "line",
-            data: labels.map((x, i) => [x, data[i]]),
-            symbol: "none",
-            lineStyle: { color: "#162961", width: 1 },
-            itemStyle: {
-              color: "#162961",
-              borderColor: "#fff",
-              borderWidth: 1,
-            },
-            large: true,
-            progressive: 2000,
-          },
-          ...markLines,
-        ],
-      };
-
-      this.chartInstance.setOption(option);
-    },
-
-    // 处理复选框变化 特征值
-    handleCheckChange() {
-      this.PXcheckList.forEach((item) => {
-        item.checked = this.checkedValues.includes(item.val);
-      });
-
-      // 构建新的特征频率数据
-      const newFeatureLines = {
-        Fr: this.checkedValues.includes("Fr") ? this.spectrumList.fn_Gen : [],
-        BPFI: this.checkedValues.includes("BPFI") ? this.spectrumList.BPFI : [],
-        BPFO: this.checkedValues.includes("BPFO") ? this.spectrumList.BPFO : [],
-        BSF: this.checkedValues.includes("BSF") ? this.spectrumList.BSF : [],
-        FTF: this.checkedValues.includes("FTF") ? this.spectrumList.FTF : [],
-        B3P: this.checkedValues.includes("3P")
-          ? Array.isArray(this.spectrumList.B3P)
-            ? this.spectrumList.B3P
-            : [{ Xaxis: this.spectrumList.B3P, val: "3P" }]
-          : [],
-      };
-
-      // 仅更新 `series`,避免重新渲染整个 ECharts 组件
-      if (this.chartInstance) {
-        this.chartInstance.setOption(
-          {
-            series: this.generateSeries(newFeatureLines),
-          },
-          { replaceMerge: ["series"] }
-        );
-      }
-    },
-
-    generateSeries(featureLines) {
-      const createMarkLine = (dataSource, color) => ({
-        type: "line",
-        markLine: {
-          silent: false,
-          lineStyle: { color, type: "dashed", width:1 },
-          symbol: ["arrow", "none"],
-          label: {
-            show: true,
-            position: "end",
-            formatter: ({ data }) => data.val,
-          },
-          emphasis: {
-            lineStyle: { color: "#FF6A00", width: 2 },
-            label: {
-              show: true,
-              formatter: ({ value }) => `特征值: ${value}`,
-              color: "#000",
-            },
-          },
-          data: dataSource.map(({ Xaxis, val }) => ({ xAxis: Xaxis, val })),
-        },
-      });
-
-      const markLines = [
-        { data: featureLines.Fr, color: "#A633FF" },
-        { data: featureLines.BPFI, color: "#23357e" },
-        { data: featureLines.BPFO, color: "#42a0ae" },
-        { data: featureLines.BSF, color: "#008080" },
-        { data: featureLines.FTF, color: "#af254f" },
-        { data: featureLines.B3P, color: "#FFD700" },
-      ].map(({ data, color }) => createMarkLine(data, color));
-
-      return [
-        {
-          name: "数据系列",
-          type: "line",
-          data: this.spectrumList.x.map((x, i) => [x, this.spectrumList.y[i]]),
-          symbol: "none",
-          lineStyle: { color: "#162961", width: 1 },
-          itemStyle: { color: "#162961", borderColor: "#fff", borderWidth: 1 },
-          large: true,
-        },
-        ...markLines,
-      ];
-    },
-
-    // 处理复选框变化 光标
-    handlecursor(){
-      this.GBcheckList.forEach((item) => {
-        item.checked = this.checkedGB.includes(item.val);
-        console.log(  item.checked ,"item.checked");
-      });
-
-    },
-
-    getTime() {
-      this.$emit("handleLoading", null, true, this.activeIndex);
-      const params = {
-        ids: this.ids,
-        windCode: this.windCode,
-        analysisType: "frequency",
-      };
-      axios
-        .post("/WJapi/analysis/frequency", params)
-        .then((res) => {
-          console.log(res, "频谱图数据");
-          this.spectrumList = { ...JSON.parse(res.data) };
-          console.log(this.spectrumList, "频谱图数据1");
-          const XrmsValue = this.spectrumList?.Xrms;
-          // 通过 $emit 传递 XrmsValue 给父组件
-          this.$emit("updateXrms", XrmsValue);
-          this.PXcheckList.forEach((item) => {
-            if (item.checked) {
-              switch (item.val) {
-                case "Fr":
-                  this.Fr = this.spectrumList.fn_Gen;
-                  break;
-                case "BPFI":
-                  this.BPFI = this.spectrumList.BPFI;
-                  break;
-                case "BPFO":
-                  this.BPFO = this.spectrumList.BPFO;
-                  break;
-                case "BSF":
-                  this.BSF = this.spectrumList.BSF;
-                  break;
-                case "FTF":
-                  this.FTF = this.spectrumList.FTF;
-                  break;
-                case "3P":
-                  this.B3P = Array.isArray(this.spectrumList.B3P)
-                    ? this.spectrumList.B3P
-                    : [{ Xaxis: this.spectrumList.B3P, val: "3P" }];
-                  break;
-                default:
-                  break;
-              }
-            }
-          });
-        })
-        .catch((error) => {
-          console.error(error);
-        })
-        .finally(() => {
-          this.$emit("handleLoading", this.currentRow, false, this.activeIndex);
-        });
-    },
-
-    previousRow() {
-      this.$emit("update-previous-row", 2, this.activeIndex);
-    },
-
-    nextRow() {
-      this.$emit("update-next-row", 2, this.activeIndex);
-    },
-
-    Show(value) {
-      const stateMap = {
-        1: { TZshow: true, BGshow: false, PXshow: false },
-        2: { TZshow: false, BGshow: true, PXshow: false },
-        3: { TZshow: false, BGshow: false, PXshow: true },
-      };
-
-      if (stateMap[value]) {
-        // Toggle the state for the given value
-        this.TZshow = value === "1" ? !this.TZshow : false;
-        this.BGshow = value === "2" ? !this.BGshow : false;
-        this.PXshow = value === "3" ? !this.PXshow : false;
-      }
-    },
-  },
-};
-</script>
-<style lang="scss" scoped>
-.line-chart {
-  width: 100%;
-  height: 280px;
-}
-
-.FD {
-  width: 100%;
-  height: 1px;
-  position: relative;
-}
-
-.eigenvalue {
-  position: absolute;
-  top: 30px;
-  right: 0;
-  font-size: 10px;
-  width: 100px;
-  border: 1px solid black;
-  padding: 5px;
-  background: #fff;
-  z-index: 99;
-
-  h5 {
-    line-height: 16px;
-    height: 16px;
-  }
-}
-</style>

+ 12 - 2
src/views/health/components/spectrogramcharts.vue

@@ -333,6 +333,12 @@ export default {
       ].map(({ data, color }) => createMarkLine(data, color));
 
       const option = {
+        grid: {
+          left: 60, // 原来是100,适当缩小左右边距
+          right: 60,
+          bottom: 60, // 给推拽条和坐标轴腾出空间
+          top: 60,
+        },
         title: { text: this.spectrumList.title, left: "center" },
         toolbox: {
           feature: {
@@ -372,7 +378,11 @@ export default {
           nameTextStyle: {
             fontSize: 14,
             color: "#333",
-            padding: [10, 0, 0, 0],
+            padding: [15, 0, 0, 0], // 增加X轴标题和轴线的距离
+          },
+          axisLabel: {
+            margin: 1, // 增加数值标签和轴线的间距
+            formatter: (value) => value,
           },
         },
         yAxis: {
@@ -507,7 +517,7 @@ export default {
 <style lang="scss" scoped>
 .line-chart {
   width: 100%;
-  height: 280px;
+  height: 320px;
 }
 
 .FD {

+ 21 - 17
src/views/health/components/timedomaincharts.vue

@@ -118,6 +118,12 @@ export default {
           text: this.timeList.title,
           left: "center",
         },
+        grid: {
+          left: 60, // 原来是100,适当缩小左右边距
+          right: 60,
+          bottom: 60, // 给推拽条和坐标轴腾出空间
+          top: 60,
+        },
         toolbox: {
           feature: {
             dataZoom: { yAxisIndex: "none" },
@@ -150,12 +156,11 @@ export default {
           nameTextStyle: {
             fontSize: 14,
             color: "#333",
-            padding: [10, 0, 0, 0],
+            padding: [15, 0, 0, 0], // 增加X轴标题和轴线的距离
           },
           axisLabel: {
-            formatter: (value) => {
-              return value;
-            },
+            margin: 1, // 增加数值标签和轴线的间距
+            formatter: (value) => value,
           },
           axisTick: {
             show: true,
@@ -170,12 +175,11 @@ export default {
           nameTextStyle: {
             fontSize: 14,
             color: "#333",
-            padding: [10, 0, 0, 0],
+            padding: [0, 10, 0, 0], // 根据需要微调
           },
           axisLabel: {
-            formatter: (value) => {
-              return value;
-            },
+            margin: 10,
+            formatter: (value) => value,
           },
           axisTick: {
             show: true,
@@ -197,16 +201,16 @@ export default {
         },
         dataZoom: [
           {
-            type: "inside", // 内置型数据区域缩放组件
-            start: 0, // 初始缩放范围的起始百分比
-            end: 10, // 初始缩放范围的结束百分比
+            type: "inside",
+            start: 0,
+            end: 10,
           },
           {
-            type: "slider", // 滑动条型数据区域缩放组件
+            type: "slider",
             start: 0,
             end: 10,
-            handleSize: "80%", // 控制手柄大小
-            showDataShadow: false, // 是否显示数据阴影
+            handleSize: "80%",
+            showDataShadow: false,
           },
         ],
         series: [
@@ -225,8 +229,8 @@ export default {
               borderColor: "#fff",
               borderWidth: 1,
             },
-            large: true, // 开启大数据量优化
-            progressive: 2000, // 渐进式渲染的数据块大小
+            large: true,
+            progressive: 2000,
           },
         ],
       };
@@ -271,7 +275,7 @@ export default {
 <style lang="scss" scoped>
 .line-chart {
   width: 100%;
-  height: 280px;
+  height: 320px;
 }
 .FD {
   width: 100%;

+ 3 - 1
src/views/health/index.vue

@@ -4,6 +4,7 @@
       <p>
         单位:
         <selecttree
+               size="small"
           style="width: 180px"
           placeholder="请选择所属公司"
           :list="parentOpt"
@@ -21,6 +22,7 @@
       <p>
         时间:
         <el-date-picker
+               size="small"
           v-model="timevalue"
           type="datetimerange"
           range-separator="至"
@@ -239,7 +241,7 @@ export default {
   display: flex;
   margin: 0 0 20px 0;
   p {
-    margin-right: 20px;
+    margin-right: 10px;
   }
   .el-select {
     width: 180px;

+ 8 - 4
src/views/health/malfunction.vue

@@ -18,6 +18,7 @@
       <p>
         单位:
         <selecttree
+               size="small"
           style="width: 180px"
           placeholder="请选择所属公司"
           :list="parentOpt"
@@ -35,6 +36,7 @@
       <p>
         风机:
         <el-select
+               size="small"
           style="width: 150px"
           v-model="unitvalue"
           @change="getchedian"
@@ -51,7 +53,7 @@
       </p>
       <p>
         测点:
-        <el-select v-model="monitoringvalue" clearable placeholder="请选择">
+        <el-select v-model="monitoringvalue"         size="small" clearable placeholder="请选择">
           <el-option
             v-for="item in monitoringoptions"
             :key="item.detectionPointEn"
@@ -63,7 +65,7 @@
       </p>
       <p>
         频率:
-        <el-select v-model="frequencyvalue" clearable placeholder="请选择">
+        <el-select v-model="frequencyvalue"        size="small"  clearable placeholder="请选择">
           <el-option
             v-for="item in frequencyoptions"
             :key="item"
@@ -76,6 +78,7 @@
       <p>
         时间:
         <el-date-picker
+               size="small"
           v-model="timevalue"
           type="datetimerange"
           range-separator="至"
@@ -323,7 +326,7 @@ export default {
   
   <style lang="scss" scoped>
 .global-variable {
-  padding: 20px;
+  padding: 10px;
 }
 .head {
   padding: 5px 0;
@@ -384,10 +387,11 @@ export default {
   margin-bottom: 10px;
   align-items: center;
   flex-wrap: wrap;
+  padding-top: 10px;
   p {
     margin-right: 10px;
     margin-bottom: 0;
-    margin-top: 10px;
+    //margin-top: 10px;
     display: flex;
     align-items: center;
 

+ 16 - 7
src/views/health/vibration.vue

@@ -26,11 +26,12 @@
         <img src="@/assets/analyse/06.png" alt="全部关闭" @click="guanbi" />
       </div>
     </div>
-    
+
     <div class="searchbox">
       <p>
         单位:
         <selecttree
+          size="small"
           style="width: 180px"
           placeholder="请选择所属公司"
           :list="parentOpt"
@@ -52,6 +53,7 @@
           v-model="unitvalue"
           @change="getchedian"
           placeholder="请选择"
+          size="small"
         >
           <el-option
             v-for="item in unitoptions"
@@ -64,7 +66,12 @@
       </p>
       <p>
         测点:
-        <el-select v-model="monitoringvalue" clearable placeholder="请选择">
+        <el-select
+          v-model="monitoringvalue"
+          clearable
+          size="small"
+          placeholder="请选择"
+        >
           <el-option
             v-for="item in monitoringoptions"
             :key="item.detectionPointEn"
@@ -82,6 +89,7 @@
           range-separator="至"
           start-placeholder="开始日期"
           end-placeholder="结束日期"
+          size="small"
         >
         </el-date-picker>
       </p>
@@ -815,9 +823,9 @@ export default {
 }
 .searchbox {
   display: flex;
-  margin: 20px 0;
+  margin: 10px 0;
   p {
-    margin-right: 20px;
+    margin-right: 10px;
   }
   .el-select {
     width: 180px;
@@ -832,7 +840,9 @@ export default {
 }
 
 .subject {
-  height: 300px;
+  height: 350px;
+  // overflow: hidden;
+  // overflow-y: auto;
   transition: all 0.3s ease;
   padding: 0 10px;
   p {
@@ -846,8 +856,7 @@ export default {
   align-items: flex-start;
   .data-map {
     width: 60%;
-    // height: 620px;
-    // overflow-y: auto;
+
     .chart-area {
       margin-bottom: 10px;
       box-shadow: 0 2px 4px rgba(0, 0, 0, 0.12), 0 0 6px rgba(0, 0, 0, 0.04);

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

@@ -71,7 +71,7 @@ export default {
   height: 100vh;
   .el-container {
     // height: 100%;
-    min-height: 88vh;
+    min-height: 89vh;
   }
   .el-main {
     min-width: 800px;
@@ -79,10 +79,12 @@ export default {
     height: 100%;
     background-color: #f7f7f8;
     padding: 0;
+    overflow: hidden;
     .main-content {
       height: 100%;
     }
   }
+  
 }
 ::v-deep.el-header {
   padding: 0 !important;

+ 21 - 3
src/views/home/components/MenuHD.vue

@@ -6,12 +6,15 @@
     class="mt-3 el-menu-vertical-demo"
     @open="handleOpen"
     @close="handleClose"
-    :active-text-color="activeTextColor"
+
     :router="true"
     :default-active="defaultActive"
     :default-openeds="openMenus"
-
+    background-color="#1b3b7f"
+  text-color="#fff"
+  active-text-color="#ffd04b"
   >
+  <!--     :active-text-color="activeTextColor" -->
     <template v-for="(item, indexMenu) in routerList">
       <!-- 判断是否是中间位置 -->
       <el-menu-item
@@ -52,6 +55,7 @@
           :key="child.id"
           :index="`${child.path}?id=${child.id}`"
           @click="handleChangeMenuUrl(child, `${child.path}?id=${child.id}`)"
+
         >
           <span>{{ child.name }}</span>
         </el-menu-item>
@@ -371,9 +375,23 @@ export default {
 
 /* 当前选中项的颜色 */
 .el-menu--horizontal .el-menu-item.is-active {
-  color: #fff !important;
+  color: #ffffff !important;
 
 }
 
 
 </style>
+
+<style>
+.el-menu--popup {
+      min-width: 120px !important;
+      width: 120px !important;
+
+    }
+    .el-menu--popup .el-menu-item {
+      width: 100% !important;
+      min-width: unset !important;
+      text-align: center;
+      padding: 0 5px !important;
+    }
+</style>

+ 1 - 1
src/views/laserRangeFinder/index.vue

@@ -366,7 +366,7 @@ export default {
   // display: flex;
   margin: 20px 0 0 0;
   p {
-    margin-right: 20px;
+    margin-right: 10px;
   }
   .el-select {
     width: 180px;

+ 1 - 1
src/views/overview/index.vue

@@ -401,7 +401,7 @@ export default {
 
 .global-variable {
   display: flex;
-  height: 90vh;
+  height: 89vh;
   overflow: hidden;
   .left {
     width: 200px;

+ 8 - 8
vue.config.js

@@ -66,8 +66,8 @@ module.exports = {
         // target: "http://192.168.5.4:16200", // 石月
         // target: "http://192.168.50.235:16200", // 内网
         // target: "http://192.168.5.15:16200",
-        target: "http://192.168.50.235:16500", //演示环境
-        // target: "http://106.120.102.238:26500", //外网演示环境
+        // target: "http://192.168.50.235:16500", //演示环境
+        target: "http://106.120.102.238:26500", //外网演示环境
         // target: "http://106.120.102.238:16700", // 外网16700  生产16600
         // target: "http://10.96.137.5",
         changeOrigin: true,
@@ -77,8 +77,8 @@ module.exports = {
       },
       // 未知量  //振动、激光测距仪
       "/WZLapi": {
-        target: "http://192.168.50.241:9001", // WZLapi 目标地址
-        // target: "http://106.120.102.238:18080/WindTransDev", // WZLapi 外网目标地址
+        // target: "http://192.168.50.241:9001", // WZLapi 目标地址
+        target: "http://106.120.102.238:18080/WindTransDev", // WZLapi 外网目标地址
         changeOrigin: true,
         pathRewrite: {
           "^/WZLapi": "", // 去掉 /WZLapi 前缀
@@ -89,8 +89,8 @@ module.exports = {
         // target: "http://192.168.5.11:8001", // WZLapi 目标地址
         // target: "http://106.120.102.238:18080/ImportDataDev", //导数工具
         // target: "http://106.120.102.238:18080/WindTransDev", //WTL外网目标地址
-        // target: "http://106.120.102.238:28999/transDataWeb", //WTL演示环境
-        target: "http://192.168.50.235:8999/transDataWeb", //WTL演示环境
+        target: "http://106.120.102.238:28999/transDataWeb", //WTL演示环境
+        // target: "http://192.168.50.235:8999/transDataWeb", //WTL演示环境
         changeOrigin: true,
         pathRewrite: {
           "^/ETLapi": "", // 去掉 /WZLapi 前缀
@@ -102,8 +102,8 @@ module.exports = {
 
       // 文佳
       "/WJapi": {
-        target: "http://192.168.50.235:8888", // WZLapi 内网 目标地址
-        // target: "http://106.120.102.238:18888", // WZLapi/ 内网 目标地址
+        // target: "http://192.168.50.235:8888", // WZLapi 内网 目标地址
+        target: "http://106.120.102.238:18888", // WZLapi/ 内网 目标地址
         changeOrigin: true,
         pathRewrite: {
           "^/WJapi": "", // 去掉 /WZLapi 前缀