Acasă Explorează Ajutor
Autentificare
longping
/
subject_gxj
1
0
Bifurcare 0
Fisiere Probleme 0 Trageți solicitările 0 Wiki
Răsfoiți Sursa

Merge remote-tracking branch 'origin/master'

JiangPengLi 3 luni în urmă
părinte
49912d56be a457c47cf8
comite
eaec91b9b5
7 a modificat fișierele cu 48 adăugiri și 20 ștergeri
Vizualizare divizată Arată Statisticile Diff
  1. 1 1
      projects/src/main/webapp/asset/lib/layui-v2.5.5/css/layui.css
  2. 6 4
      projects/src/main/webapp/vmodules/passport/registerCk.jsp
  3. 6 4
      projects/src/main/webapp/vmodules/passport/registerCksbdw.jsp
  4. 6 4
      projects/src/main/webapp/vmodules/passport/registerEdit.jsp
  5. 6 4
      projects/src/main/webapp/vmodules/passport/registerEditsbdw.jsp
  6. 10 2
      projects/src/main/webapp/vmodules/subIndu/list.jsp
  7. 13 1
      projects/src/main/webapp/vmodules/top.jsp

+ 1 - 1
projects/src/main/webapp/asset/lib/layui-v2.5.5/css/layui.css
Vizualizați fișierul 

@@ -426,7 +426,7 @@
 
  .layui-btn-danger{background-color:#FF5722}
 
  .layui-btn-checked{background-color:#5FB878}
 
  .layui-btn-export{background-color:#FFAA00;color: #333 !important;}
 
- .layui-btn-add{background-color:#51B748 !important;}
 
+ .layui-btn-add{background-color: #10adf1 !important;}
 
  .layui-btn-disabled,.layui-btn-disabled:active,.layui-btn-disabled:hover{border:1px solid #e6e6e6;background-color:#FBFBFB;color:#C9C9C9;cursor:not-allowed;opacity:1}
 
  .layui-btn-lg{height:44px;line-height:44px;padding:0 25px;font-size:16px}
 
  .layui-btn-sm{height:30px;line-height:30px;padding:0 10px;font-size:12px}

+ 6 - 4
projects/src/main/webapp/vmodules/passport/registerCk.jsp
Vizualizați fișierul 

@@ -25,10 +25,11 @@
 
 <div id="app">
 
     <input type="hidden" id="id" value="${id}"/>
 
     <input type="hidden" id="is" value="${is}"/>
 
-    <form class="layui-form">
 
+    <div class="title">
 
+      <form class="layui-form">
 
         <div class="option_card">
 
             <div class="card_title">项目单位信息</div>
 
-            <div class="layui-colla-content layui-show" style="height: auto;">
 
+            <div class="layui-colla-content layui-show detail" style="height: auto;">
 
                 <div class="table_box">
 
                     <div class="layui-row">
 
                         <div class="layui-col-xs6 layui-col-sm6">
 
@@ -267,7 +268,7 @@
 
             </div>
 
 
             <div class="card_title">法人信息</div>
 
-            <div class="layui-colla-content layui-show" style="height: auto;">
 
+            <div class="layui-colla-content layui-show detail" style="height: auto;">
 
                 <div class="table_box">
 
 
                     <div class="layui-row">
 
@@ -418,7 +419,7 @@
 
             </div>
 
 
             <div class="card_title">业务负责人信息</div>
 
-            <div class="layui-colla-content layui-show" style="height: auto;">
 
+            <div class="layui-colla-content layui-show detail" style="height: auto;">
 
                 <div class="table_box">
 
 
                     <div class="layui-row">
 
@@ -600,6 +601,7 @@
 
             <span style="font-size: 26px">原因:</span><span style="color: red;font-size: 26px" id="yy"></span>
 
         </div>
 
 </form>
 
+    </div>
 
 </div>
 
 
 <jsp:include page="../common/common-js-include.jsp"/>

+ 6 - 4
projects/src/main/webapp/vmodules/passport/registerCksbdw.jsp
Vizualizați fișierul 

@@ -24,10 +24,11 @@
 
 <div id="app">
 
   <input type="hidden" id="id" value="${id}"/>
 
   <input type="hidden" id="is" value="${is}"/>
 
-  <form class="layui-form">
 
+  <div class="title">
 
+    <form class="layui-form">
 
     <div class="option_card">
 
       <div class="card_title">项目单位信息</div>
 
-      <div class="layui-colla-content layui-show" style="height: auto;">
 
+      <div class="layui-colla-content layui-show detail" style="height: auto;">
 
         <div class="table_box">
 
           <div class="layui-row">
 
             <div class="layui-col-xs6 layui-col-sm6">
 
@@ -247,7 +248,7 @@
 
       </div>
 
 
       <div class="card_title">法人信息</div>
 
-      <div class="layui-colla-content layui-show" style="height: auto;">
 
+      <div class="layui-colla-content layui-show detail" style="height: auto;">
 
         <div class="table_box">
 
 
           <div class="layui-row">
 
@@ -388,7 +389,7 @@
 
       </div>
 
 
       <div class="card_title">业务负责人信息</div>
 
-      <div class="layui-colla-content layui-show" style="height: auto;">
 
+      <div class="layui-colla-content layui-show detail" style="height: auto;">
 
         <div class="table_box">
 
 
           <div class="layui-row">
 
@@ -559,6 +560,7 @@
 
     </div>
 
 
 </form>
 
+  </div>
 
 </div>
 
 
 <jsp:include page="../common/common-js-include.jsp"/>

+ 6 - 4
projects/src/main/webapp/vmodules/passport/registerEdit.jsp
Vizualizați fișierul 

@@ -14,11 +14,12 @@
 
 </head>
 
 <body>
 
 <div id="app">
 
-    <form class="layui-form">
 
+    <div class="title">
 
+      <form class="layui-form">
 
         <input type="hidden" id="id" value="${id}"/>
 
         <div class="option_card">
 
             <div class="card_title">项目单位信息</div>
 
-            <div class="layui-colla-content layui-show" style="height: auto;">
 
+            <div class="layui-colla-content layui-show detail" style="height: auto;">
 
                 <div class="table_box">
 
                     <div class="layui-row">
 
                         <div class="layui-col-xs6 layui-col-sm6">
 
@@ -261,7 +262,7 @@
 
             </div>
 
 
             <div class="card_title">法人信息</div>
 
-            <div class="layui-colla-content layui-show" style="height: auto;">
 
+            <div class="layui-colla-content layui-show detail" style="height: auto;">
 
                 <div class="table_box">
 
 
                     <div class="layui-row">
 
@@ -411,7 +412,7 @@
 
             </div>
 
 
             <div class="card_title">业务负责人信息</div>
 
-            <div class="layui-colla-content layui-show" style="height: auto;">
 
+            <div class="layui-colla-content layui-show detail" style="height: auto;">
 
                 <div class="table_box">
 
 
                     <div class="layui-row">
 
@@ -648,6 +649,7 @@
 
             </div>
 
         </div>
 
     </form>
 
+    </div>
 
 </div>
 
 
 <jsp:include page="../common/common-js-include.jsp"/>

+ 6 - 4
projects/src/main/webapp/vmodules/passport/registerEditsbdw.jsp
Vizualizați fișierul 

@@ -13,11 +13,12 @@
 
 </head>
 
 <body>
 
 <div id="app">
 
-  <form class="layui-form">
 
+  <div class="title">
 
+    <form class="layui-form">
 
     <input type="hidden" id="id" value="${id}"/>
 
     <div class="option_card">
 
       <div class="card_title">项目单位信息</div>
 
-      <div class="layui-colla-content layui-show" style="height: auto;">
 
+      <div class="layui-colla-content layui-show detail" style="height: auto;">
 
         <div class="table_box">
 
           <div class="layui-row">
 
             <div class="layui-col-xs6 layui-col-sm6">
 
@@ -238,7 +239,7 @@
 
       </div>
 
 
       <div class="card_title">法人信息</div>
 
-      <div class="layui-colla-content layui-show" style="height: auto;">
 
+      <div class="layui-colla-content layui-show detail" style="height: auto;">
 
         <div class="table_box">
 
 
           <div class="layui-row">
 
@@ -376,7 +377,7 @@
 
       </div>
 
 
       <div class="card_title">业务负责人信息</div>
 
-      <div class="layui-colla-content layui-show" style="height: auto;">
 
+      <div class="layui-colla-content layui-show detail" style="height: auto;">
 
         <div class="table_box">
 
 
           <div class="layui-row">
 
@@ -601,6 +602,7 @@
 
       </div>
 
     </div>
 
   </form>
 
+  </div>
 
 </div>
 
 
 <jsp:include page="../common/common-js-include.jsp"/>

+ 10 - 2
projects/src/main/webapp/vmodules/subIndu/list.jsp
Vizualizați fișierul 

@@ -35,14 +35,14 @@
 
 <body>
 
 <div class="layui-layout layui-layout-admin pd0">
 
     <div class="right_title">
 
-        <span class="txt">行业设置</span>
 
+        <span class="txt">行业设置<div class="top-breadcrumb"></div></span>
 
         <div class="layui-collapse search_form">
 
             <div class="layui-colla-item">
 
                 <%--                    <h2 class="layui-colla-title">筛选</h2>--%>
 
                 <div class="layui-colla-content layui-show">
 
                     <form class="layui-form" lay-filter="searchForm">
 
                         <div class="layui-row" style="margin-bottom: 30px">
 
-                            <div class="layui-col-xs6 layui-col-sm6 layui-col-md4">
 
+                            <div class="layui-col-xs6 layui-col-sm4 layui-col-md3">
 
                                 <div class="layui-form-item">
 
                                     <label class="layui-form-label">行业</label>
 
                                     <div class="layui-input-block">
 
@@ -143,6 +143,14 @@
 
                     methods.add();
 
                 });
 
                 methods.getData();
 
+                window.addEventListener('message', methods.receiveMessage, false);
 
+                window.parent.postMessage('init loaded')
 
+            },
 
+            receiveMessage (e) {
 
+                console.log('cb receiveMessage: ', e.data)
 
+                if (e.data.topBreadcrumb) {
 
+                    $(".top-breadcrumb").html(e.data.topBreadcrumb)
 
+                }
 
             },
 
             add: function (obj) {
 
                 App.openLayer({

+ 13 - 1
projects/src/main/webapp/vmodules/top.jsp
Vizualizați fișierul 

@@ -72,7 +72,7 @@
 
 
     <div class="top-cutline"></div>
 
     <div class="layui-logo" style="">哈密市投资项目智慧平台</div>--%>
 
-    <div class="prompt"><span class="date">2024年12月20日 星期五</span></div>
 
+    <div class="prompt"><span class="date">{{dateWeek}}</span></div>
 
     <c:if test="${isShowDialog==1}">
 
         <div class="top-task" onClick="toTask()">
 
             <div class="top-dashboard-icon"></div>
 
@@ -125,6 +125,10 @@
 
         el: "#top",
 
         data: {
 
             collapse: true,
 
+            dateWeek: ""
 
+        },
 
+        created() {
 
+            this.dateWeek = this.formatDate(new Date());
 
         },
 
         methods: {
 
             changeSide: function () {
 
@@ -142,6 +146,14 @@
 
                         window.location.href = targetUrl;
 
                     }
 
                 });
 
+            },
 
+            formatDate(date) {
 
+                const weekdays = ["日", "一", "二", "三", "四", "五", "六"];
 
+                const year = date.getFullYear();
 
+                const month = date.getMonth() + 1; // JavaScript中的月份是从0开始的，所以需要加1
 
+                const day = date.getDate();
 
+                const weekday = weekdays[date.getDay()]; // JavaScript中的getDay()方法返回的是一周中的第几天，从0（星期日）到6（星期六）
 
+                return year+`年`+(month < 10 ? '0' + month : month)+`月`+(day < 10 ? '0' + day : day)+`日 星期`+weekday;
 
             }
 
         }
 
     })