Quellcode durchsuchen

导入其他标段计量数据,导入信息显示变更数量

MaiXinRong vor 3 Jahren
Ursprung
Commit
2da1158cb9
3 geänderte Dateien mit 16 neuen und 14 gelöschten Zeilen
  1. 12 14
      app/middleware/auto_finish_logger.js
  2. 1 0
      app/public/js/shares/cs_tools.js
  3. 3 0
      config/config.default.js

+ 12 - 14
app/middleware/auto_finish_logger.js

@@ -12,27 +12,25 @@ module.exports = options => {
     return async function autoFinishLogger(ctx, next) {
         await next();
 
-        const bLogger = ctx.getLogger('finish');
+        if (ctx.url.indexOf('/public/') === 0) return;
+
         const responseTime = new Date();
-        const runTime = responseTime.getTime() - responseTime.getTime();
+        const runTime = responseTime.getTime() - ctx.logTime.getTime();
+        let logData;
         if (ctx.session && ctx.session.sessionUser) {
-            const logData = {
-                requestTime: ctx.logTime,
-                responseTime, runTime,
-                method: ctx.method,
-                user: ctx.session.sessionUser,
-                project: ctx.session.sessionProject,
+            logData = {
+                requestTime: ctx.logTime, responseTime, runTime,
+                user: ctx.session.sessionUser.accountId, userName: ctx.session.sessionUser.name, loginType: ctx.session.sessionUser.loginType,
+                pCode: ctx.session.sessionProject.code,
                 data: ctx.request.body,
             };
-            bLogger.info(JSON.stringify(logData));
         } else {
-            const logData = {
-                requestTime: ctx.logTime,
-                responseTime, runTime,
-                method: ctx.method,
+            logData = {
+                requestTime: ctx.logTime, responseTime, runTime,
                 data: ctx.body,
             };
-            bLogger.info(JSON.stringify(logData));
         }
+        const bLogger = runTime > 500 ? ctx.getLogger('warning') : ctx.getLogger('finish');
+        bLogger.info(JSON.stringify(logData));
     };
 };

+ 1 - 0
app/public/js/shares/cs_tools.js

@@ -960,6 +960,7 @@ const showSelectTab = function(select, spread, afterShow) {
                     { title: '清单名称', field: 'name', width: 120, formatter: '@' },
                     { title: '单位', field: 'unit', width: 50, formatter: '@' },
                     { title: '数量', field: 'qty', width: 60 },
+                    { title: '变更数量', field: 'qc_qty', width: 60, visible: setting.type === 'stage' },
                     {
                         title: '类型', field: 'type', width: 100, getValue: function (x) {
                             switch (x.type) {

+ 3 - 0
config/config.default.js

@@ -167,6 +167,9 @@ module.exports = appInfo => {
         },
         finish: {
             file: path.join(appInfo.root, 'logs', appInfo.name, config.version, 'finish.log'),
+        },
+        warning: {
+            file: path.join(appInfo.root, 'logs', appInfo.name, config.version, 'warning.log'),
         }
     };