qdintc/fishery-web
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

fix: 控制器故障告警开关显示。

Browse Source
This commit is contained in:
tianyongbao
2026-06-15 13:03:30 +08:00
parent 7395713d6e
commit 887c6a00a3
6 changed files with 105 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

18
src/views/fishery/aquUser/index.vue
View File

@@ -454,6 +454,15 @@
</el-col>
</el-row>
<el-row :gutter="10" class="mt-3">
<el-col :span="6">
<div class="param-item">
<div class="param-label">控制器故障电话告警</div>
<dict-tag :options="[{label:'关',value:'0'},{label:'开',value:'1'}]" :value="String(device.controllerFaultCallOpen ?? 1)"/>
</div>
</el-col>
</el-row>
<el-row :gutter="10" class="mt-3">
<el-col :span="6">
<div class="param-item">
@@ -665,6 +674,15 @@
</el-col>
</el-row>
<el-row :gutter="10" class="mt-3">
<el-col :span="6">
<div class="param-item">
<div class="param-label">控制器故障电话告警</div>
<dict-tag :options="[{label:'关',value:'0'},{label:'开',value:'1'}]" :value="String(device.controllerFaultCallOpen ?? 1)"/>
</div>
</el-col>
</el-row>
<el-row :gutter="10" class="mt-3">
<el-col :span="6">
<div class="param-item">

20
src/views/fishery/device/index.vue
View File

@@ -128,6 +128,11 @@
<dict-tag :options="open_close" :value="scope.row.voltageWarnOpen"/>
</template>
</el-table-column>
<el-table-column label="控制器故障电话报警开关" align="center" prop="controllerFaultCallOpen" width="170">
<template #default="scope">
<dict-tag :options="open_close" :value="scope.row.controllerFaultCallOpen ?? 1"/>
</template>
</el-table-column>
<el-table-column label="设备分类" align="center" prop="category" />
<el-table-column label="电量电话告警开关" align="center" prop="batteryWarnCallOpen" >
<template #default="scope">
@@ -252,6 +257,7 @@
<div class="info-row"><span class="label">温度补偿</span><span class="value">{{ item.temperatureCompensation ?? '-' }}</span></div>
<div class="info-row"><span class="label">输入额定电压</span><span class="value">{{ item.inputVoltage ?? '-' }}</span></div>
<div class="info-row"><span class="label">电压告警开关</span><span class="value"><dict-tag :options="open_close" :value="item.voltageWarnOpen"/></span></div>
<div class="info-row"><span class="label">控制器故障电话报警</span><span class="value"><dict-tag :options="open_close" :value="item.controllerFaultCallOpen ?? 1"/></span></div>
</div>
</div>
@@ -511,6 +517,18 @@
</el-col>
</el-row>
<el-row :gutter="20">
<el-col :span="12">
<el-form-item label="控制器故障电话告警" prop="controllerFaultCallOpen">
<el-select v-model="form.controllerFaultCallOpen" placeholder="请选择控制器故障电话告警" clearable style="width: 100%">
<el-option
v-for="dict in open_close"
:key="dict.value"
:label="dict.label"
:value="parseInt(dict.value)"
></el-option>
</el-select>
</el-form-item>
</el-col>
<el-col :span="12">
<el-form-item label="电量电话告警开关" prop="batteryWarnCallOpen">
<el-select v-model="form.batteryWarnCallOpen" placeholder="请选择电量电话告警开关" clearable style="width: 100%">
@@ -1123,6 +1141,7 @@ const initFormData: DeviceForm = {
phasedifCompensation: undefined,
temperatureCompensation: undefined,
voltageWarnOpen: undefined,
controllerFaultCallOpen: 1,
remark: undefined,
category: undefined,
batteryWarnCallOpen: undefined,
@@ -1340,6 +1359,7 @@ const handleUpdate = async (row?: DeviceVO) => {
const _id = row?.id || ids.value[0]
const res = await getDevice(_id);
Object.assign(form.value, res.data);
form.value.controllerFaultCallOpen = form.value.controllerFaultCallOpen ?? 1;
// 回显用户信息
if (form.value.userId) {

32
src/views/fishery/payOrder/index.vue
View File

@@ -55,7 +55,18 @@
<dict-tag :options="profit_status" :value="scope.row.profitStatus"/>
</template>
</el-table-column>
<el-table-column label="创建时间" align="center" prop="createTime" width="160"/>
<el-table-column label="创建时间" align="center" prop="createTime" width="160"/>
<el-table-column label="操作" align="center" width="140" fixed="right">
<template #default="scope">
<el-button
v-if="scope.row.orderStatus !== 2"
link
type="primary"
icon="Refresh"
@click="handleConfirmPay(scope.row)"
>修复支付状态</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" />
@@ -64,7 +75,7 @@
</template>
<script setup name="PayOrder" lang="ts">
import { listPayOrder } from '@/api/fishery/payOrder';
import { confirmPayOrder, listPayOrder } from '@/api/fishery/payOrder';
import { PayOrderVO, PayOrderQuery } from '@/api/fishery/payOrder/types';
const { proxy } = getCurrentInstance() as ComponentInternalInstance;
@@ -120,6 +131,23 @@ const handleExport = () => {
}, `payOrder_${new Date().getTime()}.xlsx`)
}
/** 主动确认并修复微信支付状态 */
const handleConfirmPay = async (row: PayOrderVO) => {
await proxy?.$modal.confirm('是否向微信支付查询并修复该订单状态？');
loading.value = true;
try {
const res = await confirmPayOrder(row.id);
if (res.code === 200) {
proxy?.$modal.msgSuccess('修复成功');
} else {
proxy?.$modal.msgWarning(res.msg || '微信侧尚未确认支付成功');
}
await getList();
} finally {
loading.value = false;
}
}
onMounted(() => {
getList();
});