From ab44d67723f6b260dd9862831eaa0aeb262d83db Mon Sep 17 00:00:00 2001
From: weizhiqiang <598748873@qq.com>
Date: Thu, 25 Oct 2018 10:36:53 +0800
Subject: [PATCH] =?UTF-8?q?=E9=A1=B5=E9=9D=A2=E6=9B=B4=E6=96=B0?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../main/webapp/assets/lib/layui/custom.js    |  9 +++++-
 .../main/webapp/js/rmmysmpro/mysmprolist.js   |  1 -
 .../js/rmmysmpropage/mysmpropagelist.js       | 19 ++++++++++++
 .../webapp/tpl/rmmysmpro/mysmprolist.html     |  3 +-
 .../tpl/rmmysmpropage/mysmpropagelist.html    | 30 +++++++++++++++++++
 5 files changed, 59 insertions(+), 3 deletions(-)
 create mode 100644 skyeye-web/src/main/webapp/js/rmmysmpropage/mysmpropagelist.js
 create mode 100644 skyeye-web/src/main/webapp/tpl/rmmysmpropage/mysmpropagelist.html

diff --git a/skyeye-web/src/main/webapp/assets/lib/layui/custom.js b/skyeye-web/src/main/webapp/assets/lib/layui/custom.js
index 52a73df98..6befa1f0f 100644
--- a/skyeye-web/src/main/webapp/assets/lib/layui/custom.js
+++ b/skyeye-web/src/main/webapp/assets/lib/layui/custom.js
@@ -35,6 +35,9 @@ function _openNewWindows(mation){
 			if(isNull(mation.offset)){
 				mation.offset = ['15vh', '20vw'];
 			}
+			if(isNull(mation.maxmin)){
+				mation.maxmin = false;
+			}
 		    var index = layer.load(1);
 		    refreshCode = "";
 		    layui.$.ajax({
@@ -45,19 +48,23 @@ function _openNewWindows(mation){
 		            layer.close(index);
 		            //从桌面打开
 //		            top.winui.window.open
-		            layer.open({
+		            var pageIndex = layer.open({
 		            	id: mation.pageId,
 		                type: 2,
 		                title: mation.title,
 		                content: mation.url,
 		                area: mation.area,
 		                offset: mation.offset,
+		                maxmin: mation.maxmin,
 		                end: function(){
 		                	if(typeof(mation.callBack) == "function") {
 		                		mation.callBack(refreshCode);
 		        			}
 		                }
 		            });
+		            if(mation.maxmin){
+		            	layer.full(pageIndex);
+		            }
 		        },
 		        error: function (xml) {
 		            layer.close(index);
diff --git a/skyeye-web/src/main/webapp/js/rmmysmpro/mysmprolist.js b/skyeye-web/src/main/webapp/js/rmmysmpro/mysmprolist.js
index 012307f46..48b25fb9f 100644
--- a/skyeye-web/src/main/webapp/js/rmmysmpro/mysmprolist.js
+++ b/skyeye-web/src/main/webapp/js/rmmysmpro/mysmprolist.js
@@ -79,7 +79,6 @@ layui.config({
 			url: "../../tpl/rmmysmpropage/mysmpropagelist.html", 
 			title: "管理项目",
 			pageId: "rmmysmproconsolePro",
-			area:[],
 			maxmin: true,
 			callBack: function(refreshCode){
                 if (refreshCode == '0') {
diff --git a/skyeye-web/src/main/webapp/js/rmmysmpropage/mysmpropagelist.js b/skyeye-web/src/main/webapp/js/rmmysmpropage/mysmpropagelist.js
new file mode 100644
index 000000000..0efaf7a38
--- /dev/null
+++ b/skyeye-web/src/main/webapp/js/rmmysmpropage/mysmpropagelist.js
@@ -0,0 +1,19 @@
+
+layui.config({
+	base: basePath, 
+	version: skyeyeVersion
+}).define(['table', 'jquery', 'winui', 'form'], function (exports) {
+	
+	winui.renderColor();
+	
+	var $ = layui.$,
+	form = layui.form,
+	table = layui.table;
+	console.log(parent.rowId);
+    
+    function loadTable(){
+    	table.reload("messageTable", {where:{proName:$("#proName").val()}});
+    }
+    
+    exports('mysmpropagelist', {});
+});
diff --git a/skyeye-web/src/main/webapp/tpl/rmmysmpro/mysmprolist.html b/skyeye-web/src/main/webapp/tpl/rmmysmpro/mysmprolist.html
index 96f6f24f1..988ae35cd 100644
--- a/skyeye-web/src/main/webapp/tpl/rmmysmpro/mysmprolist.html
+++ b/skyeye-web/src/main/webapp/tpl/rmmysmpro/mysmprolist.html
@@ -34,7 +34,8 @@
     <div style="margin:auto 10px;">
         <table id="messageTable" lay-filter="messageTable"></table>
         <script type="text/html" id="tableBar">
-            <a class="layui-btn layui-btn-xs" lay-event="edit">编辑</a>
+            <a class="layui-btn layui-btn-xs" lay-event="edit">编辑项目</a>
+			<a class="layui-btn layui-btn-xs" lay-event="consolePro">管理项目</a>
 			{{# if(d.pageNum == 0 && d.modelNum == 0){ }}
 				<a class="layui-btn layui-btn-danger layui-btn-xs" lay-event="del">删除</a>
 			{{# } }}
diff --git a/skyeye-web/src/main/webapp/tpl/rmmysmpropage/mysmpropagelist.html b/skyeye-web/src/main/webapp/tpl/rmmysmpropage/mysmpropagelist.html
new file mode 100644
index 000000000..b99099852
--- /dev/null
+++ b/skyeye-web/src/main/webapp/tpl/rmmysmpropage/mysmpropagelist.html
@@ -0,0 +1,30 @@
+<!DOCTYPE html>
+<html>
+<head>
+    <meta charset="utf-8" />
+    <title></title>
+    <link href="../../assets/lib/layui/css/layui.css" rel="stylesheet" />
+    <link href="../../assets/lib/font-awesome-4.7.0/css/font-awesome.css" rel="stylesheet" />
+    <link href="../../assets/lib/winui/css/winui.css" rel="stylesheet" />
+</head>
+<body>
+    <div class="winui-toolbar">
+        <div class="winui-tool">
+            <button id="reloadTable" class="winui-toolbtn"><i class="fa fa-refresh" aria-hidden="true"></i>刷新数据</button>
+            <button id="addBean" class="winui-toolbtn"><i class="fa fa-plus" aria-hidden="true"></i>新增项目</button>
+        </div>
+    </div>
+    
+    <div class="txtcenter" style="width:700px;margin:0 auto;padding-top:20px;">
+	    <form class="layui-form layui-form-pane" action="" autocomplete="off">
+	        
+	    </form>
+	</div>
+    
+    <script src="../../assets/lib/layui/layui.js"></script>
+    <script src="../../assets/lib/layui/custom.js"></script>
+    <script type="text/javascript">
+        layui.config({base: '../../js/rmmysmpropage/'}).use('mysmpropagelist');
+    </script>
+</body>
+</html>
\ No newline at end of file
-- 
GitLab