列表更新

skyeye-service/src/main/java/com/skyeye/planproject/service/impl/PlanProjectFlowServiceImpl.java

@@ -31,13 +31,10 @@ public class PlanProjectFlowServiceImpl implements PlanProjectFlowService{
 	     * @return void    返回类型
 	     * @throws
 	 */
-	@SuppressWarnings({ "unchecked", "rawtypes" })
 	@Override
 	public void queryPlanProjectFlowList(InputObject inputObject, OutputObject outputObject) throws Exception {
 		Map<String, Object> map = inputObject.getParams();
 		List<Map<String, Object>> beans = planProjectFlowDao.queryPlanProjectFlowList(map);
-		JSONArray result = ToolUtil.listToTree(JSONArray.parseArray(JSON.toJSONString(beans)), "id", "parentId", "children");
-		beans = (List)result;
 		if(!beans.isEmpty()){
 			outputObject.setBeans(beans);
 			outputObject.settotal(beans.size());

skyeye-web/src/main/resources/dbmapper/PlanProjectFlowMapper.xml

@@ -6,12 +6,9 @@
 		SELECT
 			a.id,
 			a.title title,
-			a.p_id parentId,
-			CASE a.type WHEN 1 THEN
-				(CASE a.p_id WHEN '0' THEN false ELSE true END) ELSE true END isLast,
-			'[{"type": "0", "isChecked": "0"}]' checkArr,
-			CASE a.p_id WHEN '0' THEN '1' ELSE '2' END level,
-			a.`type`
+			a.p_id pId,
+			a.`type`,
+			false lay_is_open
 		FROM
 			plan_project_flow a
 		WHERE a.project_id = #{projectId}

skyeye-web/src/main/webapp/assets/lib/winui/css/winui.css

@@ -4156,25 +4156,6 @@ body .layer-ext-winconfirm {
 
 /*** 折叠面板列表样式start ***/
 
-.skyeye-collapse{
-	
-}
-
-.skyeye-collapse .layui-colla-title{
-	height: 30px !important;
-	line-height: 30px !important;
-}
-
-.skyeye-collapse .layui-colla-content{
-    padding: 10px 10px !important;
-}
-
-.operater{
-	float: right;
-    position: relative;
-    right: 10px;
-}
-
 /*** 折叠面板列表样式end ***/
 
 .mar-left-5px{

skyeye-web/src/main/webapp/js/flowchart/makeflowchart.js

@@ -2,12 +2,13 @@
 layui.config({
 	base: basePath, 
 	version: skyeyeVersion
-}).define(['jquery', 'winui', 'g6'], function (exports) {
+}).define(['treeGrid', 'jquery', 'winui', 'g6'], function (exports) {
 	
 	winui.renderColor();
 	
 	var index = parent.layer.getFrameIndex(window.name); //获取窗口索引
-    var $ = layui.$;
+    var $ = layui.$,
+    treeGrid = layui.treeGrid;
     
     var tip_index = 0;//鼠标移上去的tip的index
     
@@ -16,18 +17,22 @@ layui.config({
 	// 关闭 G6 的体验改进计划打点请求
     G6.track(false);
     
-//    showGrid({
-//	 	id: "groupList",
-//	 	url: reqBasePath + 'planprojectflow001',
-//	 	params: {projectId: parent.rowId},
-//	 	pagination: false,
-//	 	template: getFileContent('tpl/planprojectflow/planprojectfloweditTemplate.tpl'),
-//	 	ajaxSendLoadBefore: function(hdb){
-//	 	},
-//	 	ajaxSendAfter:function(json){
-//	 		
-//	 	}
-//    });
+    treeGrid.render({
+        id: 'messageTable',
+        elem: '#messageTable',
+        method: 'post',
+        idField: 'id',
+        url: reqBasePath + 'planprojectflow001?projectId=' + parent.rowId,
+        cellMinWidth: 100,
+        treeId: 'id',//树形id字段名称
+        treeUpId: 'pId',//树形父id字段名称
+        treeShowName: 'title',//以树形式显示的字段
+        cols: [[
+            {field:'title', width:80, title: '名称'},
+            {field:'type', width:60, title: '类型'},
+        ]],
+        isPage:false
+    });
     
     //左右框高度
     /*$(".left-div").css({height:window.innerHeight});

skyeye-web/src/main/webapp/tpl/flowchart/makeflowchart.html

@@ -11,53 +11,7 @@
 	<div class="layui-col-xs12">
 		<div class="layui-col-xs2" style="min-height: 100px;">
 			<div id="groupList" class="layui-col-xs12">
-			
-				<div class="layui-collapse skyeye-collapse" lay-accordion="">
-					<div class="layui-colla-item">
-						<h2 class="layui-colla-title">文豪</h2>
-						<div class="operater">
-							<div class="layui-btn-group">
-								<button class="layui-btn layui-btn-primary layui-btn-sm">
-									<i class="layui-icon">&#xe654;</i>
-								</button>
-								<button class="layui-btn layui-btn-primary layui-btn-sm">
-									<i class="layui-icon">&#xe642;</i>
-								</button>
-								<button class="layui-btn layui-btn-primary layui-btn-sm">
-									<i class="layui-icon">&#xe640;</i>
-								</button>
-							</div>
-						</div>
-						<div class="layui-colla-content layui-show">
-							<div class="layui-collapse" lay-accordion="">
-								<div class="layui-colla-item">
-									<h2 class="layui-colla-title">唐代</h2>
-									<div class="layui-colla-content layui-show">
-										<div class="layui-collapse" lay-accordion="">
-											<div class="layui-colla-item">
-												<h2 class="layui-colla-title">杜甫</h2>
-												<div class="layui-colla-content layui-show">伟大的诗人</div>
-											</div>
-											<div class="layui-colla-item">
-												<h2 class="layui-colla-title">李白</h2>
-												<div class="layui-colla-content">
-													<p>据说是韩国人</p>
-												</div>
-											</div>
-											<div class="layui-colla-item">
-												<h2 class="layui-colla-title">王勃</h2>
-												<div class="layui-colla-content">
-													<p>千古绝唱《滕王阁序》</p>
-												</div>
-											</div>
-										</div>
-									</div>
-								</div>
-							</div>
-						</div>
-					</div>
-				</div>
-				
+				<table id="messageTable" lay-filter="messageTable"></table>
 			</div>
 		</div>
 	    <div class="layui-col-xs10">