code sync

modules/reports/controllers/rpt_tpl_controller.js

@@ -23,10 +23,10 @@ let callback = function(req, res, err, message, data){
 
 let mExport = {
     getCustomerCfg(req, res) {
-        let params = JSON.parse(req.body.params)
-            // userId = params.userId
+        let params = JSON.parse(req.body.params),
+            userId = params.userId
         ;
-        let userId = req.session.sessionUser.id;
+        if (req.session.sessionUser && req.session.sessionUser.id) userId = req.session.sessionUser.id;
         let userIds = [];
         userIds.push(userId);
         if (userId !== "-100") {
@@ -76,9 +76,9 @@ let mExport = {
     getRptTplTree: function(req, res) {
         let params = JSON.parse(req.body.params),
             compilationId = params.compilationId,
-            // userId = params.userId,
+            userId = params.userId,
             engineerId = params.engineerId;
-        let userId = req.session.sessionUser.id;
+        if (req.session.sessionUser && req.session.sessionUser.id) userId = req.session.sessionUser.id;
         let userIds = [];
         userIds.push(userId);
         if (userId != "-100") {
@@ -163,10 +163,10 @@ let mExport = {
     updateTopNodeName: function (req, res) {
         let params = JSON.parse(req.body.params),
             compilationId = params.compilationId, engineerId = params.engineerId,
-            // userId = params.userId,
+            userId = params.userId,
             nodeName = params.nodeName
         ;
-        let userId = req.session.sessionUser.id;
+        if (req.session.sessionUser && req.session.sessionUser.id) userId = req.session.sessionUser.id;
         let filter = {"compilationId": compilationId, "engineerId": engineerId, "userId": userId, "$or": [{"isDeleted": null}, {"isDeleted": false}]};
         let updateStatement = {"$set": {"name": nodeName}};
         rttFacade.updateTreeInDetail(filter, updateStatement).then(function (rst) {
@@ -182,10 +182,10 @@ let mExport = {
     updateSubLevelOneNode: function (req, res) {
         let params = JSON.parse(req.body.params),
             compilationId = params.compilationId, engineerId = params.engineerId,
-            // userId = params.userId,
+            userId = params.userId,
             subNode = params.subNode
         ;
-        let userId = req.session.sessionUser.id;
+        if (req.session.sessionUser && req.session.sessionUser.id) userId = req.session.sessionUser.id;
         let filter = {"compilationId": compilationId, "engineerId": engineerId, "userId": userId, "items.ID": subNode.ID, "$or": [{"isDeleted": null}, {"isDeleted": false}]};
         let updateStatement = {$set: {"items.$": subNode}};
         rttFacade.updateTreeInDetail(filter, updateStatement).then(function (rst) {
@@ -203,10 +203,10 @@ let mExport = {
         let params = JSON.parse(req.body.params),
             compilationId = params.compilationId,
             engineerId = params.engineerId,
-            // userId = params.userId,
+            userId = params.userId,
             isPhysically = params.isPhysically
             ;
-        let userId = req.session.sessionUser.id;
+        if (req.session.sessionUser && req.session.sessionUser.id) userId = req.session.sessionUser.id;
         if (isPhysically) {
             rttFacade.removeTreePhycically(compilationId, engineerId, userId).then(function (rst) {
                 if (rst) {
@@ -268,10 +268,10 @@ let mExport = {
             grpKey = params.grpKey,
             compilationId = params.compilationId,
             engineerId = params.engineerId,
-            // userId = params.userId,
+            userId = params.userId,
             subNode = params.subNode
         ;
-        let userId = req.session.sessionUser.id;
+        if (req.session.sessionUser && req.session.sessionUser.id) userId = req.session.sessionUser.id;
         let filter = {"ID": rptDftTplId};
         RptTplModel.findOne(filter, '-_id').exec().then(function(dftTplRst) {
             if (dftTplRst) {

modules/reports/facade/rpt_cust_cfg_facade.js

@@ -6,7 +6,8 @@ import mongoose from "mongoose";
 let rpt_customize_cfg_mdl = mongoose.model("rpt_customize_cfg");
 
 module.exports = {
-    getCustomizeCfg: getCustomizeCfg
+    getCustomizeCfg: getCustomizeCfg,
+    saveCustomizeCfg: saveCustomizeCfg
 };
 
 async function getCustomizeCfg(userIds) {
@@ -16,3 +17,8 @@ async function getCustomizeCfg(userIds) {
     }
     return await rpt_customize_cfg_mdl.find(filter, '-_id');
 }
+
+async function saveCustomizeCfg(custCfg) {
+    let filter = {"userId": custCfg.userId};
+    return await rpt_customize_cfg_mdl.update(filter, custCfg);
+}

modules/reports/routes/rpt_tpl_router.js

@@ -29,6 +29,7 @@ module.exports = function (app) {
     rptTplRouter.post('/updateRptTpl', reportTplController.updateRptTpl);
     rptTplRouter.post('/getCompilationList', reportTplController.getCompilationList);
     rptTplRouter.post('/getCustomizeCfg', reportTplController.getCustomerCfg);
+    rptTplRouter.post('/saveCustomerCfg', reportTplController.saveCustomerCfg);
 
     rptTplRouter.post('/getUserRptCfg', reportCfgController.getReportUserCfg);
     rptTplRouter.post('/getMappingFields', reportCfgController.getAllMappingFields);

web/maintain/report/js/jpc_output.js

@@ -43,7 +43,7 @@ let JpcCanvasOutput = {
                     break;
             }
         }
-        function private_setupAreaV(area, type, fontAngle, dftFontHeight, outputPoint) {
+        function private_setupAreaV(area, type, fontAngle, fontName, dftFontHeight, outputPoint) {
             let lType = type;
             if (type !== "top" && type !== "bottom" && type !== "center") lType = "top";
             switch (lType) {
@@ -59,14 +59,20 @@ let JpcCanvasOutput = {
                         outputPoint[0] = 1 * area[JV.IDX_LEFT] + JV.OUTPUT_OFFSET[JV.OFFSET_IDX_BOTTOM];
                     } else if (fontAngle === JV.ANTI_VERTICAL_ANGLE_INT) {
                         outputPoint[0] = 1 * area[JV.IDX_RIGHT] - JV.OUTPUT_OFFSET[JV.OFFSET_IDX_BOTTOM];
-                    } else outputPoint[1] = 1 * area[JV.IDX_BOTTOM] - JV.OUTPUT_OFFSET[JV.OFFSET_IDX_BOTTOM];
+                    } else {
+                        outputPoint[1] = 1 * area[JV.IDX_BOTTOM] - JV.OUTPUT_OFFSET[JV.OFFSET_IDX_BOTTOM];
+                        if (fontName === "宋体") outputPoint[1] = outputPoint[1] - 1;
+                    }
                     break;
                 case "center":
                     if (fontAngle === JV.VERTICAL_ANGLE_INT) {
                         outputPoint[0] = (1 * area[JV.IDX_LEFT] + 1 * area[JV.IDX_RIGHT] - dftFontHeight) / 2;
                     } else if (fontAngle === JV.ANTI_VERTICAL_ANGLE_INT) {
                         outputPoint[0] = (1 * area[JV.IDX_LEFT] + 1 * area[JV.IDX_RIGHT] + dftFontHeight) / 2;
-                    } else outputPoint[1] = (1 * area[JV.IDX_TOP] + 1 * area[JV.IDX_BOTTOM] + dftFontHeight) / 2;
+                    } else {
+                        outputPoint[1] = (1 * area[JV.IDX_TOP] + 1 * area[JV.IDX_BOTTOM] + dftFontHeight) / 2;
+                        if (fontName === "宋体") outputPoint[1] = outputPoint[1] - 1;
+                    }
                     break;
             }
         }
@@ -88,10 +94,10 @@ let JpcCanvasOutput = {
             }
             if (control) {
                 private_setupAreaH(area, control.Horizon, parseInt(font.FontAngle), dftFontHeight, output);
-                private_setupAreaV(area, control.Vertical, parseInt(font.FontAngle), dftFontHeight, output);
+                private_setupAreaV(area, control.Vertical, parseInt(font.FontAngle), font.Name, dftFontHeight, output);
             } else {
                 private_setupAreaH(area, "left", parseInt(font.FontAngle), dftFontHeight, output);
-                private_setupAreaV(area, "bottom", parseInt(font.FontAngle), dftFontHeight, output);
+                private_setupAreaV(area, "bottom", parseInt(font.FontAngle), font.Name, dftFontHeight, output);
             }
             let w = area[JV.IDX_RIGHT] - JV.OUTPUT_OFFSET[JV.OFFSET_IDX_RIGHT] - area[JV.IDX_LEFT] - JV.OUTPUT_OFFSET[JV.OFFSET_IDX_RIGHT];
             if ( parseInt(font.FontAngle) !== 0) {

web/maintain/report/js/rpt_tpl_main.js

@@ -237,7 +237,7 @@ let zTreeOprObj = {
     getReportTemplateTree: function(compilationSelect) {
         let me = zTreeOprObj, params = {};
         params.compilationId = compilationSelect.value;
-        params.userId = (userAccount ===  'admin')?(parseInt(-100)):parseInt(userID);
+        params.userId = (userAccount ===  'admin')?("-100"):userID;
         let allEngIds = [];
         for (let item of engineeringList) {
             allEngIds.push(item.value);