From 5b8bf171b9afda52fa366a72e54eedbd9e6d4d17 Mon Sep 17 00:00:00 2001
From: yanjinhui <3306209981@qq.com>
Date: 星期六, 01 十一月 2025 19:54:25 +0800
Subject: [PATCH] Merge branch 'master' of http://115.159.85.185:8098/r/ZhiHuiQiCe/FangCangZhiNeng
---
新建文件夹/WMS/src/views/Alarm/Container.vue | 12 +++++++-----
1 files changed, 7 insertions(+), 5 deletions(-)
diff --git "a/\346\226\260\345\273\272\346\226\207\344\273\266\345\244\271/WMS/src/views/Alarm/Container.vue" "b/\346\226\260\345\273\272\346\226\207\344\273\266\345\244\271/WMS/src/views/Alarm/Container.vue"
index 9666be9..03db34c 100644
--- "a/\346\226\260\345\273\272\346\226\207\344\273\266\345\244\271/WMS/src/views/Alarm/Container.vue"
+++ "b/\346\226\260\345\273\272\346\226\207\344\273\266\345\244\271/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,11 +88,11 @@
{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:'creater',title:'鍒涘缓鑰�',type:'string',width:100,require:true,align:'left'},
{field:'createDate',title:'鍒涘缓鏃堕棿',type:'datetime',width:160,require:true,align:'left',sort:true},
- {field:'modifier',title:'淇敼浜�',type:'string',width:100,align:'left'},
+ // {field:'modifier',title:'淇敼浜�',type:'string',width:100,align:'left'},
{field:'modifyDate',title:'淇敼鏃ユ湡',type:'datetime',width:160,align:'left',sort:true}
]);
const detail = ref({
--
Gitblit v1.9.3