code tuning -> ration repository

modules/rationRepository/controllers/rationController.js

@@ -2,7 +2,7 @@
  * Created by Tony on 2017/5/2.
  */
 
-var rationItem = require('../models/rationItem');
+var rationItem = require('../models/ration_item');
 var callback = function(req, res, err, message, data){
     res.json({error: err, message: message, data: data});
 };

modules/rationRepository/controllers/rationRepositoryController.js

@@ -1,7 +1,7 @@
 /**
  * Created by Tony on 2017/4/20.
  */
-var rationRepository = require("../models/repositoryMap");
+var rationRepository = require("../models/repository_map");
 
 var callback = function(req, res, err, message, data){
     res.json({error: err, message: message, data: data});

modules/rationRepository/controllers/rationChapterTreeController.js

@@ -2,7 +2,7 @@
  * Created by Tony on 2017/4/21.
  */
 
-var rationChapterTreeData = require('../models/rationChapterTree');
+var rationChapterTreeData = require('../models/ration_section_tree');
 var callback = function(req,res,err,message, data){
     res.json({error: err, message: message, data: data});
 }

modules/rationRepository/controllers/repositoryGljController.js

@@ -1,7 +1,7 @@
 /**
  * Created by Tony on 2017/5/5.
  */
-var gljRepository = require("../models/gljRepository");
+var gljRepository = require("../models/glj_repository");
 
 var callback = function(req,res,err,message, data){
     res.json({error: err, message: message, data: data});

modules/rationRepository/models/gljRepository.js

@@ -32,7 +32,7 @@ var gljSchema = mongoose.Schema({
 });
 var gljTypeModel = db.model("gljType",gljTypeSchema, "gljType");
 var gljItemModel = db.model("gljRepository",gljSchema, "gljRepository");
-var repositoryMap = require('./repositoryMap');
+var repositoryMap = require('./repository_map');
 var counter = require('../../../public/counter/counter');
 
 var gljItemDAO = function(){};

modules/rationRepository/models/rationChapterTree.js

@@ -17,7 +17,7 @@ var rationChapterTreeSchema = mongoose.Schema({//章节树  //生成唯一id改
     isDeleted: Boolean
 });
 var rationChapterTreeModel = chapterTreeDb.model("rationChapterTrees",rationChapterTreeSchema, "rationChapterTrees")
-var repositoryMap = require('./repositoryMap');
+var repositoryMap = require('./repository_map');
 var counter = require('../../../public/counter/counter');
 
 var rationChapterTreeDAO = function(){};

modules/rationRepository/routes/rationRepRoutes.js

@@ -5,10 +5,10 @@ var express = require("express");
 var apiRouter =express.Router();
 //var _rootDir = __dirname;
 
-var rationRepositoryController = require("../controllers/rationRepositoryController");
-var rationChapterTreeController = require("../controllers/rationChapterTreeController");
-var rationController = require("../controllers/rationController");
-var repositoryGljController = require("../controllers/repositoryGljController");
+var rationRepositoryController = require("../controllers/ration_repository_controller");
+var rationChapterTreeController = require("../controllers/ration_section_tree_controller");
+var rationController = require("../controllers/ration_controller");
+var repositoryGljController = require("../controllers/repository_glj_controller");
 var coeListController = require("../controllers/coe_controller");
 
 apiRouter.post("/getRationDisplayNames",rationRepositoryController.getDisPlayRationLibs);

server.js

@@ -130,23 +130,23 @@ app.use("/report_api", rpt_Router);
 //var rations_Router = require("./modules/rationLibEditor/routes/rationLibEditor_route");
 //app.use("/rationLibEditor",rations_Router);
 
-var rationRepository_Router = require("./modules/rationRepository/routes/rationRepRoutes");
+var rationRepository_Router = require("./modules/ration_repository/routes/ration_rep_routes");
 app.get('/rationRepository/main', function(req, res) {
-    res.render('maintain/rationRepository/main.html',
+    res.render('maintain/ration_repository/main.html',
         {
             userAccount: req.session.userAccount,
             userID: req.session.userID
         });
 });
 app.get('/rationRepository/ration', function(req, res) {
-    res.render('maintain/rationRepository/dinge.html',
+    res.render('maintain/ration_repository/dinge.html',
         {
             userAccount: req.session.userAccount,
             userID: req.session.userID
         });
 });
 app.get('/rationRepository/lmm', function(req, res) {
-    res.render('maintain/rationRepository/gongliao.html',
+    res.render('maintain/ration_repository/gongliao.html',
         {
             userAccount: req.session.userAccount,
             userID: req.session.userID
@@ -154,7 +154,7 @@ app.get('/rationRepository/lmm', function(req, res) {
 });
 
 app.get('/rationRepository/coeList', function(req, res) {
-    res.render('maintain/rationRepository/fuzhu.html',
+    res.render('maintain/ration_repository/fuzhu.html',
         {
             userAccount: req.session.userAccount,
             userID: req.session.userID

web/maintain/rationRepository/css/main.css

@@ -1,8 +1,7 @@
 /*building SAAS 0.1*/
 /*bootstrap 初始化*/
 body {
-    font-size: 0.9rem;
-    overflow: hidden;
+    font-size: 0.9rem
 }
 .dropdown-menu {
     font-size: 0.9rem
@@ -27,12 +26,12 @@ body {
   width:100%;
   z-index: 999
 }
-.in-1{padding-left:0px!important}
-.in-2{padding-left:21px!important}
-.in-3{padding-left:42px!important}
-.in-4{padding-left:63px!important}
-.in-5{padding-left:84px!important}
-.in-6{padding-left:105px!important}
+.in-1{padding-left:0rem!important}
+.in-2{padding-left:1rem!important}
+.in-3{padding-left:1.5rem!important}
+.in-4{padding-left:2rem!important}
+.in-5{padding-left:2.5rem!important}
+.in-6{padding-left:3rem!important}
 .main {
     position: relative;
     background: #f7f7f9;
@@ -63,12 +62,7 @@ body {
     background: #fff;
     color: #333
 }
-.main-nav .nav-tabs{
-  border-bottom: none
-}
 .content {
-    border-left: 1px solid #ccc;
-    margin-left: 29px;
     background: #fff
 }
 .tools-btn {
@@ -79,22 +73,29 @@ body {
     background: #f7f7f9;
 }
 .main-side {
-    border-top: 1px solid #ccc;
-    border-left: 1px solid #ccc;
-    overflow-y: hidden;
+    border-right: 1px solid #ccc;
+    overflow-y: auto;
 }
-.sidebar-bottom,.sidebar-bottom .col-lg-6,.sidebar-bottom .col-lg-12 {
-  height:200px
+.main-side .tab-bar {
+    padding:5px 10px;
+    height:38px;
+    position:fixed;
+}
+.main-side .tab-content {
+    margin-top: 38px
 }
 .top-content, .fluid-content {
-    overflow: auto;
+    overflow: hidden;
     border-bottom: 1px solid #ccc;
 }
-.bottom-content .nav {
+.warp-p2 {
+    padding: 2px
+}
+.bottom-content .nav,.top-content .nav {
     background: #f7f7f9;
     padding:0 0 0 2px
 }
-.bottom-content .nav-tabs .nav-link, .side-tabs .nav-tabs .nav-link {
+.bottom-content .nav-tabs .nav-link, .side-tabs .nav-tabs .nav-link,.top-content .nav-tabs .nav-link {
     border-radius: 0;
     padding: 0.2em 0.5em
 }
@@ -211,13 +212,14 @@ body {
         transform: translateX(10px);
     }
 }
+.bottom-content {
+    height: 370px;
+    overflow: hidden;
+}
 .bottom-content .tab-content .main-data-bottom{
-    height: 200px;
+    height: 340px;
     overflow: auto;
 }
-.bottom-content .tab-content .ovf-hidden{
-    overflow: hidden;
-}
 .form-signin {
     max-width: 500px;
     margin: 150px auto;
@@ -226,13 +228,9 @@ body {
     overflow: auto;
 }
 .poj-list span.poj-icon {
-  padding-right:7px;
+  padding-right:10px;
   color:#ccc
 }
-.poj-list a.tree-open,.poj-list a.tree-close{
-  width:15px;
-  display: inline-block;
-}
 .print-toolsbar{
   padding:5px
 }
@@ -268,7 +266,10 @@ body {
   width:inherit;
   height: inherit;
 }
-.modal-fixed-height {
-  height: 400px;
-  overflow-y: auto;
+.codeList{
+    max-height: 200px;
+    overflow:auto;
+}
+.main-data-top,.main-data-bottom,.main-data{
+  overflow: auto;
 }

web/maintain/rationRepository/dinge.html

@@ -8,7 +8,7 @@
     <title>定额库编辑器</title>
     <link rel="stylesheet" href="/lib/bootstrap/css/bootstrap.min.css">
    <!-- <link rel="stylesheet" href="/lib/css/bootstrap/themes.css">-->
-    <link rel="stylesheet" href="/web/building_saas/css/main_dinge.css">
+    <link rel="stylesheet" href="/web/maintain/ration_repository/css/main.css">
     <link rel="stylesheet" href="/lib/font-awesome/font-awesome.min.css">
     <!--zTree-->
   	<link rel="stylesheet" href="/lib/ztree/css/zTreeStyle.css" type="text/css">
@@ -497,16 +497,16 @@
         <script src="/lib/jquery/jquery.min.js"></script>
         <script src="/lib/tether/tether.min.js"></script>
         <script src="/lib/bootstrap/bootstrap.min.js"></script>
-        <script src="/web/building_saas/js/global.js"></script>
+        <script type="text/javascript" src="/web/maintain/ration_repository/js/global.js"></script>
         <!-- zTree -->
         <script type="text/javascript" src="/lib/ztree/jquery.ztree.core.js"></script>
         <script type="text/javascript" src="/lib/ztree/jquery.ztree.excheck.js"></script>
         <script type="text/javascript" src="/lib/ztree/jquery.ztree.exedit.js"></script>
-        <script type="text/javascript" src="/web/maintain/rationRepository/js/chapterTree.js"></script>
-        <script type="text/javascript" src="/web/maintain/rationRepository/js/zTreeCommon.js"></script>
-        <script type="text/javascript" src="/web/maintain/rationRepository/js/sheetCommon.js"></script>
-        <script type="text/javascript" src="/web/maintain/rationRepository/js/ration.js"></script>
-        <script type="text/javascript" src="/web/maintain/rationRepository/js/rationGLJ.js"></script>
+        <script type="text/javascript" src="/web/maintain/ration_repository/js/section_tree.js"></script>
+        <script type="text/javascript" src="/web/maintain/ration_repository/js/ztree_common.js"></script>
+        <script type="text/javascript" src="/web/maintain/ration_repository/js/sheet_common.js"></script>
+        <script type="text/javascript" src="/web/maintain/ration_repository/js/ration.js"></script>
+        <script type="text/javascript" src="/web/maintain/ration_repository/js/ration_glj.js"></script>
         <script type="text/javascript" src="/public/web/treeDataHelper.js"></script>
         <script type="text/javascript" src="/public/web/QueryParam.js"></script>
         <script type="text/javascript" src="/public/web/storageUtil.js"></script>

web/maintain/rationRepository/fuzhu.html

@@ -7,7 +7,7 @@
     <meta http-equiv="x-ua-compatible" content="ie=edge">
     <title>定额库编辑器</title>
     <link rel="stylesheet" href="/lib/bootstrap/css/bootstrap.min.css">
-    <link rel="stylesheet" href="/web/maintain/rationRepository/css/main.css">
+    <link rel="stylesheet" href="/web/maintain/ration_repository/css/main.css">
     <link rel="stylesheet" href="/lib/font-awesome/font-awesome.min.css">
     <link rel="stylesheet" href="/lib/spreadjs/sheets/css/gc.spread.sheets.10.0.1.css" type="text/css">
     <!--zTree-->
@@ -184,7 +184,7 @@
     <script src="/lib/jquery/jquery.min.js"></script>
     <script src="/lib/tether/tether.min.js"></script>
     <script src="/lib/bootstrap/bootstrap.min.js"></script>
-    <script src="/web/building_saas/js/global.js"></script>
+    <script type="text/javascript" src="/web/maintain/ration_repository/js/global.js"></script>
     <!-- zTree -->
     <script src = "/lib/spreadjs/sheets/gc.spread.sheets.all.10.0.1.min.js"></script>
     <script>GC.Spread.Sheets.LicenseKey = "559432293813965#A0y3iTOzEDOzkjMyMDN9UTNiojIklkI1pjIEJCLi4TPB9mM5AFNTd4cvZ7SaJUVy3CWKtWYXx4VVhjMpp7dYNGdx2ia9sEVlZGOTh7NRlTUwkWR9wEV4gmbjBDZ4ElR8N7cGdHVvEWVBtCOwIGW0ZmeYVWVr3mI0IyUiwCMzETN8kzNzYTM0IicfJye&Qf35VfiEzRwEkI0IyQiwiIwEjL6ByUKBCZhVmcwNlI0IiTis7W0ICZyBlIsIyNyMzM5ADI5ADNwcTMwIjI0ICdyNkIsIibj9SbvNmL4N7bjRnch56ciojIz5GRiwiI8+Y9sWY9QmZ0Jyp96uL9v6L0wap9biY9qiq95q197Wr9g+89iojIh94Wiqi";</script>
@@ -196,9 +196,7 @@
     <script src="/public/web/sheet.js"></script>
     <script src="/public/debug.js"></script>
     <script type="text/javascript" src="/public/web/storageUtil.js"></script>
-    <script type="text/javascript" src="/web/maintain/rationRepository/js/coe.js"></script>
-    <!--<script type="text/javascript" src="/web/rationRepository/js/zTreeCommon.js"></script>-->
-    <!--<script type="text/javascript" src="/web/rationRepository/js/sheetCommon.js"></script>-->
+    <script type="text/javascript" src="/web/maintain/ration_repository/js/coe.js"></script>
     <SCRIPT type="text/javascript">
   		<!--
   		var setting = {

web/maintain/rationRepository/gongliao.html

@@ -7,7 +7,7 @@
     <meta http-equiv="x-ua-compatible" content="ie=edge">
     <title>定额库编辑器</title>
     <link rel="stylesheet" href="/lib/bootstrap/css/bootstrap.min.css">
-    <link rel="stylesheet" href="/web/building_saas/css/main_dinge.css">
+    <link rel="stylesheet" href="/web/maintain/ration_repository/css/main.css">
     <link rel="stylesheet" href="/lib/font-awesome/font-awesome.min.css">
     <link rel="stylesheet" href="/lib/spreadjs/sheets/css/gc.spread.sheets.10.0.1.css" type="text/css">
     <!--zTree-->
@@ -171,7 +171,7 @@
     <script src="/lib/jquery/jquery.min.js"></script>
     <script src="/lib/tether/tether.min.js"></script>
     <script src="/lib/bootstrap/bootstrap.min.js"></script>
-    <script src="/web/building_saas/js/global.js"></script>
+    <script type="text/javascript" src="/web/maintain/ration_repository/js/global.js"></script>
     <!-- zTree -->
     <script src = "/lib/spreadjs/sheets/gc.spread.sheets.all.10.0.1.min.js"></script>
     <script>GC.Spread.Sheets.LicenseKey = "559432293813965#A0y3iTOzEDOzkjMyMDN9UTNiojIklkI1pjIEJCLi4TPB9mM5AFNTd4cvZ7SaJUVy3CWKtWYXx4VVhjMpp7dYNGdx2ia9sEVlZGOTh7NRlTUwkWR9wEV4gmbjBDZ4ElR8N7cGdHVvEWVBtCOwIGW0ZmeYVWVr3mI0IyUiwCMzETN8kzNzYTM0IicfJye&Qf35VfiEzRwEkI0IyQiwiIwEjL6ByUKBCZhVmcwNlI0IiTis7W0ICZyBlIsIyNyMzM5ADI5ADNwcTMwIjI0ICdyNkIsIibj9SbvNmL4N7bjRnch56ciojIz5GRiwiI8+Y9sWY9QmZ0Jyp96uL9v6L0wap9biY9qiq95q197Wr9g+89iojIh94Wiqi";</script>
@@ -180,9 +180,9 @@
     <script type="text/javascript" src="/lib/ztree/jquery.ztree.exedit.js"></script>
     <script type="text/javascript" src="/public/web/treeDataHelper.js"></script>
     <script type="text/javascript" src="/public/web/QueryParam.js"></script>
-    <script type="text/javascript" src="/web/maintain/rationRepository/js/repositoryGLJ.js"></script>
-    <script type="text/javascript" src="/web/maintain/rationRepository/js/zTreeCommon.js"></script>
-    <script type="text/javascript" src="/web/maintain/rationRepository/js/sheetCommon.js"></script>
+    <script type="text/javascript" src="/web/maintain/ration_repository/js/repository_glj.js"></script>
+    <script type="text/javascript" src="/web/maintain/ration_repository/js/ztree_common.js"></script>
+    <script type="text/javascript" src="/web/maintain/ration_repository/js/sheet_common.js"></script>
     <script type="text/javascript" src="/public/web/storageUtil.js"></script>
     <script type="text/javascript">
         var gljSetting = {

web/maintain/rationRepository/main.html

@@ -8,7 +8,7 @@
     <title>定额库编辑器</title>
     <link rel="stylesheet" href="/lib/bootstrap/css/bootstrap.min.css">
    <!-- <link rel="stylesheet" href="css/bootstrap/themes.css">-->
-    <link rel="stylesheet" href="/web/maintain/rationRepository/css/main.css">
+    <link rel="stylesheet" href="/web/maintain/ration_repository/css/main.css">
     <link rel="stylesheet" href="/lib/font-awesome/font-awesome.min.css">
     <!--zTree-->
   	<link rel="stylesheet" href="/lib/ztree/css/zTreeStyle.css" type="text/css">
@@ -128,12 +128,12 @@
     <script src="/lib/jquery/jquery.min.js"></script>
     <script src="/lib/tether/tether.min.js"></script>
     <script src="/lib/bootstrap/bootstrap.min.js"></script>
-    <script src="/web/maintain/rationRepository/js/global.js"></script>
+    <script src="/web/maintain/ration_repository/js/global.js"></script>
     <!-- zTree -->
     <script type="text/javascript" src="/public/web/dateUtil.js"></script>
   	<script type="text/javascript" src="/lib/ztree/jquery.ztree.core.js"></script>
   	<script type="text/javascript" src="/lib/ztree/jquery.ztree.excheck.js"></script>
-    <script type="text/javascript" src="/web/maintain/rationRepository/js/mainJ.js"></script>
+    <script type="text/javascript" src="/web/maintain/ration_repository/js/mainJ.js"></script>
     <script type="text/javascript" src="/public/web/storageUtil.js"></script>
 </body>
 <script type="text/javascript">

web/maintain/report/html/RptHome.html

@@ -10,8 +10,8 @@
     -->
 
     <script src="/lib/jquery/jquery.min.js"></script>
-    <script type="text/javascript" src="/web/maintain/report/js/Jpc_Output_ValueDefine.js"></script>
-    <script type="text/javascript" src="/web/maintain/report/js/Jpc_Output.js"></script>
+    <script type="text/javascript" src="/web/maintain/report/js/jpc_output_value_define.js"></script>
+    <script type="text/javascript" src="/web/maintain/report/js/jpc_output.js"></script>
     <table id="forPrintHide">
         <tr>
             <td width="5"></td>