修复bug

config/gulpConfig.js

@@ -7,6 +7,7 @@ module.exports = {
     common_jspaths:[
         'lib/jquery/jquery-3.2.1.min.js',
         'lib/popper/popper.min.js',
+        'lib/jquery-ui/jquery-ui.min.js',
         'lib/bootstrap/bootstrap.min.js',
         'web/building_saas/js/*.js',
         'public/web/scMathUtil.js',
@@ -39,7 +40,6 @@ module.exports = {
     main_jspaths:[
         'lib/JSExpressionEval_src/*.js',
         '!lib/JSExpressionEval_src/JsHashMap.js',
-        'lib/jquery-ui/jquery-ui.min.js',
         'lib/jquery-ui/jquery-ui-datepickerCN.js',
         'lib/jquery-contextmenu/*.js',
         'lib/lodash/lodash.js',

modules/main/routes/main_route.js

@@ -4,16 +4,22 @@
 
 
 import BaseController from "../../common/base/base_controller";
+const projectModel = require("../../pm/models/project_model");
 module.exports =function (app) {
     const baseController = new BaseController();
     app.get('/main', baseController.init, function(req, res) {
         let pm = require('../../pm/controllers/pm_controller');
-        pm.checkProjectRight(req.session.sessionUser.ssoId, req.query.project, function (hasRight) {
+
+        pm.checkProjectRight(req.session.sessionUser.ssoId, req.query.project, async function (hasRight) {
             if (hasRight) {
+                // 获取项目信息
+                const projectId = req.query.project;
+                const projectData = await projectModel.project.getProject(projectId);
                 res.render('building_saas/main/html/main.html',
                     {
                         userAccount: req.session.userAccount,
-                        userID: req.session.sessionUser.ssoId
+                        userID: req.session.sessionUser.ssoId,
+                        projectData: projectData,
                     });
             } else {
                 res.redirect('/pm');

web/building_saas/main/html/main.html

@@ -5,7 +5,7 @@
     <meta charset="utf-8">
     <meta name="viewport" content="width=device-width, initial-scale=1, shrink-to-fit=no">
     <meta http-equiv="x-ua-compatible" content="ie=edge">
-    <title>造价书-纵横云造价</title>
+    <title><%= projectData.name !== undefined ? projectData.name : '造价书' %>-纵横云造价</title>
     <!-- inject:css -->
     <link rel="stylesheet" href="/lib/bootstrap/css/bootstrap.min.css">
     <link rel="stylesheet" href="/web/building_saas/css/main.css">
@@ -55,7 +55,7 @@
               <div class="toolsbar px-1 d-flex justify-content-between">
                   <div class="tools-btn btn-group align-top">
                     <a href="" class="btn btn-sm" title="复制"><i class="fa fa-files-o" aria-hidden="true"></i></a>
-                    <a href="" class="btn btn-sm" title="接切"><i class="fa fa-scissors" aria-hidden="true"></i></a>
+                    <a href="" class="btn btn-sm" title="剪切"><i class="fa fa-scissors" aria-hidden="true"></i></a>
                     <a href="" class="btn btn-sm" title="粘贴"><i class="fa fa-clipboard" aria-hidden="true"></i></a>
                     <a href="javascript:void(0)" class="btn btn-sm" id="insert" title="插入"><i class="fa fa-sign-in" aria-hidden="true"></i></a>
                     <a href="javascript:void(0)" class="btn btn-sm" id="delete" title="删除"><i class="fa fa-remove" aria-hidden="true"></i></a>

web/building_saas/main/js/views/project_info.js

@@ -6,8 +6,9 @@ var projectInfoObj = {
     projectInfo: null,
     getFullPathHtml: function (proj) {
         let fullPath = [], i, pm = '<span class="text-truncate"><a href="/pm">项目管理</a></span>', angleRight = '<span class="text-truncate"><i class="fa fa-angle-right fa-fw"></i></span>';
-        fullPath.push(pm);
+        // fullPath.push(pm);
         if (proj && proj.fullFolder) {
+            /*
             for (i = 0; i < proj.fullFolder.length; i++) {
                 if (i <= proj.fullFolder.length - 3) {
                     fullPath.push(angleRight, '<span class="text-truncate" data-toggle="tooltip" data-placement="bottom" title="', proj.fullFolder[i], '"><i class="fa fa-folder-open-o"></i></span>');
@@ -19,7 +20,9 @@ var projectInfoObj = {
                     // fullPath.push(angleRight, '<span class="text-truncate" data-toggle="tooltip" data-placement="bottom" title="' + proj.fullFolder[i] + '"><i class="fa fa-cube"></i>' + proj.fullFolder[i] + '</span>');
                 }
             }
-            fullPath.push(angleRight, '<span class="text-truncate" data-toggle="tooltip" data-placement="bottom" title="' + proj.name + '"><i class="fa fa-sticky-note-o"></i>' + proj.name + '</span>');
+             */
+            fullPath.push('<span class="text-truncate" data-toggle="tooltip" data-placement="bottom" title="' + proj.name + '"><i class="fa fa-sticky-note-o"></i> ' + proj.name + '</span>');
+
         }
         return fullPath.join('');
     },

web/building_saas/pm/html/project-management.html

@@ -26,13 +26,16 @@
         #summary-engineering,#summary-project{
             display: none;
         }
+        #header-menu{
+            display: none;
+        }
     </style>
 </head>
 
 <body>
 <div class="header">
     <div class="top-msg clearfix">
-        <div class="alert alert-warning mb-0 py-0" role="alert">
+        <div class="alert alert-warning mb-0 py-0" role="alert" style="display: none;">
             <button type="button" class="close" data-dismiss="alert" aria-label="Close">
                 <span aria-hidden="true">&times;</span>
             </button>

web/common/html/header.html

@@ -1,6 +1,6 @@
 <nav class="navbar navbar-expand-lg p-0 d-flex">
-    <span class="header-logo px-2">纵横云造价</span>
-    <ul class="nav navbar-nav px-1">
+    <a class="header-logo px-2" href="/pm" style="text-decoration: none;">纵横云造价</a>
+    <ul class="nav navbar-nav px-1" id="header-menu">
         <li class="nav-item">
             <a class="nav-link" href="#" aria-expanded="false" data-toggle="modal" data-target="#poj-set"><i class="fa fa-cube"></i> 项目属性</a>
         </li>
@@ -29,7 +29,7 @@
     </ul>
     <div class="navbar-text navbar-crumb p-0" id="fullpath">
         <% if (action !== 'index' || controller !== 'pm') {%>
-        <span class="text-truncate"><a href="/pm">项目管理</a></span>
+        <!--<span class="text-truncate"><a href="/pm">项目管理</a></span>-->
         <% } %>
     </div>
     <div class="ml-auto navbar-text p-0">