工艺参数导出功能搞定

src/api/dye/process.js

@@ -0,0 +1,44 @@
+import request from '@/utils/request'
+
+// 查询染整线设备类型工艺参数列表
+export function listProcess(query) {
+    return request({
+        url: '/dye/process/list',
+        method: 'get',
+        params: query
+    })
+}
+
+// 查询染整线设备类型工艺参数详细
+export function getProcess(tpId) {
+    return request({
+        url: '/dye/process/' + tpId,
+        method: 'get'
+    })
+}
+
+// 新增染整线设备类型工艺参数
+export function addProcess(data) {
+    return request({
+        url: '/dye/process',
+        method: 'post',
+        data: data
+    })
+}
+
+// 修改染整线设备类型工艺参数
+export function updateProcess(data) {
+    return request({
+        url: '/dye/process',
+        method: 'put',
+        data: data
+    })
+}
+
+// 删除染整线设备类型工艺参数
+export function delProcess(tpId) {
+    return request({
+        url: '/dye/process/' + tpId,
+        method: 'delete'
+    })
+}

src/views/dye/device/index.vue

@@ -304,7 +304,7 @@ const data = reactive({
   form: {},
   queryParams: {
     pageNum: 1,
-    pageSize: 10,
+    pageSize: 20,
     typeId: null,
     wsName: null,
     line: null,
@@ -437,18 +437,33 @@ function handleUpdate(row) {
     form.value = response.data;
     // 获取所有能源数据，用于判断哪些参数是从能源导入的
     listEnergy({pageSize: 10000}).then(energyResponse => {
-      const energyMap = new Map();
-      if (energyResponse.rows) {
-        energyResponse.rows.forEach(energy => {
-          energyMap.set(energy.engCode, {
-            name: energy.engName,
-            lineStand: energy.lineStand
+      // 如果子表为空，则自动导入能源基础配置，模拟新增时的行为
+      if (!response.data.dyeDeviceParaList || response.data.dyeDeviceParaList.length === 0) {
+        if (energyResponse.rows && energyResponse.rows.length > 0) {
+          energyResponse.rows.forEach(energy => {
+            let obj = {};
+            obj.paraCode = energy.engCode; // 使用能源编码
+            obj.paraName = energy.engName; // 使用能源名称
+            obj.paraExp = "";
+            obj.paraAlarm = "";
+            obj.lineStand = energy.lineStand || ""; // 导入能源的产线标准
+            // 添加标记，表示这是从能源基础配置导入的，不可修改删除
+            obj.isFromEnergy = true;
+            dyeDeviceParaList.value.push(obj);
           });
-        });
-      }
+        }
+      } else {
+        const energyMap = new Map();
+        if (energyResponse.rows) {
+          energyResponse.rows.forEach(energy => {
+            energyMap.set(energy.engCode, {
+              name: energy.engName,
+              lineStand: energy.lineStand
+            });
+          });
+        }
 
-      // 为从能源导入的参数添加标记
-      if (response.data.dyeDeviceParaList) {
+        // 为从能源导入的参数添加标记
         response.data.dyeDeviceParaList.forEach(item => {
           // 如果参数编码在能源编码列表中，则标记为从能源导入
           if (energyMap.has(item.paraCode)) {
@@ -467,8 +482,8 @@ function handleUpdate(row) {
             item.isFromEnergy = false;
           }
         });
+        dyeDeviceParaList.value = response.data.dyeDeviceParaList;
       }
-      dyeDeviceParaList.value = response.data.dyeDeviceParaList;
       open.value = true;
       title.value = "修改染整线设备管理";
     });

src/views/dye/hour/calc.vue

@@ -133,7 +133,7 @@
       <div slot="header">
         <span>Mann-Whitney U检验结果</span>
       </div>
-      
+
       <!-- 折叠面板 -->
       <el-collapse v-model="activeCollapseNames">
         <el-collapse-item name="significance-results">
@@ -141,7 +141,7 @@
             <span style="font-weight: bold;">显著性分析摘要</span>
             <el-tag size="mini" style="margin-left: 10px;">{{ significantData.length }} 个显著差异</el-tag>
           </template>
-          
+
           <!-- 统计说明 -->
           <el-alert
             title="统计说明"
@@ -151,7 +151,7 @@
             :closable="false"
             style="margin-bottom: 10px;"
           />
-          
+
           <!-- 详细表格 -->
           <el-table :data="significantData" height="300" style="width: 100%" stripe>
             <el-table-column prop="typeName" label="设备类型"></el-table-column>
@@ -1214,6 +1214,9 @@ function handleChartClick(params, chartType) {
   }
 
   // 检查两个设备是否都有对应小时的数据
+  console.log('targetData0:', targetData0);
+  console.log('targetData1:', targetData1);
+
   if ((targetData0 && targetData0.paraMValue) || (targetData1 && targetData1.paraMValue)) {
     try {
       // 设置对话框标题

src/views/dye/process/export.vue

@@ -0,0 +1,212 @@
+<template>
+  <div class="app-container">
+    <!-- 导出工艺参数 -->
+    <el-card style="margin-bottom: 15px;">
+      <div style="font-size: 18px; font-weight: bold; text-align: center; margin-bottom: 15px;">导出工艺参数</div>
+      <el-row :gutter="15" align="middle">
+        <!-- 时间选择 -->
+        <el-col :span="6">
+          <div style="display: flex; align-items: center; justify-content: center;">
+            <el-date-picker clearable
+                            v-model="processParams.date"
+                            type="date"
+                            value-format="YYYY-MM-DD"
+                            placeholder="请选择日期"
+                            style="width: 130px"
+                            @change="handleProcessQuery">
+            </el-date-picker>
+            <el-select v-model="processParams.hour" placeholder="小时" style="width: 80px; margin-left: 5px;">
+              <el-option v-for="hour in 24" :key="hour - 1" :label="(hour - 1).toString().padStart(2, '0') + ':00'"
+                         :value="hour - 1"></el-option>
+            </el-select>
+          </div>
+        </el-col>
+
+        <!-- 设备类型选择 -->
+        <el-col :span="6">
+          <div style="display: flex; align-items: center; flex-wrap: nowrap; gap: 10px;">
+            <span style="white-space: nowrap;">类型：</span>
+            <el-select v-model="processParams.types" multiple placeholder="请选择设备类型"
+                       style="flex: 1; min-width: 100px;">
+              <el-option
+                  v-for="item in equipmentTypeOptions"
+                  :key="item.typeId"
+                  :label="item.typeName"
+                  :value="item.typeId">
+              </el-option>
+            </el-select>
+          </div>
+        </el-col>
+
+        <!-- 产线选择 -->
+        <el-col :span="4">
+          <div style="display: flex; align-items: center;">
+            <span style="white-space: nowrap; margin-right: 10px;">产线：</span>
+            <el-select
+                v-model="processParams.lines"
+                multiple
+                placeholder="请选择产线"
+                style="width: 180px;">
+              <el-option
+                  v-for="line in allLines"
+                  :key="line"
+                  :label="line + '号线'"
+                  :value="line">
+              </el-option>
+            </el-select>
+          </div>
+        </el-col>
+
+        <!-- 导出按钮 -->
+        <el-col :span="5">
+          <div style="display: flex; align-items: center; justify-content: center;">
+            <el-button type="warning"
+                       plain
+                       icon="Download" @click="exportProcessParams">导出工艺参数
+            </el-button>
+          </div>
+        </el-col>
+      </el-row>
+    </el-card>
+
+    <!-- 导出电量 -->
+    <el-card>
+      <div style="font-size: 18px; font-weight: bold; text-align: center; margin-bottom: 15px;">导出电量</div>
+      <el-row :gutter="15" align="middle">
+        <!-- 时间选择 -->
+        <el-col :span="6">
+          <div style="display: flex; align-items: center; justify-content: center;">
+            <el-date-picker clearable
+                            v-model="electricityParams.date"
+                            type="date"
+                            value-format="YYYY-MM-DD"
+                            placeholder="请选择日期"
+                            style="width: 130px"
+                            @change="handleElectricityQuery">
+            </el-date-picker>
+            <el-select v-model="electricityParams.hour" placeholder="小时"
+                       style="width: 80px; margin-left: 5px;">
+              <el-option v-for="hour in 24" :key="hour - 1" :label="(hour - 1).toString().padStart(2, '0') + ':00'"
+                         :value="hour - 1"></el-option>
+            </el-select>
+          </div>
+        </el-col>
+
+        <!-- 设备类型选择 -->
+        <el-col :span="6">
+          <div style="display: flex; align-items: center; flex-wrap: nowrap; gap: 10px;">
+            <span style="white-space: nowrap;">类型：</span>
+            <el-select v-model="electricityParams.types" multiple placeholder="请选择设备类型"
+                       style="flex: 1; min-width: 100px;">
+              <el-option
+                  v-for="item in equipmentTypeOptions"
+                  :key="item.typeId"
+                  :label="item.typeName"
+                  :value="item.typeId">
+              </el-option>
+            </el-select>
+          </div>
+        </el-col>
+
+        <!-- 产线选择 -->
+        <el-col :span="4">
+          <div style="display: flex; align-items: center;">
+            <span style="white-space: nowrap; margin-right: 10px;">产线：</span>
+            <el-select
+                v-model="electricityParams.lines"
+                multiple
+                placeholder="请选择产线"
+                style="width: 180px;">
+              <el-option
+                  v-for="line in allLines"
+                  :key="line"
+                  :label="line + '号线'"
+                  :value="line">
+              </el-option>
+            </el-select>
+          </div>
+        </el-col>
+
+        <!-- 导出按钮 -->
+        <el-col :span="5">
+          <div style="display: flex; align-items: center; justify-content: center;">
+            <el-button type="warning"
+                       plain
+                       icon="Download" @click="exportElectricity">导出电量
+            </el-button>
+          </div>
+        </el-col>
+      </el-row>
+    </el-card>
+  </div>
+</template>
+
+<script setup name="dyeHourCalc">
+import {listDeviceTypes} from "@/api/dyeing/gyfx";
+import {ref} from 'vue';
+
+const {proxy} = getCurrentInstance();
+
+const processParams = reactive({
+  date: new Date().Format('yyyy-MM-dd'),
+  hour: new Date().getHours(),
+  types: [],
+  lines: []
+});
+
+const electricityParams = reactive({
+  date: new Date(new Date().getTime() - 31 * 60 * 60 * 1000).Format('yyyy-MM-dd'),
+  hour: new Date().getHours(),
+  types: [],
+  lines: []
+});
+
+const equipmentTypeList = ref([]);
+const equipmentTypeOptions = ref([]);
+const allLines = ref(['1', '2', '3', '4', '5', '6', '7', '8']);
+
+/** 查询染整线产线小时统计数据列表 */
+function getList() {
+  // 先获取设备类型列表
+  listDeviceTypes({pageSize: 10000}).then(response => {
+    equipmentTypeList.value = response.rows;
+    // 提取设备类型选项
+    equipmentTypeOptions.value = response.rows.map(item => {
+      return {
+        typeId: item.typeId,
+        typeName: item.typeName
+      };
+    });
+
+    // 默认选择全部设备类型
+    processParams.types = response.rows.map(item => item.typeId);
+    electricityParams.types = response.rows.map(item => item.typeId);
+
+    // 默认选择全部产线
+    processParams.lines = [...allLines.value];
+    electricityParams.lines = [...allLines.value];
+  });
+}
+
+// 导出工艺参数
+function exportProcessParams() {
+  proxy.download('dye/process/export', {
+    date: processParams.date,
+    hour: processParams.hour,
+    types: processParams.types,
+    lines: processParams.lines
+  }, `前整车间工艺参数_${new Date().Format('yyyyMMddhhmmss')}.xlsx`)
+}
+
+// 导出电量
+function exportElectricity() {
+  proxy.download('dye/electricity/export', {
+    date: electricityParams.date,
+    hour: electricityParams.hour,
+    types: electricityParams.types,
+    lines: electricityParams.lines
+  }, `前整车间电量_${new Date().getTime()}.xlsx`)
+}
+
+getList();
+</script>

src/views/dye/process/index.vue

@@ -0,0 +1,371 @@
+<template>
+  <div class="app-container">
+    <el-form :model="queryParams" ref="queryRef" :inline="true" v-show="showSearch" label-width="68px">
+      <el-form-item label="ID" prop="typeId">
+        <el-input
+          v-model="queryParams.typeId"
+          placeholder="请输入ID"
+          clearable
+          @keyup.enter="handleQuery"
+        />
+      </el-form-item>
+      <el-form-item label="参数编码" prop="paraCode">
+        <el-input
+          v-model="queryParams.paraCode"
+          placeholder="请输入参数编码"
+          clearable
+          @keyup.enter="handleQuery"
+        />
+      </el-form-item>
+      <el-form-item label="参数名称" prop="paraName">
+        <el-input
+          v-model="queryParams.paraName"
+          placeholder="请输入参数名称"
+          clearable
+          @keyup.enter="handleQuery"
+        />
+      </el-form-item>
+      <el-form-item label="设定值表达式" prop="paraSet">
+        <el-input
+          v-model="queryParams.paraSet"
+          placeholder="请输入设定值表达式"
+          clearable
+          @keyup.enter="handleQuery"
+        />
+      </el-form-item>
+      <el-form-item label="实际值表达式" prop="paraAct">
+        <el-input
+          v-model="queryParams.paraAct"
+          placeholder="请输入实际值表达式"
+          clearable
+          @keyup.enter="handleQuery"
+        />
+      </el-form-item>
+      <el-form-item label="创建人" prop="createdBy">
+        <el-input
+          v-model="queryParams.createdBy"
+          placeholder="请输入创建人"
+          clearable
+          @keyup.enter="handleQuery"
+        />
+      </el-form-item>
+      <el-form-item label="创建时间" prop="createdTime">
+        <el-date-picker clearable
+          v-model="queryParams.createdTime"
+          type="date"
+          value-format="YYYY-MM-DD"
+          placeholder="请选择创建时间">
+        </el-date-picker>
+      </el-form-item>
+      <el-form-item label="更新人" prop="updatedBy">
+        <el-input
+          v-model="queryParams.updatedBy"
+          placeholder="请输入更新人"
+          clearable
+          @keyup.enter="handleQuery"
+        />
+      </el-form-item>
+      <el-form-item label="更新时间" prop="updatedTime">
+        <el-date-picker clearable
+          v-model="queryParams.updatedTime"
+          type="date"
+          value-format="YYYY-MM-DD"
+          placeholder="请选择更新时间">
+        </el-date-picker>
+      </el-form-item>
+      <el-form-item label="备注" prop="remark">
+        <el-input
+          v-model="queryParams.remark"
+          placeholder="请输入备注"
+          clearable
+          @keyup.enter="handleQuery"
+        />
+      </el-form-item>
+      <el-form-item>
+        <el-button type="primary" icon="Search" @click="handleQuery">搜索</el-button>
+        <el-button icon="Refresh" @click="resetQuery">重置</el-button>
+      </el-form-item>
+    </el-form>
+
+    <el-row :gutter="10" class="mb8">
+      <el-col :span="1.5">
+        <el-button
+          type="primary"
+          plain
+          icon="Plus"
+          @click="handleAdd"
+          v-hasPermi="['dye:process:add']"
+        >新增</el-button>
+      </el-col>
+      <el-col :span="1.5">
+        <el-button
+          type="success"
+          plain
+          icon="Edit"
+          :disabled="single"
+          @click="handleUpdate"
+          v-hasPermi="['dye:process:edit']"
+        >修改</el-button>
+      </el-col>
+      <el-col :span="1.5">
+        <el-button
+          type="danger"
+          plain
+          icon="Delete"
+          :disabled="multiple"
+          @click="handleDelete"
+          v-hasPermi="['dye:process:remove']"
+        >删除</el-button>
+      </el-col>
+      <el-col :span="1.5">
+        <el-button
+          type="warning"
+          plain
+          icon="Download"
+          @click="handleExport"
+          v-hasPermi="['dye:process:export']"
+        >导出</el-button>
+      </el-col>
+      <right-toolbar v-model:showSearch="showSearch" @queryTable="getList"></right-toolbar>
+    </el-row>
+
+    <el-table v-loading="loading" :data="processList" @selection-change="handleSelectionChange">
+      <el-table-column type="selection" width="55" align="center" />
+      <el-table-column label="参数ID" align="center" prop="tpId" />
+      <el-table-column label="ID" align="center" prop="typeId" />
+      <el-table-column label="参数编码" align="center" prop="paraCode" />
+      <el-table-column label="参数名称" align="center" prop="paraName" />
+      <el-table-column label="设定值表达式" align="center" prop="paraSet" />
+      <el-table-column label="实际值表达式" align="center" prop="paraAct" />
+      <el-table-column label="创建人" align="center" prop="createdBy" />
+      <el-table-column label="创建时间" align="center" prop="createdTime" width="180">
+        <template #default="scope">
+          <span>{{ parseTime(scope.row.createdTime, '{y}-{m}-{d}') }}</span>
+        </template>
+      </el-table-column>
+      <el-table-column label="更新人" align="center" prop="updatedBy" />
+      <el-table-column label="更新时间" align="center" prop="updatedTime" width="180">
+        <template #default="scope">
+          <span>{{ parseTime(scope.row.updatedTime, '{y}-{m}-{d}') }}</span>
+        </template>
+      </el-table-column>
+      <el-table-column label="备注" align="center" prop="remark" />
+      <el-table-column label="操作" align="center" class-name="small-padding fixed-width">
+        <template #default="scope">
+          <el-button link type="primary" icon="Edit" @click="handleUpdate(scope.row)" v-hasPermi="['dye:process:edit']">修改</el-button>
+          <el-button link type="primary" icon="Delete" @click="handleDelete(scope.row)" v-hasPermi="['dye:process:remove']">删除</el-button>
+        </template>
+      </el-table-column>
+    </el-table>
+    
+    <pagination
+      v-show="total>0"
+      :total="total"
+      v-model:page="queryParams.pageNum"
+      v-model:limit="queryParams.pageSize"
+      @pagination="getList"
+    />
+
+    <!-- 添加或修改染整线设备类型工艺参数对话框 -->
+    <el-dialog :title="title" v-model="open" width="500px" append-to-body>
+      <el-form ref="processRef" :model="form" :rules="rules" label-width="80px">
+        <el-form-item label="ID" prop="typeId">
+          <el-input v-model="form.typeId" placeholder="请输入ID" />
+        </el-form-item>
+        <el-form-item label="参数编码" prop="paraCode">
+          <el-input v-model="form.paraCode" placeholder="请输入参数编码" />
+        </el-form-item>
+        <el-form-item label="参数名称" prop="paraName">
+          <el-input v-model="form.paraName" placeholder="请输入参数名称" />
+        </el-form-item>
+        <el-form-item label="设定值表达式" prop="paraSet">
+          <el-input v-model="form.paraSet" placeholder="请输入设定值表达式" />
+        </el-form-item>
+        <el-form-item label="实际值表达式" prop="paraAct">
+          <el-input v-model="form.paraAct" placeholder="请输入实际值表达式" />
+        </el-form-item>
+        <el-form-item label="创建人" prop="createdBy">
+          <el-input v-model="form.createdBy" placeholder="请输入创建人" />
+        </el-form-item>
+        <el-form-item label="创建时间" prop="createdTime">
+          <el-date-picker clearable
+            v-model="form.createdTime"
+            type="date"
+            value-format="YYYY-MM-DD"
+            placeholder="请选择创建时间">
+          </el-date-picker>
+        </el-form-item>
+        <el-form-item label="更新人" prop="updatedBy">
+          <el-input v-model="form.updatedBy" placeholder="请输入更新人" />
+        </el-form-item>
+        <el-form-item label="更新时间" prop="updatedTime">
+          <el-date-picker clearable
+            v-model="form.updatedTime"
+            type="date"
+            value-format="YYYY-MM-DD"
+            placeholder="请选择更新时间">
+          </el-date-picker>
+        </el-form-item>
+        <el-form-item label="备注" prop="remark">
+          <el-input v-model="form.remark" placeholder="请输入备注" />
+        </el-form-item>
+      </el-form>
+      <template #footer>
+        <div class="dialog-footer">
+          <el-button type="primary" @click="submitForm">确 定</el-button>
+          <el-button @click="cancel">取 消</el-button>
+        </div>
+      </template>
+    </el-dialog>
+  </div>
+</template>
+
+<script setup name="Process">
+import { listProcess, getProcess, delProcess, addProcess, updateProcess } from "@/api/dye/process";
+
+const { proxy } = getCurrentInstance();
+
+const processList = ref([]);
+const open = ref(false);
+const loading = ref(true);
+const showSearch = ref(true);
+const ids = ref([]);
+const single = ref(true);
+const multiple = ref(true);
+const total = ref(0);
+const title = ref("");
+
+const data = reactive({
+  form: {},
+  queryParams: {
+    pageNum: 1,
+    pageSize: 10,
+    typeId: null,
+    paraCode: null,
+    paraName: null,
+    paraSet: null,
+    paraAct: null,
+    createdBy: null,
+    createdTime: null,
+    updatedBy: null,
+    updatedTime: null,
+    remark: null
+  },
+  rules: {
+  }
+});
+
+const { queryParams, form, rules } = toRefs(data);
+
+/** 查询染整线设备类型工艺参数列表 */
+function getList() {
+  loading.value = true;
+  listProcess(queryParams.value).then(response => {
+    processList.value = response.rows;
+    total.value = response.total;
+    loading.value = false;
+  });
+}
+
+// 取消按钮
+function cancel() {
+  open.value = false;
+  reset();
+}
+
+// 表单重置
+function reset() {
+  form.value = {
+    tpId: null,
+    typeId: null,
+    paraCode: null,
+    paraName: null,
+    paraSet: null,
+    paraAct: null,
+    createdBy: null,
+    createdTime: null,
+    updatedBy: null,
+    updatedTime: null,
+    remark: null
+  };
+  proxy.resetForm("processRef");
+}
+
+/** 搜索按钮操作 */
+function handleQuery() {
+  queryParams.value.pageNum = 1;
+  getList();
+}
+
+/** 重置按钮操作 */
+function resetQuery() {
+  proxy.resetForm("queryRef");
+  handleQuery();
+}
+
+// 多选框选中数据
+function handleSelectionChange(selection) {
+  ids.value = selection.map(item => item.tpId);
+  single.value = selection.length != 1;
+  multiple.value = !selection.length;
+}
+
+/** 新增按钮操作 */
+function handleAdd() {
+  reset();
+  open.value = true;
+  title.value = "添加染整线设备类型工艺参数";
+}
+
+/** 修改按钮操作 */
+function handleUpdate(row) {
+  reset();
+  const _tpId = row.tpId || ids.value
+  getProcess(_tpId).then(response => {
+    form.value = response.data;
+    open.value = true;
+    title.value = "修改染整线设备类型工艺参数";
+  });
+}
+
+/** 提交按钮 */
+function submitForm() {
+  proxy.$refs["processRef"].validate(valid => {
+    if (valid) {
+      if (form.value.tpId != null) {
+        updateProcess(form.value).then(response => {
+          proxy.$modal.msgSuccess("修改成功");
+          open.value = false;
+          getList();
+        });
+      } else {
+        addProcess(form.value).then(response => {
+          proxy.$modal.msgSuccess("新增成功");
+          open.value = false;
+          getList();
+        });
+      }
+    }
+  });
+}
+
+/** 删除按钮操作 */
+function handleDelete(row) {
+  const _tpIds = row.tpId || ids.value;
+  proxy.$modal.confirm('是否确认删除染整线设备类型工艺参数编号为"' + _tpIds + '"的数据项？').then(function() {
+    return delProcess(_tpIds);
+  }).then(() => {
+    getList();
+    proxy.$modal.msgSuccess("删除成功");
+  }).catch(() => {});
+}
+
+/** 导出按钮操作 */
+function handleExport() {
+  proxy.download('dye/process/export', {
+    ...queryParams.value
+  }, `process_${new Date().getTime()}.xlsx`)
+}
+
+getList();
+</script>