Merge remote-tracking branch 'origin/master'

spring-cloud/server-basic/src/main/java/com/jd/service/impl/SystemRiskServiceImpl.java

@@ -226,7 +226,7 @@ public class SystemRiskServiceImpl implements SystemRiskService {
             Map<String, Object> resultMap = new HashMap<>();
             Map<String, Object> timeMap = new HashMap<>();
             Integer createYear = calendar.get(Calendar.YEAR);
-            Integer createMonth = calendar.get(Calendar.MONTH)+1==0?12:calendar.get(Calendar.MONTH+1);
+            Integer createMonth = calendar.get(Calendar.MONTH)+1==0?12:calendar.get(Calendar.MONTH)+1;
             timeMap.put("createYear", createYear);
             timeMap.put("createMonth", createMonth);
             if(Blank.isNotEmpty(orgType)){

spring-cloud/server-page/src/main/resources/static/mh2/css/tc.css

@@ -63,8 +63,11 @@ body.modal-active {
 }
 
 #modal-container .modal-background .modal {
-    background: rgba(27, 42, 75, 0.4);
-    padding: 50px;
+    background: url('../images/bj.png') no-repeat;
+    background-position: 0% 0%;
+    background-size: 100% 100%;
+    /* background: rgba(27, 42, 75, 0.4); */
+    padding: 200px 110px;
     display: inline-block;
     border-radius: 15px;
     font-weight: 300;
@@ -169,4 +172,17 @@ body.modal-active {
     100% {
         transform: scale(0);
     }
+}
+
+
+/* 取消 */
+
+.cancel {
+    background: url('../images/close.png') no-repeat;
+    background-size: 100% 100%;
+    position: absolute;
+    right: 2%;
+    top: 5%;
+    width: 300px;
+    height: 300px;
 }

spring-cloud/server-page/src/main/resources/static/mh2/css/totalplatform.css

@@ -11,6 +11,7 @@ p {
 .plateform-box {
     width: 100%;
     height: 100%;
+    /* 必须超过7680 2016 100%根据父亲盒子高宽来的 */
     min-width: 7680px;
     min-height: 2016px;
     /* background-color: #000; */

spring-cloud/server-page/src/main/resources/static/mh2/js/init.js

@@ -1,17 +1,20 @@
-// const GATEWAY_URL = "http://23.37.100.87:8084";
+// 内务网ip地址
+const GATEWAY_URL = "http://23.37.100.87:8084";
+// 服务器ip地址
 // const GATEWAY_URL = "http://23.37.100.80:8084";
-const GATEWAY_URL = "http://192.168.0.100:8084"
+// const GATEWAY_URL = "http://192.168.0.100:8084"
 const PAGE_BASIC = GATEWAY_URL + "/basic";
 let sceneThemes;
 $(function() {
     let datas = get(PAGE_BASIC + '/apiNoProcess/scence/getAllSceneAndThemeAndSystem');
-    console.log(datas);
+    // console.log(datas);
+
     // 场景主题
     const scenes = datas.scenes;
     sceneThemes = datas.sceneThemes;
     initSences(scenes);
     initThemes(sceneThemes);
-    initAncment(); //初始化通知公告
+    // initAncment(); //初始化通知公告
 
 
 
@@ -33,7 +36,6 @@ $(function() {
         $('.footer-box .item').css("opacity", 1);
     }, 3000)
 
-
     $('.cards-box').on('click', '.item', function() {
         const sceneId = parseInt($(this).data("id"));
         let newArr = [];
@@ -50,6 +52,7 @@ $(function() {
 \t      <h2>${item.themeName}</h2>
 \t    </div>`
             })
+            str += `<div class="cancel"></div>`
             $(".modal-background").empty().append(str);
             $('#modal-container').removeAttr('class').addClass('Unfolding');
             $('body').addClass('modal-active');
@@ -60,7 +63,7 @@ $(function() {
             alert("该主题未添加子场景")
         }
 
-        console.log(newArr)
+        // console.log(newArr)
 
         // 关闭通知公告
         $('.setting-menu').css("display", "none");
@@ -122,12 +125,13 @@ function initSences(scenes) {
 
 }
 // 初始化主题
+// <img src="${Boolean(item.themeIconPath) ? PAGE_BASIC + item.themeIconPath : './images/ssgy_icon.png'}" alt="">
 function initThemes(themes) {
     let str = '';
     themes.forEach(item => {
         if (item.quickNavigation == 1) {
             str += `<div class="item" onclick="location.href='${item.url}'">
-					<img src="${Boolean(item.themeIconPath) ? PAGE_BASIC + item.themeIconPath : './images/ssgy_icon.png'}" alt="">
+					<img src="${'./images/ssgy_icon.png'}" alt="">
 					<p class="name">${item.themeName}</p>
 				</div>`
         }

spring-cloud/server-page/src/main/resources/static/mh2/totalplatform.html

@@ -181,6 +181,7 @@
                 <span>来源:城市园林绿化管理处</span>
             </div>
             <div class="not-text">
+
                 <p>5月9日，市城市管理局组织召开国家生态园林城市创建工作专题会，市城市管理局党组成员石继渝，局相关处室、直属单位负责人，中心城区城市管理局分管负责人、绿化科科长参加会议。</p>
                 <p>会议听取市园林规划院相关负责人关于中心城区绿地规划，中心城区建成区重要指标现状情况等两方面的汇报，就创建规划指标、建设任务分解进行讨论，并对下一步创建重点工作进行安排部署。</p>
                 <p>会议强调：一是摸清底数，补齐短板；二是落实创建生态园林城市绿化项目；三是加大力度，全面推进创建工作。</p>

spring-cloud/server-page/src/main/resources/static/page/safetyInforManager.html

@@ -51,7 +51,7 @@
 					</div>
 				</div>
 				<div class="layui-btn-container">
-					<button class="layui-btn layui-btn-sm timeBtn" ><span class="iconfont">&#xe607;</span>确定</button>
+					<button class="layui-btn layui-btn-sm timeBtn" >确定</button>
 				</div>
 				<table class="layui-hide" id="safetyInfoTable" lay-filter="safetyInfoTable"></table>
 				<!--安全信息表头按钮-->