2 Commits 1d459c9e1f ... 34efcea174

Author SHA1 Message Date
  yangyang 34efcea174 Merge branch 'cloud' of http://115.238.142.158:20182/Ahrs/AHRS into cloud 2 years ago
  yangyang 854fa20598 fix:新增申报弹窗提醒&500页面 2 years ago

BIN
ruoyi-admin/src/main/resources/static/img/is_500_bg.png


BIN
ruoyi-admin/src/main/resources/static/img/submit_apply_arrow.png


+ 6 - 8
ruoyi-admin/src/main/resources/templates/error/500.html

@@ -9,14 +9,12 @@
     <link href="/css/style.css" rel="stylesheet"/>
 </head>
 <body class="gray-bg">
-    <div class="middle-box text-center animated fadeInDown">
-        <h1>500</h1>
-        <h3 class="font-bold">内部服务器错误!</h3>
-
-        <div class="error-desc">
-                                服务器遇到意外事件,不允许完成请求。我们抱歉。您可以返回主页面。
-            <a href="javascript:top.document.location.href='/'" class="btn btn-primary m-t">主页</a>
-        </div>
+    <div class="middle-box text-center animated fadeInDown" style="max-width: 560px;">
+        <!-- <h1>500</h1> -->
+        <img th:src="@{/img/is_500_bg.png}" style="width: 382px;height: 274px;" alt="">
+        <div class="color-333 ft-20" style="margin: 30px 0 15px 0;">内部服务器错误!</div>
+        <div class="color-666 ft-16">服务器遇到意外事件,不允许完成请求。我们抱歉。您可以返回主页面。</div>
+        <a href="javascript:top.document.location.href='/'" class="btn btn-bg-blue" style="padding: 0 60px;margin-top: 20px;">主页</a>
     </div>
 </body>
 </html>

BIN
ruoyi-system/src/main/resources/static/imgs/submit_apply_arrow.png


+ 24 - 16
ruoyi-system/src/main/resources/templates/process/declaration/add.html

@@ -167,7 +167,7 @@
     }
 
     .add-mask-class{
-      width: 465px;
+      width: 465px!important;
       background: linear-gradient(180deg, #E4ECFF 0%, #FFFFFF 100%);
     }
 
@@ -180,13 +180,16 @@
       line-height: 70px;
     }
     .add-mask-class .layui-layer-content{
-      padding-top: 0!important;
+      background: white;
+      border-radius: 4px;
+      padding: 20px!important;
+      margin: 0 20px 20px 20px!important;
     }
 
     .add-mask-class .layui-layer-content div{
       background: white;
       border-radius: 4px;
-      padding: 20px 20px 0 20px;
+      padding: 0;
     }
 
     .add-mask-class .layui-layer-btn{
@@ -2068,39 +2071,41 @@
             async: false,
             success: function (result) {
                 if (result.code == 0) {
-                    var msgValue = "是否将";
-                    var unSelectValue = "将未勾选的";
+                    // var msgValue = "是否将";   var unSelectValue = "将未勾选的";
+                    var msgValue = "";
+                    var unSelectValue = "";
                     if (dataSelect1.length == 0 && dataSelect2.length == 0 && dataSelect3.length == 0) {
                         if (dataUnSelect1.length > 0) {
-                            msgValue += "增员申报(" + dataUnSelect1.length + "条),";
+                            msgValue += "增员申报(<span class='color-blue'>" + dataUnSelect1.length + "条</span>),";
                         }
                         if (dataUnSelect3.length > 0) {
-                            msgValue += "岗位申报(" + dataUnSelect3.length + "条),";
+                            msgValue += "岗位申报(<span class='color-blue'>" + dataUnSelect3.length + "条</span>),";
                         }
                         if (dataUnSelect2.length > 0) {
-                            msgValue += "减员申报(" + dataUnSelect2.length + "条),";
+                            msgValue += "减员申报(<span class='color-blue'>" + dataUnSelect2.length + "条</span>),";
                         }
                     } else {
-                        msgValue = "是否将已勾选的";
+                        // msgValue = "是否将已勾选的";
+                        msgValue = "";
                         //选择的人员
                         if (dataSelect1.length > 0) {
-                            msgValue += "增员申报(" + dataSelect1.length + "条),";
+                            msgValue += "增员申报(<span class='color-blue'>" + dataSelect1.length + "条</span>),";
                         }
                         if (dataSelect3.length > 0) {
-                            msgValue += "岗位申报(" + dataSelect3.length + "条),";
+                            msgValue += "岗位申报(<span class='color-blue'>" + dataSelect3.length + "条</span>),";
                         }
                         if (dataSelect2.length > 0) {
-                            msgValue += "减员申报(" + dataSelect2.length + "条),";
+                            msgValue += "减员申报(<span class='color-blue'>" + dataSelect2.length + "条</span>),";
                         }
                         //未勾选的人员
                         if (dataUnSelect1.length > 0) {
-                            unSelectValue += "增员申报(" + dataUnSelect1.length + "条),";
+                            unSelectValue += "增员申报(<span class='color-blue'>" + dataUnSelect1.length + "条</span>),";
                         }
                         if (dataUnSelect3.length > 0) {
-                            unSelectValue += "岗位申报(" + dataUnSelect3.length + "条),";
+                            unSelectValue += "岗位申报(<span class='color-blue'>" + dataUnSelect3.length + "条</span>),";
                         }
                         if (dataUnSelect2.length > 0) {
-                            unSelectValue += "减员申报(" + dataUnSelect2.length + "条),";
+                            unSelectValue += "减员申报(<span class='color-blue'>" + dataUnSelect2.length + "条</span>),";
                         }
                     }
                     msgValue = msgValue.substring(0, msgValue.length - 1);
@@ -2122,7 +2127,10 @@
                                 "declarationType": "101"
                             }, success: function (r) {
                                 if (r.code == 0) {
-                                    let html = `<div class='flex flex-direction align-center'><h3>${msgValue}</h3><img style="width: 48px;height: 110px;margin: 15px 0;object-fit: cover;" src="../../../../../imgs/img_mask_arrow.png"><span>${r.msg}</span><br>${unSelectValue}</div>`;
+                                    let isTitle =  `<div class='flex align-center'><span>某某身份</span><img style="width: 120px;height: 38px;margin: 0 28px;object-fit: cover;" src="../../../../../imgs/submit_apply_arrow.png"><span>${r.msg}</span></div>`;
+                                    let isContent = `<div style='line-height: 1.5;margin-top: 30px;'><svg xmlns="http://www.w3.org/2000/svg" width='6' height='6' fill='currentColor' class='bi bi-circle-fill margin-r-8 color-999' viewBox="0 0 16 16"><circle cx='8' cy='8' r='8'/></svg>${msgValue}</div>`
+                                    // let html = `<div class='flex flex-direction align-center'><h3>${msgValue}</h3><img style="width: 48px;height: 110px;margin: 15px 0;object-fit: cover;" src="../../../../../imgs/img_mask_arrow.png"><span>${r.msg}</span><br>${unSelectValue}</div>`;
+                                    let html = `<div class='flex justify-around'>${isTitle}</div><div>${isContent}</div>`
                                     layer.confirm(html, {
                                             skin: 'add-mask-class',
                                             title: "系统提示",