From 53d833b9e67a9770c3a137d91abd4609a6608286 Mon Sep 17 00:00:00 2001
From: luosongbai <15272473386@163.com>
Date: Tue, 7 Sep 2021 20:07:50 +0800
Subject: [PATCH] 1

---
 web/main.html                 |  3 +++
 web/pages/dashboard.html      | 14 +++++++-------
 web/src/x.min.js              | 34 +++++++++++++++++++++++++++++++---
 web/srczip/common.js          |  5 ++++-
 web/srczip/logic/dashboard.js | 29 +++++++++++++++++++++++++++--
 5 files changed, 72 insertions(+), 13 deletions(-)

diff --git a/web/main.html b/web/main.html
index 904d0e5..9c454f6 100644
--- a/web/main.html
+++ b/web/main.html
@@ -28,6 +28,9 @@
   <script src="./src/comboTreePlugin.js"  type="text/javascript"></script>
 
   <script src="./src/jquery.dad.min.js"  type="text/javascript"></script>
+  <!-- 拖动插件 -->
+  <script src="./src/jquery.nestable.js"  type="text/javascript"></script>
+
 
   <!-- table -->
   <script src="./src/FixedTable.js"  type="text/javascript"></script>
diff --git a/web/pages/dashboard.html b/web/pages/dashboard.html
index 0aea20e..f92dc5b 100644
--- a/web/pages/dashboard.html
+++ b/web/pages/dashboard.html
@@ -130,7 +130,7 @@
             </li>
             <li class="layui-nav-item modify-layui-nav-item">
               <a href="javascript:;" class="fontcolor">项目空间</a>
-              <dl class="layui-nav-child modeify-layui-nav-child" id="kongjian">
+              <dl class="layui-nav-child modeify-layui-nav-" id="kongjian">
                
               </dl>
             </li>
@@ -567,7 +567,7 @@
             <a href="javascript:;" class="fontcolor mykanban category xiangmukongjian" data-id="{{item._id}}"> 
                 <i class="layui-icon layui-icon-template-1"></i> {{item.name}} 
                 <img src="./static/img/renyuan.png" class="nav-space-bar" data-id="{{item._id}}"/></a>
-            <dl class="layui-nav-child modeify-layui-nav-child">
+            <dl class="layui-nav-child modeify-layui-nav-child sidebar-box">
 
                 {{#  layui.each(item.children, function(indexs, items){ }}
                     {{#  if(items.isFolder === true){ }}
@@ -596,7 +596,7 @@
 </script>
 
 <!-- 看板模板 -->
-<script id="kanban-model-table-dot" type="text/html">
+ <!-- <script id="kanban-model-table-dot" type="text/html">
 
     {{#  if(d.modelsize === "small"){ }}
 
@@ -655,7 +655,7 @@
         {{# } else { }}
             <div class="layui-col-md6" id="model{{d.id}}">
         {{#  } }} 
-        <!-- <div class="layui-col-md6" style="float: none;"> -->
+        <div class="layui-col-md6" style="float: none;">
             <div class="layui-card">
                 <div class="row-top">
                     <div class="row-tit">
@@ -786,8 +786,8 @@
                 <div style="display: flex; align-items: center;">
                     <div class="data-num">{{d.sameday}}<span></span></div>
                     <div class="proportion">
-                        <!-- <div class="proportion-data">较环比 <div class="sanjiao"></div><span>5.4%</span></div>
-                        <div class="proportion-data">较同比 <div class="sanjiao"></div><span>5.4%</span></div> -->
+                        <div class="proportion-data">较环比 <div class="sanjiao"></div><span>5.4%</span></div>
+                        <div class="proportion-data">较同比 <div class="sanjiao"></div><span>5.4%</span></div>
                     </div>
                 </div>
                 
@@ -811,7 +811,7 @@
 
 
 {{#  } }} 
-</script>
+</script>  -->
 
 <!-- 看板模板外框 -->
 <script id="kanban-model-box-dot" type="text/html">
diff --git a/web/src/x.min.js b/web/src/x.min.js
index 1111e95..311ec1b 100644
--- a/web/src/x.min.js
+++ b/web/src/x.min.js
@@ -627,7 +627,8 @@ var X = window.X || {
                     for(let j in data[i]['values']){
                         var arr;
                         arr = $.extend(true,[],data[i].values[j])
-                        arr.unshift(data[i]['event_name'],data[i]['sum'][j]);
+                        arr.unshift(data[i]['event_name']);
+                        // ,data[i]['sum'][j]
                         condata.push(arr);
                     }
 
@@ -643,6 +644,8 @@ var X = window.X || {
             }
         }
         date = data[0]['start_date'] + " - " + data[0]['end_date'];
+        console.log(titledata);
+        console.log(condata);
         var dataArr = {
             titledata:titledata,
             condata:condata,
@@ -4346,6 +4349,29 @@ var X = window.X || {
                 X.DATA['ProjectData'] = d.spaces;
                 X.laytpldata('#mykanban-dot',d.kanban,'#mykanban');
                 X.laytpldata('#kongjian-dot',d.spaces,'#kongjian');
+                
+                
+                // var updateOutput = function(e){
+
+                //     var list   = e.length ? e : $(e.target),
+            
+                //         output = list.data('output');
+            
+                //     if (window.JSON) {
+            
+                //         output.val(window.JSON.stringify(list.nestable('serialize')));//, null, 2));
+                //         console.log(list.nestable('serialize'));
+            
+                //     } else {
+            
+                //         output.val('JSON browser support required for this demo.');
+                //         console.log(222);
+                //     }
+            
+                // };
+            
+                // $('#kongjian').nestable({group: 1}).on('change', updateOutput);
+                // updateOutput($('#kongjian').data('output', $('#nestable-output')));
             });
         },
 
@@ -4416,7 +4442,8 @@ var X = window.X || {
                             data['timeParticleSize'] = granularity;
                             data['modelswitch'] = d['modelswitch'];
                             eventdata.push(data);
-
+                            console.log(eventdata);
+                            // return;
                             if(d['modelswitch']){
                                 var originaldata;//原始数据
                                 originaldata= $.extend(true,[],eventdata[0]['condata']);
@@ -4432,7 +4459,8 @@ var X = window.X || {
                                     }
                                 }
                                 var titledata = dataarr[0];
-                                var condata = dataarr.slice(1, dataarr.length - 1);
+                                var condata = dataarr.slice(1, dataarr.length);
+
                                 eventdata[0]['titledata'] = titledata;
                                 eventdata[0]['condata'] = condata;
                             }
diff --git a/web/srczip/common.js b/web/srczip/common.js
index bc85855..8385f03 100644
--- a/web/srczip/common.js
+++ b/web/srczip/common.js
@@ -626,7 +626,8 @@ var X = window.X || {
                     for(let j in data[i]['values']){
                         var arr;
                         arr = $.extend(true,[],data[i].values[j])
-                        arr.unshift(data[i]['event_name'],data[i]['sum'][j]);
+                        arr.unshift(data[i]['event_name']);
+                        // ,data[i]['sum'][j]
                         condata.push(arr);
                     }
 
@@ -642,6 +643,8 @@ var X = window.X || {
             }
         }
         date = data[0]['start_date'] + " - " + data[0]['end_date'];
+        console.log(titledata);
+        console.log(condata);
         var dataArr = {
             titledata:titledata,
             condata:condata,
diff --git a/web/srczip/logic/dashboard.js b/web/srczip/logic/dashboard.js
index 4ea2a42..7c16c12 100644
--- a/web/srczip/logic/dashboard.js
+++ b/web/srczip/logic/dashboard.js
@@ -500,6 +500,29 @@
                 X.DATA['ProjectData'] = d.spaces;
                 X.laytpldata('#mykanban-dot',d.kanban,'#mykanban');
                 X.laytpldata('#kongjian-dot',d.spaces,'#kongjian');
+                
+                
+                // var updateOutput = function(e){
+
+                //     var list   = e.length ? e : $(e.target),
+            
+                //         output = list.data('output');
+            
+                //     if (window.JSON) {
+            
+                //         output.val(window.JSON.stringify(list.nestable('serialize')));//, null, 2));
+                //         console.log(list.nestable('serialize'));
+            
+                //     } else {
+            
+                //         output.val('JSON browser support required for this demo.');
+                //         console.log(222);
+                //     }
+            
+                // };
+            
+                // $('#kongjian').nestable({group: 1}).on('change', updateOutput);
+                // updateOutput($('#kongjian').data('output', $('#nestable-output')));
             });
         },
 
@@ -570,7 +593,8 @@
                             data['timeParticleSize'] = granularity;
                             data['modelswitch'] = d['modelswitch'];
                             eventdata.push(data);
-
+                            console.log(eventdata);
+                            // return;
                             if(d['modelswitch']){
                                 var originaldata;//原始数据
                                 originaldata= $.extend(true,[],eventdata[0]['condata']);
@@ -586,7 +610,8 @@
                                     }
                                 }
                                 var titledata = dataarr[0];
-                                var condata = dataarr.slice(1, dataarr.length - 1);
+                                var condata = dataarr.slice(1, dataarr.length);
+
                                 eventdata[0]['titledata'] = titledata;
                                 eventdata[0]['condata'] = condata;
                             }