浏览代码

code adjust, bills_lib

MaiXinRong 8 年之前
父节点
当前提交
01667ede37

+ 2 - 2
modules/billsLib/billsLibControllers/billsLibControllers.js

@@ -2,9 +2,9 @@
  * Created by vian on 2017/3/22.
  */
 
-var billsLibDao = require("../billsLibModel/billsLibInterfaces");
+var billsLibDao = require("./../models/bills_lib_interfaces");
 //----
-var model = require("../billsLibModel/billsLibModel");
+var model = require("./../models/bills_lib_model");
 var counter = require("../../../public/counter/counter");
 var StdBillsLib = model.stdBillsLibMod;
 var Bills = model.billsMod;

+ 1 - 1
modules/billsLib/billsLibModel/billsLibInterfaces.js

@@ -1,7 +1,7 @@
 /**
  * Created by vian on 2017/3/20.
  */
-var model = require("./billsLibModel");
+var model = require("./bills_lib_model");
 var counter = require("../../../public/counter/counter");
 var StdBillsLib = model.stdBillsLibMod;
 var Bills = model.billsMod;

+ 1 - 1
modules/billsLib/billsLibModel/billsLibModel.js

@@ -2,7 +2,7 @@
  * Created by vian on 2017/3/17.
  */
 var dbm = require("../../../config/db/db_manager");
-var schemas = require("./billsLibSchemas.js");
+var schemas = require("./bills_lib_schemas.js");
 //var db = dbm.getLocalConnection("stdBillsEditor");
 var db = dbm.getCfgConnection("stdBillsEditor");
 var stdBillsLibMod = db.model("stdBillsLib", schemas.stdBillsLibSchema);

modules/billsLib/billsLibModel/billsLibSchemas.js → modules/bills_lib/models/bills_lib_schemas.js


+ 1 - 1
modules/billsLib/billsLibRoutes/billsLibRoutes.js

@@ -2,7 +2,7 @@
  * Created by vian on 2017/3/17.
  */
 var express = require("express");
-var billsController = require("../billsLibControllers/billsLibControllers");
+var billsController = require("./../controllers/bills_lib_controllers");
 var billsRouter =express.Router();
 
 billsRouter.post('/getMaxNumber', billsController.getMaxNumber);

+ 5 - 5
server.js

@@ -168,21 +168,21 @@ app.get("/stdBillsmain", function(req, res){
         res.redirect('/login');
     }
     else {
-        res.render("maintain/billsLib/html/main.html",
+        res.render("maintain/bills_lib/html/main.html",
             {userAccount: req.session.userAccount,
                 userID: req.session.userID});
     }
 });
 app.get("/stdBills", function(req, res){
-    res.render("maintain/billsLib/html/qingdan.html");
+    res.render("maintain/bills_lib/html/qingdan.html");
 });
 app.get('/stdJobs', function(req, res){
-    res.render('maintain/billsLib/html/neirong.html');
+    res.render('maintain/bills_lib/html/neirong.html');
 });
 app.get('/stdItems', function(req, res){
-    res.render('maintain/billsLib/html/tezheng.html');
+    res.render('maintain/bills_lib/html/tezheng.html');
 });
-var billsLibRouter = require("./modules/billsLib/billsLibRoutes/billsLibRoutes");
+var billsLibRouter = require("./modules/bills_lib/routes/bills_lib_routes");
 app.use("/stdBillsEditor", billsLibRouter);
 //-----------------
 

web/maintain/billsLib/css/main.css → web/maintain/bills_lib/css/main.css


+ 3 - 3
web/maintain/billsLib/html/main.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/billsLib/css/main.css">
+    <link rel="stylesheet" href="/web/maintain/bills_lib/css/main.css">
     <link rel="stylesheet" href="/lib/font-awesome/font-awesome.min.css">
 </head>
 
@@ -121,8 +121,8 @@
     <script src="/lib/tether/tether.min.js"></script>
     <script src="/lib/bootstrap/bootstrap.min.js"></script>
     <script src="/web/maintain/js/global.js"></script>
-    <script src="/web/maintain/billsLib/scripts/billsLibAjax.js"></script>
-    <script src="/web/maintain/billsLib/scripts/tools.js"></script>
+    <script src="/web/maintain/bills_lib/scripts/bills_lib_ajax.js"></script>
+    <script src="/web/maintain/bills_lib/scripts/tools.js"></script>
 
 </body>
 <script type="text/javascript">

+ 7 - 7
web/maintain/billsLib/html/neirong.html

@@ -8,7 +8,7 @@
     <title>清单规则编辑器</title>
     <link rel="stylesheet" href="/lib/bootstrap/css/bootstrap.min.css">
     <!--<link rel="stylesheet" href="../../web/css/bootstrap/themes.css">-->
-    <link rel="stylesheet" href="/web/maintain/billsLib/css/main.css">
+    <link rel="stylesheet" href="/web/maintain/bills_lib/css/main.css">
     <link rel="stylesheet" href="/lib/font-awesome/font-awesome.min.css">
     <!--spread-->
     <link rel="stylesheet" href="/lib/spreadjs/sheets/css/gc.spread.sheets.excel2013white.10.0.1.css">
@@ -169,13 +169,13 @@
     <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/billsLib/scripts/global.js"></script>
-    <script src="/web/maintain/billsLib/scripts/setSheets.js"></script>
-    <script src="/web/maintain/billsLib/scripts/billsLibAjax.js"></script>
-    <script src="/web/maintain/billsLib/scripts/tools.js"></script>
+    <script src="/web/maintain/bills_lib/scripts/global.js"></script>
+    <script src="/web/maintain/bills_lib/scripts/set_sheets.js"></script>
+    <script src="/web/maintain/bills_lib/scripts/bills_lib_ajax.js"></script>
+    <script src="/web/maintain/bills_lib/scripts/tools.js"></script>
     <script src="/public/web/tree_sheet/tree_sheet_helper.js"></script>
-    <script src="/web/maintain/billsLib/scripts/billsLibSetting.js"></script>
-    <script src="/web/maintain/billsLib/scripts/dbController.js"></script>
+    <script src="/web/maintain/bills_lib/scripts/bills_lib_setting.js"></script>
+    <script src="/web/maintain/bills_lib/scripts/db_controller.js"></script>
     <SCRIPT type="text/javascript">
         var billsLibId = getQueryString("billsLibId");
         tools.redirect(billsLibId, 'stdBillsmain');

+ 8 - 8
web/maintain/billsLib/html/qingdan.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/billsLib/css/main.css">
+    <link rel="stylesheet" href="/web/maintain/bills_lib/css/main.css">
     <link rel="stylesheet" href="/lib/font-awesome/font-awesome.min.css">
     <!--spread-->
     <link rel="stylesheet" href="/lib/spreadjs/sheets/css/gc.spread.sheets.excel2013white.10.0.1.css">
@@ -214,18 +214,18 @@
     <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/billsLib/scripts/global.js"></script>
-    <script src="/web/maintain/billsLib/scripts/setSheets.js"></script>
-    <script src="/web/maintain/billsLib/scripts/billsLibAjax.js"></script>
+    <script src="/web/maintain/bills_lib/scripts/global.js"></script>
+    <script src="/web/maintain/bills_lib/scripts/set_sheets.js"></script>
+    <script src="/web/maintain/bills_lib/scripts/bills_lib_ajax.js"></script>
     <!--idTree-->
     <script src="/public/web/id_tree.js"></script>
     <script src="/public/web/tree_sheet/tree_sheet_controller.js"></script>
     <script src="/public/web/tree_sheet/tree_sheet_helper.js"></script>
-    <script src="/web/maintain/billsLib/scripts/billsLibSetting.js"></script>
-    <script src="/web/maintain/billsLib/scripts/billsLibTree.js"></script>
+    <script src="/web/maintain/bills_lib/scripts/bills_lib_setting.js"></script>
+    <script src="/web/maintain/bills_lib/scripts/bills_lib_tree.js"></script>
     <script src="/test/tmp_data/bills_grid_setting.js"></script>
-    <script src="/web/maintain/billsLib/scripts/dbController.js"></script>
-    <script src="/web/maintain/billsLib/scripts/tools.js"></script>
+    <script src="/web/maintain/bills_lib/scripts/db_controller.js"></script>
+    <script src="/web/maintain/bills_lib/scripts/tools.js"></script>
 </body>
 <script type="text/javascript">
     autoFlashHeight();

+ 7 - 7
web/maintain/billsLib/html/tezheng.html

@@ -8,7 +8,7 @@
     <title>清单规则编辑器</title>
     <link rel="stylesheet" href="/lib/bootstrap/css/bootstrap.min.css">
     <!--<link rel="stylesheet" href="../../web/css/bootstrap/themes.css">-->
-    <link rel="stylesheet" href="/web/maintain/billsLib/css/main.css">
+    <link rel="stylesheet" href="/web/maintain/bills_lib/css/main.css">
     <link rel="stylesheet" href="/lib/font-awesome/font-awesome.min.css">
     <!--spread-->
     <link rel="stylesheet" href="/lib/spreadjs/sheets/css/gc.spread.sheets.excel2013white.10.0.1.css">
@@ -170,14 +170,14 @@
     <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/billsLib/scripts/global.js"></script>
+    <script src="/web/maintain/bills_lib/scripts/global.js"></script>
     <!--<script src="lib/global.js"></script>-->
-    <script src="/web/maintain/billsLib/scripts/setSheets.js"></script>
-    <script src="/web/maintain/billsLib/scripts/billsLibAjax.js"></script>
-    <script src="/web/maintain/billsLib/scripts/tools.js"></script>
+    <script src="/web/maintain/bills_lib/scripts/set_sheets.js"></script>
+    <script src="/web/maintain/bills_lib/scripts/bills_lib_ajax.js"></script>
+    <script src="/web/maintain/bills_lib/scripts/tools.js"></script>
     <script src="/public/web/tree_sheet/tree_sheet_helper.js"></script>
-    <script src="/web/maintain/billsLib/scripts/billsLibSetting.js"></script>
-    <script src="/web/maintain/billsLib/scripts/dbController.js"></script>
+    <script src="/web/maintain/bills_lib/scripts/bills_lib_setting.js"></script>
+    <script src="/web/maintain/bills_lib/scripts/db_controller.js"></script>
     <SCRIPT type="text/javascript">
         var spread = new GC.Spread.Sheets.Workbook($('#spreadAllItems')[0], {sheetCount: 1});
         var spreadVal = new GC.Spread.Sheets.Workbook($('#spreadEigenvalue')[0], {sheetCount: 1});

web/maintain/billsLib/scripts/billsLibAjax.js → web/maintain/bills_lib/scripts/bills_lib_ajax.js


web/maintain/billsLib/scripts/billsLibSetting.js → web/maintain/bills_lib/scripts/bills_lib_setting.js


web/maintain/billsLib/scripts/billsLibTree.js → web/maintain/bills_lib/scripts/bills_lib_tree.js


web/maintain/billsLib/scripts/dbController.js → web/maintain/bills_lib/scripts/db_controller.js


web/maintain/billsLib/scripts/global.js → web/maintain/bills_lib/scripts/global.js


web/maintain/billsLib/scripts/setSheets.js → web/maintain/bills_lib/scripts/set_sheets.js


web/maintain/billsLib/scripts/tools.js → web/maintain/bills_lib/scripts/tools.js