Merge branch 'master' of http://115.159.85.185:8098/r/ZhiHuiQiCe/FangCangZh...

dengjunjie

2025-10-27 1ba8e226d5f369b3f9bc2a1b581118558b9a539c

 н¨Îļþ¼Ð/WMS/src/views/Alarm/Container.vue

@@ -58,7 +58,9 @@
                        field: "alarm",
                        title: "是否报警",
                        type: "select",
                        bind: { key: "alarmStatus", data: [] },
                        // bind: { key: "enable", data: [] },
                        data:[],
                        datakey: "enable",
                        span: 12
                    }
                ],
@@ -78,7 +80,7 @@
            const searchFormOptions = ref([
               [
                    {title:"设备名称", field:"deviceName", type:"like"},
                    {title:"报警状态", field:"Alarm", type:"eq", bind: { key: "alarmStatus", data: [] }}
                    {title:"报警状态", field:"Alarm", type:"select", dataKey: "enable",data:[]}
               ]
            ]);
            const columns = ref([
@@ -86,7 +88,7 @@
                {field:'deviceName',title:'设备名称',type:'string',width:120,align:'left',sort:true},
                {field:'currentTemperature',title:'温度',type:'float',width:100,align:'left'},
                {field:'humidity',title:'湿度',type:'float',width:100,align:'left'},
                {field:'alarm',title:'是否报警',type:'select',width:100,align:'left',bind:{key:'alarmStatus',data:[]}},
                {field:'alarm',title:'是否报警',type:'select',width:100,align:'left',bind:{key:'enable',data:[]}},
                {field:'alarmInformation',title:'报警信息',type:'string',width:200,align:'left'},
                {field:'creater',title:'创建者',type:'string',width:100,require:true,align:'left'},
                {field:'createDate',title:'创建时间',type:'datetime',width:160,require:true,align:'left',sort:true},