云版1.1修复部分BUG

操作日志等问题

app/models/operate_log.js

@@ -49,23 +49,13 @@ module.exports = (sequelize, DataTypes) => {
         
         var list=[];
         var sqlQuery = 'select  CONVERT(GROUP_CONCAT(id) USING utf8)   as id,date_format(createDate,"%Y") as year FROM operate_log where ' +
-        'logType=? and dataId=? GROUP BY Year(createDate) ';
+        'logType=? and dataId=? GROUP BY Year(createDate) order by createDate ';
         await sequelize.query(sqlQuery,
         		  { replacements: [logType,dataId], type: sequelize.QueryTypes.SELECT }
         		).then(function(results) {
         			list=results;
         		})
-        
-        /*
-         .spread((results, metadata) => {
-                    list=results;
-                    
-                });
-         
-         .then(function(results) {
-    			list=results;
-    		})
-         */
+
 
         var sqlArray=[];
         list.forEach(function(v,i){

app/service/cloudBuildEditionService.js

@@ -9,9 +9,9 @@ const urlObj=require("url");
 //测试服务器
 //var curingUrl ='https://uat.smartcost.com.cn/cld';
 //正式服务器
-var curingUrl ='https://yun.smartcost.com.cn/cld';
+//var curingUrl ='https://yun.smartcost.com.cn/cld';
 //本地跑
-//var curingUrl ="http://qa.smartcost.com.cn:6060/cld";
+var curingUrl ="http://qa.smartcost.com.cn:6060/cld";
 
 
 
@@ -275,7 +275,7 @@ var cloudService={
         //获得操作日志
         userData['operateLog']=[];
         if(hash.isExistence(userData['curingInfo'])){
-            userData['operateLog']=await models.buildOperate_log.findByCondition(1,hash.hashDecode(userData['curingInfo']['id']));
+            userData['operateLog']=await models.operate_log.findByCondition(2,hash.hashDecode(userData['curingInfo']['id']));
         }
 
         return userData;
@@ -333,7 +333,7 @@ var cloudService={
 
             var operation=STAFF.username+'升级'+data.name;
             //记录锁日志
-            await models.buildOperate_log.createOperateLog(1,id,operation);
+            await models.operate_log.createOperateLog(2,id,operation);
 
             return true;
         }else{
@@ -371,7 +371,7 @@ var cloudService={
 
                 //记录操作日志
                 var operation=STAFF.username+'关联CLD联系人'+clientDetail.clientname;
-                await models.buildOperate_log.createOperateLog(1,id,operation);
+                await models.operate_log.createOperateLog(2,id,operation);
                 return true;
             }else{
                 return false;
@@ -406,7 +406,7 @@ var cloudService={
             var clientDetail=await models.CLD_client.findById(curingDetail['client_id']);
             //记录操作日志
             var operation=STAFF.username+'移除CLD联系人'+clientDetail.clientname;
-            await models.buildOperate_log.createOperateLog(1,id,operation);
+            await models.operate_log.createOperateLog(2,id,operation);
 
             return true;
         }else{

app/service/cloudEditionService.js

@@ -9,9 +9,9 @@ const urlObj=require("url");
 //测试服务器
 //var curingUrl ='https://yhuat.smartcost.com.cn/cld';
 //正式服务器
-var curingUrl ='https://yhyun.smartcost.com.cn/cld';
+//var curingUrl ='https://yhyun.smartcost.com.cn/cld';
 //本地跑
-//var curingUrl ="http://qa.smartcost.com.cn:2060/cld";
+var curingUrl ="http://qa.smartcost.com.cn:2060/cld";
 
 
 

global/js/cloud/buildHtml.js

@@ -10,7 +10,7 @@
 function fnStructureCuringUser(data){
     var html='';
     $.each(data, function(k, v) {
-        html+='<tr curingInfoEdi dataCid="'+setUndefined(v.client_id)+'" data='+setUndefined(v.ssoId)+' dataId="'+setUndefined(v._id)+'" data-toggle="modal" data-target="">';
+        html+='<tr class="pointer-hover" curingInfoEdi dataCid="'+setUndefined(v.client_id)+'" data='+setUndefined(v.ssoId)+' dataId="'+setUndefined(v._id)+'" data-toggle="modal" data-target="">';
         html+='<td>'+setUndefined(v.mobile)+'</td>';
         html+='<td>'+setUndefined(v.qq)+'</td>';
         html+='<td>'+setUndefined(v.company)+'</td>';

global/js/cloud/curingHtml.js

@@ -10,7 +10,7 @@
 function fnStructureCuringUser(data){
     var html='';
     $.each(data, function(k, v) {
-        html+='<tr curingInfoEdi dataCid="'+setUndefined(v.client_id)+'" data='+setUndefined(v.ssoId)+' dataId="'+setUndefined(v._id)+'" data-toggle="modal" data-target="">';
+        html+='<tr class="pointer-hover" curingInfoEdi dataCid="'+setUndefined(v.client_id)+'" data='+setUndefined(v.ssoId)+' dataId="'+setUndefined(v._id)+'" data-toggle="modal" data-target="">';
         html+='<td>'+setUndefined(v.mobile)+'</td>';
         html+='<td>'+setUndefined(v.qq)+'</td>';
         html+='<td>'+setUndefined(v.company)+'</td>';

views/cloud/build.html

@@ -244,7 +244,7 @@
                                             </tr></thead>
                                         <tbody curingUser >
                                         <% curingList.forEach(function(curing) { %>
-                                        <tr curingInfoEdi dataCid="<%= curing.client_id %>" data="<%= curing.ssoId %>" dataId="<%= curing._id %>"
+                                        <tr class="pointer-hover" curingInfoEdi dataCid="<%= curing.client_id %>" data="<%= curing.ssoId %>" dataId="<%= curing._id %>"
                                          data-toggle="modal" data-target="">
                                             <td><%= curing.mobile %> </td>
                                             <td><%= curing.qq %></td>

views/cloud/cloudMenu.html

@@ -6,7 +6,6 @@
                 <i class="fal fa-magic "></i>
                 <span class="nav-link-text">软件锁</span>
             </a>
-
         </li>
          -->
         <li class="active open">
@@ -21,7 +20,7 @@
                     </a>
                 </li>
                
-                <li data="/cloud/build/edition" do style="display:none" >
+                <li data="/cloud/build/edition" do style="display:" >
                     <a href="/cloud/build/edition" title="大司空云计价" data-filter-tags="application intel marketing dashboard">
                         <span class="nav-link-text">大司空云计价</span>
                     </a>

views/cloud/curing.html

@@ -245,7 +245,7 @@
                                             </tr></thead>
                                         <tbody curingUser >
                                         <% curingList.forEach(function(curing) { %>
-                                        <tr curingInfoEdi dataCid="<%= curing.client_id %>" data="<%= curing.ssoId %>" dataId="<%= curing._id %>"
+                                        <tr class="pointer-hover" curingInfoEdi dataCid="<%= curing.client_id %>" data="<%= curing.ssoId %>" dataId="<%= curing._id %>"
                                          data-toggle="modal" data-target="">
                                             <td><%= curing.mobile %> </td>
                                             <td><%= curing.qq %></td>