From 3cc43725fa2e4b8ed4b4b00b845a7dc83f99f39a Mon Sep 17 00:00:00 2001
From: gdg <764716047@qq.com>
Date: 星期二, 23 二月 2021 16:53:35 +0800
Subject: [PATCH] Merge remote-tracking branch 'remotes/origin/yufei' into master
---
src/main/webapp/laboratory_mng.xhtml | 7 +++++--
1 files changed, 5 insertions(+), 2 deletions(-)
diff --git a/src/main/webapp/laboratory_mng.xhtml b/src/main/webapp/laboratory_mng.xhtml
index 601dedb..b93d58d 100644
--- a/src/main/webapp/laboratory_mng.xhtml
+++ b/src/main/webapp/laboratory_mng.xhtml
@@ -12,7 +12,7 @@
<h:form id="laboratoryMngForm">
<p:panel styleClass="center-header">
<p:outputLabel styleClass="title" value="实验室管理"></p:outputLabel>
- <p:panelGrid styleClass="filter" columns="5">
+ <p:panelGrid styleClass="filter" columns="7">
<p:outputLabel value="实验室类型："></p:outputLabel>
<p:selectOneMenu value="#{laboratoryMngController.type}">
<f:selectItem itemLabel="全部" itemValue="#{null}" noSelectionOption="true"></f:selectItem>
@@ -23,6 +23,9 @@
<p:outputLabel value="实验室名："></p:outputLabel>
<p:inputText value="#{laboratoryMngController.name}"></p:inputText>
+
+ <p:outputLabel value="课题组："></p:outputLabel>
+ <p:inputText value="#{laboratoryMngController.project}"></p:inputText>
<p:commandLink styleClass="search" process="@form" update="@form"></p:commandLink>
</p:panelGrid>
@@ -67,7 +70,7 @@
<h:outputText value="#{row.name}"></h:outputText>
</p:column>
- <p:column headerText="所属项目组">
+ <p:column headerText="课题组">
<h:outputText value="#{row.project}"></h:outputText>
</p:column>
--
Gitblit v1.9.2