update

controller/collectSMCController.js

@@ -39,13 +39,14 @@ async function list(req, res, next) {
                 search.deviceNumber = {$in: devNums}
             }
         }
-        search.deviceHQType = req.body.deviceHQType; 
+        search.deviceHQType = req.body.deviceHQType || 1; 
         let page = req.body.page || 1;
         let pageSize = req.body.pageSize || 10;
         let skip = (page - 1) * pageSize;
+        console.log(search);
         let count = await collectSMCModule.count(search);
         let data = await collectSMCModule.findList(search, { skip, limit: pageSize });
-        if(!search.deviceHQType) { // 这段是为了大屏 把 ph电导率 和 温湿度氮磷钾 合并起来
+        if(!req.body.deviceHQType) { // 这段是为了大屏 把 ph电导率 和 温湿度氮磷钾 合并起来
             search.deviceHQType = 2;
             delete search.deviceNumber;
             let phData = await collectSMCModule.findList(search, { skip, limit: pageSize});

module/collectSMCModule.js

@@ -23,7 +23,6 @@ async function findList(search, options) {
 
 // 总量
 async function count(search) {
-    console.log(DB.CollectSMC)
     return DB.CollectSMC.countDocuments(search);
 }