Merge remote-tracking branch 'origin/master'

modules/glj/facade/glj_facade.js

@@ -41,7 +41,6 @@ async function changeUnitFile(projectData,unitFile,type,userID) {
             insertData.user_id = userID;
             delete insertData._id;
             delete insertData.ID;
-            currentUnitPriceId = changeUnitPriceId;//从其它建设项目复制时，这个ID要变成被选中的来源的单价文件ID
         }
         // 获取即将更改的单价文件信息
         let targetUnitPriceFile = type === 0 ? await unitPriceFileModel.findDataByCondition({id: changeUnitPriceId}) :

modules/users/models/log_model.js

@@ -60,7 +60,7 @@ class LogModel extends BaseModel {
      */
     async addLoginLog(userId, request) {
         let ip = request.connection.remoteAddress;
-        ip = ip.split(':');
+        ip = ip?ip.split(':'):[];
         ip = ip[3] === undefined ? '' : ip[3];
         // let ipInfo = '127.0.0.1';//await this.getIpInfoFromApi(ip);
         let ipInfo = await this.getIpInfoFromApi(ip);

web/common/html/dataStatistics.html

@@ -0,0 +1 @@
+<script type="text/javascript">var cnzz_protocol = (("https:" == document.location.protocol) ? "https://" : "http://");document.write(unescape("%3Cspan id='cnzz_stat_icon_1278513319'%3E%3C/span%3E%3Cscript src='" + cnzz_protocol + "v1.cnzz.com/stat.php%3Fid%3D1278513319%26show%3Dpic1' type='text/javascript'%3E%3C/script%3E"));</script>

web/common/html/header.html

@@ -277,6 +277,10 @@
         </div>
     </div>
 </div>
+<div style="display: none">
+    <%include dataStatistics.html %>
+</div>
+
 <!-- inject:js -->
 <script src="/lib/jquery/jquery-3.2.1.min.js"></script>
 <script type="text/javascript" src="/lib/jquery-ui/jquery-ui.min.js"></script>