xins
/
hwmom-ui
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

update Dms报警规则关联信息、机台添加字段

Browse Source
master
yinq 3 months ago
parent 474f4f28e7
commit cd85acada1
4 changed files with 362 additions and 245 deletions
Show Stats Download Patch File Download Diff File

2
src/api/dms/alarmLevel/types.ts
Unescape Escape View File

@ -55,7 +55,7 @@ export interface AlarmLevelForm extends BaseEntity {
/** /**
* 默认通知方式（1、邮箱，2、短信，3、钉钉，4、微信公众号，5、企业微信），多个保存用,隔开。 * 默认通知方式（1、邮箱，2、短信，3、钉钉，4、微信公众号，5、企业微信），多个保存用,隔开。
*/ */
defaultNotifyMode?: string; defaultNotifyMode?: [];
/** /**
* 描述 * 描述

228
src/views/dms/alarmLevel/index.vue
Unescape Escape View File

@ -1,132 +1,142 @@
<template> <template>
<div class="p-2"> <div class='p-2'>
<transition :enter-active-class="proxy?.animate.searchAnimate.enter" :leave-active-class="proxy?.animate.searchAnimate.leave"> <transition :enter-active-class='proxy?.animate.searchAnimate.enter'
<div v-show="showSearch" class="mb-[10px]"> :leave-active-class='proxy?.animate.searchAnimate.leave'>
<el-card shadow="hover"> <div v-show='showSearch' class='mb-[10px]'>
<el-form ref="queryFormRef" :model="queryParams" :inline="true"> <el-card shadow='hover'>
<el-form-item label="报警级别ID" prop="alarmLevelId"> <el-form ref='queryFormRef' :model='queryParams' :inline='true' label-width='100px'>
<el-input v-model="queryParams.alarmLevelId" placeholder="请输入报警级别ID" clearable @keyup.enter="handleQuery" /> <el-form-item label='报警级别名称' prop='alarmLevelName'>
</el-form-item> <el-input v-model='queryParams.alarmLevelName' placeholder='请输入报警级别名称' clearable
<el-form-item label="报警级别名称" prop="alarmLevelName"> @keyup.enter='handleQuery' />
<el-input v-model="queryParams.alarmLevelName" placeholder="请输入报警级别名称" clearable @keyup.enter="handleQuery" />
</el-form-item>
<el-form-item label="严重程度" prop="levelNumber">
<el-input v-model="queryParams.levelNumber" placeholder="请输入严重程度" clearable @keyup.enter="handleQuery" />
</el-form-item>
<el-form-item label="状态" prop="levelStatus">
<el-select v-model="queryParams.levelStatus" placeholder="请选择状态" clearable >
<el-option v-for="dict in dms_level_status" :key="dict.value" :label="dict.label" :value="dict.value"/>
</el-select>
</el-form-item> </el-form-item>
<!-- <el-form-item label="状态" prop="levelStatus">-->
<!-- <el-select v-model="queryParams.levelStatus" placeholder="请选择状态" clearable >-->
<!-- <el-option v-for="dict in dms_level_status" :key="dict.value" :label="dict.label" :value="dict.value"/>-->
<!-- </el-select>-->
<!-- </el-form-item>-->
<el-form-item> <el-form-item>
<el-button type="primary" icon="Search" @click="handleQuery">搜索</el-button> <el-button type='primary' icon='Search' @click='handleQuery'>搜索</el-button>
<el-button icon="Refresh" @click="resetQuery">重置</el-button> <el-button icon='Refresh' @click='resetQuery'>重置</el-button>
</el-form-item> </el-form-item>
</el-form> </el-form>
</el-card> </el-card>
</div> </div>
</transition> </transition>
<el-card shadow="never"> <el-card shadow='never'>
<template #header> <template #header>
<el-row :gutter="10" class="mb8"> <el-row :gutter='10' class='mb8'>
<el-col :span="1.5"> <el-col :span='1.5'>
<el-button type="primary" plain icon="Plus" @click="handleAdd" v-hasPermi="['dms:alarmLevel:add']">新增</el-button> <el-button type='primary' plain icon='Plus' @click='handleAdd' v-hasPermi="['dms:alarmLevel:add']">新增
</el-button>
</el-col> </el-col>
<el-col :span="1.5"> <el-col :span='1.5'>
<el-button type="success" plain icon="Edit" :disabled="single" @click="handleUpdate()" v-hasPermi="['dms:alarmLevel:edit']">修改</el-button> <el-button type='success' plain icon='Edit' :disabled='single' @click='handleUpdate()'
v-hasPermi="['dms:alarmLevel:edit']">修改
</el-button>
</el-col> </el-col>
<el-col :span="1.5"> <el-col :span='1.5'>
<el-button type="danger" plain icon="Delete" :disabled="multiple" @click="handleDelete()" v-hasPermi="['dms:alarmLevel:remove']">删除</el-button> <el-button type='danger' plain icon='Delete' :disabled='multiple' @click='handleDelete()'
v-hasPermi="['dms:alarmLevel:remove']">删除
</el-button>
</el-col> </el-col>
<el-col :span="1.5"> <el-col :span='1.5'>
<el-button type="warning" plain icon="Download" @click="handleExport" v-hasPermi="['dms:alarmLevel:export']">导出</el-button> <el-button type='warning' plain icon='Download' @click='handleExport'
v-hasPermi="['dms:alarmLevel:export']">导出
</el-button>
</el-col> </el-col>
<right-toolbar v-model:showSearch="showSearch" :columns="columns" :search="true" @queryTable="getList"></right-toolbar> <right-toolbar v-model:showSearch='showSearch' :columns='columns' :search='true'
@queryTable='getList'></right-toolbar>
</el-row> </el-row>
</template> </template>
<el-table v-loading="loading" :data="alarmLevelList" @selection-change="handleSelectionChange"> <el-table v-loading='loading' :data='alarmLevelList' @selection-change='handleSelectionChange'>
<el-table-column type="selection" width="55" align="center" /> <el-table-column type='selection' width='55' align='center' />
<el-table-column label="报警级别ID" align="center" prop="alarmLevelId" v-if="columns[0].visible"/> <el-table-column label='报警级别ID' align='center' prop='alarmLevelId' v-if='columns[0].visible' />
<el-table-column label="报警级别名称" align="center" prop="alarmLevelName" v-if="columns[1].visible"/> <el-table-column label='报警级别名称' align='center' prop='alarmLevelName' v-if='columns[1].visible' />
<el-table-column label="严重程度" align="center" prop="levelNumber" v-if="columns[3].visible"/> <el-table-column label='严重程度' align='center' prop='levelNumber' v-if='columns[3].visible' />
<el-table-column label="状态" align="center" prop="levelStatus" v-if="columns[4].visible"> <el-table-column label='状态' align='center' prop='levelStatus' v-if='columns[4].visible'>
<template #default="scope"> <template #default='scope'>
<dict-tag :options="dms_level_status" :value="scope.row.levelStatus"/> <dict-tag :options='dms_level_status' :value='scope.row.levelStatus' />
</template> </template>
</el-table-column> </el-table-column>
<el-table-column label="默认通知方式" align="center" prop="defaultNotifyMode" v-if="columns[5].visible"> <el-table-column label='默认通知方式' align='center' prop='defaultNotifyMode' v-if='columns[5].visible'>
<template #default="scope"> <template #default='scope'>
<dict-tag :options="dms_default_notify_mode" :value="scope.row.defaultNotifyMode ? scope.row.defaultNotifyMode.split(',') : []"/> <dict-tag :options='dms_default_notify_mode'
:value="scope.row.defaultNotifyMode ? scope.row.defaultNotifyMode.split(',') : []" />
</template> </template>
</el-table-column> </el-table-column>
<el-table-column label="描述" align="center" prop="remark" v-if="columns[6].visible"/> <el-table-column label='描述' align='center' prop='remark' v-if='columns[6].visible' />
<el-table-column label="操作" align="center" class-name="small-padding fixed-width"> <el-table-column label='操作' align='center' class-name='small-padding fixed-width'>
<template #default="scope"> <template #default='scope'>
<el-tooltip content="修改" placement="top"> <el-tooltip content='修改' placement='top'>
<el-button link type="primary" icon="Edit" @click="handleUpdate(scope.row)" v-hasPermi="['dms:alarmLevel:edit']"></el-button> <el-button link type='primary' icon='Edit' @click='handleUpdate(scope.row)'
v-hasPermi="['dms:alarmLevel:edit']"></el-button>
</el-tooltip> </el-tooltip>
<el-tooltip content="删除" placement="top"> <el-tooltip content='删除' placement='top'>
<el-button link type="primary" icon="Delete" @click="handleDelete(scope.row)" v-hasPermi="['dms:alarmLevel:remove']"></el-button> <el-button link type='primary' icon='Delete' @click='handleDelete(scope.row)'
v-hasPermi="['dms:alarmLevel:remove']"></el-button>
</el-tooltip> </el-tooltip>
</template> </template>
</el-table-column> </el-table-column>
</el-table> </el-table>
<pagination v-show="total > 0" :total="total" v-model:page="queryParams.pageNum" v-model:limit="queryParams.pageSize" @pagination="getList" /> <pagination v-show='total > 0' :total='total' v-model:page='queryParams.pageNum'
v-model:limit='queryParams.pageSize' @pagination='getList' />
</el-card> </el-card>
<!-- 添加或修改报警级别对话框 --> <!-- 添加或修改报警级别对话框 -->
<el-dialog :title="dialog.title" v-model="dialog.visible" width="500px" append-to-body> <el-dialog :title='dialog.title' v-model='dialog.visible' width='500px' append-to-body>
<el-form ref="alarmLevelFormRef" :model="form" :rules="rules" label-width="80px"> <el-form ref='alarmLevelFormRef' :model='form' :rules='rules' label-width='110px'>
<el-form-item label="报警级别ID" prop="alarmLevelId"> <el-form-item label='报警级别名称' prop='alarmLevelName'>
<el-input v-model="form.alarmLevelId" placeholder="请输入报警级别ID" /> <el-input v-model='form.alarmLevelName' placeholder='请输入报警级别名称' />
</el-form-item> </el-form-item>
<el-form-item label="报警级别名称" prop="alarmLevelName"> <el-form-item label='严重程度' prop='levelNumber'>
<el-input v-model="form.alarmLevelName" placeholder="请输入报警级别名称" /> <el-input-number v-model='form.levelNumber' placeholder='请输入严重程度' style='width: 220px;' />
<span style='color: #8d8c8c;'>注：数字越大，严重程度越高</span>
</el-form-item> </el-form-item>
<el-form-item label="严重程度" prop="levelNumber"> <!-- <el-form-item label='状态' prop='levelStatus'>-->
<el-input v-model="form.levelNumber" placeholder="请输入严重程度" /> <!-- <el-radio-group v-model='form.levelStatus'>-->
</el-form-item> <!-- <el-radio-->
<el-form-item label="状态" prop="levelStatus"> <!-- v-for='dict in dms_level_status'-->
<el-radio-group v-model="form.levelStatus"> <!-- :key='dict.value'-->
<el-radio <!-- :value='dict.value'-->
v-for="dict in dms_level_status" <!-- >{{ dict.label }}-->
:key="dict.value" <!-- </el-radio>-->
:value="dict.value" <!-- </el-radio-group>-->
>{{dict.label}}</el-radio> <!-- </el-form-item>-->
</el-radio-group> <el-form-item label='默认通知方式' prop='defaultNotifyMode'>
</el-form-item> <el-checkbox-group v-model='form.defaultNotifyMode'>
<el-form-item label="默认通知方式" prop="defaultNotifyMode">
<el-checkbox-group v-model="form.defaultNotifyMode">
<el-checkbox <el-checkbox
v-for="dict in dms_default_notify_mode" v-for='dict in dms_default_notify_mode'
:key="dict.value" :key='dict.value'
:label="dict.value"> :label='dict.value'>
{{ dict.label }} {{ dict.label }}
</el-checkbox> </el-checkbox>
</el-checkbox-group> </el-checkbox-group>
</el-form-item> </el-form-item>
<el-form-item label="描述" prop="remark"> <el-form-item label='描述' prop='remark'>
<el-input v-model="form.remark" placeholder="请输入描述" /> <el-input v-model='form.remark' type='textarea' placeholder='请输入描述' />
</el-form-item> </el-form-item>
</el-form> </el-form>
<template #footer> <template #footer>
<div class="dialog-footer"> <div class='dialog-footer'>
<el-button :loading="buttonLoading" type="primary" @click="submitForm">确 定</el-button> <el-button :loading='buttonLoading' type='primary' @click='submitForm'>确 定</el-button>
<el-button @click="cancel">取 消</el-button> <el-button @click='cancel'>取 消</el-button>
</div> </div>
</template> </template>
</el-dialog> </el-dialog>
</div> </div>
</template> </template>
<script setup name="AlarmLevel" lang="ts"> <script setup name='AlarmLevel' lang='ts'>
import { listAlarmLevel, getAlarmLevel, delAlarmLevel, addAlarmLevel, updateAlarmLevel } from '@/api/dms/alarmLevel'; import { listAlarmLevel, getAlarmLevel, delAlarmLevel, addAlarmLevel, updateAlarmLevel } from '@/api/dms/alarmLevel';
import { AlarmLevelVO, AlarmLevelQuery, AlarmLevelForm } from '@/api/dms/alarmLevel/types'; import { AlarmLevelVO, AlarmLevelQuery, AlarmLevelForm } from '@/api/dms/alarmLevel/types';
const { proxy } = getCurrentInstance() as ComponentInternalInstance; const { proxy } = getCurrentInstance() as ComponentInternalInstance;
const { dms_level_status, dms_default_notify_mode } = toRefs<any>(proxy?.useDict('dms_level_status', 'dms_default_notify_mode')); const {
dms_level_status,
dms_default_notify_mode
} = toRefs<any>(proxy?.useDict('dms_level_status', 'dms_default_notify_mode'));
const alarmLevelList = ref<AlarmLevelVO[]>([]); const alarmLevelList = ref<AlarmLevelVO[]>([]);
const buttonLoading = ref(false); const buttonLoading = ref(false);
@ -147,7 +157,7 @@ const dialog = reactive<DialogOption>({
// 列显隐信息 // 列显隐信息
const columns = ref<FieldOption[]>([ const columns = ref<FieldOption[]>([
{ key: 0, label: `报警级别ID`, visible: true }, { key: 0, label: `报警级别ID`, visible: false },
{ key: 1, label: `报警级别名称`, visible: true }, { key: 1, label: `报警级别名称`, visible: true },
{ key: 2, label: `租户编号`, visible: true }, { key: 2, label: `租户编号`, visible: true },
{ key: 3, label: `严重程度`, visible: true }, { key: 3, label: `严重程度`, visible: true },
@ -158,17 +168,18 @@ const columns = ref<FieldOption[]>([
{ key: 8, label: `创建人`, visible: true }, { key: 8, label: `创建人`, visible: true },
{ key: 9, label: `创建时间`, visible: true }, { key: 9, label: `创建时间`, visible: true },
{ key: 10, label: `更新人`, visible: true }, { key: 10, label: `更新人`, visible: true },
{ key: 11, label: `更新时间`, visible: true }, { key: 11, label: `更新时间`, visible: true }
]); ]);
const initFormData: AlarmLevelForm = { const initFormData: AlarmLevelForm = {
alarmLevelId: undefined, alarmLevelId: undefined,
alarmLevelName: undefined, alarmLevelName: undefined,
levelNumber: undefined, levelNumber: undefined,
levelStatus: undefined, levelStatus: '1',
defaultNotifyMode: [], defaultNotifyMode: [],
remark: undefined, remark: undefined
} };
const data = reactive<PageData<AlarmLevelForm, AlarmLevelQuery>>({ const data = reactive<PageData<AlarmLevelForm, AlarmLevelQuery>>({
form: { ...initFormData }, form: { ...initFormData },
queryParams: { queryParams: {
@ -179,16 +190,15 @@ const data = reactive<PageData<AlarmLevelForm, AlarmLevelQuery>>({
levelNumber: undefined, levelNumber: undefined,
levelStatus: undefined, levelStatus: undefined,
defaultNotifyMode: undefined, defaultNotifyMode: undefined,
params: { params: {}
}
}, },
rules: { rules: {
alarmLevelName: [ alarmLevelName: [
{ required: true, message: "报警级别名称不能为空", trigger: "blur" } { required: true, message: '报警级别名称不能为空', trigger: 'blur' }
], ],
defaultNotifyMode: [ defaultNotifyMode: [
{ required: true, message: "默认通知方式不能为空", trigger: "blur" } { required: true, message: '默认通知方式不能为空', trigger: 'blur' }
], ]
} }
}); });
@ -201,90 +211,90 @@ const getList = async () => {
alarmLevelList.value = res.rows; alarmLevelList.value = res.rows;
total.value = res.total; total.value = res.total;
loading.value = false; loading.value = false;
} };
/** 取消按钮 */ /** 取消按钮 */
const cancel = () => { const cancel = () => {
reset(); reset();
dialog.visible = false; dialog.visible = false;
} };
/** 表单重置 */ /** 表单重置 */
const reset = () => { const reset = () => {
form.value = { ...initFormData }; form.value = { ...initFormData };
alarmLevelFormRef.value?.resetFields(); alarmLevelFormRef.value?.resetFields();
} };
/** 搜索按钮操作 */ /** 搜索按钮操作 */
const handleQuery = () => { const handleQuery = () => {
queryParams.value.pageNum = 1; queryParams.value.pageNum = 1;
getList(); getList();
} };
/** 重置按钮操作 */ /** 重置按钮操作 */
const resetQuery = () => { const resetQuery = () => {
queryFormRef.value?.resetFields(); queryFormRef.value?.resetFields();
handleQuery(); handleQuery();
} };
/** 多选框选中数据 */ /** 多选框选中数据 */
const handleSelectionChange = (selection: AlarmLevelVO[]) => { const handleSelectionChange = (selection: AlarmLevelVO[]) => {
ids.value = selection.map(item => item.alarmLevelId); ids.value = selection.map(item => item.alarmLevelId);
single.value = selection.length != 1; single.value = selection.length != 1;
multiple.value = !selection.length; multiple.value = !selection.length;
} };
/** 新增按钮操作 */ /** 新增按钮操作 */
const handleAdd = () => { const handleAdd = () => {
reset(); reset();
dialog.visible = true; dialog.visible = true;
dialog.title = "添加报警级别"; dialog.title = '添加报警级别';
} };
/** 修改按钮操作 */ /** 修改按钮操作 */
const handleUpdate = async (row?: AlarmLevelVO) => { const handleUpdate = async (row?: AlarmLevelVO) => {
reset(); reset();
const _alarmLevelId = row?.alarmLevelId || ids.value[0] const _alarmLevelId = row?.alarmLevelId || ids.value[0];
const res = await getAlarmLevel(_alarmLevelId); const res = await getAlarmLevel(_alarmLevelId);
Object.assign(form.value, res.data); Object.assign(form.value, res.data);
form.value.defaultNotifyMode = form.value.defaultNotifyMode.split(","); form.value.defaultNotifyMode = form.value.defaultNotifyMode.split(',');
dialog.visible = true; dialog.visible = true;
dialog.title = "修改报警级别"; dialog.title = '修改报警级别';
} };
/** 提交按钮 */ /** 提交按钮 */
const submitForm = () => { const submitForm = () => {
alarmLevelFormRef.value?.validate(async (valid: boolean) => { alarmLevelFormRef.value?.validate(async (valid: boolean) => {
if (valid) { if (valid) {
buttonLoading.value = true; buttonLoading.value = true;
form.value.defaultNotifyMode = form.value.defaultNotifyMode.join(","); form.value.defaultNotifyMode = form.value.defaultNotifyMode.join(',');
if (form.value.alarmLevelId) { if (form.value.alarmLevelId) {
await updateAlarmLevel(form.value).finally(() => buttonLoading.value = false); await updateAlarmLevel(form.value).finally(() => buttonLoading.value = false);
} else { } else {
await addAlarmLevel(form.value).finally(() => buttonLoading.value = false); await addAlarmLevel(form.value).finally(() => buttonLoading.value = false);
} }
proxy?.$modal.msgSuccess("操作成功"); proxy?.$modal.msgSuccess('操作成功');
dialog.visible = false; dialog.visible = false;
await getList(); await getList();
} }
}); });
} };
/** 删除按钮操作 */ /** 删除按钮操作 */
const handleDelete = async (row?: AlarmLevelVO) => { const handleDelete = async (row?: AlarmLevelVO) => {
const _alarmLevelIds = row?.alarmLevelId || ids.value; const _alarmLevelIds = row?.alarmLevelId || ids.value;
await proxy?.$modal.confirm('是否确认删除报警级别编号为"' + _alarmLevelIds + '"的数据项？').finally(() => loading.value = false); await proxy?.$modal.confirm('是否确认删除报警级别编号为"' + _alarmLevelIds + '"的数据项？').finally(() => loading.value = false);
await delAlarmLevel(_alarmLevelIds); await delAlarmLevel(_alarmLevelIds);
proxy?.$modal.msgSuccess("删除成功"); proxy?.$modal.msgSuccess('删除成功');
await getList(); await getList();
} };
/** 导出按钮操作 */ /** 导出按钮操作 */
const handleExport = () => { const handleExport = () => {
proxy?.download('dms/alarmLevel/export', { proxy?.download('dms/alarmLevel/export', {
...queryParams.value ...queryParams.value
}, `alarmLevel_${new Date().getTime()}.xlsx`) }, `alarmLevel_${new Date().getTime()}.xlsx`);
} };
onMounted(() => { onMounted(() => {
getList(); getList();

257
src/views/dms/alarmRule/index.vue
Unescape Escape View File

@ -5,70 +5,38 @@
<div v-show='showSearch' class='mb-[10px]'> <div v-show='showSearch' class='mb-[10px]'>
<el-card shadow='hover'> <el-card shadow='hover'>
<el-form ref='queryFormRef' :model='queryParams' :inline='true'> <el-form ref='queryFormRef' :model='queryParams' :inline='true'>
<el-form-item label='报警规则ID，主键' prop='alarmRuleId'>
<el-input v-model='queryParams.alarmRuleId' placeholder='请输入报警规则ID，主键' clearable
@keyup.enter='handleQuery' />
</el-form-item>
<el-form-item label='规则名称' prop='alarmRuleName'> <el-form-item label='规则名称' prop='alarmRuleName'>
<el-input v-model='queryParams.alarmRuleName' placeholder='请输入规则名称' clearable <el-input v-model='queryParams.alarmRuleName' placeholder='请输入规则名称' clearable
@keyup.enter='handleQuery' /> @keyup.enter='handleQuery' />
</el-form-item> </el-form-item>
<el-form-item label='报警级别，关联表hw_alarm_level字段alarm_level_id' prop='alarmLevelId'> <!-- <el-form-item label='报警级别' prop='alarmLevelId'>-->
<el-input v-model='queryParams.alarmLevelId' placeholder='请输入报警级别，关联表hw_alarm_level字段alarm_level_id' <!-- <el-input v-model='queryParams.alarmLevelId' placeholder='请输入报警级别'-->
clearable @keyup.enter='handleQuery' /> <!-- clearable @keyup.enter='handleQuery' />-->
</el-form-item> <!-- </el-form-item>-->
<el-form-item label='报警类型，关联表hw_alarm_type字段alarm_type_id' prop='alarmTypeId'> <!-- <el-form-item label='报警类型' prop='alarmTypeId'>-->
<el-input v-model='queryParams.alarmTypeId' placeholder='请输入报警类型，关联表hw_alarm_type字段alarm_type_id' <!-- <el-input v-model='queryParams.alarmTypeId' placeholder='请输入报警类型'-->
clearable @keyup.enter='handleQuery' /> <!-- clearable @keyup.enter='handleQuery' />-->
</el-form-item> <!-- </el-form-item>-->
<el-form-item label='规则类型' prop='ruleType'> <el-form-item label='规则类型' prop='ruleType'>
<el-select v-model='queryParams.ruleType' placeholder='请选择规则类型' clearable> <el-select v-model='queryParams.ruleType' placeholder='请选择规则类型' clearable>
<el-option v-for='dict in dms_rule_type' :key='dict.value' :label='dict.label' :value='dict.value' /> <el-option v-for='dict in dms_rule_type' :key='dict.value' :label='dict.label' :value='dict.value' />
</el-select> </el-select>
</el-form-item> </el-form-item>
<el-form-item label='关联表hw_device字段device_id。' prop='ruleDeviceId'> <!-- <el-form-item label='联动标识' prop='linkFlag'>-->
<el-input v-model='queryParams.ruleDeviceId' placeholder='请输入关联表hw_device字段device_id。' clearable <!-- <el-select v-model='queryParams.linkFlag' placeholder='请选择联动标识' clearable>-->
@keyup.enter='handleQuery' /> <!-- <el-option v-for='dict in active_flag' :key='dict.value' :label='dict.label' :value='dict.value' />-->
</el-form-item> <!-- </el-select>-->
<el-form-item label='关联表hw_device_mode字段device_mode_id；' prop='ruleDeviceModeId'> <!-- </el-form-item>-->
<el-input v-model='queryParams.ruleDeviceModeId' placeholder='请输入关联表hw_device_mode字段device_mode_id；' <!-- <el-form-item label='报警启用状态' prop='alarmRuleStatus'>-->
clearable @keyup.enter='handleQuery' /> <!-- <el-select v-model='queryParams.alarmRuleStatus' placeholder='请选择报警启用状态' clearable>-->
</el-form-item> <!-- <el-option v-for='dict in active_flag' :key='dict.value' :label='dict.label' :value='dict.value' />-->
<el-form-item label='一共有几个属性规则' prop='ruleFunctionTotal'> <!-- </el-select>-->
<el-input v-model='queryParams.ruleFunctionTotal' placeholder='请输入一共有几个属性规则' clearable <!-- </el-form-item>-->
@keyup.enter='handleQuery' /> <!-- <el-form-item label='报警推送标识' prop='alarmPushFlag'>-->
</el-form-item> <!-- <el-select v-model='queryParams.alarmPushFlag' placeholder='请选择报警推送标识' clearable>-->
<el-form-item label='表达式，例如:{}>60 or {}<-88' prop='triggerExpression'> <!-- <el-option v-for='dict in active_flag' :key='dict.value' :label='dict.label' :value='dict.value' />-->
<el-input v-model='queryParams.triggerExpression' placeholder='请输入表达式，例如:{}>60 or {}<-88' clearable <!-- </el-select>-->
@keyup.enter='handleQuery' /> <!-- </el-form-item>-->
</el-form-item>
<el-form-item label='联动标识' prop='linkFlag'>
<el-select v-model='queryParams.linkFlag' placeholder='请选择联动标识' clearable>
<el-option v-for='dict in active_flag' :key='dict.value' :label='dict.label' :value='dict.value' />
</el-select>
</el-form-item>
<el-form-item label='报警启用状态(1、是，0、否）' prop='alarmRuleStatus'>
<el-select v-model='queryParams.alarmRuleStatus' placeholder='请选择报警启用状态(1、是，0、否）' clearable>
<el-option v-for='dict in active_flag' :key='dict.value' :label='dict.label' :value='dict.value' />
</el-select>
</el-form-item>
<el-form-item label='报警推送标识(1、是，0、否）' prop='alarmPushFlag'>
<el-select v-model='queryParams.alarmPushFlag' placeholder='请选择报警推送标识(1、是，0、否）' clearable>
<el-option v-for='dict in active_flag' :key='dict.value' :label='dict.label' :value='dict.value' />
</el-select>
</el-form-item>
<el-form-item label='时间范围' prop='triggerTimeFrame'>
<el-input v-model='queryParams.triggerTimeFrame' placeholder='请输入时间范围' clearable
@keyup.enter='handleQuery' />
</el-form-item>
<el-form-item label='触发阈值次数' prop='triggerNumber'>
<el-input v-model='queryParams.triggerNumber' placeholder='请输入触发阈值次数' clearable
@keyup.enter='handleQuery' />
</el-form-item>
<el-form-item label='触发死区' prop='triggerDeadzone'>
<el-input v-model='queryParams.triggerDeadzone' placeholder='请输入触发死区' clearable
@keyup.enter='handleQuery' />
</el-form-item>
<el-form-item> <el-form-item>
<el-button type='primary' icon='Search' @click='handleQuery'>搜索</el-button> <el-button type='primary' icon='Search' @click='handleQuery'>搜索</el-button>
<el-button icon='Refresh' @click='resetQuery'>重置</el-button> <el-button icon='Refresh' @click='resetQuery'>重置</el-button>
@ -107,41 +75,41 @@
<el-table v-loading='loading' :data='alarmRuleList' @selection-change='handleSelectionChange'> <el-table v-loading='loading' :data='alarmRuleList' @selection-change='handleSelectionChange'>
<el-table-column type='selection' width='55' align='center' /> <el-table-column type='selection' width='55' align='center' />
<el-table-column label='报警规则ID，主键' align='center' prop='alarmRuleId' v-if='columns[0].visible' /> <el-table-column label='报警规则ID' align='center' prop='alarmRuleId' v-if='columns[0].visible' />
<el-table-column label='规则名称' align='center' prop='alarmRuleName' v-if='columns[1].visible' /> <el-table-column label='规则名称' align='center' prop='alarmRuleName' v-if='columns[1].visible' width='130' />
<el-table-column label='报警级别，关联表hw_alarm_level字段alarm_level_id' align='center' prop='alarmLevelId' <el-table-column label='报警级别' align='center' prop='alarmLevelName'
v-if='columns[3].visible' /> v-if='columns[3].visible' />
<el-table-column label='报警类型，关联表hw_alarm_type字段alarm_type_id' align='center' prop='alarmTypeId' <el-table-column label='报警类型' align='center' prop='alarmTypeName'
v-if='columns[4].visible' /> v-if='columns[4].visible' />
<el-table-column label='规则类型' align='center' prop='ruleType' v-if='columns[5].visible'> <el-table-column label='规则类型' align='center' prop='ruleType' v-if='columns[5].visible'>
<template #default='scope'> <template #default='scope'>
<dict-tag :options='dms_rule_type' :value='scope.row.ruleType' /> <dict-tag :options='dms_rule_type' :value='scope.row.ruleType' />
</template> </template>
</el-table-column> </el-table-column>
<el-table-column label='关联表hw_device字段device_id。' align='center' prop='ruleDeviceId' <el-table-column label='设备名称' align='center' prop='ruleDeviceName'
v-if='columns[6].visible' /> v-if='columns[6].visible' />
<el-table-column label='关联表hw_device_mode字段device_mode_id；' align='center' prop='ruleDeviceModeId' <el-table-column label='设备模型' align='center' prop='ruleDeviceModeName'
v-if='columns[7].visible' /> v-if='columns[7].visible' width='110' />
<el-table-column label='一共有几个属性规则' align='center' prop='ruleFunctionTotal' v-if='columns[8].visible' /> <el-table-column label='属性规则数量' align='center' prop='ruleFunctionTotal' v-if='columns[8].visible' width='110' />
<el-table-column label='表达式，例如:{}>60 or {}<-88' align='center' prop='triggerExpression' <el-table-column label='表达式' align='center' prop='triggerExpression' v-if='columns[9].visible' width='120' />
v-if='columns[9].visible' />
<el-table-column label='联动标识' align='center' prop='linkFlag' v-if='columns[10].visible'> <el-table-column label='联动标识' align='center' prop='linkFlag' v-if='columns[10].visible'>
<template #default='scope'> <template #default='scope'>
<dict-tag :options='active_flag' :value='scope.row.linkFlag' /> <dict-tag :options='active_flag' :value='scope.row.linkFlag' />
</template> </template>
</el-table-column> </el-table-column>
<el-table-column label='报警启用状态(1、是，0、否）' align='center' prop='alarmRuleStatus' v-if='columns[11].visible'> <el-table-column label='报警启用状态' align='center' prop='alarmRuleStatus' v-if='columns[11].visible' width='110'>
<template #default='scope'> <template #default='scope'>
<dict-tag :options='active_flag' :value='scope.row.alarmRuleStatus' /> <dict-tag :options='active_flag' :value='scope.row.alarmRuleStatus' />
</template> </template>
</el-table-column> </el-table-column>
<el-table-column label='报警推送标识(1、是，0、否）' align='center' prop='alarmPushFlag' v-if='columns[12].visible'> <el-table-column label='报警推送标识' align='center' prop='alarmPushFlag' v-if='columns[12].visible' width='110'>
<template #default='scope'> <template #default='scope'>
<dict-tag :options='active_flag' :value='scope.row.alarmPushFlag' /> <dict-tag :options='active_flag' :value='scope.row.alarmPushFlag' />
</template> </template>
</el-table-column> </el-table-column>
<el-table-column label='报警推送内容' align='center' prop='alarmPushContent' v-if='columns[13].visible' /> <el-table-column label='报警推送内容' align='center' prop='alarmPushContent' v-if='columns[13].visible' width='110' />
<el-table-column label='恢复正常推送内容' align='center' prop='alarmRecoverContent' v-if='columns[14].visible' /> <el-table-column label='恢复正常推送内容' align='center' prop='alarmRecoverContent' v-if='columns[14].visible'
width='130' />
<el-table-column label='时间范围' align='center' prop='triggerTimeFrame' v-if='columns[15].visible' /> <el-table-column label='时间范围' align='center' prop='triggerTimeFrame' v-if='columns[15].visible' />
<el-table-column label='触发阈值次数' align='center' prop='triggerNumber' v-if='columns[16].visible' /> <el-table-column label='触发阈值次数' align='center' prop='triggerNumber' v-if='columns[16].visible' />
<el-table-column label='触发死区' align='center' prop='triggerDeadzone' v-if='columns[17].visible' /> <el-table-column label='触发死区' align='center' prop='triggerDeadzone' v-if='columns[17].visible' />
@ -165,18 +133,29 @@
</el-card> </el-card>
<!-- 添加或修改报警规则对话框 --> <!-- 添加或修改报警规则对话框 -->
<el-dialog :title='dialog.title' v-model='dialog.visible' width='500px' append-to-body> <el-dialog :title='dialog.title' v-model='dialog.visible' width='500px' append-to-body>
<el-form ref='alarmRuleFormRef' :model='form' :rules='rules' label-width='80px'> <el-form ref='alarmRuleFormRef' :model='form' :rules='rules' label-width='130px'>
<el-form-item label='报警规则ID，主键' prop='alarmRuleId'>
<el-input v-model='form.alarmRuleId' placeholder='请输入报警规则ID，主键' />
</el-form-item>
<el-form-item label='规则名称' prop='alarmRuleName'> <el-form-item label='规则名称' prop='alarmRuleName'>
<el-input v-model='form.alarmRuleName' placeholder='请输入规则名称' /> <el-input v-model='form.alarmRuleName' placeholder='请输入规则名称' />
</el-form-item> </el-form-item>
<el-form-item label='报警级别，关联表hw_alarm_level字段alarm_level_id' prop='alarmLevelId'> <el-form-item label='报警级别' prop='alarmLevelId'>
<el-input v-model='form.alarmLevelId' placeholder='请输入报警级别，关联表hw_alarm_level字段alarm_level_id' /> <el-select v-model='form.alarmLevelId' placeholder='请选择报警级别'>
<el-option
v-for='item in alarmLevelList'
:key='item.alarmLevelId'
:label='item.alarmLevelName'
:value='item.alarmLevelId'
/>
</el-select>
</el-form-item> </el-form-item>
<el-form-item label='报警类型，关联表hw_alarm_type字段alarm_type_id' prop='alarmTypeId'> <el-form-item label='报警类型' prop='alarmTypeId'>
<el-input v-model='form.alarmTypeId' placeholder='请输入报警类型，关联表hw_alarm_type字段alarm_type_id' /> <el-select v-model='form.alarmTypeId' placeholder='请选择报警类型'>
<el-option
v-for='item in alarmTypeList'
:key='item.alarmTypeId'
:label='item.alarmTypeName'
:value='item.alarmTypeId'
/>
</el-select>
</el-form-item> </el-form-item>
<el-form-item label='规则类型' prop='ruleType'> <el-form-item label='规则类型' prop='ruleType'>
<el-radio-group v-model='form.ruleType'> <el-radio-group v-model='form.ruleType'>
@ -188,17 +167,24 @@
</el-radio> </el-radio>
</el-radio-group> </el-radio-group>
</el-form-item> </el-form-item>
<el-form-item label='关联表hw_device字段device_id。' prop='ruleDeviceId'> <el-form-item label='设备模型' prop='ruleDeviceModeId'>
<el-input v-model='form.ruleDeviceId' placeholder='请输入关联表hw_device字段device_id。' /> <el-select v-model='form.ruleDeviceModeId' placeholder='请选择设备模型'>
<el-option
v-for='item in deviceModeList'
:key='item.deviceModeId'
:label='item.deviceModeName'
:value='item.deviceModeId'
/>
</el-select>
</el-form-item> </el-form-item>
<el-form-item label='关联表hw_device_mode字段device_mode_id；' prop='ruleDeviceModeId'> <!-- <el-form-item label='设备模型功能' prop='ruleDeviceModeId'>-->
<el-input v-model='form.ruleDeviceModeId' placeholder='请输入关联表hw_device_mode字段device_mode_id；' /> <!-- <el-input v-model='form.ruleDeviceModeId' placeholder='请输入设备模型功能' />-->
<!-- </el-form-item>-->
<el-form-item label='属性规则数量' prop='ruleFunctionTotal'>
<el-input-number v-model='form.ruleFunctionTotal' placeholder='请输入属性规则数量' style='width: 220px;' />
</el-form-item> </el-form-item>
<el-form-item label='一共有几个属性规则' prop='ruleFunctionTotal'> <el-form-item label='表达式' prop='triggerExpression'>
<el-input v-model='form.ruleFunctionTotal' placeholder='请输入一共有几个属性规则' /> <el-input v-model='form.triggerExpression' placeholder='请输入表达式' />
</el-form-item>
<el-form-item label='表达式，例如:{}>60 or {}<-88' prop='triggerExpression'>
<el-input v-model='form.triggerExpression' placeholder='请输入表达式，例如:{}>60 or {}<-88' />
</el-form-item> </el-form-item>
<el-form-item label='联动标识' prop='linkFlag'> <el-form-item label='联动标识' prop='linkFlag'>
<el-radio-group v-model='form.linkFlag'> <el-radio-group v-model='form.linkFlag'>
@ -210,7 +196,7 @@
</el-radio> </el-radio>
</el-radio-group> </el-radio-group>
</el-form-item> </el-form-item>
<el-form-item label='报警启用状态(1、是，0、否）' prop='alarmRuleStatus'> <el-form-item label='报警启用状态' prop='alarmRuleStatus'>
<el-radio-group v-model='form.alarmRuleStatus'> <el-radio-group v-model='form.alarmRuleStatus'>
<el-radio <el-radio
v-for='dict in active_flag' v-for='dict in active_flag'
@ -220,7 +206,7 @@
</el-radio> </el-radio>
</el-radio-group> </el-radio-group>
</el-form-item> </el-form-item>
<el-form-item label='报警推送标识(1、是，0、否）' prop='alarmPushFlag'> <el-form-item label='报警推送标识' prop='alarmPushFlag'>
<el-radio-group v-model='form.alarmPushFlag'> <el-radio-group v-model='form.alarmPushFlag'>
<el-radio <el-radio
v-for='dict in active_flag' v-for='dict in active_flag'
@ -231,19 +217,19 @@
</el-radio-group> </el-radio-group>
</el-form-item> </el-form-item>
<el-form-item label='报警推送内容'> <el-form-item label='报警推送内容'>
<editor v-model='form.alarmPushContent' :min-height='192' /> <el-input v-model='form.alarmPushContent' type='textarea' placeholder='请输入报警推送内容' />
</el-form-item> </el-form-item>
<el-form-item label='恢复正常推送内容'> <el-form-item label='恢复正常推送内容'>
<editor v-model='form.alarmRecoverContent' :min-height='192' /> <el-input v-model='form.alarmRecoverContent' type='textarea' placeholder='请输入恢复正常推送内容' />
</el-form-item> </el-form-item>
<el-form-item label='时间范围' prop='triggerTimeFrame'> <el-form-item label='时间范围' prop='triggerTimeFrame'>
<el-input v-model='form.triggerTimeFrame' placeholder='请输入时间范围' /> <el-input v-model='form.triggerTimeFrame' placeholder='请输入时间范围' />
</el-form-item> </el-form-item>
<el-form-item label='触发阈值次数' prop='triggerNumber'> <el-form-item label='触发阈值次数' prop='triggerNumber'>
<el-input v-model='form.triggerNumber' placeholder='请输入触发阈值次数' /> <el-input-number v-model='form.triggerNumber' placeholder='请输入触发阈值次数' style='width: 220px;' />
</el-form-item> </el-form-item>
<el-form-item label='触发死区' prop='triggerDeadzone'> <el-form-item label='触发死区' prop='triggerDeadzone'>
<el-input v-model='form.triggerDeadzone' placeholder='请输入触发死区' /> <el-input-number v-model='form.triggerDeadzone' placeholder='请输入触发死区' style='width: 220px;' />
</el-form-item> </el-form-item>
<el-form-item label='描述' prop='remark'> <el-form-item label='描述' prop='remark'>
<el-input v-model='form.remark' placeholder='请输入描述' /> <el-input v-model='form.remark' placeholder='请输入描述' />
@ -262,6 +248,9 @@
<script setup name='AlarmRule' lang='ts'> <script setup name='AlarmRule' lang='ts'>
import { listAlarmRule, getAlarmRule, delAlarmRule, addAlarmRule, updateAlarmRule } from '@/api/dms/alarmRule'; import { listAlarmRule, getAlarmRule, delAlarmRule, addAlarmRule, updateAlarmRule } from '@/api/dms/alarmRule';
import { AlarmRuleVO, AlarmRuleQuery, AlarmRuleForm } from '@/api/dms/alarmRule/types'; import { AlarmRuleVO, AlarmRuleQuery, AlarmRuleForm } from '@/api/dms/alarmRule/types';
import { getBaseAlarmLevelList } from '@/api/dms/alarmLevel';
import { getBaseAlarmTypeList } from '@/api/dms/alarmType';
import { getDmsDeviceModeList } from '@/api/dms/deviceMode';
const { proxy } = getCurrentInstance() as ComponentInternalInstance; const { proxy } = getCurrentInstance() as ComponentInternalInstance;
const { active_flag, dms_rule_type } = toRefs<any>(proxy?.useDict('active_flag', 'dms_rule_type')); const { active_flag, dms_rule_type } = toRefs<any>(proxy?.useDict('active_flag', 'dms_rule_type'));
@ -283,32 +272,53 @@ const dialog = reactive<DialogOption>({
title: '' title: ''
}); });
/** 获取报警级别下拉框 */
const alarmLevelList = ref([]);
const getBaseAlarmLevelListSelect = async () => {
let res = await getBaseAlarmLevelList(null);
alarmLevelList.value = res.data;
};
/** 获取报警类型下拉框 */
const alarmTypeList = ref([]);
const getBaseAlarmTypeListSelect = async () => {
let res = await getBaseAlarmTypeList(null);
alarmTypeList.value = res.data;
};
/** 获取设备模型下拉框 */
const deviceModeList = ref([]);
const getDmsDeviceModeListSelect = async () => {
let res = await getDmsDeviceModeList(null);
deviceModeList.value = res.data;
};
// 列显隐信息 // 列显隐信息
const columns = ref<FieldOption[]>([ const columns = ref<FieldOption[]>([
{ key: 0, label: `报警规则ID，主键`, visible: true }, { key: 0, label: `报警规则ID`, visible: false },
{ key: 1, label: `规则名称`, visible: true }, { key: 1, label: `规则名称`, visible: true },
{ key: 2, label: `租户编号`, visible: true }, { key: 2, label: `租户编号`, visible: false },
{ key: 3, label: `报警级别，关联表hw_alarm_level字段alarm_level_id`, visible: true }, { key: 3, label: `报警级别`, visible: true },
{ key: 4, label: `报警类型，关联表hw_alarm_type字段alarm_type_id`, visible: true }, { key: 4, label: `报警类型`, visible: true },
{ key: 5, label: `规则类型`, visible: true }, { key: 5, label: `规则类型`, visible: true },
{ key: 6, label: `关联表hw_device字段device_id。`, visible: true }, { key: 6, label: `设备名称`, visible: false },
{ key: 7, label: `关联表hw_device_mode字段device_mode_id；`, visible: true }, { key: 7, label: `设备模型`, visible: true },
{ key: 8, label: `一共有几个属性规则`, visible: true }, { key: 8, label: `属性规则数量`, visible: true },
{ key: 9, label: `表达式，例如:{}>60 or {}<-88`, visible: true }, { key: 9, label: `表达式`, visible: true },
{ key: 10, label: `联动标识`, visible: true }, { key: 10, label: `联动标识`, visible: true },
{ key: 11, label: `报警启用状态(1、是，0、否）`, visible: true }, { key: 11, label: `报警启用状态`, visible: true },
{ key: 12, label: `报警推送标识(1、是，0、否）`, visible: true }, { key: 12, label: `报警推送标识`, visible: true },
{ key: 13, label: `报警推送内容`, visible: true }, { key: 13, label: `报警推送内容`, visible: true },
{ key: 14, label: `恢复正常推送内容`, visible: true }, { key: 14, label: `恢复正常推送内容`, visible: true },
{ key: 15, label: `时间范围`, visible: true }, { key: 15, label: `时间范围`, visible: false },
{ key: 16, label: `触发阈值次数`, visible: true }, { key: 16, label: `触发阈值次数`, visible: false },
{ key: 17, label: `触发死区`, visible: true }, { key: 17, label: `触发死区`, visible: false },
{ key: 18, label: `描述`, visible: true }, { key: 18, label: `描述`, visible: true },
{ key: 19, label: `创建部门`, visible: true }, { key: 19, label: `创建部门`, visible: false },
{ key: 20, label: `创建人`, visible: true }, { key: 20, label: `创建人`, visible: false },
{ key: 21, label: `创建时间`, visible: true }, { key: 21, label: `创建时间`, visible: false },
{ key: 22, label: `更新人`, visible: true }, { key: 22, label: `更新人`, visible: false },
{ key: 23, label: `更新时间`, visible: true } { key: 23, label: `更新时间`, visible: false }
]); ]);
const initFormData: AlarmRuleForm = { const initFormData: AlarmRuleForm = {
@ -321,9 +331,9 @@ const initFormData: AlarmRuleForm = {
ruleDeviceModeId: undefined, ruleDeviceModeId: undefined,
ruleFunctionTotal: undefined, ruleFunctionTotal: undefined,
triggerExpression: undefined, triggerExpression: undefined,
linkFlag: undefined, linkFlag: '1',
alarmRuleStatus: undefined, alarmRuleStatus: '1',
alarmPushFlag: undefined, alarmPushFlag: '1',
alarmPushContent: undefined, alarmPushContent: undefined,
alarmRecoverContent: undefined, alarmRecoverContent: undefined,
triggerTimeFrame: undefined, triggerTimeFrame: undefined,
@ -360,16 +370,30 @@ const data = reactive<PageData<AlarmRuleForm, AlarmRuleQuery>>({
{ required: true, message: '规则名称不能为空', trigger: 'blur' } { required: true, message: '规则名称不能为空', trigger: 'blur' }
], ],
alarmLevelId: [ alarmLevelId: [
{ required: true, message: '报警级别，关联表hw_alarm_level字段alarm_level_id不能为空', trigger: 'blur' } { required: true, message: '报警级别不能为空', trigger: 'blur' }
],
triggerExpression: [
{ required: true, message: '表达式不能为空', trigger: 'blur' }
], ],
alarmTypeId: [ alarmTypeId: [
{ required: true, message: '报警类型，关联表hw_alarm_type字段alarm_type_id不能为空', trigger: 'blur' } { required: true, message: '报警类型不能为空', trigger: 'blur' }
] ]
} }
}); });
const { queryParams, form, rules } = toRefs(data); const { queryParams, form, rules } = toRefs(data);
// /** 获取设备模型功能下拉框 */
// const deviceModeFunctionList = ref([]);
// watch(() => form.value.deviceModeId, (val, oldVal) => {
// const getDmsDeviceModeFunctionListSelect = async () => {
// if (val !== null){
// let res = await getDmsDeviceModeFunctionList({ deviceModeId: val, functionMode: '3'});
// deviceModeFunctionList.value = res.data;
// }
// };
// });
/** 查询报警规则列表 */ /** 查询报警规则列表 */
const getList = async () => { const getList = async () => {
loading.value = true; loading.value = true;
@ -461,6 +485,9 @@ const handleExport = () => {
}; };
onMounted(() => { onMounted(() => {
getBaseAlarmLevelListSelect();
getBaseAlarmTypeListSelect();
getDmsDeviceModeListSelect();
getList(); getList();
}); });
</script> </script>

90
src/views/mes/prodBaseMachineInfo/index.vue
Unescape Escape View File

@ -92,12 +92,22 @@
<el-table-column label='机台类型' align='center' prop='machineType' v-if='columns[6].visible' /> <el-table-column label='机台类型' align='center' prop='machineType' v-if='columns[6].visible' />
<el-table-column label='机台规格' align='center' prop='machineSpec' v-if='columns[7].visible' /> <el-table-column label='机台规格' align='center' prop='machineSpec' v-if='columns[7].visible' />
<el-table-column label='供应商' align='center' prop='supplierId' v-if='columns[8].visible' /> <el-table-column label='供应商' align='center' prop='supplierId' v-if='columns[8].visible' />
<el-table-column label='所属车间' align='center' prop='workshopName' v-if='columns[16].visible' /> <el-table-column label='所属车间' align='center' prop='workshopName' v-if='columns[16].visible' width='120' />
<el-table-column label='机台状态' align='center' prop='machineStatus' v-if='columns[9].visible'> <el-table-column label='机台状态' align='center' prop='machineStatus' v-if='columns[9].visible'>
<template #default='scope'> <template #default='scope'>
<dict-tag :options='machine_status' :value='scope.row.machineStatus' /> <dict-tag :options='machine_status' :value='scope.row.machineStatus' />
</template> </template>
</el-table-column> </el-table-column>
<el-table-column label='设备模型' align='center' prop='deviceModeName' v-if='columns[17].visible' width='100' />
<el-table-column label='设备IP地址' align='center' prop='machineIp' v-if='columns[18].visible' width='100' />
<el-table-column label='设备端口' align='center' prop='machinePort' v-if='columns[19].visible' />
<el-table-column label='设备协议' align='center' prop='accessProtocol' v-if='columns[20].visible' />
<el-table-column label='寄存器地址' align='center' prop='registerAddress' v-if='columns[21].visible' width='100' />
<el-table-column label='数据类型' align='center' prop='dataType' v-if='columns[22].visible' />
<el-table-column label='数据长度' align='center' prop='dataLength' v-if='columns[23].visible' />
<el-table-column label='数据编码格式' align='center' prop='dataEncoding' v-if='columns[24].visible' width='120' />
<el-table-column label='请求间隔（毫秒）' align='center' prop='requestInterval' v-if='columns[25].visible'
width='130' />
<el-table-column label='备注' align='center' prop='remark' v-if='columns[10].visible' /> <el-table-column label='备注' align='center' prop='remark' v-if='columns[10].visible' />
<el-table-column label='创建部门' align='center' prop='createDept' v-if='columns[11].visible' /> <el-table-column label='创建部门' align='center' prop='createDept' v-if='columns[11].visible' />
<el-table-column label='创建人' align='center' prop='createBy' v-if='columns[12].visible' /> <el-table-column label='创建人' align='center' prop='createBy' v-if='columns[12].visible' />
@ -112,7 +122,7 @@
<span>{{ parseTime(scope.row.updateTime, '{y}-{m}-{d} {h}:{i}:{s}') }}</span> <span>{{ parseTime(scope.row.updateTime, '{y}-{m}-{d} {h}:{i}:{s}') }}</span>
</template> </template>
</el-table-column> </el-table-column>
<el-table-column label='操作' align='center' class-name='small-padding fixed-width'> <el-table-column label='操作' align='center' class-name='small-padding fixed-width' fixed='right' width='120'>
<template #default='scope'> <template #default='scope'>
<el-button link type='primary' icon='Edit' @click='handleRelatedTires(scope.row)' <el-button link type='primary' icon='Edit' @click='handleRelatedTires(scope.row)'
v-hasPermi="['mes:prodBaseMachineInfo:edit']">关联工序 v-hasPermi="['mes:prodBaseMachineInfo:edit']">关联工序
@ -132,7 +142,7 @@
</el-card> </el-card>
<!-- 添加或修改机台信息对话框 --> <!-- 添加或修改机台信息对话框 -->
<el-dialog :title='dialog.title' v-model='dialog.visible' width='500px' append-to-body> <el-dialog :title='dialog.title' v-model='dialog.visible' width='500px' append-to-body>
<el-form ref='prodBaseMachineInfoFormRef' :model='form' :rules='rules' label-width='80px'> <el-form ref='prodBaseMachineInfoFormRef' :model='form' :rules='rules' label-width='140px'>
<!-- <el-form-item label="主键标识" prop="machineId"> <!-- <el-form-item label="主键标识" prop="machineId">
<el-input v-model="form.machineId" placeholder="请输入主键标识" /> <el-input v-model="form.machineId" placeholder="请输入主键标识" />
</el-form-item>--> </el-form-item>-->
@ -177,6 +187,54 @@
></el-option> ></el-option>
</el-select> </el-select>
</el-form-item> </el-form-item>
<el-form-item label='设备模型' prop='deviceModeId'>
<el-select v-model='form.deviceModeId' placeholder='请选择设备模型'>
<el-option
v-for='item in deviceModeList'
:key='item.deviceModeId'
:label='item.deviceModeName'
:value='item.deviceModeId'
/>
</el-select>
</el-form-item>
<el-form-item label='设备IP地址' prop='machineIp'>
<el-input v-model='form.machineIp' placeholder='请输入设备IP地址' />
</el-form-item>
<el-form-item label='设备端口' prop='machinePort'>
<el-input v-model='form.machinePort' placeholder='请输入设备端口' />
</el-form-item>
<el-form-item label='设备协议' prop='accessProtocol'>
<el-input v-model='form.accessProtocol' placeholder='请输入设备协议' />
</el-form-item>
<el-form-item label='寄存器地址' prop='registerAddress'>
<el-input v-model='form.registerAddress' placeholder='请输入寄存器地址' />
</el-form-item>
<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'
></el-option>
</el-select>
</el-form-item>
<el-form-item label='数据长度' prop='dataLength'>
<el-input-number v-model='form.dataLength' placeholder='请输入数据长度' style='width: 220px;' />
</el-form-item>
<el-form-item label='数据编码格式' prop='dataEncoding'>
<el-select v-model='form.dataEncoding' placeholder='请选择数据编码格式'>
<el-option
v-for='dict in machine_data_encoding'
:key='dict.value'
:label='dict.label'
:value='dict.value'
></el-option>
</el-select>
</el-form-item>
<el-form-item label='请求间隔（毫秒）' prop='requestInterval'>
<el-input-number v-model='form.requestInterval' placeholder='请输入请求间隔' style='width: 220px;' />
</el-form-item>
<el-form-item label='备注' prop='remark'> <el-form-item label='备注' prop='remark'>
<el-input v-model='form.remark' placeholder='请输入备注' /> <el-input v-model='form.remark' placeholder='请输入备注' />
</el-form-item> </el-form-item>
@ -257,9 +315,14 @@ import {
} from '@/api/mes/prodBaseMachineInfo/types'; } from '@/api/mes/prodBaseMachineInfo/types';
import { getWorkshopList } from '@/api/mes/baseWorkshopInfo'; import { getWorkshopList } from '@/api/mes/baseWorkshopInfo';
import { getProcessInfoList } from '@/api/mes/baseProcessInfo'; import { getProcessInfoList } from '@/api/mes/baseProcessInfo';
import { getDmsDeviceModeList } from '@/api/dms/deviceMode';
const { proxy } = getCurrentInstance() as ComponentInternalInstance; const { proxy } = getCurrentInstance() as ComponentInternalInstance;
const { machine_status } = toRefs<any>(proxy?.useDict('machine_status')); const {
machine_status,
machine_data_type,
machine_data_encoding
} = toRefs<any>(proxy?.useDict('machine_status', 'machine_data_type', 'machine_data_encoding'));
const prodBaseMachineInfoList = ref<ProdBaseMachineInfoVO[]>([]); const prodBaseMachineInfoList = ref<ProdBaseMachineInfoVO[]>([]);
const buttonLoading = ref(false); const buttonLoading = ref(false);
@ -285,6 +348,13 @@ const getWorkshopListSelect = async () => {
workshopInfoList.value = res.data; workshopInfoList.value = res.data;
}; };
/** 查询设备模型下拉树结构 */
const deviceModeList = ref([]);
const getDmsDeviceModeListSelect = async () => {
let res = await getDmsDeviceModeList(null);
deviceModeList.value = res.data;
};
const relationOpen = ref(false); const relationOpen = ref(false);
const baseMachineProcessList = ref<any[]>([]); const baseMachineProcessList = ref<any[]>([]);
const chekedMachineProcessList = ref<any[]>([]); const chekedMachineProcessList = ref<any[]>([]);
@ -314,7 +384,16 @@ const columns = ref<FieldOption[]>([
{ key: 13, label: `创建时间`, visible: false }, { key: 13, label: `创建时间`, visible: false },
{ key: 14, label: `更新人`, visible: false }, { key: 14, label: `更新人`, visible: false },
{ key: 15, label: `更新时间`, visible: false }, { key: 15, label: `更新时间`, visible: false },
{ key: 16, label: `所属车间`, visible: true } { key: 16, label: `所属车间`, visible: true },
{ key: 17, label: `设备模型`, visible: true },
{ key: 18, label: `设备IP地址`, visible: true },
{ key: 19, label: `设备端口`, visible: true },
{ key: 20, label: `设备协议`, visible: true },
{ key: 21, label: `寄存器地址`, visible: true },
{ key: 22, label: `数据类型`, visible: true },
{ key: 23, label: `数据长度`, visible: true },
{ key: 24, label: `数据编码格式`, visible: true },
{ key: 25, label: `请求间隔`, visible: true }
]); ]);
const initFormData: ProdBaseMachineInfoForm = { const initFormData: ProdBaseMachineInfoForm = {
@ -512,6 +591,7 @@ const handleExport = () => {
onMounted(() => { onMounted(() => {
getProcessInfoListSelect(); getProcessInfoListSelect();
getWorkshopListSelect(); getWorkshopListSelect();
getDmsDeviceModeListSelect();
getList(); getList();
}); });
</script> </script>

Write Preview
Loading…
Cancel
Save