From 5f7b38aa8e46c99f70ccab613b68cdd769c83794 Mon Sep 17 00:00:00 2001
From: luosongbai <15272473386@163.com>
Date: Thu, 4 Nov 2021 16:45:06 +0800
Subject: [PATCH] 1

---
 web/pages/dashboard.html  |  1 +
 web/pages/modeltable.html | 23 ++++++++++++++++++++++-
 web/pages/retained.html   |  9 ++++++---
 3 files changed, 29 insertions(+), 4 deletions(-)

diff --git a/web/pages/dashboard.html b/web/pages/dashboard.html
index 650ca8b..d6a2bce 100644
--- a/web/pages/dashboard.html
+++ b/web/pages/dashboard.html
@@ -51,6 +51,7 @@
                       <dd><a class="ajax-content" href="eventmanagement" data-id="conetnt">事件管理</a></dd>
                       <dd><a class="ajax-content" href="eventattradmin" data-id="conetnt">事件属性管理</a></dd>
                       <dd><a class="ajax-content" href="userattradmin" data-id="conetnt">用户属性管理</a></dd>
+                      <dd><a class="ajax-content" href="" data-id="conetnt">自定义别名</a></dd>
                       <dd><a class="ajax-content" href="datacheck" data-id="conetnt">埋点数据检查</a></dd>
                     </dl>
                   </li>
diff --git a/web/pages/modeltable.html b/web/pages/modeltable.html
index 3887c23..6884082 100644
--- a/web/pages/modeltable.html
+++ b/web/pages/modeltable.html
@@ -55,7 +55,7 @@
                                 </tr>
                             {{#  }); }}
                         </tbody>
-                    {{# } else if(d.cat === "retention" || d.cat == "scatter"){ }}
+                    {{# } else if( d.cat == "scatter"){ }}
                         <tbody class="table-fenxi-td">
                             
                             {{# layui.each(d.condata, function(indexs, items) {  }}
@@ -71,6 +71,27 @@
                             </tr>
                             {{#  }); }}
                         </tbody>
+                    {{# } else if(d.cat === "retention"){ }}
+                    <tbody class="table-fenxi-td">
+                            
+                        {{# layui.each(d.condata, function(indexs, items) {  }}
+                        <tr >
+                            <td>{{items.date}}</td>
+                            <td>{{items.d0}}</td>
+                            {{#  layui.each(items.data, function(indexss, itemss){ }}
+                            <td>
+                                {{#  if(itemss.p == '-'){ }}
+                                    <p>{{itemss.p}}</p>
+                                {{# } else { }}
+                                    <p>{{itemss.p}}%</p>
+                                {{#  } }} 
+                                
+                            </td>
+                            {{#  }); }}
+                        </tr>
+                        {{#  }); }}
+                    </tbody>
+
                     {{# } else if(d.cat === "ltv"){ }}
                         <tbody class="table-fenxi-td">
                             
diff --git a/web/pages/retained.html b/web/pages/retained.html
index daa1f63..55fdee9 100644
--- a/web/pages/retained.html
+++ b/web/pages/retained.html
@@ -123,7 +123,7 @@
 
                         <div class="analtsis-condition-right-box">
                             <!-- <div class="analtsis-condition">指标</div> -->
-                            <div class="analtsis-condition analtsis-condition-xssz" >显示设置</div>
+                            <!-- <div class="analtsis-condition analtsis-condition-xssz" >显示设置</div> -->
                             <div class="analtsis-chart-switch-box">
                                 <div class="analtsis-chart-switch select-chart" title="数据报表"> <i class="iconfont" style="font-size: 18px; ">&#xe670;</i> </div>
                                 <div class="analtsis-chart-switch  " title="第N日留存"> <i class="iconfont" style="font-size: 18px; ">&#xe601;</i> </div>
@@ -208,8 +208,11 @@
         <td>{{item.d0}}</td>
         {{#  layui.each(item.data, function(indexs, items){ }}
         <td>
-            <p>{{items.n}}</p>
-            <p>{{items.p}}%</p>
+            {{#  if(items.p == '-'){ }}
+                <p>{{items.p}}</p>
+            {{# } else { }}
+                <p>{{items.p}}%</p>
+            {{#  } }} 
         </td>
         {{#  }); }}
     </tr>