Merge remote-tracking branch 'origin/boardTest' into boardTest

src/utils/request.js

@@ -18,7 +18,7 @@ const service = axios.create({
   // axios中请求配置有baseURL选项，表示请求URL公共部分
   baseURL: process.env.VUE_APP_BASE_API,
   // 超时
-  timeout: 10000
+  timeout: 100000
 })
 
 // request拦截器
@@ -137,6 +137,7 @@ export function download(url, params, filename, config) {
     transformRequest: [(params) => { return tansParams(params) }],
     headers: { 'Content-Type': 'application/x-www-form-urlencoded' },
     responseType: 'blob',
+    timeout: -1, // 导出操作超时时间无限制
     ...config
   }).then(async (data) => {
     const isBlob = blobValidate(data);

src/views/ems/record/recordIOTInstant/index.vue

@@ -180,7 +180,7 @@
               plain
               icon="el-icon-download"
               size="mini"
-              @click="handleExport"
+              @click="openExportDialog"
               v-hasPermi="['ems/record:recordIotenvInstant:export']"
             >导出</el-button>
           </el-col>
@@ -295,6 +295,126 @@
         <el-button @click="cancel">取 消</el-button>
       </div>
     </el-dialog>
+
+    <!-- 导出对话框 -->
+    <el-dialog title="导出物联网数据" :visible.sync="exportDialogVisible" width="700px" append-to-body>
+      <el-form ref="exportForm" :model="exportForm" label-width="100px">
+        <!-- 时间范围选择 -->
+        <el-form-item label="时间范围" prop="timeRange" required>
+          <el-date-picker
+            v-model="exportForm.timeRange"
+            style="width: 100%"
+            value-format="yyyy-MM-dd HH:mm:ss"
+            type="datetimerange"
+            range-separator="-"
+            start-placeholder="开始时间"
+            end-placeholder="结束时间"
+          ></el-date-picker>
+        </el-form-item>
+
+        <!-- 设备选择区域 -->
+        <el-form-item label="设备选择">
+          <div style="margin-bottom: 10px;">
+            <el-button type="primary" size="mini" @click="selectAllDevices">全选设备</el-button>
+            <el-button type="info" size="mini" @click="clearAllDevices">清空选择</el-button>
+            <span style="margin-left: 15px; color: #909399;">
+              已选择 <span style="color: #409EFF; font-weight: bold;">{{ selectedDevicesCount }}</span> 个设备
+            </span>
+          </div>
+
+          <!-- 按能源类型分组显示设备 -->
+          <div class="device-select-container">
+            <el-checkbox-group v-model="exportForm.selectedDeviceCodes" @change="handleDeviceSelectionChange">
+              <!-- 温度设备 (type=5) -->
+              <div v-if="deviceGroups.temperature.length > 0" class="device-group">
+                <div class="device-group-header">
+                  <span class="device-group-title">温度设备</span>
+                  <el-button type="text" size="mini" @click="selectGroupDevices('temperature')">
+                    {{ isGroupAllSelected('temperature') ? '取消全选' : '全选该类型' }}
+                  </el-button>
+                </div>
+                <el-row :gutter="10">
+                  <el-col :span="12" v-for="device in deviceGroups.temperature" :key="device.monitorCode">
+                    <el-checkbox :label="device.monitorCode" :disabled="device.isAmmeter === '0'">
+                      {{ device.monitorName }}
+                      <span v-if="device.isAmmeter === '0'" style="color: #F56C6C; font-size: 12px;">(虚拟)</span>
+                    </el-checkbox>
+                  </el-col>
+                </el-row>
+              </div>
+
+              <!-- 温湿度设备 (type=6) -->
+              <div v-if="deviceGroups.humidity.length > 0" class="device-group">
+                <div class="device-group-header">
+                  <span class="device-group-title">温湿度设备</span>
+                  <el-button type="text" size="mini" @click="selectGroupDevices('humidity')">
+                    {{ isGroupAllSelected('humidity') ? '取消全选' : '全选该类型' }}
+                  </el-button>
+                </div>
+                <el-row :gutter="10">
+                  <el-col :span="12" v-for="device in deviceGroups.humidity" :key="device.monitorCode">
+                    <el-checkbox :label="device.monitorCode" :disabled="device.isAmmeter === '0'">
+                      {{ device.monitorName }}
+                      <span v-if="device.isAmmeter === '0'" style="color: #F56C6C; font-size: 12px;">(虚拟)</span>
+                    </el-checkbox>
+                  </el-col>
+                </el-row>
+              </div>
+
+              <!-- 噪声设备 (type=7) -->
+              <div v-if="deviceGroups.noise.length > 0" class="device-group">
+                <div class="device-group-header">
+                  <span class="device-group-title">噪声设备</span>
+                  <el-button type="text" size="mini" @click="selectGroupDevices('noise')">
+                    {{ isGroupAllSelected('noise') ? '取消全选' : '全选该类型' }}
+                  </el-button>
+                </div>
+                <el-row :gutter="10">
+                  <el-col :span="12" v-for="device in deviceGroups.noise" :key="device.monitorCode">
+                    <el-checkbox :label="device.monitorCode" :disabled="device.isAmmeter === '0'">
+                      {{ device.monitorName }}
+                      <span v-if="device.isAmmeter === '0'" style="color: #F56C6C; font-size: 12px;">(虚拟)</span>
+                    </el-checkbox>
+                  </el-col>
+                </el-row>
+              </div>
+
+              <!-- 其他设备 -->
+              <div v-if="deviceGroups.other.length > 0" class="device-group">
+                <div class="device-group-header">
+                  <span class="device-group-title">其他设备</span>
+                  <el-button type="text" size="mini" @click="selectGroupDevices('other')">
+                    {{ isGroupAllSelected('other') ? '取消全选' : '全选该类型' }}
+                  </el-button>
+                </div>
+                <el-row :gutter="10">
+                  <el-col :span="12" v-for="device in deviceGroups.other" :key="device.monitorCode">
+                    <el-checkbox :label="device.monitorCode" :disabled="device.isAmmeter === '0'">
+                      {{ device.monitorName }}
+                      <span v-if="device.isAmmeter === '0'" style="color: #F56C6C; font-size: 12px;">(虚拟)</span>
+                    </el-checkbox>
+                  </el-col>
+                </el-row>
+              </div>
+
+              <!-- 空状态处理：当所有设备组都为空时显示 -->
+              <div v-if="deviceGroups.temperature.length === 0 &&
+                       deviceGroups.humidity.length === 0 &&
+                       deviceGroups.noise.length === 0 &&
+                       deviceGroups.other.length === 0"
+                   class="no-devices-empty">
+                <i class="el-icon-info"></i>
+                <span>暂无可用设备，请先配置物联网采集设备</span>
+              </div>
+            </el-checkbox-group>
+          </div>
+        </el-form-item>
+      </el-form>
+      <div slot="footer" class="dialog-footer">
+        <el-button type="primary" @click="confirmExport">确定导出</el-button>
+        <el-button @click="exportDialogVisible = false">取消</el-button>
+      </div>
+    </el-dialog>
   </div>
 </template>
 
@@ -368,6 +488,24 @@ export default {
       form: {},
       // 表单校验
       rules: {
+      },
+      // 导出对话框相关
+      exportDialogVisible: false,
+      exportForm: {
+        timeRange: [],
+        selectedDeviceCodes: []
+      },
+      // 所有设备列表（用于导出选择）
+      allDevicesList: [],
+      // 设备列表缓存（避免重复请求）
+      allDevicesListCache: null,
+      cacheTimestamp: 0,
+      // 按类型分组的设备（不含振动设备，振动在专用页面处理）
+      deviceGroups: {
+        temperature: [],    // 温度设备 (type=5)
+        humidity: [],       // 温湿度设备 (type=6)
+        noise: [],          // 噪声设备 (type=7)
+        other: []           // 其他设备 (8,9等，不含振动10)
       }
     };
   },
@@ -375,6 +513,10 @@ export default {
     // 计算是否已选择设备
     hasSelectedDevice() {
       return this.queryParams.monitorId || (this.queryParams.monitorIds && this.queryParams.monitorIds.length > 0);
+    },
+    // 计算已选择的设备数量
+    selectedDevicesCount() {
+      return this.exportForm.selectedDeviceCodes ? this.exportForm.selectedDeviceCodes.length : 0;
     }
   },
   created() {
@@ -607,13 +749,195 @@ export default {
         this.$modal.msgSuccess("删除成功");
       }).catch(() => {});
     },
-    /** 导出按钮操作 */
+
-    handleExport() {
+    /** ========== 导出相关方法 ========== */
-      this.download('ems/record/recordIotenvInstant/export', {
+
-        ...this.queryParams
+    /** 打开导出对话框 */
-      }, `recordIotenvInstant_${new Date().getTime()}.xlsx`)
+    openExportDialog() {
+      // 初始化导出表单
+      this.exportForm.timeRange = this.daterangeRecordTime ? [...this.daterangeRecordTime] : [];
+      this.exportForm.selectedDeviceCodes = [];
+
+      // 加载所有设备列表
+      this.loadAllDevicesForExport();
+      this.exportDialogVisible = true;
     },
 
+    /** 加载所有设备列表（用于导出，使用缓存优化性能） */
+    loadAllDevicesForExport() {
+      // 缓存5分钟有效（300000毫秒）
+      const now = Date.now();
+      if (this.allDevicesListCache && (now - this.cacheTimestamp) < 300000) {
+        // 使用缓存数据
+        this.allDevicesList = this.allDevicesListCache;
+        this.groupDevicesByType();
+        return;
+      }
+
+      // 缓存失效，重新加载（不含振动设备type=10）
+      listBaseMonitorInfo({ monitorTypeList: [5, 6, 7, 8, 9] }).then(response => {
+        this.allDevicesList = response.data;
+        this.allDevicesListCache = response.data;
+        this.cacheTimestamp = now;
+        this.groupDevicesByType();
+      });
+    },
+
+    /** 按设备类型分组（不含振动设备，振动在专用页面处理） */
+    groupDevicesByType() {
+      // 重置分组
+      this.deviceGroups = {
+        temperature: [],    // 温度设备 (type=5)
+        humidity: [],       // 温湿度设备 (type=6)
+        noise: [],          // 噪声设备 (type=7)
+        other: []           // 其他设备 (8,9等，不含振动10)
+      };
+
+      this.allDevicesList.forEach(device => {
+        // 跳过虚拟设备
+        if (device.isAmmeter === '0') return;
+        // 跳过振动设备（振动设备在专用页面处理）
+        if (device.monitorType === 10) return;
+
+        switch (device.monitorType) {
+          case 5:
+            this.deviceGroups.temperature.push(device);
+            break;
+          case 6:
+            this.deviceGroups.humidity.push(device);
+            break;
+          case 7:
+            this.deviceGroups.noise.push(device);
+            break;
+          default:
+            this.deviceGroups.other.push(device);
+            break;
+        }
+      });
+    },
+
+    /** 全选设备（不含振动设备） */
+    selectAllDevices() {
+      // 获取所有非虚拟、非振动设备的设备编号
+      const allCodes = this.allDevicesList
+        .filter(device => device.isAmmeter !== '0' && device.monitorType !== 10)
+        .map(device => device.monitorCode);
+      this.exportForm.selectedDeviceCodes = allCodes;
+    },
+
+    /** 清空设备选择 */
+    clearAllDevices() {
+      this.exportForm.selectedDeviceCodes = [];
+    },
+
+    /** 处理设备选择变化 */
+    handleDeviceSelectionChange() {
+      // 可以在这里添加额外的逻辑，比如更新显示等
+    },
+
+    /** 判断某个类型的设备是否全部选中 */
+    isGroupAllSelected(groupName) {
+      const group = this.deviceGroups[groupName] || [];
+      // 获取该组非虚拟设备的编码列表
+      const validCodes = group
+        .filter(device => device.isAmmeter !== '0')
+        .map(device => device.monitorCode);
+      if (validCodes.length === 0) return false;
+      // 检查是否全部在已选列表中
+      return validCodes.every(code => this.exportForm.selectedDeviceCodes.includes(code));
+    },
+
+    /** 全选/取消全选某个类型的设备 */
+    selectGroupDevices(groupName) {
+      const group = this.deviceGroups[groupName] || [];
+      // 获取该组非虚拟设备的编码列表
+      const validCodes = group
+        .filter(device => device.isAmmeter !== '0')
+        .map(device => device.monitorCode);
+
+      if (this.isGroupAllSelected(groupName)) {
+        // 已全选，则取消该组所有设备
+        this.exportForm.selectedDeviceCodes = this.exportForm.selectedDeviceCodes
+          .filter(code => !validCodes.includes(code));
+      } else {
+        // 未全选，则添加该组所有设备
+        const newCodes = validCodes.filter(code => !this.exportForm.selectedDeviceCodes.includes(code));
+        this.exportForm.selectedDeviceCodes = [...this.exportForm.selectedDeviceCodes, ...newCodes];
+      }
+    },
+
+    /** 确认导出 */
+    confirmExport() {
+      // 校验时间范围
+      if (!this.exportForm.timeRange || this.exportForm.timeRange.length !== 2) {
+        this.$modal.msgWarning("请先选择时间范围");
+        return;
+      }
+      // 校验设备选择
+      if (this.exportForm.selectedDeviceCodes.length === 0) {
+        this.$modal.msgWarning("请至少选择一个设备");
+        return;
+      }
+
+      // 计算选中的设备类型集合（用于后端动态导出列）
+      const selectedMonitorTypes = this.getSelectedMonitorTypes();
+
+      // 构建导出参数
+      const exportParams = {
+        params: {
+          beginRecordTime: this.exportForm.timeRange[0],
+          endRecordTime: this.exportForm.timeRange[1],
+          // 传递设备类型，后端根据类型动态选择导出列
+          monitorTypes: selectedMonitorTypes.join(',')
+        },
+        monitorIds: this.exportForm.selectedDeviceCodes,
+        monitorId: null  // 清空单个设备ID，使用多设备数组
+      };
+
+      // 生成文件名（简化格式，移除日期中的横杠以缩短文件名）
+      const beginDate = this.exportForm.timeRange[0].substring(0, 10).replace(/-/g, '');
+      const endDate = this.exportForm.timeRange[1].substring(0, 10).replace(/-/g, '');
+      const deviceCount = this.exportForm.selectedDeviceCodes.length;
+      // 文件名包含能源类型信息
+      const typeNames = this.getTypeNamesForFileName(selectedMonitorTypes);
+      const fileName = `IOT数据_${typeNames}_${beginDate}_${endDate}_${deviceCount}设备.xlsx`;
+
+      // 执行导出
+      this.download('ems/record/recordIotenvInstant/export', exportParams, fileName);
+      this.exportDialogVisible = false;
+    },
+
+    /** 获取选中设备的类型集合 */
+    getSelectedMonitorTypes() {
+      const selectedCodes = this.exportForm.selectedDeviceCodes;
+      const types = new Set();
+
+      // 遍历所有设备列表，找出选中设备的类型
+      this.allDevicesList.forEach(device => {
+        if (selectedCodes.includes(device.monitorCode) && device.monitorType) {
+          types.add(device.monitorType);
+        }
+      });
+
+      return Array.from(types);
+    },
+
+    /** 根据类型生成文件名中的类型描述（不含振动） */
+    getTypeNamesForFileName(types) {
+      if (types.length === 0) return '混合';
+      if (types.length > 2) return '混合';
+
+      const typeMap = {
+        5: '温度',
+        6: '温湿度',
+        7: '噪声'
+      };
+
+      return types.map(t => typeMap[t] || '其他').join('_');
+    },
+
+    /** ========== 原有方法 ========== */
+
     getTreeselect() {
       getMonitorInfoTree({ monitorTypeList: [5,6,7,8,9]}).then(response => {
         this.monitorInfoOptions = response.data
@@ -636,4 +960,66 @@ export default {
 .no-device-tip .el-empty {
   padding: 0;
 }
+
+/* 导出对话框样式 */
+.device-select-container {
+  max-height: 400px;
+  overflow-y: auto;
+  border: 1px solid #DCDFE6;
+  border-radius: 4px;
+  padding: 10px;
+}
+
+.device-group {
+  margin-bottom: 15px;
+  padding-bottom: 15px;
+  border-bottom: 1px solid #EBEEF5;
+}
+
+.device-group:last-child {
+  border-bottom: none;
+  margin-bottom: 0;
+  padding-bottom: 0;
+}
+
+.device-group-header {
+  display: flex;
+  justify-content: space-between;
+  align-items: center;
+  margin-bottom: 8px;
+}
+
+.device-group-title {
+  font-weight: bold;
+  color: #1f2d3d; /* 提升对比度，便于识别设备类型标题 */
+  font-size: 14px;
+  padding: 2px 6px;
+  border-left: 3px solid #409EFF;
+  background: #f5f7fa; /* 浅底突出文字 */
+  border-radius: 3px;
+}
+
+.device-select-container .el-checkbox {
+  margin-right: 0;
+  margin-bottom: 8px;
+  display: block;
+}
+
+/* 空状态样式 */
+.no-devices-empty {
+  text-align: center;
+  padding: 40px 20px;
+  color: #909399;
+  font-size: 14px;
+}
+
+.no-devices-empty i {
+  font-size: 24px;
+  margin-right: 8px;
+  color: #E6A23C;
+}
+
+.device-select-container .el-col {
+  margin-bottom: 5px;
+}
 </style>

src/views/ems/record/recordVibrationInstant/index.vue

@@ -135,6 +135,14 @@
               end-placeholder="结束时间"
             ></el-date-picker>
           </el-form-item>
+          <el-form-item label="振动参数">
+            <el-select v-model="selectedVibrationParam" placeholder="请选择振动参数" style="width: 150px" @change="handleQuery">
+              <el-option label="振动速度" value="vibrationSpeed"></el-option>
+              <el-option label="振动位移" value="vibrationDisplacement"></el-option>
+              <el-option label="振动加速度" value="vibrationAcceleration"></el-option>
+              <el-option label="振动温度" value="vibrationTemp"></el-option>
+            </el-select>
+          </el-form-item>
           <el-form-item>
             <el-button type="primary" icon="el-icon-search" size="mini" @click="handleQuery">搜索</el-button>
             <el-button icon="el-icon-refresh" size="mini" @click="resetQuery">重置</el-button>
@@ -193,14 +201,14 @@
           <el-table-column label="计量设备" align="center" prop="monitorName" min-width="150">
           </el-table-column>
           
-          <!-- 振动设备专用列 -->
+          <!-- 振动设备专用列：根据选中参数动态显示单列 -->
-          <el-table-column label="振动速度(mm/s)" align="center" prop="vibrationSpeed" width="120">
+          <el-table-column v-if="selectedVibrationParam === 'vibrationSpeed'" label="振动速度(mm/s)" align="center" prop="vibrationSpeed" width="150">
           </el-table-column>
-          <el-table-column label="振动位移(μm)" align="center" prop="vibrationDisplacement" width="120">
+          <el-table-column v-if="selectedVibrationParam === 'vibrationDisplacement'" label="振动位移(μm)" align="center" prop="vibrationDisplacement" width="150">
           </el-table-column>
-          <el-table-column label="振动加速度(g)" align="center" prop="vibrationAcceleration" width="120">
+          <el-table-column v-if="selectedVibrationParam === 'vibrationAcceleration'" label="振动加速度(g)" align="center" prop="vibrationAcceleration" width="150">
           </el-table-column>
-          <el-table-column label="振动温度(℃)" align="center" prop="vibrationTemp" width="120">
+          <el-table-column v-if="selectedVibrationParam === 'vibrationTemp'" label="振动温度(℃)" align="center" prop="vibrationTemp" width="150">
           </el-table-column>
           
           <!-- 记录时间列，给足够的宽度 -->
@@ -304,6 +312,8 @@ export default {
   name: "RecordIotenvInstant",
   data() {
     return {
+      // 选中的振动参数（默认振动速度）
+      selectedVibrationParam: 'vibrationSpeed',
 
       workUnitName:null,
       //下拉树List
@@ -484,9 +494,16 @@ export default {
         return;
       }
 
+      // 传递选中的振动参数到后端，让SQL根据该参数过滤
+      this.queryParams.vibrationParam = this.selectedVibrationParam;
       listRecordIotenvInstant(this.queryParams).then(response => {
-        this.recordIotenvInstantList = response.rows;
+        // 后端已根据vibrationParam过滤，前端再做一次保险过滤
-        this.total = response.total;
+        const filteredRows = response.rows.filter(row => {
+          const value = parseFloat(row[this.selectedVibrationParam]);
+          return !isNaN(value) && value > 0 && value < 80;
+        });
+        this.recordIotenvInstantList = filteredRows;
+        this.total = response.total; // 使用后端返回的总数
         this.loading = false;
       });
     },
@@ -586,9 +603,36 @@ export default {
     },
     /** 导出按钮操作 */
     handleExport() {
+      // 校验时间范围是否已选择
+      if (!this.daterangeRecordTime || this.daterangeRecordTime.length !== 2) {
+        this.$modal.msgWarning("请先选择记录时间范围再导出");
+        return;
+      }
+      // 校验是否已选择设备
+      if (!this.queryParams.monitorId && (!this.queryParams.monitorIds || this.queryParams.monitorIds.length === 0)) {
+        this.$modal.msgWarning("请先在左侧树中选择设备再导出");
+        return;
+      }
+      // 设置时间范围参数
+      this.queryParams.params['beginRecordTime'] = this.daterangeRecordTime[0];
+      this.queryParams.params['endRecordTime'] = this.daterangeRecordTime[1];
+      // 振动页面固定传递monitorTypes=10，确保后端只导出振动相关列
+      this.queryParams.params['monitorTypes'] = '10';
+      // 传递选中的振动参数，后端只导出该参数列
+      this.queryParams.params['vibrationParam'] = this.selectedVibrationParam;
+      
+      // 参数中文名映射
+      const paramNameMap = {
+        vibrationSpeed: '振动速度',
+        vibrationDisplacement: '振动位移',
+        vibrationAcceleration: '振动加速度',
+        vibrationTemp: '振动温度'
+      };
+      const paramName = paramNameMap[this.selectedVibrationParam] || '振动数据';
+      
       this.download('ems/record/recordIotenvInstant/export', {
         ...this.queryParams
-      }, `recordIotenvInstant_${new Date().getTime()}.xlsx`)
+      }, `${paramName}_${this.daterangeRecordTime[0].substring(0,10)}_${this.daterangeRecordTime[1].substring(0,10)}.xlsx`)
     },
 
     getTreeselect() {

src/views/ems/report/currentVibrationCurve/index.vue

@@ -59,16 +59,22 @@
             ></el-input-number>
             <span style="margin-left: 5px; color: #909399;">分钟/点</span>
           </el-form-item>
+          <el-form-item label="振动参数">
+            <el-select v-model="selectedVibrationParam" placeholder="请选择振动参数" style="width: 150px" @change="handleQuery">
+              <el-option label="振动速度" value="vibrationSpeed"></el-option>
+              <el-option label="振动位移" value="vibrationDisplacement"></el-option>
+              <el-option label="振动加速度" value="vibrationAcceleration"></el-option>
+              <el-option label="振动温度" value="vibrationTemp"></el-option>
+            </el-select>
+          </el-form-item>
           <el-form-item>
             <el-button type="primary" icon="el-icon-search" size="mini" @click="handleQuery">搜索</el-button>
             <el-button icon="el-icon-refresh" size="mini" @click="resetQuery">重置</el-button>
           </el-form-item>
         </el-form>
 
-        <Chart ref="Chart1" class="chart1"/>
+        <!-- 根据选中参数只显示单个图表 -->
-        <Chart ref="Chart2" class="chart2"/>
+        <Chart ref="VibrationChart" class="vibration-chart"/>
-        <Chart ref="Chart3" class="chart3"/>
-        <Chart ref="Chart4" class="chart4"/>
       </el-col>
     </el-row>
 
@@ -96,6 +102,8 @@ export default {
   },
   data() {
     return {
+      // 选中的振动参数（默认振动速度）
+      selectedVibrationParam: 'vibrationSpeed',
       //下拉树List
       baseMonitorInfoOptions: [],
       //左侧树结构List
@@ -288,213 +296,45 @@ export default {
       this.handleQuery()
     },
 
-    /** 振动曲线 */
+    /** 振动曲线：根据选中参数只显示单个图表，过滤无效值保持曲线光滑 */
     async getChart() {
       if (this.queryParams.monitorId == null) {
         return
       }
       let query = JSON.parse(JSON.stringify(this.queryParams))
-      // const {data} = await vibrationInstantList(query)
+      // 传递选中的振动参数到后端，让SQL根据该参数过滤
+      query.vibrationParam = this.selectedVibrationParam
       const {data} = await getRecordIotenvInstantList(query)
-      let option1 = {
-        title: {
-          text: this.selectMonitorName + ' 速度曲线',
-          x: 'center'
-        },
-        grid: {
-          top: '15%',
-          bottom: '10%',
-          left: '10%',
-          right: '3%'
-        },
-        tooltip: {
-          trigger: 'axis',
-          axisPointer: {
-            type: 'shadow',
-            label: {
-              show: true
-            }
-          }
-        },
-        dataZoom: [{
-          type: 'slider'
-        }],
-        legend: {
-          right: 0
-        },
-        xAxis: {
-          data: data.map(e => e.recodeTime),
-          axisLine: {
-            show: true, //隐藏X轴轴线
-            lineStyle: {
-              color: '#000000'
-            }
-          },
-          axisTick: {
-            show: true //隐藏X轴刻度
-          },
-          axisLabel: {
-            show: true,
-            textStyle: {
-              color: '#000000' //X轴文字颜色
-            }
-          }
-        },
-        yAxis: [
-          {
-            type: 'value',
-            name: '速度(mm/s)',
-            nameTextStyle: {
-              color: '#000000'
-            },
-            splitLine: {
-              show: false
-            },
-            axisTick: {
-              show: true
-            },
-            axisLine: {
-              show: true,
-              lineStyle: {
-                color: '#000000'
-              }
-            },
-            axisLabel: {
-              show: true,
-              textStyle: {
-                color: '#000000'
-              }
-            }
-          }
-        ],
-        series: [
-          {
-            name: '速度(mm/s)',
-            connectNulls: true, // 关键配置
-            type: 'line',
-            smooth: true, //平滑曲线显示
-            showAllSymbol: true, //显示所有图形。
-            symbol: 'circle', //标记的图形为实心圆
-            symbolSize: 10, //标记的大小
-            // itemStyle: {
-            //   //折线拐点标志的样式
-            //   color: "#058cff",
-            // },
-            // lineStyle: {
-            //   color: "#058cff",
-            // },
-            // areaStyle: {
-            //   color: "rgba(5,140,255, 0.2)",
-            // },
-            data: data.map(e => e.vibrationSpeed)
-          },
-        ]
-      }
-      let option2 = {
-        title: {
-          text: this.selectMonitorName + ' 温度曲线',
-          x: 'center'
-        },
-        grid: {
-          top: '15%',
-          bottom: '10%',
-          left: '10%',
-          right: '3%'
-        },
       
-        dataZoom: [{
+      // 参数配置映射
-          type: 'slider'
+      const paramConfig = {
-        }],
+        vibrationSpeed: { name: '速度(mm/s)', title: '速度曲线', field: 'vibrationSpeed' },
-        tooltip: {
+        vibrationDisplacement: { name: '位移(μm)', title: '位移曲线', field: 'vibrationDisplacement' },
-          trigger: 'axis',
+        vibrationAcceleration: { name: '加速度(g)', title: '加速度曲线', field: 'vibrationAcceleration' },
-          axisPointer: {
+        vibrationTemp: { name: '温度(℃)', title: '温度曲线', field: 'vibrationTemp' }
-            type: 'shadow',
-            label: {
-              show: true
-            }
-          }
-        },
-        legend: {
-          right: 0
-        },
-        xAxis: {
-          data: data.map(e => e.recodeTime),
-          axisLine: {
-            show: true, //隐藏X轴轴线
-            lineStyle: {
-              color: '#000000'
-            }
-          },
-          axisTick: {
-            show: true //隐藏X轴刻度
-          },
-          axisLabel: {
-            show: true,
-            textStyle: {
-              color: '#000000' //X轴文字颜色
-            }
-          }
-        },
-        yAxis: [
-          {
-            type: 'value',
-            name: '温度(℃)',
-            nameTextStyle: {
-              color: '#000000'
-            },
-            splitLine: {
-              show: false
-            },
-            axisTick: {
-              show: true
-            },
-            axisLine: {
-              show: true,
-              lineStyle: {
-                color: '#000000'
-              }
-            },
-            axisLabel: {
-              show: true,
-              textStyle: {
-                color: '#000000'
-              }
-            }
-          }
-        ],
-        series: [
-          {
-            name: '温度(℃)',
-            connectNulls: true, // 关键配置
-            type: 'line',
-            smooth: true, //平滑曲线显示
-            showAllSymbol: true, //显示所有图形。
-            symbol: 'circle', //标记的图形为实心圆
-            symbolSize: 10, //标记的大小
-            // itemStyle: {
-            //   //折线拐点标志的样式
-            //   color: "#058cff",
-            // },
-            // lineStyle: {
-            //   color: "#058cff",
-            // },
-            // areaStyle: {
-            //   color: "rgba(5,140,255, 0.2)",
-            // },
-            data: data.map(e => e.vibrationTemp)
-          },
-        ]
       }
-      let option3 = {
+      
+      const config = paramConfig[this.selectedVibrationParam]
+      
+      // 过滤无效值：小于等于0或大于等于80的数值不显示
+      const validPoints = data.filter(e => {
+        const value = parseFloat(e[config.field])
+        return !isNaN(value) && value > 0 && value < 80
+      })
+      // 提取有效数据的时间和数值（保持一一对应）
+      const timeData = validPoints.map(e => e.recodeTime)
+      const validData = validPoints.map(e => parseFloat(e[config.field]))
+      
+      let option = {
         title: {
-          text: this.selectMonitorName + ' 位移曲线',
+          text: this.selectMonitorName + ' ' + config.title,
           x: 'center'
         },
         grid: {
           top: '15%',
-          bottom: '10%',
+          bottom: '15%',
           left: '10%',
-          right: '3%'
+          right: '5%'
         },
         tooltip: {
           trigger: 'axis',
@@ -512,32 +352,36 @@ export default {
           right: 0
         },
         xAxis: {
-          data: data.map(e => e.recodeTime),
+          data: timeData,
           axisLine: {
-            show: true, //隐藏X轴轴线
+            show: true,
             lineStyle: {
               color: '#000000'
             }
           },
           axisTick: {
-            show: true //隐藏X轴刻度
+            show: true
           },
           axisLabel: {
             show: true,
             textStyle: {
-              color: '#000000' //X轴文字颜色
+              color: '#000000'
             }
           }
         },
         yAxis: [
           {
             type: 'value',
-            name: '位移(um)',
+            name: config.name,
+            min: 0,
             nameTextStyle: {
               color: '#000000'
             },
             splitLine: {
-              show: false
+              show: true,
+              lineStyle: {
+                type: 'dashed'
+              }
             },
             axisTick: {
               show: true
@@ -552,198 +396,36 @@ export default {
               show: true,
               textStyle: {
                 color: '#000000'
+              },
+              formatter: function(value) {
+                return value.toFixed(2); // 保留2位小数
               }
             }
           }
         ],
         series: [
           {
-            name: '位移(um)',
+            name: config.name,
-            connectNulls: true, // 关键配置
+            connectNulls: true, // 跳过null值但保持曲线连续光滑
             type: 'line',
-            smooth: true, //平滑曲线显示
+            smooth: true, // 平滑曲线显示
-            showAllSymbol: true, //显示所有图形。
+            showAllSymbol: true,
-            symbol: 'circle', //标记的图形为实心圆
+            symbol: 'circle',
-            symbolSize: 10, //标记的大小
+            symbolSize: 8,
-            // itemStyle: {
+            data: validData
-            //   //折线拐点标志的样式
+          }
-            //   color: "#058cff",
-            // },
-            // lineStyle: {
-            //   color: "#058cff",
-            // },
-            // areaStyle: {
-            //   color: "rgba(5,140,255, 0.2)",
-            // },
-            data: data.map(e => e.vibrationDisplacement)
-          },
         ]
       }
-      let option4 = {
+      this.$refs.VibrationChart.setData(option)
-        title: {
-          text: this.selectMonitorName + ' 加速度曲线',
-          x: 'center'
-        },
-        grid: {
-          top: '15%',
-          bottom: '10%',
-          left: '10%',
-          right: '3%'
-        },
-        tooltip: {
-          trigger: 'axis',
-          axisPointer: {
-            type: 'shadow',
-            label: {
-              show: true
-            }
-          }
-        },
-        dataZoom: [{
-          type: 'slider'
-        }],
-        legend: {
-          right: 0
-        },
-        xAxis: {
-          data: data.map(e => e.recodeTime),
-          axisLine: {
-            show: true, //隐藏X轴轴线
-            lineStyle: {
-              color: '#000000'
-            }
-          },
-          axisTick: {
-            show: true //隐藏X轴刻度
-          },
-          axisLabel: {
-            show: true,
-            textStyle: {
-              color: '#000000' //X轴文字颜色
-            }
-          }
-        },
-        yAxis: [
-          {
-            type: 'value',
-            name: '加速度(g)',
-            nameTextStyle: {
-              color: '#000000'
-            },
-            splitLine: {
-              show: false
-            },
-            axisTick: {
-              show: true
-            },
-            axisLine: {
-              show: true,
-              lineStyle: {
-                color: '#000000'
-              }
-            },
-            axisLabel: {
-              show: true,
-              textStyle: {
-                color: '#000000'
-              }
-            }
-          }
-        ],
-        series: [
-          {
-            name: '加速度(g)',
-            connectNulls: true, // 关键配置
-            type: 'line',
-            smooth: true, //平滑曲线显示
-            showAllSymbol: true, //显示所有图形。
-            symbol: 'circle', //标记的图形为实心圆
-            symbolSize: 10, //标记的大小
-            // itemStyle: {
-            //   color: "#058cff",
-            // },
-            // lineStyle: {
-            //   color: "#058cff",
-            // },
-            // areaStyle: {
-            //   color: "rgba(5,140,255, 0.2)",
-            // },
-            data: data.map(e => e.vibrationAcceleration)
-          },
-        ]
-      }
-      this.$refs.Chart1.setData(option1)
-      this.$refs.Chart2.setData(option2)
-      this.$refs.Chart3.setData(option3)
-      this.$refs.Chart4.setData(option4)
-      echarts.connect(this.$refs.Chart1.chart, this.$refs.Chart2.chart, this.$refs.Chart3.chart, this.$refs.Chart4.chart)
-      this.$refs.Chart1.chart.on('datazoom', (e) => {
-        option2.dataZoom[0].start = e.start
-        option2.dataZoom[0].end = e.end
-        this.$refs.Chart2.setData(option2)
-        option3.dataZoom[0].start = e.start
-        option3.dataZoom[0].end = e.end
-        this.$refs.Chart3.setData(option3)
-        option4.dataZoom[0].start = e.start
-        option4.dataZoom[0].end = e.end
-        this.$refs.Chart4.setData(option4)
-      })
-      this.$refs.Chart2.chart.on('datazoom', (e) => {
-        option1.dataZoom[0].start = e.start
-        option1.dataZoom[0].end = e.end
-        this.$refs.Chart1.setData(option1)
-        option3.dataZoom[0].start = e.start
-        option3.dataZoom[0].end = e.end
-        this.$refs.Chart3.setData(option3)
-        option4.dataZoom[0].start = e.start
-        option4.dataZoom[0].end = e.end
-        this.$refs.Chart4.setData(option4)
-      })
-      this.$refs.Chart3.chart.on('datazoom', (e) => {
-        option2.dataZoom[0].start = e.start
-        option2.dataZoom[0].end = e.end
-        this.$refs.Chart2.setData(option2)
-        option1.dataZoom[0].start = e.start
-        option1.dataZoom[0].end = e.end
-        this.$refs.Chart1.setData(option1)
-        option4.dataZoom[0].start = e.start
-        option4.dataZoom[0].end = e.end
-        this.$refs.Chart4.setData(option4)
-      })
-      this.$refs.Chart4.chart.on('datazoom', (e) => {
-        option2.dataZoom[0].start = e.start
-        option2.dataZoom[0].end = e.end
-        this.$refs.Chart2.setData(option2)
-        option3.dataZoom[0].start = e.start
-        option3.dataZoom[0].end = e.end
-        this.$refs.Chart3.setData(option3)
-        option1.dataZoom[0].start = e.start
-        option1.dataZoom[0].end = e.end
-        this.$refs.Chart4.setData(option1)
-      })
     }
   }
 }
 </script>
 <style scoped>
-.chart1 {
+/* 单个振动曲线图表样式 */
-  width: 50%;
+.vibration-chart {
-  height: 40vh;
+  width: 100%;
-  display: inline-block;
+  height: 70vh;
-}
+  display: block;
-.chart2 {
-  width: 50%;
-  height: 40vh;
-  display: inline-block;
-}
-.chart3 {
-  width: 50%;
-  height: 40vh;
-  display: inline-block;
-}
-.chart4 {
-  width: 50%;
-  display: inline-block;
-  height: 40vh;
 }
 </style>

src/views/index.vue

@@ -303,6 +303,7 @@ export default {
       selectedNodeName: null, // 当前选中的节点名称
       selectedNodeType: null, // 当前选中的节点类型
       selectedNodeCode: null, // 当前选中的节点Code
+      isParentNode: false, // 是否为父节点（有子节点）
       deviceTreeProps: {
         children: 'children',
         label: 'label'
@@ -362,68 +363,54 @@ export default {
       this.loading = true
       try {
         console.log('=== 开始加载节点数据 ===')
-        console.log('节点ID:', nodeId)
+        console.log('节点ID:', nodeId, '是否为父节点:', this.isParentNode)
 
-        // 同时获取当前节点和子节点的数据
+        // 判断是否为父节点（有子节点的节点）
-        const [currentNodeResponse, childNodesResponse] = await Promise.all([
+        const isParentNode = this.isParentNode
-          // 获取当前节点自身的数据（通过获取所有数据然后筛选）
-          getLatestRecords(),
-          // 获取子节点的数据
-          getLatestRecordsByParentId(nodeId)
-        ])
 
         let allDeviceData = []
 
-        // 处理当前节点自身的数据
+        if (isParentNode) {
-        if (currentNodeResponse.code === 200) {
+          // 父节点：只获取子节点的数据，不显示父节点自身（父节点通常是虚拟设备）
-          const currentNodeData = currentNodeResponse.data || []
+          const childNodesResponse = await getLatestRecordsByParentId(nodeId)
-          console.log('所有设备数据总数:', currentNodeData.length)
+          if (childNodesResponse.code === 200) {
-          console.log('当前节点信息 - ID:', this.selectedNodeId, '名称:', this.selectedNodeName, 'Code:', this.selectedNodeCode)
+            const childNodesData = childNodesResponse.data || []
+            console.log('子节点原始数据数量:', childNodesData.length)
 
-          // 筛选出当前节点对应的设备数据
+            const childDevices = childNodesData.filter(device => {
-          // 优先通过节点code匹配设备monitorId（叶子节点的正确匹配方式）
+              const matches = device.monitorName !== '胶东机场' &&
-          const currentDevices = currentNodeData.filter(device => {
+                device.monitorId &&
-            const matchByCode = this.selectedNodeCode && device.monitorId === this.selectedNodeCode
+                device.monitorName
-            const matchById = device.monitorId === nodeId
+              return matches
-            const matchByName = device.monitorName === this.selectedNodeName
+            })
-            const isValid = device.monitorName !== '胶东机场' &&
+            console.log('子节点有效设备数量:', childDevices.length)
-              device.monitorId &&
+            allDeviceData = childDevices
-              device.monitorName
+          }
+        } else {
+          // 叶子节点：获取当前节点自身的数据
+          const currentNodeResponse = await getLatestRecords()
+          if (currentNodeResponse.code === 200) {
+            const currentNodeData = currentNodeResponse.data || []
+            console.log('所有设备数据总数:', currentNodeData.length)
+            console.log('当前节点信息 - ID:', this.selectedNodeId, '名称:', this.selectedNodeName, 'Code:', this.selectedNodeCode)
 
-            const matches = (matchByCode || matchById || matchByName) && isValid
+            // 筛选出当前节点对应的设备数据
+            const currentDevices = currentNodeData.filter(device => {
+              const matchByCode = this.selectedNodeCode && device.monitorId === this.selectedNodeCode
+              const matchById = device.monitorId === nodeId
+              const matchByName = device.monitorName === this.selectedNodeName
+              const isValid = device.monitorName !== '胶东机场' &&
+                device.monitorId &&
+                device.monitorName
 
-            if (matches) {
+              return (matchByCode || matchById || matchByName) && isValid
-              console.log('找到当前节点设备:', device.monitorName, device.monitorId,
+            })
-                matchByCode ? '(通过Code匹配)' :
+            console.log('当前节点设备数量:', currentDevices.length)
-                  matchById ? '(通过ID匹配)' : '(通过名称匹配)')
+            allDeviceData = currentDevices
-            }
+          }
-            return matches
-          })
-          console.log('当前节点设备数量:', currentDevices.length)
-          allDeviceData = [...allDeviceData, ...currentDevices]
         }
 
-        // 处理子节点数据
+        console.log('设备数据总数:', allDeviceData.length)
-        if (childNodesResponse.code === 200) {
-          const childNodesData = childNodesResponse.data || []
-          console.log('子节点原始数据数量:', childNodesData.length)
-
-          const childDevices = childNodesData.filter(device => {
-            const matches = device.monitorName !== '胶东机场' &&
-              device.monitorId &&
-              device.monitorName
-            if (matches) {
-              console.log('找到子节点设备:', device.monitorName, device.monitorId)
-            }
-            return matches
-          })
-          console.log('子节点有效设备数量:', childDevices.length)
-          allDeviceData = [...allDeviceData, ...childDevices]
-        }
-
-        console.log('合并后设备数据总数:', allDeviceData.length)
-
-
 
         // 去重处理（基于monitorId）
         const uniqueDevices = []
@@ -438,18 +425,6 @@ export default {
 
         this.deviceList = uniqueDevices
         console.log('最终设备列表数量:', this.deviceList.length)
-
-        // 统计当前节点和子节点的设备数量
-        const currentNodeDeviceCount = this.deviceList.filter(d => {
-          return (this.selectedNodeCode && d.monitorId === this.selectedNodeCode) ||
-            d.monitorId === nodeId ||
-            d.monitorName === this.selectedNodeName
-        }).length
-
-        const childNodeDeviceCount = this.deviceList.length - currentNodeDeviceCount
-
-        console.log('当前节点数据数量:', currentNodeDeviceCount)
-        console.log('子节点数据数量:', childNodeDeviceCount)
         console.log('=== 数据加载完成 ===')
 
       } catch (error) {
@@ -491,8 +466,10 @@ export default {
       this.selectedNodeName = data.label
       this.selectedNodeType = data.type
       this.selectedNodeCode = data.code // 添加节点code字段
+      // 判断是否为父节点：有children且children不为空
+      this.isParentNode = !!(data.children && data.children.length > 0)
 
-      console.log('选中节点ID:', this.selectedNodeId, '节点名称:', this.selectedNodeName, '节点类型:', this.selectedNodeType, '节点Code:', this.selectedNodeCode)
+      console.log('选中节点ID:', this.selectedNodeId, '节点名称:', this.selectedNodeName, '节点类型:', this.selectedNodeType, '节点Code:', this.selectedNodeCode, '是否父节点:', this.isParentNode)
 
       // 根据选中的节点ID加载该节点下的设备数据
       this.loadDeviceDataByNode(this.selectedNodeId)