caipin 5 years ago
parent
commit
d8f32242eb
2 changed files with 21 additions and 10 deletions
  1. 5 4
      app/service/cloudEditionService.js
  2. 16 6
      views/cloud/curing.html

+ 5 - 4
app/service/cloudEditionService.js

@@ -73,13 +73,13 @@ var cloudService={
         		var obj = {
                         mobile: cclValue.mobile,
                         sso_id: cclValue.ssoId,
-                        compilation_id: cclValue.filter.compilationID,
-                        curingCompany: cclValue.company,
+                        //compilation_id: cclValue.filter.compilationID,
+                       // curingCompany: cclValue.company,
                         sid: sid,
                         cid: STAFF.cid,
                         status: 2,
-                        addtime: new Date().getTime(),
-                        updateTotal: cclValue.isUserActive
+                        //addtime: new Date().getTime(),
+                        //updateTotal: cclValue.isUserActive
                     };
                 var detail = await models.cloud_curing.create(obj);
         	}
@@ -110,6 +110,7 @@ var cloudService={
             });
 
             curingCloudList[i].addtime=moment(v.create_time).format('YYYY-MM-DD HH:mm');
+            curingCloudList[i].latest_login=moment(v.latest_login).format('YYYY-MM-DD HH:mm');
             //curingCloudList[i].id=hash.hashEncode(v.id.toString());
             curingCloudList[i].client_id=hash.hashEncode(v.client_id.toString());
             curingCloudList[i].sso_id=v.sso_id;

+ 16 - 6
views/cloud/curing.html

@@ -129,17 +129,27 @@
                                         <thead><tr><th>通行账号</th>
                                             <th>企业名称</th>
                                             <th>CLD客户</th>
-                                            <th>单位名称</th>
-                                            <th>专业版</th>
-                                            <th>注册云版</th></tr></thead>
+                                            <th>公司</th>
+                                            <th>最近登录</th>
+                                            <th>最近使用</th>
+                                            <th>登录时长</th>
+                                            <th>注册时间</th>
+                                            <th>已升级专业版</th>
+                                            </tr></thead>
                                         <tbody curingUser >
                                         <% curingList.forEach(function(curing) { %>
-                                        <tr curingInfoEdi dataCid="<%= curing.client_id %>" data="<%= curing.sso_id %>" dataId="<%= curing.id %>" data-toggle="modal" data-target="#detail">
+                                        <tr curingInfoEdi dataCid="<%= curing.client_id %>" data="<%= curing.sso_id %>" dataId="<%= curing._id %>" data-toggle="modal" data-target="#detail">
                                             <td><%= curing.mobile %> </td>
-                                            <td><%= curing.curingCompany %></td>
+                                            <td><%= curing.company %></td>
                                             <td><%= curing.clientInfo.clientname %></td>
                                             <td><%= curing.clientInfo.companyname %></td>
-                                            <td><span class="badge badge-primary"><%= curing.updateTotal %></span></td>
+                                            
+                                            <td><%= curing.clientInfo.latest_login %></td>
+                                            
+                                            
+                                            <td>
+                                            <span class="badge badge-primary"><%= curing.clientInfo.isUserActive %></span>
+                                            </td>
                                             <td><%= curing.addtime %></td>
                                         </tr>
                                         <% }); %>