Merge branch 'master' of http://192.168.1.41:3000/SmartCost/YangHuCost

config/config.js

@@ -16,6 +16,20 @@ module.exports = {
         },
         importURL:"192.168.1.184:2050"
     },
+    qa_outer: {
+        server: "smartcost.in.8866.org",
+        port: "26904",
+        options:{
+            user:'smartcost',
+            pass:'smartcost3850888',
+            auth: {
+                "authdb": "admin"
+            },
+            connectTimeoutMS: 100000,
+            useMongoClient: true
+        },
+        importURL:"192.168.1.184:6050"
+    },
     test_auth: {
             server: "120.78.150.216",
             port: "27017",

modules/users/controllers/cld_controller.js

@@ -249,6 +249,13 @@ class CLDController {
                 filter.loginMsg = userModel.getDayMsg(loginTime);
             }
 
+            // 排序方式
+            let sortType = request.query.sortType !== '' && request.query.sortType !== undefined ? request.query.sortType : -1;
+
+            // 排序条件
+            let sortField = request.query.sortField;
+            let sort = sortField !== '' && sortField !== undefined && sortField === 'latest_login' ? {latest_login: sortType}: {_id: sortType};
+
             // 获取用户总数
             total = await userModel.count(condition);
 
@@ -263,7 +270,7 @@ class CLDController {
             // console.log("取用户信息=========================");
             // console.log(condition);
             // 获取用户列表
-            userList = await userModel.getList(condition, page, pageSize);
+            userList = await userModel.getList(condition, page, pageSize, sort);
             await online_facade.setOnlineTimes(userList,condition);
             response.json({error: 0, msg: 'success', data: {
                 userInfo: userList,

modules/users/models/user_model.js

@@ -400,10 +400,10 @@ class UserModel extends BaseModel {
      * @param {Number} pageSize
      * @return {promise}
      */
-    async getList(condition = null, page = 1, pageSize = 30) {
+    async getList(condition = null, page = 1, pageSize = 30, sort = {_id:-1}) {
         page = parseInt(page);
         page = page <= 1 ? 1 : page;
-        let option = {pageSize: pageSize, offset: parseInt((page - 1) * pageSize), sort: {_id:-1}};
+        let option = {pageSize: pageSize, offset: parseInt((page - 1) * pageSize), sort: sort};
 
         let userList = await this.db.find(condition, null, option);
         userList = userList.length > 0 ? userList : [];

web/over_write/js/anhui_2019.js

@@ -247,7 +247,7 @@ if (typeof baseFigureTemplate !== 'undefined' && baseFigureTemplate.budget) {
         // 养护单位管理费 算法：以{定额建筑安装工程费(不含专项管理费) }为基数，采用累进办法计算。
         YHDWGLF(tender) {
             const baseFee = this['DEJZAZGCFBHZXGLF'](tender);
-            return cbTools.getProgressiveFee(baseFee, '养护单位(业主)管理费');
+            return cbTools.getProgressiveFee(baseFee, '养护单位管理费');
         },
         // 养护项目信息化费 算法：以{定额建筑安装工程费}为基数，采用累进办法计算。(不足20000元时按20000元计算)
         YHXMXXHF(tender) {
@@ -269,7 +269,7 @@ if (typeof baseFigureTemplate !== 'undefined' && baseFigureTemplate.budget) {
         // 前期工作费 算法：以{定额建筑安装工程费(不含专项管理费) }为基数，采用累进办法计算。(不足30000元时按30000元计算)
         QQGZF(tender) {
             const baseFee = this['DEJZAZGCFBHZXGLF'](tender);
-            const fee = cbTools.getProgressiveFee(baseFee, '养护项目前期工作费');
+            const fee = cbTools.getProgressiveFee(baseFee, '前期工作费');
             return fee > 0 && fee < 30000 ? 30000 : fee;
         },
         /*  价差预备费 算法：以建筑安装工程费为基数，按设计文件编制年始至养护项目工程竣工年终的年数和年工程造价增涨率计算。

web/users/html/user-info.html

@@ -76,7 +76,7 @@
                             </select>
                         </div>
                         <div class="form-group">
-                            <label class="form-control-label">联系人</label>
+                            <label class="form-control-label">账号姓名</label>
                             <input class="form-control" value="<%= userData.real_name %>" placeholder="输入您的姓名" id="name" name="real_name" autocomplete="off">
                         </div>
                         <div class="form-group">