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

src/views/health/components/charts.vue

@@ -0,0 +1,121 @@
+<template>
+  <div class="line-chart" ref="chart"></div>
+</template>
+
+<script>
+import * as echarts from "echarts";
+
+export default {
+  mounted() {
+    this.renderChart();
+    window.addEventListener("resize", this.handleResize); // Resize handler for chart
+  },
+  beforeDestroy() {
+    window.removeEventListener("resize", this.handleResize); // Cleanup resize event on component destroy
+  },
+  methods: {
+    renderChart() {
+      const chartDom = this.$refs.chart; // Access chart DOM via ref
+      const myChart = echarts.init(chartDom); // Initialize ECharts instance
+      let option;
+
+      let base = +new Date(1988, 9, 3);
+      let oneDay = 24 * 3600 * 1000;
+      let data = [[base, Math.random() * 300]];
+      for (let i = 1; i < 20000; i++) {
+        let now = new Date((base += oneDay));
+        data.push([
+          +now,
+          Math.round((Math.random() - 0.5) * 20 + data[i - 1][1]),
+        ]);
+      }
+
+      option = {
+        toolbox: {
+          feature: {
+            dataZoom: {
+              yAxisIndex: "none",
+            },
+            restore: {},
+            saveAsImage: {},
+            myCustomTool: {
+              show: true, // 显示自定义按钮
+              title: "上一条", // 按钮标题
+              icon: `image://${require("@/assets/analyse/08.png")}`, // 使用 require 导入图片
+              onclick: function () {
+                const table = this.$refs.singleTable;
+                if (table) {
+                  const nextRow = this.currentRow + 1; // index + 1
+                  this.handleCurrentChange(nextRow);
+                }
+              },
+            },
+            myCustomTool2: {
+              show: true, // 显示自定义按钮
+              title: "下一条", // 按钮标题
+              icon: `image://${require("@/assets/analyse/09.png")}`, // 使用 require 导入图片
+              onclick: function () {
+                // 自定义按钮点击事件
+                alert("自定义按钮被点击！");
+              },
+            },
+            myCustomTool3: {
+              show: true, // 显示自定义按钮
+              title: "特征值", // 按钮标题
+              icon: `image://${require("@/assets/analyse/10.png")}`, // 使用 require 导入图片
+              onclick: function () {
+                // 自定义按钮点击事件
+                alert("自定义按钮被点击！");
+              },
+            },
+          },
+        },
+
+        xAxis: {
+          type: "time",
+          boundaryGap: false,
+          min: data[0][0], // 设置最小值
+          max: data[data.length - 1][0], // 设置最大值
+          name: "时间", // x轴名字
+          nameLocation: "middle", // 名字位置
+          nameGap: 25, // 名字与轴线的间距
+        },
+        yAxis: {
+          type: "value",
+          boundaryGap: [0, "100%"],
+          name: "数值", // y轴名字
+          nameLocation: "middle", // 名字位置
+          nameGap: 50, // 名字与轴线的间距
+        },
+
+        series: [
+          {
+            name: "Fake Data",
+            type: "line",
+            smooth: true,
+            symbol: "none",
+            areaStyle: {},
+            data: data,
+          },
+        ],
+      };
+
+      myChart.setOption(option); // Apply the option to the chart instance
+    },
+    handleResize() {
+      const chartDom = this.$refs.chart;
+      const myChart = echarts.getInstanceByDom(chartDom);
+      if (myChart) {
+        myChart.resize(); // Resize the chart on window resize
+      }
+    },
+  },
+};
+</script>
+
+<style scoped>
+.line-chart {
+  width: 100%;
+  height: 100%;
+}
+</style>

src/views/health/vibration.vue

@@ -2,27 +2,27 @@
   <div class="global-variable">
     <div class="head">
       <div class="headleft">
-        <div class="picture">
+        <div @click="generate('1')" class="picture">
           <img src="@/assets/analyse/03.png" alt="" />
           <p>时域图</p>
         </div>
-        <div class="picture">
+        <div @click="generate('2')" class="picture">
           <img src="@/assets/analyse/04.png" alt="" />
           <p>频谱图</p>
         </div>
-        <div class="picture">
+        <div @click="generate('3')" class="picture">
           <img src="@/assets/analyse/01.png" alt="" />
           <p>包络谱图</p>
         </div>
-        <div class="picture">
+        <div @click="generate('4')" class="picture">
           <img src="@/assets/analyse/02.png" alt="" />
           <p>趋势图</p>
         </div>
       </div>
       <div class="headright">
-        <img src="@/assets/analyse/05.png" alt="" />
-        <img src="@/assets/analyse/07.png" alt="" />
-        <img src="@/assets/analyse/06.png" alt="" />
+        <img src="@/assets/analyse/05.png" alt="全部展开" @click="zhankai" />
+        <img src="@/assets/analyse/07.png" alt="全部缩小" @click="suoxiao" />
+        <img src="@/assets/analyse/06.png" alt="全部关闭" @click="guanbi" />
       </div>
     </div>
     <div class="searchbox">
@@ -79,7 +79,47 @@
     </div>
     <div class="main-body">
       <div class="data-map">
-        
+        <div
+          class="chart-area"
+          v-for="(item, index) in fourList"
+          :key="item.id"
+        >
+          <div class="dialog-actions">
+            <p>{{ item.name }}</p>
+            <span>
+              <i
+                class="el-icon-minus"
+                @click="lessen(index)"
+                style="cursor: pointer; margin-right: 10px"
+              ></i>
+              <i
+                class="el-icon-full-screen"
+                @click="amplifier(index)"
+                style="cursor: pointer; margin-right: 10px"
+              ></i>
+              <i
+                class="el-icon-close"
+                @click="close(index)"
+                style="cursor: pointer"
+              ></i>
+            </span>
+          </div>
+          <div
+            class="subject"
+            :class="{
+              minimized: item.isMinimized,
+            }"
+          >
+            <p>测点路径:</p>
+            <P><span>采样频率:</span><span>采样时间:</span></P>
+            <div
+              :id="item.id"
+              class="line-chart"
+              style="width: 100%; height: 260px"
+            ></div>
+            <!-- <charts></charts> -->
+          </div>
+        </div>
       </div>
       <div class="data-origin">
         <el-table
@@ -101,7 +141,10 @@
 </template>
 
 <script>
+import * as echarts from "echarts";
+import Charts from "./components/charts.vue";
 export default {
+  // components: { Charts },
   data() {
     return {
       company: "",
@@ -111,15 +154,245 @@ export default {
       monitoringvalue: "",
       monitoringoptions: [],
       timevalue: "",
-      tableData: [{}, {}, {}, {}],
+      tableData: [
+        { name: "2024-11-01", address: "Location A" },
+        { name: "2024-11-02", address: "Location B" },
+        { name: "2024-11-03", address: "Location C" },
+      ],
+
+      fourList: [],
+
+      currentRow: null, // 用于存储当前选中的行
+      currentIndex: 0,
     };
   },
+
   methods: {
+    // 当前所在行高亮提示
     setCurrent(row) {
       this.$refs.singleTable.setCurrentRow(row);
     },
+    // 当前单选
     handleCurrentChange(val) {
       this.currentRow = val;
+      const index = this.tableData.indexOf(val);
+      this.currentIndex = index; // 更新当前索引
+    },
+
+    renderChart(containerId, data = []) {
+    // 获取特定的图表容器
+    const chartDom = document.getElementById(containerId);
+    if (!chartDom) {
+      console.error(`Container with id ${containerId} not found`);
+      return;
+    }
+
+    // 检查是否已经存在 ECharts 实例，如果存在则销毁它
+    if (chartDom.__echarts_instance__) {
+      echarts.dispose(chartDom);
+    }
+
+    // 初始化 ECharts 实例
+    const myChart = echarts.init(chartDom);
+
+    // 定义默认的数据
+    let base = +new Date(1968, 9, 3);
+    let oneDay = 24 * 3600 * 1000;
+    let date = [];
+    let defaultData = [Math.random() * 300];
+    for (let i = 1; i < 200; i++) {
+      const now = new Date((base += oneDay));
+      date.push(
+        [now.getFullYear(), now.getMonth() + 1, now.getDate()].join("/")
+      );
+      defaultData.push(
+        Math.round((Math.random() - 0.5) * 20 + defaultData[i - 1])
+      );
+    }
+
+    // 使用传入的数据或默认数据
+    const chartData = data.length > 0 ? data : defaultData;
+
+    // 配置选项
+    const option = {
+      toolbox: {
+        feature: {
+          dataZoom: { yAxisIndex: "none" },
+          restore: {},
+          saveAsImage: {},
+          myCustomTool: {
+            show: true,
+            title: "上一条",
+            icon: `image://${require("@/assets/analyse/08.png")}`,
+            onclick: () => this.previousRow(containerId), // 传递当前图表的 ID
+          },
+          myCustomTool2: {
+            show: true,
+            title: "下一条",
+            icon: `image://${require("@/assets/analyse/09.png")}`,
+            onclick: () => this.nextRow(containerId), // 传递当前图表的 ID
+          },
+          myCustomTool3: {
+            show: true,
+            title: "特征值",
+            icon: `image://${require("@/assets/analyse/10.png")}`,
+            onclick: () => alert("自定义按钮被点击！"),
+          },
+        },
+      },
+      xAxis: {
+        type: "category",
+        boundaryGap: false,
+        data: date,
+      },
+      yAxis: {
+        type: "value",
+        boundaryGap: [0, "100%"],
+      },
+      series: [
+        {
+          name: "数据系列",
+          type: "line",
+          symbol: "none",
+          sampling: "lttb",
+          itemStyle: { color: "rgb(255, 70, 131)" },
+          areaStyle: {
+            color: new echarts.graphic.LinearGradient(0, 0, 0, 1, [
+              { offset: 0, color: "rgb(255, 158, 68)" },
+              { offset: 1, color: "rgb(255, 70, 131)" },
+            ]),
+          },
+          data: chartData,
+        },
+      ],
+    };
+
+    // 设置图表选项
+    myChart.setOption(option);
+
+    // 监听窗口大小变化，调整图表大小
+    window.addEventListener('resize', () => {
+      myChart.resize();
+    });
+  },
+
+    // 上一条
+    previousRow(chartId) {
+      if (this.currentIndex > 0) {
+        this.currentIndex--; 
+      } else {
+        this.currentIndex = this.tableData.length - 1; 
+      }
+      this.selectRow(chartId); 
+    },
+
+    // 下一条
+    nextRow(chartId) {
+      if (this.currentIndex < this.tableData.length - 1) {
+        this.currentIndex++; 
+      } else {
+        this.currentIndex = 0; 
+      }
+      this.selectRow(chartId); 
+    },
+    selectRow(chartId) {
+      const row = this.tableData[this.currentIndex];
+      this.handleCurrentChange(row);
+      this.setCurrent(row);
+      this.$nextTick(() => {
+        this.renderChart(chartId); 
+      });
+    },
+
+    generate(type) {
+      if (!this.currentRow) {
+        this.$message.warning("请先选择数据");
+        return;
+      }
+      const nameMap = {
+        1: "时域图",
+        2: "频谱图",
+        3: "包络谱图",
+        4: "趋势图",
+      };
+      if (nameMap[type]) {
+        const newItem = {
+          name: nameMap[type],
+          isMinimized: false,
+          id: `chart-${Date.now()}`, // 使用唯一 ID
+        };
+        this.fourList.push(newItem);
+        if (this.fourList.length > 4) {
+          this.fourList.shift();
+        }
+      }
+      this.$nextTick(() => {
+        const newChart = this.fourList[this.fourList.length - 1];
+        this.renderChart(newChart.id); // 为新图表渲染数据
+      });
+    },
+
+    generate(type) {
+      if (!this.currentRow) {
+        this.$message.warning("请先选择数据");
+        return;
+      }
+      const nameMap = {
+        1: "时域图",
+        2: "频谱图",
+        3: "包络谱图",
+        4: "趋势图",
+      };
+      if (nameMap[type]) {
+        const newItem = {
+          name: nameMap[type],
+          isMinimized: false,
+          id: `chart-${Date.now()}`, // 使用唯一 ID
+        };
+        this.fourList.push(newItem);
+        if (this.fourList.length > 4) {
+          this.fourList.shift();
+        }
+      }
+      this.$nextTick(() => {
+        const newChart = this.fourList[this.fourList.length - 1];
+        this.renderChart(newChart.id); // 为新图表渲染数据
+      });
+    },
+
+    // 缩小
+    lessen(index) {
+      if (!this.fourList[index].isMinimized) {
+        this.fourList[index].isMinimized = true;
+      }
+      console.log("1");
+    },
+    // 放大
+    amplifier(index) {
+      const item = this.fourList[index];
+      if (item.isMinimized) {
+        item.isMinimized = false;
+      }
+      console.log("2");
+    },
+    // 关闭
+    close(index) {
+      this.fourList.splice(index, 1);
+      console.log("3");
+    },
+
+    zhankai() {
+      this.fourList.forEach((item) => {
+        item.isMinimized = false;
+      });
+    },
+    suoxiao() {
+      this.fourList.forEach((item) => {
+        item.isMinimized = true;
+      });
+    },
+    guanbi() {
+      this.fourList = [];
     },
   },
 };
@@ -135,12 +408,14 @@ export default {
   .headleft {
     display: flex;
     .picture {
+      cursor: pointer;
       display: inline-block;
       text-align: center;
       margin: 0 20px;
+      font-size: 12px;
       img {
-        width: 80px;
-        height: 30px;
+        width: 50px;
+        height: 20px;
       }
     }
   }
@@ -149,6 +424,7 @@ export default {
       width: 20px;
       height: 20px;
       margin: 0 10px;
+      cursor: pointer;
     }
   }
 }
@@ -162,18 +438,51 @@ export default {
     width: 180px;
   }
 }
+.dialog-actions {
+  text-align: right;
+  padding: 0 10px;
+  display: flex;
+  justify-content: space-between;
+}
+.subject {
+  height: 280px;
+  transition: all 0.3s ease;
+  padding: 0 10px;
+  p {
+    font-size: 10px;
+  }
+}
+
 .main-body {
   display: flex;
   justify-content: space-between;
   .data-map {
     width: 60%;
-    height: 200px;
-    box-shadow: 0 2px 4px rgba(0, 0, 0, 0.12), 0 0 6px rgba(0, 0, 0, 0.04);
+    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);
+    }
   }
+  .data-map::-webkit-scrollbar {
+    display: none; /* 隐藏滚动条 */
+  }
+
   .data-origin {
     width: 39%;
-    height: 200px;
+
     box-shadow: 0 2px 4px rgba(0, 0, 0, 0.12), 0 0 6px rgba(0, 0, 0, 0.04);
   }
 }
+
+.subject.minimized {
+  height: 0px; /* Adjust height when minimized */
+  overflow: hidden;
+}
+
+#main {
+  width: 100%;
+  height: 280px;
+}
 </style>

src/views/ledger/componentBJ/chilunxiang.vue

@@ -2,29 +2,31 @@
   <div>
     <div class="message">
       <div class="message-DIV">
-        <p>润滑油品牌：</p>
-        <el-select clearable v-model="brandvalue" placeholder="请选择">
-          <el-option
-            v-for="item in brandoptions"
-            :key="item.value"
-            :label="item.label"
-            :value="item.value"
-          >
-          </el-option
-        ></el-select>
-      </div>
-      <div class="message-DIV">
-        <p>润滑油型号：</p>
-        <el-select clearable v-model="modelvalue" placeholder="请选择">
-          <el-option
-            v-for="item in modeloptions"
-            :key="item.value"
-            :label="item.label"
-            :value="item.value"
-          >
-          </el-option
-        ></el-select>
-      </div>
+  <p>润滑油品牌：</p>
+  <el-select clearable v-model="brandvalue" placeholder="请选择" @change="handleBrandChange">
+    <el-option
+      v-for="item in brandoptions"
+      :key="item"
+      :label="item"
+      :value="item"
+    >
+    </el-option>
+  </el-select>
+</div>
+
+<div class="message-DIV">
+  <p>润滑油型号：</p>
+  <el-select clearable v-model="modelvalue" placeholder="请选择" :disabled="!brandvalue">
+    <el-option
+      v-for="item in modeloptions"
+      :key="item"
+      :label="item"
+      :value="item"
+    >
+    </el-option>
+  </el-select>
+</div>
+
     </div>
     <!-- LLS -->
     <p class="locationP">
@@ -75,7 +77,7 @@
       <div class="message-BOX">
         <div class="message-DIV">
           <p>行星轮轴承品牌：</p>
-          <el-select clearable v-model="xxlPPvalue" placeholder="请选择">
+          <el-select clearable v-model="item.xxlPPvalue" placeholder="请选择">
             <el-option
               v-for="item in lssPPoptions"
               :key="item.value"
@@ -87,7 +89,7 @@
         </div>
         <div class="message-DIV">
           <p>行星轮轴承型号：</p>
-          <el-select clearable v-model="xxlxhvalue" placeholder="请选择">
+          <el-select clearable v-model="item.xxlxhvalue" placeholder="请选择">
             <el-option
               v-for="item in xxlxhoptions"
               :key="item.value"
@@ -132,7 +134,7 @@
       <div class="message-BOX">
         <div class="message-DIV">
           <p>太阳轮轴承品牌：</p>
-          <el-select clearable v-model="tyPPvalue" placeholder="请选择">
+          <el-select clearable v-model="item.tyPPvalue" placeholder="请选择">
             <el-option
               v-for="item in tyPPoptions"
               :key="item.value"
@@ -144,7 +146,7 @@
         </div>
         <div class="message-DIV">
           <p>太阳轮轴承型号：</p>
-          <el-select clearable v-model="tyxhvalue" placeholder="请选择">
+          <el-select clearable v-model="item.tyxhvalue" placeholder="请选择">
             <el-option
               v-for="item in tyxhoptions"
               :key="item.value"
@@ -156,6 +158,7 @@
         </div>
       </div>
     </div>
+
     <!-- 平行轮 -->
     <p class="locationP">
       <i @click="addparallel" class="el-icon-plus"></i>
@@ -188,26 +191,17 @@
         ></el-input>
       </div>
     </div>
+
     <!-- 低速中间轴 -->
     <p class="locationP">
       <i @click="addslowly" class="el-icon-plus"></i>
-      <i
-        v-if="slowly.length > 1"
-        @click="delslowly"
-        class="el-icon-minus"
-      ></i>
+      <i v-if="slowly.length > 1" @click="delslowly" class="el-icon-minus"></i>
     </p>
     <div class="message">
       <p class="caption">
         <span class="capSpan1">低速中间轴</span>
       </p>
-      <div class="message-DIV">
-        <p>齿圈齿数：</p>
-        <el-input
-          v-model="gearring"
-          @input="validateInput($event, 'gearring')"
-        ></el-input>
-      </div>
+  
       <div v-for="(item, index) in slowly" :key="index" class="message-BOX">
         <div class="message-DIV">
           <p>轴承-RS品牌：</p>
@@ -257,29 +251,27 @@
             </el-option>
           </el-select>
         </div>
+        <div class="message-DIV">
+        <p>齿圈齿数：</p>
+        <el-input
+          v-model="item.gearring"
+       @input="(event) => validateInput(event, index, 'gearring')"
+        ></el-input>
+      </div>
       </div>
     </div>
-      <!-- 高速轴 -->
-      <p class="locationP">
-      <i @click="addhigh " class="el-icon-plus"></i>
-      <i
-        v-if="high.length > 1"
-        @click="delhigh "
-        class="el-icon-minus"
-      ></i>
+
+    <!-- 高速轴 -->
+    <p class="locationP">
+      <i @click="addhigh" class="el-icon-plus"></i>
+      <i v-if="high.length > 1" @click="delhigh" class="el-icon-minus"></i>
     </p>
     <div class="message">
       <p class="caption">
         <span class="capSpan1">高速轴</span>
       </p>
-      <div class="message-DIV">
-        <p>齿圈齿数：</p>
-        <el-input
-          v-model="gearring"
-          @input="validateInput($event, 'gearring')"
-        ></el-input>
-      </div>
-      <div v-for="(item, index) in high " :key="index" class="message-BOX">
+    
+      <div v-for="(item, index) in high" :key="index" class="message-BOX">
         <div class="message-DIV">
           <p>轴承-RS品牌：</p>
           <el-select clearable v-model="item.rsBrand" placeholder="请选择">
@@ -328,7 +320,16 @@
             </el-option>
           </el-select>
         </div>
+        <div class="message-DIV">
+        <p>齿圈齿数：</p>
+        <el-input
+          v-model="item.gearring"
+        @input="(event) => validateInput(event, index, 'gearring')"
+        ></el-input>
+      </div>
+
       </div>
+  
     </div>
   </div>
 </template>
@@ -338,13 +339,13 @@ export default {
   data() {
     return {
       brandvalue: "",
-      brandoptions: [],
       modelvalue: "",
+      brandoptions: [],
       modeloptions: [],
-      lssList: [
-        { lssPPvalue: "", lssXXvalue: "" },
-        { lssPPvalue: "", lssXXvalue: "" },
-      ],
+ 
+
+
+      lssList: [{ lssPPvalue: "", lssXXvalue: "" }],
       lssPPoptions: [],
       lssXXoptions: [],
 
@@ -359,19 +360,40 @@ export default {
       tyxhoptions: [],
 
       planets: [
-        { planetnumber: "", planetooth: "", suntooth: "", gearring: "" },
+        {
+          planetnumber: "",
+          planetooth: "",
+          suntooth: "",
+          gearring: "",
+          xxlPPvalue: "",
+          xxlxhvalue: "",
+          tyPPvalue: "",
+          tyxhvalue: "",
+        },
       ],
       levelNames: ["一级", "二级", "三级"],
       parallel: [{ big: "", little: "" }],
       sunbearing: "",
       planetbearing: "",
 
-      slowly: [{ rsBrand: null, rsModel: null, gsBrand: null, gsModel: null }],
-      gearring: "",
-      high :[{ rsBrand: null, rsModel: null, gsBrand: null, gsModel: null }],
+      slowly: [
+        {
+          gearring: "",
+          rsBrand: null,
+          rsModel: null,
+          gsBrand: null,
+          gsModel: null,
+        },
+      ],
+     
+      high: [{ gearring:"", rsBrand: null, rsModel: null, gsBrand: null, gsModel: null }],
     };
   },
   methods: {
+    handleBrandChange() {
+      this.modeloptions = this.modelData[this.brandvalue] || [];
+      this.modelvalue = ''; // 重置型号选择
+    },
     addPlanet() {
       if (this.planets.length < 3) {
         this.planets.push({
@@ -389,7 +411,18 @@ export default {
     },
     validateInput(value, index, field) {
       const validValue = value.replace(/[^0-9]/g, "");
-      this.planets[index][field] = validValue;
+      if (this.planets[index]) {
+        this.planets[index][field] = validValue;
+      }
+      if (this.parallel[index]) {
+        this.parallel[index][field] = validValue;
+      }
+      if (this.slowly[index]) {
+        this.slowly[index][field] = validValue;
+      }
+      if (this.high[index]) {
+        this.high[index][field] = validValue;
+      }
       if (validValue !== value) {
         this.$message({
           message: "只能输入数字",
@@ -398,16 +431,16 @@ export default {
         });
       }
     },
-    delparallel() {
-      if (this.parallel.length > 1) {
-        this.parallel.pop();
-      }
-    },
     addparallel() {
       if (this.parallel.length < 3) {
         this.parallel.push({ big: "", little: "" });
       }
     },
+    delparallel() {
+      if (this.parallel.length > 1) {
+        this.parallel.pop();
+      }
+    },
 
     addLSS() {
       if (this.lssList.length < 2) {
@@ -422,10 +455,11 @@ export default {
     addslowly() {
       if (this.slowly.length < 2) {
         this.slowly.push({
-          rsBrand: null,
-          rsModel: null,
-          gsBrand: null,
-          gsModel: null,
+          gearring: "",
+          rsBrand: "",
+          rsModel: "",
+          gsBrand: "",
+          gsModel: "",
         });
       }
     },
@@ -433,12 +467,12 @@ export default {
       if (this.slowly.length > 1) {
         this.slowly.pop();
       }
-  },
+    },
 
-  
-  addhigh() {
+    addhigh() {
       if (this.high.length < 2) {
         this.high.push({
+          gearring: "",
           rsBrand: null,
           rsModel: null,
           gsBrand: null,
@@ -450,11 +484,11 @@ export default {
       if (this.high.length > 1) {
         this.high.pop();
       }
-  },
-
+    },
 
     submitForm() {
-      console.log(this.planets);
+      console.log(this.brandvalue
+      ,this.modelvalue);
     },
   },
 };
@@ -467,10 +501,11 @@ export default {
   .message-BOX {
     width: 100%;
     display: flex;
-
+    flex-wrap: wrap;
     .message-DIV {
       width: 25%;
       display: flex;
+ 
       margin-bottom: 20px;
       justify-content: space-between;
       p {

src/views/ledger/modules.vue

@@ -1,19 +1,5 @@
 <template>
   <div class="global-variable">
-    <div class="condition">
-      <p>
-        支撑形式：<el-select clearable v-model="plankvalue" placeholder="请选择">
-          <el-option
-            v-for="item in plankoptions"
-            :key="item.value"
-            :label="item.label"
-            :value="item.value"
-          >
-          </el-option
-        ></el-select>
-      </p>
- 
-    </div>
     <h2 class="TitleH2">主轴</h2>
     <zhuzhou></zhuzhou>
     <h2 class="TitleH2">齿轮箱</h2>
@@ -40,12 +26,7 @@ export default {
 </script>
 
 <style lang="scss" scoped>
-.condition {
-  display: flex;
-  p {
-    margin-right: 20px;
-  }
-}
+
 
 .TitleH2 {
   font-weight: 800;

vue.config.js

@@ -64,9 +64,9 @@ module.exports = {
     proxy: {
       "/api": {
         // target: "http://192.168.5.4:16200", // 石月
-        target: "http://192.168.50.235:16200", //内网
+        // target: "http://192.168.50.235:16200", //内网
         // target: "http://192.168.5.15:16200",
-        // target: "http://106.120.102.238:16600", //外网
+        target: "http://106.120.102.238:16600", //外网
         //  target: "http://10.96.137.5",
         changeOrigin: true,
         pathRewrite: {