From 9c9503de4fb1e1b0127f83c8b2b0f645c6ab9e9c Mon Sep 17 00:00:00 2001
From: 李宇 <986321569@qq.com>
Date: 星期四, 21 一月 2021 11:20:53 +0800
Subject: [PATCH] 修改处理报警接口

---
 src/main/webapp/laboratory_mng.xhtml |   15 ++++++++++++++-
 1 files changed, 14 insertions(+), 1 deletions(-)

diff --git a/src/main/webapp/laboratory_mng.xhtml b/src/main/webapp/laboratory_mng.xhtml
index 55fe43a..601dedb 100644
--- a/src/main/webapp/laboratory_mng.xhtml
+++ b/src/main/webapp/laboratory_mng.xhtml
@@ -28,7 +28,7 @@
 			</p:panelGrid>
 		</p:panel>
 		<p:panel styleClass="center-body">
-			<p:panelGrid columns="5" styleClass="btn">
+			<p:panelGrid columns="6" styleClass="btn">
 				<p:commandButton value="新建" styleClass="new-btn" process="@this"
 					actionListener="#{laboratoryMngController.onNewBtnClick}"
 					oncomplete="PF('dialog').show();" update=":dialog,:dialogForm"></p:commandButton>
@@ -41,6 +41,8 @@
 				</p:commandButton>
 				<p:commandButton value="导入" styleClass="import-btn" onclick="importLab()"
 				></p:commandButton>
+				<p:commandButton value="导出" styleClass="new-btn" ajax="false"  actionListener="#{laboratoryMngController.exportLab2Excel}"
+				/>
 				<a href="resources/template/实验室导入模板.xlsx" style="display: inline-block;"><img src="resources/images/xlsx.png" width="30px;" alt=""/></a>
 				<script>
 					function importLab(){
@@ -63,6 +65,10 @@
 
 				<p:column headerText="实验室名">
 					<h:outputText value="#{row.name}"></h:outputText>
+				</p:column>
+
+				<p:column headerText="所属项目组">
+					<h:outputText value="#{row.project}"></h:outputText>
 				</p:column>
 
 				<p:column headerText="状态码">
@@ -129,6 +135,13 @@
                     <f:selectItems value="#{baseMetaService.getBaseMetaList(constants.BASE_META_GROUP_USER_DEPARTMENT)}"
                                    var="item" itemLabel="#{item.metaValue}" itemValue="#{item.id}"></f:selectItems>
                 </p:selectOneMenu>
+
+
+				<p:outputLabel value="所属课题组"  for="multiple"/>
+				<p:selectCheckboxMenu id="multiple" value="#{laboratoryMngController.sysLaboratory.projects}" label="Cities" multiple="true"
+									  filter="true" filterMatchMode="startsWith" panelStyle="width:250px">
+					<f:selectItems value="#{sysProjectServiceImpl.getAll()}" var="item" itemValue="#{item.project}" itemLabel="#{item.project}"/>
+				</p:selectCheckboxMenu>
 			</p:panelGrid>
 			<p:panel styleClass="btn">
 				<p:commandButton value="保存"

--
Gitblit v1.9.2