调整导出的参数

src/api/dye/alarm.js

@@ -0,0 +1,44 @@
+import request from '@/utils/request'
+
+// 查询工艺参数告警信息列表
+export function listAlarm(query) {
+    return request({
+        url: '/dye/alarm/list',
+        method: 'get',
+        params: query
+    })
+}
+
+// 查询工艺参数告警信息详细
+export function getAlarm(alarmId) {
+    return request({
+        url: '/dye/alarm/' + alarmId,
+        method: 'get'
+    })
+}
+
+// 新增工艺参数告警信息
+export function addAlarm(data) {
+    return request({
+        url: '/dye/alarm',
+        method: 'post',
+        data: data
+    })
+}
+
+// 修改工艺参数告警信息
+export function updateAlarm(data) {
+    return request({
+        url: '/dye/alarm',
+        method: 'put',
+        data: data
+    })
+}
+
+// 删除工艺参数告警信息
+export function delAlarm(alarmId) {
+    return request({
+        url: '/dye/alarm/' + alarmId,
+        method: 'delete'
+    })
+}

src/api/emp/empCalc.js

@@ -56,7 +56,7 @@ export function calcBl(empDate) {
     return request({
         url: '/emp/empCalc/calcBl?date=' + empDate,
         method: 'get',
-        timeout: 10*60*1000 // 设置10分钟超时时间
+        timeout: 6000000 // 设置10分钟超时时间
     })
 }
 

src/views/dye/alarm/index.vue

@@ -0,0 +1,450 @@
+<template>
+  <div class="app-container">
+    <el-form :model="queryParams" ref="queryRef" :inline="true" v-show="showSearch" label-width="68px">
+      <el-form-item label="告警时间" prop="alarmTime">
+        <el-date-picker clearable
+          v-model="queryParams.alarmTime"
+          type="date"
+          value-format="YYYY-MM-DD"
+          placeholder="请选择告警时间">
+        </el-date-picker>
+      </el-form-item>
+      <el-form-item label="设备类型" prop="typeId">
+        <el-input
+          v-model="queryParams.typeId"
+          placeholder="请输入设备类型"
+          clearable
+          @keyup.enter="handleQuery"
+        />
+      </el-form-item>
+      <el-form-item label="类型名称" prop="typeName">
+        <el-input
+          v-model="queryParams.typeName"
+          placeholder="请输入类型名称"
+          clearable
+          @keyup.enter="handleQuery"
+        />
+      </el-form-item>
+      <el-form-item label="设备ID" prop="deviceId">
+        <el-input
+          v-model="queryParams.deviceId"
+          placeholder="请输入设备ID"
+          clearable
+          @keyup.enter="handleQuery"
+        />
+      </el-form-item>
+      <el-form-item label="设备名称" prop="deviceName">
+        <el-input
+          v-model="queryParams.deviceName"
+          placeholder="请输入设备名称"
+          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="validRange">
+        <el-input
+          v-model="queryParams.validRange"
+          placeholder="请输入有效值范围"
+          clearable
+          @keyup.enter="handleQuery"
+        />
+      </el-form-item>
+      <el-form-item label="设定值" prop="setValue">
+        <el-input
+          v-model="queryParams.setValue"
+          placeholder="请输入设定值"
+          clearable
+          @keyup.enter="handleQuery"
+        />
+      </el-form-item>
+      <el-form-item label="实际值" prop="actValue">
+        <el-input
+          v-model="queryParams.actValue"
+          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:alarm:add']"
+        >新增</el-button>
+      </el-col>
+      <el-col :span="1.5">
+        <el-button
+          type="success"
+          plain
+          icon="Edit"
+          :disabled="single"
+          @click="handleUpdate"
+          v-hasPermi="['dye:alarm:edit']"
+        >修改</el-button>
+      </el-col>
+      <el-col :span="1.5">
+        <el-button
+          type="danger"
+          plain
+          icon="Delete"
+          :disabled="multiple"
+          @click="handleDelete"
+          v-hasPermi="['dye:alarm:remove']"
+        >删除</el-button>
+      </el-col>
+      <el-col :span="1.5">
+        <el-button
+          type="warning"
+          plain
+          icon="Download"
+          @click="handleExport"
+          v-hasPermi="['dye:alarm:export']"
+        >导出</el-button>
+      </el-col>
+      <right-toolbar v-model:showSearch="showSearch" @queryTable="getList"></right-toolbar>
+    </el-row>
+
+    <el-table v-loading="loading" :data="alarmList" @selection-change="handleSelectionChange">
+      <el-table-column type="selection" width="55" align="center" />
+      <el-table-column label="统计ID" align="center" prop="alarmId" />
+      <el-table-column label="告警时间" align="center" prop="alarmTime" width="180">
+        <template #default="scope">
+          <span>{{ parseTime(scope.row.alarmTime, '{y}-{m}-{d}') }}</span>
+        </template>
+      </el-table-column>
+      <el-table-column label="设备类型" align="center" prop="typeId" />
+      <el-table-column label="类型名称" align="center" prop="typeName" />
+      <el-table-column label="设备ID" align="center" prop="deviceId" />
+      <el-table-column label="设备名称" align="center" prop="deviceName" />
+      <el-table-column label="参数编码" align="center" prop="paraCode" />
+      <el-table-column label="参数名称" align="center" prop="paraName" />
+      <el-table-column label="有效值范围" align="center" prop="validRange" />
+      <el-table-column label="设定值" align="center" prop="setValue" />
+      <el-table-column label="实际值" align="center" prop="actValue" />
+      <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:alarm:edit']">修改</el-button>
+          <el-button link type="primary" icon="Delete" @click="handleDelete(scope.row)" v-hasPermi="['dye:alarm: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="alarmRef" :model="form" :rules="rules" label-width="80px">
+        <el-form-item label="告警时间" prop="alarmTime">
+          <el-date-picker clearable
+            v-model="form.alarmTime"
+            type="date"
+            value-format="YYYY-MM-DD"
+            placeholder="请选择告警时间">
+          </el-date-picker>
+        </el-form-item>
+        <el-form-item label="设备类型" prop="typeId">
+          <el-input v-model="form.typeId" placeholder="请输入设备类型" />
+        </el-form-item>
+        <el-form-item label="类型名称" prop="typeName">
+          <el-input v-model="form.typeName" placeholder="请输入类型名称" />
+        </el-form-item>
+        <el-form-item label="设备ID" prop="deviceId">
+          <el-input v-model="form.deviceId" placeholder="请输入设备ID" />
+        </el-form-item>
+        <el-form-item label="设备名称" prop="deviceName">
+          <el-input v-model="form.deviceName" placeholder="请输入设备名称" />
+        </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="validRange">
+          <el-input v-model="form.validRange" placeholder="请输入有效值范围" />
+        </el-form-item>
+        <el-form-item label="设定值" prop="setValue">
+          <el-input v-model="form.setValue" placeholder="请输入设定值" />
+        </el-form-item>
+        <el-form-item label="实际值" prop="actValue">
+          <el-input v-model="form.actValue" 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="Alarm">
+import { listAlarm, getAlarm, delAlarm, addAlarm, updateAlarm } from "@/api/dye/alarm";
+
+const { proxy } = getCurrentInstance();
+
+const alarmList = 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,
+    alarmTime: null,
+    typeId: null,
+    typeName: null,
+    deviceId: null,
+    deviceName: null,
+    paraCode: null,
+    paraName: null,
+    validRange: null,
+    setValue: null,
+    actValue: null,
+    createdBy: null,
+    createdTime: null,
+    updatedBy: null,
+    updatedTime: null,
+    remark: null
+  },
+  rules: {
+  }
+});
+
+const { queryParams, form, rules } = toRefs(data);
+
+/** 查询工艺参数告警信息列表 */
+function getList() {
+  loading.value = true;
+  listAlarm(queryParams.value).then(response => {
+    alarmList.value = response.rows;
+    total.value = response.total;
+    loading.value = false;
+  });
+}
+
+// 取消按钮
+function cancel() {
+  open.value = false;
+  reset();
+}
+
+// 表单重置
+function reset() {
+  form.value = {
+    alarmId: null,
+    alarmTime: null,
+    typeId: null,
+    typeName: null,
+    deviceId: null,
+    deviceName: null,
+    paraCode: null,
+    paraName: null,
+    validRange: null,
+    setValue: null,
+    actValue: null,
+    createdBy: null,
+    createdTime: null,
+    updatedBy: null,
+    updatedTime: null,
+    remark: null
+  };
+  proxy.resetForm("alarmRef");
+}
+
+/** 搜索按钮操作 */
+function handleQuery() {
+  queryParams.value.pageNum = 1;
+  getList();
+}
+
+/** 重置按钮操作 */
+function resetQuery() {
+  proxy.resetForm("queryRef");
+  handleQuery();
+}
+
+// 多选框选中数据
+function handleSelectionChange(selection) {
+  ids.value = selection.map(item => item.alarmId);
+  single.value = selection.length != 1;
+  multiple.value = !selection.length;
+}
+
+/** 新增按钮操作 */
+function handleAdd() {
+  reset();
+  open.value = true;
+  title.value = "添加工艺参数告警信息";
+}
+
+/** 修改按钮操作 */
+function handleUpdate(row) {
+  reset();
+  const _alarmId = row.alarmId || ids.value
+  getAlarm(_alarmId).then(response => {
+    form.value = response.data;
+    open.value = true;
+    title.value = "修改工艺参数告警信息";
+  });
+}
+
+/** 提交按钮 */
+function submitForm() {
+  proxy.$refs["alarmRef"].validate(valid => {
+    if (valid) {
+      if (form.value.alarmId != null) {
+        updateAlarm(form.value).then(response => {
+          proxy.$modal.msgSuccess("修改成功");
+          open.value = false;
+          getList();
+        });
+      } else {
+        addAlarm(form.value).then(response => {
+          proxy.$modal.msgSuccess("新增成功");
+          open.value = false;
+          getList();
+        });
+      }
+    }
+  });
+}
+
+/** 删除按钮操作 */
+function handleDelete(row) {
+  const _alarmIds = row.alarmId || ids.value;
+  proxy.$modal.confirm('是否确认删除工艺参数告警信息编号为"' + _alarmIds + '"的数据项？').then(function() {
+    return delAlarm(_alarmIds);
+  }).then(() => {
+    getList();
+    proxy.$modal.msgSuccess("删除成功");
+  }).catch(() => {});
+}
+
+/** 导出按钮操作 */
+function handleExport() {
+  proxy.download('dye/alarm/export', {
+    ...queryParams.value
+  }, `alarm_${new Date().getTime()}.xlsx`)
+}
+
+getList();
+</script>

src/views/dye/process/export.vue

@@ -67,7 +67,7 @@
     </el-card>
 
     <!-- 导出电量 -->
-    <el-card>
+    <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">
         <!-- 时间选择 -->
@@ -132,15 +132,112 @@
         </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;">
+            <span style="white-space: nowrap; margin-right: 10px;">时间范围：</span>
+            <el-date-picker
+                v-model="alarmParams.date"
+                type="daterange"
+                value-format="YYYY-MM-DD"
+                range-separator="至"
+                start-placeholder="开始日期"
+                end-placeholder="结束日期"
+                style="width: 250px">
+            </el-date-picker>
+          </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="alarmParams.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="alarmParams.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; gap: 10px;">
+            <el-tooltip content="设置将从当前时刻起开始生效" placement="top">
+              <el-button type="primary"
+                         plain
+                         icon="Setting"
+                         @click="openAlarmSetting">告警设置
+              </el-button>
+            </el-tooltip>
+            <el-button type="warning"
+                       plain
+                       icon="Download"
+                       @click="handleExportAlarm">导出
+            </el-button>
+          </div>
+        </el-col>
+      </el-row>
+    </el-card>
+
+    <!-- 告警设置弹窗 -->
+    <el-dialog
+      title="告警设置"
+      v-model="alarmSettingVisible"
+      width="90%"
+      top="30px"
+      :destroy-on-close="true"
+    >
+      <el-alert
+        title="请注意：告警设置保存后，将从设置时刻起开始生效"
+        type="warning"
+        show-icon
+        :closable="false"
+        style="margin-bottom: 15px;"
+      />
+      <set-alarm ref="setAlarmRef"></set-alarm>
+    </el-dialog>
   </div>
 </template>
 
 <script setup name="dyeHourCalc">
 import {listDeviceTypes} from "@/api/dyeing/gyfx";
 import {ref} from 'vue';
+import SetAlarm from './set.vue';
 
 const {proxy} = getCurrentInstance();
 
+const alarmSettingVisible = ref(false);
+const setAlarmRef = ref(null);
+
 const processParams = reactive({
   time: new Date().Format('yyyy-MM-dd') + ' ' + new Date().getHours().toString().padStart(2, '0') + ':' + new Date().getMinutes().toString().padStart(2, '0') + ':00',
   types: [],
@@ -156,6 +253,15 @@ const electricityParams = reactive({
   lines: []
 });
 
+const alarmParams = reactive({
+  date: [
+    new Date(new Date().getTime() - 31 * 60 * 60 * 1000).Format('yyyy-MM-dd'),
+    new Date(new Date().getTime() - 31 * 60 * 60 * 1000).Format('yyyy-MM-dd')
+  ],
+  types: [],
+  lines: []
+});
+
 const equipmentTypeList = ref([]);
 const equipmentTypeOptions = ref([]);
 const allLines = ref(['1', '2', '3', '4', '5', '6', '7', '8']);
@@ -176,10 +282,12 @@ function getList() {
     // 默认选择全部设备类型
     processParams.types = response.rows.map(item => item.typeId);
     electricityParams.types = response.rows.map(item => item.typeId);
+    alarmParams.types = response.rows.map(item => item.typeId);
 
     // 默认选择全部产线
     processParams.lines = [...allLines.value];
     electricityParams.lines = [...allLines.value];
+    alarmParams.lines = [...allLines.value];
   });
 }
 
@@ -201,5 +309,19 @@ function exportElectricity() {
   }, `前整车间电量_${new Date(electricityParams.date[0].replace(/-/g, '/')).Format('yyyyMMdd')}至${new Date(electricityParams.date[1].replace(/-/g, '/')).Format('yyyyMMdd')}.xlsx`)
 }
 
+// 打开告警设置
+function openAlarmSetting() {
+  alarmSettingVisible.value = true;
+}
+
+// 导出告警
+function handleExportAlarm() {
+  proxy.download('dye/process/exportAlarm', {
+    date: alarmParams.date.join(","),
+    types: alarmParams.types,
+    lines: alarmParams.lines
+  }, `前整车间工艺参数告警记录_${new Date(alarmParams.date[0].replace(/-/g, '/')).Format('yyyyMMdd')}至${new Date(alarmParams.date[1].replace(/-/g, '/')).Format('yyyyMMdd')}.xlsx`)
+}
+
 getList();
 </script>

src/views/dye/process/index.vue

@@ -1,84 +1,36 @@
 <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 label="设备类型" prop="typeId">
+        <el-select
+            v-model="queryParams.typeId"
+            placeholder="请选择类型"
+            clearable
+            @change="handleQuery"
+            style="width: 200px"
+        >
+          <el-option
+              v-for="item in typeOptions"
+              :key="item.typeId"
+              :label="item.typeName"
+              :value="item.typeId">
+          </el-option>
+        </el-select>
       </el-form-item>
       <el-form-item label="参数编码" prop="paraCode">
         <el-input
-          v-model="queryParams.paraCode"
-          placeholder="请输入参数编码"
-          clearable
-          @keyup.enter="handleQuery"
+            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"
+            v-model="queryParams.paraName"
+            placeholder="请输入参数名称"
+            clearable
+            @keyup.enter="handleQuery"
         />
       </el-form-item>
       <el-form-item>
@@ -90,124 +42,112 @@
     <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>
+            type="primary"
+            plain
+            icon="Plus"
+            @click="handleAdd"
+            v-hasPermi="['dye:process:remove']"
+        >新增
+        </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>
+            type="success"
+            plain
+            icon="Edit"
+            :disabled="single"
+            @click="handleUpdate"
+            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>
+            type="danger"
+            plain
+            icon="Delete"
+            :disabled="multiple"
+            @click="handleDelete"
+            v-hasPermi="['dye:process:remove']"
+        >删除
+        </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">
+      <el-table-column type="selection" width="55" align="center"/>
+      <el-table-column label="设备类型" align="center">
+        <template #default="scope">
+          <span>{{ getTypeName(scope.row.typeId) }}</span>
+        </template>
+      </el-table-column>
+      <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="coeffSet"/>
+      <el-table-column label="实际值表达式" align="center" prop="paraAct"/>
+      <el-table-column label="实际值系数" align="center" prop="coeffAct"/>
+      <el-table-column label="有效值范围" align="center" prop="validRange">
         <template #default="scope">
-          <span>{{ parseTime(scope.row.createdTime, '{y}-{m}-{d}') }}</span>
+          <el-input
+              v-model="scope.row.validRange"
+              placeholder="例:10-100 或 1.5-2.5"
+              @blur="handleValidRangeChange(scope.row)"
+              @keyup.enter="handleValidRangeChange(scope.row)"
+          />
         </template>
       </el-table-column>
-      <el-table-column label="更新人" align="center" prop="updatedBy" />
-      <el-table-column label="更新时间" align="center" prop="updatedTime" width="180">
+      <el-table-column label="是否告警" align="center" prop="updatedBy">
         <template #default="scope">
-          <span>{{ parseTime(scope.row.updatedTime, '{y}-{m}-{d}') }}</span>
+          <el-switch
+              v-model="scope.row.updatedBy"
+              :active-value="'1'"
+              :inactive-value="'0'"
+              @change="handleAlarmChange(scope.row)"
+          />
         </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>
+          <el-button link type="primary" icon="Edit" @click="handleUpdate(scope.row)"
+                     v-hasPermi="['dye:process:remove']">修改
+          </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"
+        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-input v-model="form.paraCode" placeholder="请输入参数编码"/>
         </el-form-item>
         <el-form-item label="参数名称" prop="paraName">
-          <el-input v-model="form.paraName" placeholder="请输入参数名称" />
+          <el-input v-model="form.paraName" placeholder="请输入参数名称"/>
         </el-form-item>
         <el-form-item label="设定值表达式" prop="paraSet">
-          <el-input v-model="form.paraSet" placeholder="请输入设定值表达式" />
+          <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 label="设定值系数" prop="coeffSet">
+          <el-input v-model="form.coeffSet" 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 label="实际值表达式" prop="paraAct">
+          <el-input v-model="form.paraAct" placeholder="请输入实际值表达式"/>
         </el-form-item>
-        <el-form-item label="备注" prop="remark">
-          <el-input v-model="form.remark" placeholder="请输入备注" />
+        <el-form-item label="实际值系数" prop="coeffAct">
+          <el-input v-model="form.coeffAct" placeholder="请输入实际값系数"/>
         </el-form-item>
       </el-form>
       <template #footer>
@@ -221,11 +161,13 @@
 </template>
 
 <script setup name="Process">
-import { listProcess, getProcess, delProcess, addProcess, updateProcess } from "@/api/dye/process";
+import {addProcess, delProcess, getProcess, listProcess, updateProcess} from "@/api/dye/process";
+import {listType} from "@/api/dye/type";
 
-const { proxy } = getCurrentInstance();
+const {proxy} = getCurrentInstance();
 
 const processList = ref([]);
+const typeOptions = ref([]);
 const open = ref(false);
 const loading = ref(true);
 const showSearch = ref(true);
@@ -239,23 +181,24 @@ const data = reactive({
   form: {},
   queryParams: {
     pageNum: 1,
-    pageSize: 10,
+    pageSize: 20,
     typeId: null,
     paraCode: null,
     paraName: null,
-    paraSet: null,
-    paraAct: null,
-    createdBy: null,
-    createdTime: null,
-    updatedBy: null,
-    updatedTime: null,
     remark: null
   },
   rules: {
+    validRange: [
+      {
+        pattern: /^\d+(\.\d+)?-\d+(\.\d+)?$/,
+        message: '请输入正确格式的数值范围，例如：10-100 或 1.5-2.5',
+        trigger: 'blur'
+      }
+    ]
   }
 });
 
-const { queryParams, form, rules } = toRefs(data);
+const {queryParams, form, rules} = toRefs(data);
 
 /** 查询染整线设备类型工艺参数列表 */
 function getList() {
@@ -267,6 +210,20 @@ function getList() {
   });
 }
 
+/** 查询类型选项 */
+function getTypeOptions() {
+  listType().then(response => {
+    typeOptions.value = response.rows;
+  });
+}
+
+/** 根据类型ID获取类型名称 */
+function getTypeName(typeId) {
+  if (!typeId) return '';
+  const type = typeOptions.value.find(item => item.typeId === typeId);
+  return type ? type.typeName : '';
+}
+
 // 取消按钮
 function cancel() {
   open.value = false;
@@ -281,7 +238,10 @@ function reset() {
     paraCode: null,
     paraName: null,
     paraSet: null,
+    coeffSet: null,
     paraAct: null,
+    coeffAct: null,
+    validRange: null,
     createdBy: null,
     createdTime: null,
     updatedBy: null,
@@ -352,12 +312,45 @@ function submitForm() {
 /** 删除按钮操作 */
 function handleDelete(row) {
   const _tpIds = row.tpId || ids.value;
-  proxy.$modal.confirm('是否确认删除染整线设备类型工艺参数编号为"' + _tpIds + '"的数据项？').then(function() {
+  proxy.$modal.confirm('是否确认删除染整线设备类型工艺参数编号为"' + _tpIds + '"的数据项？').then(function () {
     return delProcess(_tpIds);
   }).then(() => {
     getList();
     proxy.$modal.msgSuccess("删除成功");
-  }).catch(() => {});
+  }).catch(() => {
+  });
+}
+
+/**
+ * 处理有效值范围变更
+ */
+function handleValidRangeChange(row) {
+  // 验证输入格式
+  if (row.validRange && !/^\d+(\.\d+)?-\d+(\.\d+)?$/.test(row.validRange)) {
+    proxy.$modal.msgError("请输入正确格式的数值范围，例如：10-100 或 1.5-2.5");
+    return;
+  }
+
+  // 更新数据
+  updateProcess(row).then(response => {
+    proxy.$modal.msgSuccess("更新成功");
+    getList();
+  }).catch(error => {
+    proxy.$modal.msgError("更新失败");
+  });
+}
+
+/**
+ * 处理告警开关变更
+ */
+function handleAlarmChange(row) {
+  // 更新数据
+  updateProcess(row).then(response => {
+    proxy.$modal.msgSuccess("更新成功");
+    getList();
+  }).catch(error => {
+    proxy.$modal.msgError("更新失败");
+  });
 }
 
 /** 导出按钮操作 */
@@ -367,5 +360,6 @@ function handleExport() {
   }, `process_${new Date().getTime()}.xlsx`)
 }
 
+getTypeOptions();
 getList();
 </script>

src/views/dye/process/set.vue

@@ -0,0 +1,273 @@
+<template>
+  <div class="app-container">
+    <el-form :model="queryParams" ref="queryRef" :inline="true" v-show="showSearch" label-width="68px">
+      <el-form-item label="设备类型" prop="typeId">
+        <el-row>
+          <el-button
+              v-for="item in typeOptions"
+              :key="item.typeId"
+              :type="queryParams.typeId === item.typeId ? 'primary' : 'info'"
+              @click="selectType(item.typeId)"
+              style="margin-right: 10px; margin-bottom: 10px;"
+          >
+            {{ item.typeName }}
+          </el-button>
+        </el-row>
+      </el-form-item>
+    </el-form>
+
+    <el-table v-loading="loading" :data="processList" @selection-change="handleSelectionChange">
+      <el-table-column type="selection" width="55" align="center"/>
+      <el-table-column label="设备类型" align="center">
+        <template #default="scope">
+          <span>{{ getTypeName(scope.row.typeId) }}</span>
+        </template>
+      </el-table-column>
+      <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="coeffSet"/>
+      <el-table-column label="实际值表达式" align="center" prop="paraAct"/>
+      <el-table-column label="实际值系数" align="center" prop="coeffAct"/>
+      <el-table-column label="有效值范围" align="center" prop="validRange">
+        <template #default="scope">
+          <el-input
+              v-model="scope.row.validRange"
+              placeholder="例:10-100 或 1.5-2.5"
+              @blur="handleValidRangeChange(scope.row)"
+              @keyup.enter="handleValidRangeChange(scope.row)"
+          />
+        </template>
+      </el-table-column>
+      <el-table-column label="是否监测" align="center" prop="updatedBy">
+        <template #default="scope">
+          <el-switch
+              v-model="scope.row.updatedBy"
+              :active-value="'1'"
+              :inactive-value="'0'"
+              @change="handleAlarmChange(scope.row)"
+          />
+        </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"
+    />
+
+  </div>
+</template>
+
+<script setup name="Process">
+import {addProcess, delProcess, getProcess, listProcess, updateProcess} from "@/api/dye/process";
+import {listType} from "@/api/dye/type";
+
+const {proxy} = getCurrentInstance();
+
+const processList = ref([]);
+const typeOptions = 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: 20,
+    typeId: null,
+    paraCode: null,
+    paraName: null,
+    remark: null
+  },
+  rules: {
+    validRange: [
+      {
+        pattern: /^\d+(\.\d+)?-\d+(\.\d+)?$/,
+        message: '请输入正确格式的数值范围，例如：10-100 或 1.5-2.5',
+        trigger: 'blur'
+      }
+    ]
+  }
+});
+
+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 getTypeOptions() {
+  listType().then(response => {
+    typeOptions.value = response.rows;
+  });
+}
+
+/** 根据类型ID获取类型名称 */
+function getTypeName(typeId) {
+  if (!typeId) return '';
+  const type = typeOptions.value.find(item => item.typeId === typeId);
+  return type ? type.typeName : '';
+}
+
+// 设备类型选择
+function selectType(typeId) {
+  queryParams.value.typeId = typeId;
+  handleQuery();
+}
+
+// 取消按钮
+function cancel() {
+  open.value = false;
+  reset();
+}
+
+// 表单重置
+function reset() {
+  form.value = {
+    tpId: null,
+    typeId: null,
+    paraCode: null,
+    paraName: null,
+    paraSet: null,
+    coeffSet: null,
+    paraAct: null,
+    coeffAct: null,
+    validRange: 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 handleValidRangeChange(row) {
+  // 验证输入格式
+  if (row.validRange && !/^\d+(\.\d+)?-\d+(\.\d+)?$/.test(row.validRange)) {
+    proxy.$modal.msgError("请输入正确格式的数值范围，例如：10-100 或 1.5-2.5");
+    return;
+  }
+
+  // 更新数据
+  updateProcess(row).then(response => {
+    proxy.$modal.msgSuccess("更新成功");
+    getList();
+  }).catch(error => {
+    proxy.$modal.msgError("更新失败");
+  });
+}
+
+/**
+ * 处理告警开关变更
+ */
+function handleAlarmChange(row) {
+  // 更新数据
+  updateProcess(row).then(response => {
+    proxy.$modal.msgSuccess("更新成功");
+    getList();
+  }).catch(error => {
+    proxy.$modal.msgError("更新失败");
+  });
+}
+
+/** 导出按钮操作 */
+function handleExport() {
+  proxy.download('dye/process/export', {
+    ...queryParams.value
+  }, `process_${new Date().getTime()}.xlsx`)
+}
+
+getTypeOptions();
+getList();
+</script>