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'>
-
+
+ @keyup.enter='handleQuery'>
-
-
+
+
-
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
@@ -88,13 +99,13 @@
width='120' />
-
-
-
+
+
+
-
-
+
+
@@ -131,12 +142,22 @@
/>
-
+
+
+
+
+
+
@@ -159,21 +180,21 @@
-
-
+
+
-
-
+
+
-
-
+
+
@@ -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(proxy?.useDict('active_flag', 'machine_data_type'));
@@ -232,6 +253,7 @@ const dialog = reactive({
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([
{ 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>({
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>({
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();
});