From c39e065c7e622208b2dccb906b2d287ec3d58cff Mon Sep 17 00:00:00 2001
From: yinq <yinq>
Date: Tue, 22 Jul 2025 17:41:15 +0800
Subject: [PATCH] =?UTF-8?q?update=20mes=E7=A1=AB=E5=8C=96=E6=A0=87?=
 =?UTF-8?q?=E5=87=86=E4=BF=A1=E6=81=AF=E5=A2=9E=E5=8A=A0=E7=A1=AB=E5=8C=96?=
 =?UTF-8?q?=E5=B7=A5=E8=89=BA=E6=9F=A5=E8=AF=A2?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/api/mes/vulcAlarmStandard/types.ts    |   4 +
 src/views/mes/vulcAlarmStandard/index.vue | 106 +++++++++++++++-------
 2 files changed, 77 insertions(+), 33 deletions(-)

diff --git a/src/api/mes/vulcAlarmStandard/types.ts b/src/api/mes/vulcAlarmStandard/types.ts
index b90b497..48ea867 100644
--- a/src/api/mes/vulcAlarmStandard/types.ts
+++ b/src/api/mes/vulcAlarmStandard/types.ts
@@ -142,6 +142,8 @@ export interface VulcAlarmStandardForm extends BaseEntity {
    */
   stepTime?: number;
 
+  technologyId?: string | number;
+
 }
 
 export interface VulcAlarmStandardQuery extends PageQuery {
@@ -215,6 +217,8 @@ export interface VulcAlarmStandardQuery extends PageQuery {
    * 日期范围参数
    */
   params?: any;
+
+  technologyId?: string | number;
 }
 
 
diff --git a/src/views/mes/vulcAlarmStandard/index.vue b/src/views/mes/vulcAlarmStandard/index.vue
index a66a5fc..194bf74 100644
--- a/src/views/mes/vulcAlarmStandard/index.vue
+++ b/src/views/mes/vulcAlarmStandard/index.vue
@@ -4,13 +4,13 @@
                 :leave-active-class='proxy?.animate.searchAnimate.leave'>
       <div v-show='showSearch' class='mb-[10px]'>
         <el-card shadow='hover'>
-          <el-form ref='queryFormRef' :model='queryParams' :inline='true' label-width='100'>
+          <el-form ref='queryFormRef' :model='queryParams' :inline='true' label-width='80'>
             <!--            <el-form-item label="报警标准ID" prop="alarmStandardId">-->
             <!--              <el-input v-model="queryParams.alarmStandardId" placeholder="请输入报警标准ID" clearable @keyup.enter="handleQuery" />-->
             <!--            </el-form-item>-->
             <el-form-item label='报警项目' prop='alarmItemsId'>
               <el-select v-model='queryParams.alarmItemsId' placeholder='请选择报警项目' clearable
-                         @keyup.enter='handleQuery' >
+                         @keyup.enter='handleQuery'>
                 <el-option
                   v-for='item in alarmItemsList'
                   :key='item.alarmItemsId'
@@ -19,20 +19,31 @@
                 />
               </el-select>
             </el-form-item>
-            <el-form-item label='工艺步序' prop='stepId'>
-              <el-select v-model='queryParams.stepId' placeholder='请选择工艺步序' clearable     @keyup.enter='handleQuery' >
+            <el-form-item label='硫化工艺' prop='technologyId'>
+              <el-select v-model='queryParams.technologyId' placeholder='请选择硫化工艺' clearable
+                         @keyup.enter='handleQuery'>
                 <el-option
-                  v-for='item in technologyStepList'
-                  :key='item.stepId'
-                  :label='item.technologyName + "_" + item.stepName'
-                  :value='item.stepId'
+                  v-for='item in technologyInfoList'
+                  :key='item.technologyId'
+                  :label='item.technologyName'
+                  :value='item.technologyId'
                 />
               </el-select>
             </el-form-item>
-<!--            <el-form-item label='工艺步序编号' prop='stepCode'>-->
-<!--              <el-input v-model='queryParams.stepCode' placeholder='请输入工艺步序编号' clearable-->
-<!--                        @keyup.enter='handleQuery' />-->
+<!--            <el-form-item label='工艺步序' prop='stepId'>-->
+<!--              <el-select v-model='queryParams.stepId' placeholder='请选择工艺步序' clearable @keyup.enter='handleQuery'>-->
+<!--                <el-option-->
+<!--                  v-for='item in technologyStepList'-->
+<!--                  :key='item.stepId'-->
+<!--                  :label='item.stepName'-->
+<!--                  :value='item.stepId'-->
+<!--                />-->
+<!--              </el-select>-->
 <!--            </el-form-item>-->
+            <!--            <el-form-item label='工艺步序编号' prop='stepCode'>-->
+            <!--              <el-input v-model='queryParams.stepCode' placeholder='请输入工艺步序编号' clearable-->
+            <!--                        @keyup.enter='handleQuery' />-->
+            <!--            </el-form-item>-->
             <!--            <el-form-item label="控制标识" prop="activeFlag">-->
             <!--              <el-select v-model="queryParams.activeFlag" placeholder="请选择控制标识" clearable >-->
             <!--                <el-option v-for="dict in active_flag" :key="dict.value" :label="dict.label" :value="dict.value"/>-->
@@ -88,13 +99,13 @@
                          width='120' />
         <el-table-column label='最大值(Mpa/℃)' align='center' prop='maxValue' v-if='columns[8].visible' width='120' />
         <el-table-column label='最小值(Mpa/℃)' align='center' prop='minValue' v-if='columns[9].visible' width='120' />
-        <el-table-column label="数据类型" align="center" prop="dataType" v-if="columns[19].visible">
-          <template #default="scope">
-            <dict-tag :options="machine_data_type" :value="scope.row.dataType"/>
+        <el-table-column label='数据类型' align='center' prop='dataType' v-if='columns[19].visible'>
+          <template #default='scope'>
+            <dict-tag :options='machine_data_type' :value='scope.row.dataType' />
           </template>
         </el-table-column>
-        <el-table-column label="地址" align="center" prop="pointAddress" v-if="columns[20].visible"/>
-        <el-table-column label="频率（毫秒）" align="center" prop="stepTime" v-if="columns[21].visible"  width='120' />
+        <el-table-column label='地址' align='center' prop='pointAddress' v-if='columns[20].visible' />
+        <el-table-column label='频率（毫秒）' align='center' prop='stepTime' v-if='columns[21].visible' width='120' />
         <el-table-column label='控制标识' align='center' prop='activeFlag' v-if='columns[10].visible'>
           <template #default='scope'>
             <dict-tag :options='active_flag' :value='scope.row.activeFlag' />
@@ -131,12 +142,22 @@
             />
           </el-select>
         </el-form-item>
-        <el-form-item label='工艺步序' prop='stepId'>
+        <el-form-item label='硫化工艺' prop='technologyId'>
+          <el-select v-model='form.technologyId' placeholder='请选择硫化工艺'>
+            <el-option
+              v-for='item in technologyInfoList'
+              :key='item.technologyId'
+              :label='item.technologyName'
+              :value='item.technologyId'
+            />
+          </el-select>
+        </el-form-item>
+        <el-form-item label='工艺步序' prop='stepId' v-if='form.technologyId !== undefined'>
           <el-select v-model='form.stepId' placeholder='请选择工艺步序'>
             <el-option
               v-for='item in technologyStepList'
               :key='item.stepId'
-              :label='item.technologyName + "_" + item.stepName'
+              :label='item.stepName'
               :value='item.stepId'
             />
           </el-select>
@@ -159,21 +180,21 @@
         <el-form-item label='最小值(Mpa/℃)' prop='minValue'>
           <el-input v-model='form.minValue' placeholder='请输入最小值(Mpa/℃)' />
         </el-form-item>
-        <el-form-item label="数据类型" prop="dataType">
-          <el-select v-model="form.dataType" placeholder="请选择数据类型">
+        <el-form-item label='数据类型' prop='dataType'>
+          <el-select v-model='form.dataType' placeholder='请选择数据类型'>
             <el-option
-              v-for="dict in machine_data_type"
-              :key="dict.value"
-              :label="dict.label"
-              :value="dict.value"
+              v-for='dict in machine_data_type'
+              :key='dict.value'
+              :label='dict.label'
+              :value='dict.value'
             ></el-option>
           </el-select>
         </el-form-item>
-        <el-form-item label="地址" prop="pointAddress">
-          <el-input v-model="form.pointAddress" placeholder="请输入地址" />
+        <el-form-item label='地址' prop='pointAddress'>
+          <el-input v-model='form.pointAddress' placeholder='请输入地址' />
         </el-form-item>
-        <el-form-item label="频率（毫秒）" prop="stepTime">
-          <el-input v-model="form.stepTime" placeholder="请输入频率（毫秒）" />
+        <el-form-item label='频率（毫秒）' prop='stepTime'>
+          <el-input v-model='form.stepTime' placeholder='请输入频率（毫秒）' />
         </el-form-item>
         <el-form-item label='控制标识' prop='activeFlag'>
           <el-radio-group v-model='form.activeFlag'>
@@ -208,9 +229,9 @@ import {
   updateVulcAlarmStandard
 } from '@/api/mes/vulcAlarmStandard';
 import { VulcAlarmStandardVO, VulcAlarmStandardQuery, VulcAlarmStandardForm } from '@/api/mes/vulcAlarmStandard/types';
-import { getProcessInfoList } from '@/api/mes/baseProcessInfo';
 import { getProdVulcAlarmItemsList } from '@/api/mes/vulcAlarmItems';
 import { getProdTechnologyStepInfoList } from '@/api/mes/technologyStepInfo';
+import { getProdTechnologyInfoList } from '@/api/mes/technologyInfo';
 
 const { proxy } = getCurrentInstance() as ComponentInternalInstance;
 const { active_flag, machine_data_type } = toRefs<any>(proxy?.useDict('active_flag', 'machine_data_type'));
@@ -232,6 +253,7 @@ const dialog = reactive<DialogOption>({
   title: ''
 });
 
+
 /** 查询报警项目下拉框结构 */
 const alarmItemsList = ref([]);
 const getSelectVulcAlarmItemsList = async () => {
@@ -240,9 +262,17 @@ const getSelectVulcAlarmItemsList = async () => {
 };
 
 /** 查询硫化工艺下拉框结构 */
+const technologyInfoList = ref([]);
+const getSelectProdTechnologyInfoList = async () => {
+  let res = await getProdTechnologyInfoList({ processId: 18 });
+  technologyInfoList.value = res.data;
+};
+
+
+/** 查询硫化工艺步序下拉框结构 */
 const technologyStepList = ref([]);
-const getSelectTechnologyStepInfoList = async () => {
-  let res = await getProdTechnologyStepInfoList({ processId: 18 });
+const getSelectTechnologyStepInfoList = async (technologyId: number) => {
+  let res = await getProdTechnologyStepInfoList({ processId: 18, technologyId: technologyId });
   technologyStepList.value = res.data;
 };
 
@@ -269,7 +299,7 @@ const columns = ref<FieldOption[]>([
   { key: 18, label: `工艺名称`, visible: true },
   { key: 19, label: `数据类型`, visible: true },
   { key: 20, label: `地址`, visible: true },
-  { key: 21, label: `频率（毫秒）`, visible: true },
+  { key: 21, label: `频率（毫秒）`, visible: true }
 ]);
 
 const initFormData: VulcAlarmStandardForm = {
@@ -306,6 +336,9 @@ const data = reactive<PageData<VulcAlarmStandardForm, VulcAlarmStandardQuery>>({
     alarmItemsId: [
       { required: true, message: '报警项目不能为空', trigger: 'blur' }
     ],
+    technologyId: [
+      { required: true, message: '硫化工艺不能为空', trigger: 'blur' }
+    ],
     stepId: [
       { required: true, message: '工艺步序不能为空', trigger: 'blur' }
     ]
@@ -314,6 +347,13 @@ const data = reactive<PageData<VulcAlarmStandardForm, VulcAlarmStandardQuery>>({
 
 const { queryParams, form, rules } = toRefs(data);
 
+watch(
+  () => form.value.technologyId,
+  (newVal: number, oldVal: number) => {
+    getSelectTechnologyStepInfoList(newVal);
+  }
+);
+
 /** 查询报警标准信息列表 */
 const getList = async () => {
   loading.value = true;
@@ -406,7 +446,7 @@ const handleExport = () => {
 
 onMounted(() => {
   getSelectVulcAlarmItemsList();
-  getSelectTechnologyStepInfoList();
+  getSelectProdTechnologyInfoList();
   getList();
 });
 </script>