linweidong
/
besure_web
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

style：采集设备-添加新增产量按钮

Browse Source
pull/1/head
黄伟杰 1 month ago
parent ff25737400
commit 4fc27674a8
1 changed files with 102 additions and 59 deletions
Show Stats Download Patch File Download Diff File

161
src/views/iot/device/index.vue
Unescape Escape View File

@ -333,7 +333,10 @@
</el-form-item>
</el-form>
<div class="mb-10px text-right">
<div class="mb-10px flex justify-end gap-8px">
<el-button type="primary" plain @click="openCreateCountRuleForm">
新增产量
</el-button>
<el-button type="primary" @click="openCreateRuleForm">
{{ t('DataCollection.DeviceModel.ruleCreateButton') }}
</el-button>
@ -364,7 +367,7 @@
{{ t('DataCollection.DeviceModel.ruleEditRuleButton') }}
</el-button>
<el-button
v-if="(scope.row.identifier || '').toString().toUpperCase() === 'ALARM'"
v-if="scope.row.identifier === 'ALARM' || scope.row.identifier === 'COUNT'"
link
type="danger"
@click="handleRuleDelete(scope.row.id)"
@ -411,7 +414,10 @@
<div class="flex flex-col w-full">
<div class="border border-gray-200 dark:border-gray-600 rounded-md py-12px">
<el-form-item :label="t('DataCollection.DeviceModel.ruleDialogFieldRule')">
<el-form-item
v-if="!isCountIdentifier"
:label="t('DataCollection.DeviceModel.ruleDialogFieldRule')"
>
<el-select
v-model="ruleForm.fieldRule"
:placeholder="t('DataCollection.DeviceModel.ruleDialogFieldRulePlaceholder')"
@ -427,7 +433,7 @@
/>
</el-select>
</el-form-item>
<el-form-item :label="t('DataCollection.DeviceModel.ruleDialogRule')">
<el-form-item :label="isCountIdentifier ? '四则运算规则' : t('DataCollection.DeviceModel.ruleDialogRule')">
<div class="flex items-center gap-8px">
<el-select
v-model="ruleForm.ruleAttributeId"
@ -447,14 +453,14 @@
class="!w-160px"
>
<el-option
v-for="item in ruleOperatorOptions"
v-for="item in currentRuleOperatorOptions"
:key="item.value"
:label="item.label"
:value="item.value"
/>
</el-select>
<el-input
v-if="ruleForm.ruleOperator !== 'TRUE' && ruleForm.ruleOperator !== 'FALSE'"
v-if="isCountIdentifier || (ruleForm.ruleOperator !== 'TRUE' && ruleForm.ruleOperator !== 'FALSE')"
v-model="ruleForm.ruleValue"
:placeholder="t('DataCollection.DeviceModel.ruleDialogRuleValuePlaceholder')"
class="!w-200px"
@ -463,64 +469,66 @@
</el-form-item>
</div>
<div
v-for="(item, index) in extraPointRules"
:key="index"
class="border border-gray-200 dark:border-gray-600 rounded-md px-16px py-12px"
>
<el-form-item :label="t('DataCollection.DeviceModel.ruleDialogFieldRule')">
<el-select
v-model="item.rule"
:placeholder="t('DataCollection.DeviceModel.ruleDialogFieldRulePlaceholder')"
class="!w-240px"
>
<el-option
v-for="opt in currentRuleOptions"
:key="opt.value"
:label="opt.label"
:value="opt.value"
:disabled="isRuleDisabled(opt.value, item.rule)"
/>
</el-select>
</el-form-item>
<el-form-item :label="t('DataCollection.DeviceModel.ruleDialogRule')">
<div class="flex items-center gap-8px">
<template v-if="isRunningIdentifier">
<div
v-for="(item, index) in extraPointRules"
:key="index"
class="border border-gray-200 dark:border-gray-600 rounded-md px-16px py-12px"
>
<el-form-item :label="t('DataCollection.DeviceModel.ruleDialogFieldRule')">
<el-select
v-model="item.id"
:placeholder="t('DataCollection.DeviceModel.ruleDialogRuleAttributePlaceholder')"
v-model="item.rule"
:placeholder="t('DataCollection.DeviceModel.ruleDialogFieldRulePlaceholder')"
class="!w-240px"
>
<el-option
v-for="attr in ruleAttributeOptions"
:key="attr.id"
:label="attr.attributeName || attr.attributeCode"
:value="attr.id"
/>
</el-select>
<el-select
v-model="item.operator"
:placeholder="t('DataCollection.DeviceModel.ruleDialogRuleOperatorPlaceholder')"
class="!w-160px"
>
<el-option
v-for="opt in ruleOperatorOptions"
v-for="opt in currentRuleOptions"
:key="opt.value"
:label="opt.label"
:value="opt.value"
:disabled="isRuleDisabled(opt.value, item.rule)"
/>
</el-select>
<el-input
v-if="item.operator !== 'TRUE' && item.operator !== 'FALSE'"
v-model="item.operatorRule"
:placeholder="t('DataCollection.DeviceModel.ruleDialogRuleValuePlaceholder')"
class="!w-200px"
/>
<el-button type="danger" link @click="handleRemovePointRule(index)">
{{ t('DataCollection.DeviceModel.ruleDeleteRuleButton') }}
</el-button>
</div>
</el-form-item>
</div>
</el-form-item>
<el-form-item :label="t('DataCollection.DeviceModel.ruleDialogRule')">
<div class="flex items-center gap-8px">
<el-select
v-model="item.id"
:placeholder="t('DataCollection.DeviceModel.ruleDialogRuleAttributePlaceholder')"
class="!w-240px"
>
<el-option
v-for="attr in ruleAttributeOptions"
:key="attr.id"
:label="attr.attributeName || attr.attributeCode"
:value="attr.id"
/>
</el-select>
<el-select
v-model="item.operator"
:placeholder="t('DataCollection.DeviceModel.ruleDialogRuleOperatorPlaceholder')"
class="!w-160px"
>
<el-option
v-for="opt in ruleOperatorOptions"
:key="opt.value"
:label="opt.label"
:value="opt.value"
/>
</el-select>
<el-input
v-if="isCountIdentifier || (item.operator !== 'TRUE' && item.operator !== 'FALSE')"
v-model="item.operatorRule"
:placeholder="t('DataCollection.DeviceModel.ruleDialogRuleValuePlaceholder')"
class="!w-200px"
/>
<el-button type="danger" link @click="handleRemovePointRule(index)">
{{ t('DataCollection.DeviceModel.ruleDeleteRuleButton') }}
</el-button>
</div>
</el-form-item>
</div>
</template>
<el-form-item v-if="isRunningIdentifier" label=" ">
<el-button type="primary" link @click="handleAddPointRule">
@ -537,7 +545,7 @@
</template>
</el-dialog>
<el-dialog v-model="createRuleDialogVisible" :title="t('DataCollection.DeviceModel.ruleCreateButton')" width="520px" draggable>
<el-dialog v-model="createRuleDialogVisible" :title="createRuleDialogTitle" width="520px" draggable>
<el-form :model="createRuleForm" ref="createRuleFormRef" label-width="120px">
<el-form-item :label="t('DataCollection.DeviceModel.ruleDialogIdentifier')">
<el-input v-model="createRuleForm.identifier" disabled />
@ -551,7 +559,7 @@
<el-form-item :label="t('DataCollection.DeviceModel.ruleDialogDefaultValue')">
<el-input v-model="createRuleForm.defaultValue" disabled />
</el-form-item>
<el-form-item :label="t('DataCollection.DeviceModel.ruleDialogAlarmLevel')">
<el-form-item v-if="!isCreateCountRule" :label="t('DataCollection.DeviceModel.ruleDialogAlarmLevel')">
<el-select
v-model="createRuleForm.alarmLevel"
:placeholder="t('DataCollection.DeviceModel.ruleDialogAlarmLevelPlaceholder')"
@ -1089,6 +1097,12 @@ const runningRuleOptions = [
]
const alarmRuleOptions = [{ value: '5', label: '报警' }]
const countOperatorOptions = [
{ value: '+', label: '加' },
{ value: '-', label: '减' },
{ value: '*', label: '乘' },
{ value: '/', label: '除' },
]
const currentRuleOptions = computed(() => {
const id = (ruleForm.identifier || '').toString().toUpperCase()
@ -1114,6 +1128,13 @@ const isRuleDisabled = (value: string, selfRule?: string | number) => {
}
const ruleOperatorOptions = computed(() => getStrDictOptions('czsb_rules_conditions'))
const isCountIdentifier = computed(() => {
return (ruleForm.identifier || '').toString().toUpperCase() === 'COUNT'
})
const currentRuleOperatorOptions = computed(() => {
if (isCountIdentifier.value) return countOperatorOptions
return ruleOperatorOptions.value
})
const isRunningIdentifier = computed(() => {
return (ruleForm.identifier || '').toString().toUpperCase() === 'RUNNING'
@ -1224,8 +1245,10 @@ const handleRuleSubmit = async () => {
fieldRule: ruleForm.fieldRule,
defaultValue: ruleForm.defaultValue,
deviceId: ruleForm.deviceId ?? attributeDeviceId.value,
alarmLevel: ruleForm.alarmLevel,
pointRulesVOList,
} as any
if (!isCountIdentifier.value) {
payload.alarmLevel = ruleForm.alarmLevel
}
await request.put({ url: '/iot/device-point-rules/update', data: payload })
@ -1282,6 +1305,13 @@ const createRuleForm = reactive({
defaultValue: '报警',
alarmLevel: '',
})
const isCreateCountRule = computed(() => {
return createRuleForm.identifier.toString().toUpperCase() === 'COUNT'
})
const createRuleDialogTitle = computed(() => {
if (isCreateCountRule.value) return '新增产量'
return t('DataCollection.DeviceModel.ruleCreateButton')
})
const openCreateRuleForm = () => {
if (!attributeDeviceId.value) {
@ -1294,6 +1324,17 @@ const openCreateRuleForm = () => {
createRuleForm.alarmLevel = ''
createRuleDialogVisible.value = true
}
const openCreateCountRuleForm = () => {
if (!attributeDeviceId.value) {
message.error('请先选择设备')
return
}
createRuleForm.identifier = 'COUNT'
createRuleForm.fieldName = '产能'
createRuleForm.defaultValue = '产能'
createRuleForm.alarmLevel = ''
createRuleDialogVisible.value = true
}
const handleCreateRuleSubmit = async () => {
if (!attributeDeviceId.value) return
@ -1307,8 +1348,10 @@ const handleCreateRuleSubmit = async () => {
identifier: createRuleForm.identifier,
fieldName: createRuleForm.fieldName,
defaultValue: createRuleForm.defaultValue,
alarmLevel: createRuleForm.alarmLevel,
deviceId: attributeDeviceId.value,
} as any
if (!isCreateCountRule.value) {
payload.alarmLevel = createRuleForm.alarmLevel
}
await request.post({ url: '/iot/device-point-rules/create', data: payload })
message.success('新增成功')

Write Preview
Loading…
Cancel
Save