Browse Source

update server.js

zhangweicheng 7 years ago
parent
commit
121b320237

+ 0 - 12
modules/common/std/schemas/std_mix_ratio.js

@@ -1,12 +0,0 @@
-/**
- * 配合比标准库数据模型
- *
- * @author CaiAoLin
- * @date 2017/7/7
- * @version
- */
-import mongoose from "mongoose";
-
-let collectionName = 'std_mix_ratio';
-let model = mongoose.model(collectionName);
-export {model as default, collectionName as collectionName};

+ 0 - 13
modules/common/std/schemas/std_ration_lib_glj_list.js

@@ -1,13 +0,0 @@
-/**
- * 定额工料机标准库数据模型
- *
- * @author CaiAoLin
- * @date 2017/7/7
- * @version
- */
-import mongoose from "mongoose";
-
-let collectionName = 'std_glj_lib_gljList';
-// 因为别处已初始化过,所以直接使用
-let model = mongoose.model(collectionName);
-export {model as default, collectionName as collectionName};

+ 2 - 2
modules/common/std/std_glj_lib_glj_list_model.js

@@ -5,8 +5,8 @@
  * @date 2017/7/11
  * @version
  */
+import mongoose from "mongoose";
 import BaseModel from "../base/base_model";
-import STDRationLibGLJListSchemas from "./schemas/std_ration_lib_glj_list";
 
 class STDGLJLibGLJListModel extends BaseModel {
 
@@ -17,7 +17,7 @@ class STDGLJLibGLJListModel extends BaseModel {
      */
     constructor() {
         let parent = super();
-        parent.model = STDRationLibGLJListSchemas;
+        parent.model = mongoose.model("std_glj_lib_gljList");
         parent.init();
     }
 

+ 2 - 2
modules/common/std/std_mix_ratio_model.js

@@ -5,8 +5,8 @@
  * @date 2017/7/10
  * @version
  */
+import mongoose from "mongoose";
 import BaseModel from "../base/base_model";
-import STDMixRatioSchema from "./schemas/std_mix_ratio";
 
 class STDMixRatioModel extends BaseModel {
 
@@ -17,7 +17,7 @@ class STDMixRatioModel extends BaseModel {
      */
     constructor() {
         let parent = super();
-        parent.model = STDMixRatioSchema;
+        parent.model = mongoose.model('std_mix_ratio');
         parent.init();
     }
 

+ 0 - 10
server.js

@@ -20,16 +20,6 @@ dbm.connect();
 fileUtils.getGlobbedFiles('./modules/all_models/*.js').forEach(function(modelPath) {
     require(path.resolve(modelPath));
 })
-
-//引入报表模块
-fileUtils.getGlobbedFiles('./modules/reports/models/*.js').forEach(function(modelPath) {
-    require(path.resolve(modelPath));
-})
-
-// 引入人工系数模块
-require('./modules/main/models/labour_coe_model');
-require('./modules/main/models/calc_program_model');
-
 //config.setupCache();
 let cfgCacheUtil = require("./config/cacheCfg");
 cfgCacheUtil.setupDftCache();