From a532b5a35113b2ba9eb89ad0f26cecd0966db2e7 Mon Sep 17 00:00:00 2001
From: 廖井涛 <2265517004@qq.com>
Date: 星期一, 25 十二月 2023 09:27:40 +0800
Subject: [PATCH] Merge branch 'master' of http://10.153.19.25:10101/r/Haier_MES
---
gmms/WebContent/login/machinelistcontent.jsp | 39 +++++++++++++++++++++++----------------
1 files changed, 23 insertions(+), 16 deletions(-)
diff --git a/gmms/WebContent/login/machinelistcontent.jsp b/gmms/WebContent/login/machinelistcontent.jsp
index 24bfa1c..19a8940 100644
--- a/gmms/WebContent/login/machinelistcontent.jsp
+++ b/gmms/WebContent/login/machinelistcontent.jsp
@@ -6,13 +6,7 @@
<html>
<head>
<meta http-equiv="Content-Type" content="text/html; charset=ISO-8859-1">
-<link rel="stylesheet" href="../js/static/css/element.css">
-<link rel="stylesheet" href="../js/static/css/style.css">
-<script src="../js/static/js/vue.js"></script>
-<script src="../js/mixins.js"></script>
-<!-- import JavaScript -->
-<script src="../js/static/js/element.js"></script>
-<script src="../js/static/js/echarts.min.js"></script>
+<script src="../js/main.js"></script>
<style type="text/css">
<style>
.el-table .warning-row {
@@ -28,12 +22,23 @@
<title>Insert title here</title>
</head>
<body>
- <div id="app" style="display:width:100%">
+<%
+String a=null;
+try{
+ a=Manager.getDevice().toString();
+}
+catch(Exception e){
+ a="[{}]";
+}
+
+
+%>
+ <div id="app" style="width:100%">
<el-table border
:data="machine"
- height='700'
+ height='100%'
style="width: 100%;"
- :row-class-name="tableRowClassName"
+ :cell-class-name="tableRowClassName"
>
<el-table-column
prop="name"
@@ -49,7 +54,7 @@
</el-table-column>
<el-table-column
prop="st"
- label="鐘舵�佁�">
+ label="鐘舵��">
</el-table-column>
<el-table-column
prop="count"
@@ -63,19 +68,21 @@
el: '#app',
mixins:[mixin],
data:{
- machine:<%out.print( Manager.getDevice().toString());%>,
+ machine:<%= a%>,
},
methods:{
- tableRowClassName({row, rowIndex}) {
+ tableRowClassName({row,column,rowIndex,columnIndex}) {
- if (row['st'] == '鏈繛鎺�') {
+ if (row['st'] == '鏈繛鎺�' && columnIndex==3 ) {
return 'success-row';
+ }else{
+ return '';
}
- return '';
+
}
}
})
- //console.log(app.$data.machine);
+ // console.log(app.$data.machine);
</script>
</body>
</html>
\ No newline at end of file
--
Gitblit v1.8.0