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/EquipmentAlarmInfor.vue | 29 +++++++++++++++++++----------
1 files changed, 19 insertions(+), 10 deletions(-)
diff --git "a/\346\226\260\345\273\272\346\226\207\344\273\266\345\244\271/WMS/src/views/Alarm/EquipmentAlarmInfor.vue" "b/\346\226\260\345\273\272\346\226\207\344\273\266\345\244\271/WMS/src/views/Alarm/EquipmentAlarmInfor.vue"
index c1989ed..c4c29fd 100644
--- "a/\346\226\260\345\273\272\346\226\207\344\273\266\345\244\271/WMS/src/views/Alarm/EquipmentAlarmInfor.vue"
+++ "b/\346\226\260\345\273\272\346\226\207\344\273\266\345\244\271/WMS/src/views/Alarm/EquipmentAlarmInfor.vue"
@@ -24,10 +24,10 @@
sortName: "id"
});
const editFormFields = ref({
- RobotName: "",
- RobotCode: "",
- Status: "",
- SyncTime: ""
+ robotName: "",
+ robotCode: "",
+ status: "",
+ syncTime: ""
});
const editFormOptions = ref([
[
@@ -52,7 +52,8 @@
title: "璁惧鐘舵��",
type: "select",
required: true,
- bind: { key: "deviceStatus", data: [] },
+ // bind: { key: "deviceStatus", data: [] },
+ dataKey: "deviceStatus",
span: 12
},
{
@@ -73,19 +74,27 @@
[
{title:"璁惧鍚嶇О", field:"robotName", type:"like"},
{title:"璁惧缂栫爜", field:"robotCode", type:"like"},
- {title:"璁惧鐘舵��", field:"status", type:"eq", bind: { key: "deviceStatus", data: [] }}
+ // {title:"璁惧鐘舵��", field:"status", type:"eq", bind: { key: "deviceStatus", data: [] }}
+ {title:"璁惧鐘舵��", field:"status", type:"select",dataKey: "deviceStatus",data:[]}
]
]);
const columns = ref([
{field:'id',title:'涓婚敭',type:'int',width:90,hidden:true,readonly:true,require:true,align:'left'},
{field:'robotName',title:'璁惧鍚嶇О',type:'string',width:120,align:'left',sort:true},
{field:'robotCode',title:'璁惧缂栫爜',type:'string',width:120,align:'left'},
- {field:'status',title:'璁惧鐘舵��',type:'select',width:100,align:'left',bind:{key:'deviceStatus',data:[]}},
+ {field:'status',
+ title:'璁惧鐘舵��',
+ type:'select',
+ width:100,
+ align:'left',
+ data:[],
+ bind: { key: "deviceStatus", data: [] },
+ },
{field:'syncTime',title:'鍚屾鏃堕棿',type:'datetime',width:160,align:'left',sort:true},
- {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:'modifyDate',title:'淇敼鏃ユ湡',type:'datetime',width:160,align:'left',sort:true}
+ //{field:'modifier',title:'淇敼浜�',type:'string',width:100,align:'left'},
+ // {field:'modifyDate',title:'淇敼鏃ユ湡',type:'datetime',width:160,align:'left',sort:true}
]);
const detail = ref({
cnName: "#detailCnName",
--
Gitblit v1.9.3