Merge branch 'rongxin_dev' of http://218.59.175.43:3000/zhangzl/nsgk_web into rongxin_dev

infoport/discussions.html

@@ -67,11 +67,10 @@
             </div>
         </div>
 
-        <div class="new" style="height: 56vh;">
+        <div class="new" id="loginF" style="height: 56vh; background: url('./static/images/login_bg.png') no-repeat center;background-size: 100% 100%; ">
 
-            <div id="loginF" style="display: flex;width: 100%;">
+            <div style="width: 100%;">
                 <div class="login_form_main">
-                    <img src="./static/images/sunVillage_info_login_code_header.png" alt="">
                     <div class="login_from">
                         <div class="flex_block">
                             <div class="flex_input_main">
@@ -94,32 +93,40 @@
 
                     </div>
                 </div>
-                <img src="static/images/news2.jpg" alt="">
             </div>
 
-            <div id="listB" style="display: none;width: 100%;position:relative;">
-                <div style="position:absolute;top: 0;left: 0;display: flex;align-items: center;cursor: pointer;" onclick="clearCook()">
-                    <img src="static/images/back.png" alt="" style="display: block;">
-                    <p style="line-height: 1;color: #1663ff;margin-left: 5px;">切换验证</p>
+        </div>
+
+        <div class="new_list_main" id="listB" style="display: none;position:relative;height: 56vh;">
+
+            <div class="new_list_left">
+                <div style="display: flex;align-items: center;cursor: pointer;border-bottom: 1px solid #b6b6b5;padding-bottom: 15px;margin-bottom: 15px;" onclick="clearCook()">
+                    <img src="static/images/list_icon_01.png" alt="" style="display: block;">
+                    <p style="line-height: 1;color: #1663ff;margin-left: 5px;font-weight: bold;font-size: 20px;" id="deptName">切换验证</p>
+                    <img src="static/images/list_icon_03.png" alt="" style="display: block;margin-left: auto;">
                 </div>
                 <div class="tab_box">
-
                     <img src="./static/images/index_code_btn_1.png" alt="" onclick="changeList('1')">
                     <img src="./static/images/index_code_btn_2.png" alt="" onclick="changeList('2')">
                     <img src="./static/images/index_code_btn_3.png" alt="" onclick="changeList('3')">
                     <img src="./static/images/index_code_btn_4.png" alt="" onclick="changeList('4')">
                     <img src="./static/images/index_code_btn_5.png" alt="" onclick="changeList('5')">
                     <img src="./static/images/index_code_btn_6.png" alt="" onclick="changeList('6')">
-
+                    <img src="./static/images/index_code_btn_7.png" alt="" onclick="changeList('7')">
+                    <img src="./static/images/index_code_btn_8.png" alt="" onclick="changeList('8')">
+                    <img src="./static/images/index_code_btn_9.png" alt="" onclick="changeList('9')">
                 </div>
+            </div>
 
+            <div class="new_list_right">
                 <div class="new_list" id="new_list_1" style="display: block;">
                     <div class="new_list_tit">
+                        <img src="static/images/list_icon_02.png" alt="" style="display: block;">
                         <p>财务公开</p>
-                        <p id="nowDateNYR1">2023.03.15</p>
+                        <p id="nowDateNYR1" style="margin-left: auto;">2023.03.15</p>
                     </div>
 
-                    <div id="review_box1" style="height: 40vh;overflow: hidden;margin-top: 2.5vh;">
+                    <div id="review_box1" style="height: 44vh;overflow: hidden;margin-top: 2.5vh;">
                         <div class="new_list_ul" id="newListContent1">
                             <script id="newListData1" type="text/html">
                                 {{each newList1 as value i}}
@@ -136,18 +143,19 @@
 
                 <div class="new_list" id="new_list_2" style="display: none;">
                     <div class="new_list_tit">
+                        <img src="static/images/list_icon_02.png" alt="" style="display: block;">
                         <p>合同公开</p>
-                        <p id="nowDateNYR2">2023.03.15</p>
+                        <p id="nowDateNYR2" style="margin-left: auto;">2023.03.15</p>
                     </div>
 
-                    <div id="review_box2" style="height: 40vh;overflow: hidden;margin-top: 2.5vh;">
+                    <div id="review_box2" style="height: 44vh;overflow: hidden;margin-top: 2.5vh;">
                         <div class="new_list_ul" id="newListContent2">
                             <script id="newListData2" type="text/html">
                                 {{each newList2 as value i}}
                                     <div class="new_list_li">
                                         <a href="discussionsDetail_02.html?id={{value.code}}">{{value.name}}</a>
                                         <p>{{value.code}}</p>
-                                        <p>{{value.buildingTime}}</p>
+                                        <p>{{value.totalAmount}}元</p>
                                     </div>
                                 {{/each}}
                             </script>
@@ -158,11 +166,12 @@
 
                 <div class="new_list" id="new_list_3" style="display: none;">
                     <div class="new_list_tit">
+                        <img src="static/images/list_icon_02.png" alt="" style="display: block;">
                         <p>重大事项</p>
-                        <p id="nowDateNYR3">2023.03.15</p>
+                        <p id="nowDateNYR3" style="margin-left: auto;">2023.03.15</p>
                     </div>
 
-                    <div id="review_box3" style="height: 40vh;overflow: hidden;margin-top: 2.5vh;">
+                    <div id="review_box3" style="height: 44vh;overflow: hidden;margin-top: 2.5vh;">
                         <div class="new_list_ul" id="newListContent3">
                             <script id="newListData3" type="text/html">
                                 {{each newList3 as value i}}
@@ -180,11 +189,12 @@
 
                 <div class="new_list" id="new_list_4" style="display: none;">
                     <div class="new_list_tit">
+                        <img src="static/images/list_icon_02.png" alt="" style="display: block;">
                         <p>四议两公开</p>
-                        <p id="nowDateNYR4">2023.03.15</p>
+                        <p id="nowDateNYR4" style="margin-left: auto;">2023.03.15</p>
                     </div>
 
-                    <div id="review_box4" style="height: 40vh;overflow: hidden;margin-top: 2.5vh;">
+                    <div id="review_box4" style="height: 44vh;overflow: hidden;margin-top: 2.5vh;">
                         <div class="new_list_ul" id="newListContent4">
                             <script id="newListData4" type="text/html">
                                 {{each newList4 as value i}}
@@ -202,11 +212,12 @@
 
                 <div class="new_list" id="new_list_5" style="display: none;">
                     <div class="new_list_tit">
+                        <img src="static/images/list_icon_02.png" alt="" style="display: block;">
                         <p>工程项目</p>
-                        <p id="nowDateNYR5">2023.03.15</p>
+                        <p id="nowDateNYR5" style="margin-left: auto;">2023.03.15</p>
                     </div>
 
-                    <div id="review_box5" style="height: 40vh;overflow: hidden;margin-top: 2.5vh;">
+                    <div id="review_box5" style="height: 44vh;overflow: hidden;margin-top: 2.5vh;">
                         <div class="new_list_ul" id="newListContent5">
                             <script id="newListData5" type="text/html">
                                 {{each newList5 as value i}}
@@ -224,11 +235,12 @@
 
                 <div class="new_list" id="new_list_6" style="display: none;">
                     <div class="new_list_tit">
+                        <img src="static/images/list_icon_02.png" alt="" style="display: block;">
                         <p>事务公开</p>
-                        <p id="nowDateNYR6">2023.03.15</p>
+                        <p id="nowDateNYR6" style="margin-left: auto;">2023.03.15</p>
                     </div>
 
-                    <div id="review_box6" style="height: 40vh;overflow: hidden;margin-top: 2.5vh;">
+                    <div id="review_box6" style="height: 44vh;overflow: hidden;margin-top: 2.5vh;">
                         <div class="new_list_ul" id="newListContent6">
                             <script id="newListData6" type="text/html">
                                 {{each newList6 as value i}}
@@ -244,7 +256,76 @@
                     </div>
                 </div>
 
+                <div class="new_list" id="new_list_7" style="display: none;">
+                    <div class="new_list_tit">
+                        <img src="static/images/list_icon_02.png" alt="" style="display: block;">
+                        <p>资产公开</p>
+                        <p id="nowDateNYR7" style="margin-left: auto;">2023.03.15</p>
+                    </div>
+
+                    <div id="review_box7" style="height: 44vh;overflow: hidden;margin-top: 2.5vh;">
+                        <div class="new_list_ul" id="newListContent7">
+                            <script id="newListData7" type="text/html">
+                                {{each newList7 as value i}}
+                                    <div class="new_list_li">
+                                        <a href="discussionsDetail_06.html?id={{value.code}}">{{value.name}}</a>
+                                        <p>{{value.code}}</p>
+                                        <p>{{value.buildTime}}</p>
+                                    </div>
+                                {{/each}}
+                            </script>
+                        </div>
+                        <div class="new_list_ul" id="newListContent_ul_7"></div>
+                    </div>
+                </div>
+
+                <div class="new_list" id="new_list_8" style="display: none;">
+                    <div class="new_list_tit">
+                        <img src="static/images/list_icon_02.png" alt="" style="display: block;">
+                        <p>资源公开</p>
+                        <p id="nowDateNYR8" style="margin-left: auto;">2023.03.15</p>
+                    </div>
+
+                    <div id="review_box8" style="height: 44vh;overflow: hidden;margin-top: 2.5vh;">
+                        <div class="new_list_ul" id="newListContent8">
+                            <script id="newListData8" type="text/html">
+                                {{each newList8 as value i}}
+                                    <div class="new_list_li">
+                                        <a href="discussionsDetail_07.html?id={{value.code}}">{{value.name}}</a>
+                                        <p>{{value.code}}</p>
+                                        <p>{{value.resourceType}}</p>
+                                    </div>
+                                {{/each}}
+                            </script>
+                        </div>
+                        <div class="new_list_ul" id="newListContent_ul_8"></div>
+                    </div>
+                </div>
+
+                <div class="new_list" id="new_list_9" style="display: none;">
+                    <div class="new_list_tit">
+                        <img src="static/images/list_icon_02.png" alt="" style="display: block;">
+                        <p>零工公开</p>
+                        <p id="nowDateNYR9" style="margin-left: auto;">2023.03.15</p>
+                    </div>
+
+                    <div id="review_box9" style="height: 44vh;overflow: hidden;margin-top: 2.5vh;">
+                        <div class="new_list_ul" id="newListContent9">
+                            <script id="newListData9" type="text/html">
+                                {{each newList9 as value i}}
+                                    <div class="new_list_li">
+                                        <a href="discussionsDetail_08.html?id={{value.id}}">{{value.openName}}</a>
+                                        <p>{{value.openNy}}</p>
+                                    </div>
+                                {{/each}}
+                            </script>
+                        </div>
+                        <div class="new_list_ul" id="newListContent_ul_9"></div>
+                    </div>
+                </div>
+
             </div>
+
         </div>
 
         <div class="footer_main" >
@@ -292,12 +373,6 @@
             <img src="" id="ewm"  alt="">
 
         </div>
-
-
-        <!--                    <div class="footer_link_filings_right">-->
-        <!--                        <p>服务热线</p>-->
-        <!--                        <a href="#">{{webList[4].contentValue}}</a>-->
-        <!--                    </div>-->
     </div>
 </body>
 <script src="./static/js/common/require.js" data-main="./static/js/common/main.js?t=101" id="require-page" target-module="./static/js/project/discussions.js" defer type="text/javascript"></script>

infoport/discussionsDetail.html

@@ -95,7 +95,7 @@
 
         <div id="dialogOp" style="display: none;width: 100vw;height: 100vh;position:absolute;top: 0;left: 0;">
             <div onclick="closeDia()" style="width: 100vw;height: 100vh;position:absolute;top: 0;left: 0;background: rgba(0,0,0,.5);"></div>
-            <img src="" id="dialogImg" style="position:absolute;left: 50%;top: 50%;transform: translate(-50%,-50%);height: 50vh;" alt=""/>
+            <img src="" id="dialogImg" style="position:absolute;left: 50%;top: 50%;transform: translate(-50%,-50%);height: 70vh;" alt=""/>
         </div>
 
     </div>

infoport/discussionsDetail_01.html

@@ -95,7 +95,7 @@
 
         <div id="dialogOp" style="display: none;width: 100vw;height: 100vh;position:absolute;top: 0;left: 0;">
             <div onclick="closeDia()" style="width: 100vw;height: 100vh;position:absolute;top: 0;left: 0;background: rgba(0,0,0,.5);"></div>
-            <img src="" id="dialogImg" style="position:absolute;left: 50%;top: 50%;transform: translate(-50%,-50%);height: 50vh;" alt=""/>
+            <img src="" id="dialogImg" style="position:absolute;left: 50%;top: 50%;transform: translate(-50%,-50%);height: 70vh;" alt=""/>
         </div>
 
     </div>

infoport/discussionsDetail_02.html

@@ -102,7 +102,7 @@
 
         <div id="dialogOp" style="display: none;width: 100vw;height: 100vh;position:absolute;top: 0;left: 0;">
             <div onclick="closeDia()" style="width: 100vw;height: 100vh;position:absolute;top: 0;left: 0;background: rgba(0,0,0,.5);"></div>
-            <img src="" id="dialogImg" style="position:absolute;left: 50%;top: 50%;transform: translate(-50%,-50%);height: 50vh;" alt=""/>
+            <img src="" id="dialogImg" style="position:absolute;left: 50%;top: 50%;transform: translate(-50%,-50%);height: 70vh;" alt=""/>
         </div>
 
     </div>

infoport/discussionsDetail_03.html

@@ -96,7 +96,7 @@
 
         <div id="dialogOp" style="display: none;width: 100vw;height: 100vh;position:absolute;top: 0;left: 0;">
             <div onclick="closeDia()" style="width: 100vw;height: 100vh;position:absolute;top: 0;left: 0;background: rgba(0,0,0,.5);"></div>
-            <img src="" id="dialogImg" style="position:absolute;left: 50%;top: 50%;transform: translate(-50%,-50%);height: 50vh;" alt=""/>
+            <img src="" id="dialogImg" style="position:absolute;left: 50%;top: 50%;transform: translate(-50%,-50%);height: 70vh;" alt=""/>
         </div>
 
     </div>

infoport/discussionsDetail_06.html

@@ -0,0 +1,106 @@
+<!DOCTYPE html
+    PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
+<html xmlns="http://www.w3.org/1999/xhtml" dir="ltr" lang="zh-CN" xml:lang="zh-CN">
+
+<head>
+    <meta charset="utf-8">
+    <title>农村资源信息港</title>
+    <meta http-equiv="Content-Type" content="text/html; charset=utf-8">
+    <meta http-equiv="X-UA-Compatible" content="IE=edge">
+    <meta name="keywords" content="" />
+    <meta name="description" cxontent="" />
+    <link href="static/css/main.css" rel="stylesheet" type="text/css" />
+    <link href="static/css/index.css" rel="stylesheet" type="text/css" />
+    <link href="static/css/newDetail.css" rel="stylesheet" type="text/css" />
+    <style type="text/css">
+        .new_content_content{
+            margin-top: 0;
+        }
+    </style>
+</head>
+
+<body>
+    <div class="main" id="page">
+
+        <div class="new_content">
+            <div class="new_content_left">
+                <div class="new_content_left_tit">
+                    <a href="discussions.html"><i></i></a>
+                    <p id="name"></p>
+                </div>
+                <div class="new_content_content" style="margin-top: 10px;" id="code"></div>
+                <div class="new_content_content" id="biddingType"></div>
+                <div class="new_content_content" id="secondParty"></div>
+                <div class="new_content_content" id="settleType"></div>
+                <div class="new_content_content" id="totalAmount"></div>
+                <div class="new_content_content" id="settledAmount"></div>
+                <div class="new_content_content" id="receivedAmount"></div>
+            </div>
+            <div class="new_content_right">
+                <div class="new_content_right_tit">资产公开列表</div>
+                <div class="new_content_right_main" id="newListContent">
+                    <script id="newListData" type="text/html">
+                        {{each newList as value i}}
+                        <p><a href="discussionsDetail_06.html?id={{value.code}}">{{value.name}}</a></p>
+                        {{/each}}
+                    </script>
+                </div>
+            </div>
+        </div>
+
+        <div class="footer_main" style="margin-top:0;" >
+
+            <div class="footer" id="webContent">
+
+                <script id="webData" type="text/html">
+                    <div class="footer_link">
+                        <!--                    <p class="footer_link_tit">友情链接</p>-->
+                        <!--                    {{each webList.botoom1 as value i}}-->
+                        <!--                        <a class="hotFile" target="_blank" href="{{value.contentUrl}}">{{value.contentValue}}</a>-->
+                        <!--                    {{/each}}-->
+                        <img src="static/images/link_00.png" alt="">
+                        <!--                    <a href=""><img src="static/images/link_01.png" alt="" ></a>-->
+                        <!--                    <a href=""><img src="static/images/link_02.png" alt=""></a>-->
+                        {{each webList.botoom1 as value i}}
+                        <a href="{{value.contentUrl}}" style="background: url('static/images/{{value.contentIcon}}.png') no-repeat center;background-size: 100% 100%;" target="_blank">
+                            <!--                            <img src="static/images/{{value.contentIcon}}.png" alt="" >-->
+                            <p class="link_tt">{{value.contentValue}}</p>
+                        </a>
+                        {{/each}}
+                    </div>
+
+                    <div class="footer_link_filings">
+                        {{each webList.botoom2 as value i}}
+                        <div class="footer_link_filings_left">
+                            <p style="background-image: url('static/images/{{value.contentIcon}}')">{{value.contentTitle}}</p>
+                            <a href="#">{{value.contentValue}}</a>
+                        </div>
+                        {{/each}}
+                    </div>
+
+                    <div class="footer_link_company">
+                        {{each webList.botoom3 as value i}}
+                        <div>
+                            <p>{{value.contentTitle}}</p>
+                            <a target="{{value.contentUrl ? '_blank' : '_self' }}" href="{{value.contentUrl ? value.contentUrl : 'javascript:void(0)' }}">{{value.contentValue}}</a>
+                        </div>
+                        {{/each}}
+                    </div>
+                </script>
+
+            </div>
+
+            <img src="" id="ewm"  alt="">
+
+        </div>
+
+
+        <div id="dialogOp" style="display: none;width: 100vw;height: 100vh;position:absolute;top: 0;left: 0;">
+            <div onclick="closeDia()" style="width: 100vw;height: 100vh;position:absolute;top: 0;left: 0;background: rgba(0,0,0,.5);"></div>
+            <img src="" id="dialogImg" style="position:absolute;left: 50%;top: 50%;transform: translate(-50%,-50%);height: 70vh;" alt=""/>
+        </div>
+
+    </div>
+</body>
+<script src="./static/js/common/require.js" data-main="./static/js/common/main.js?t=101" id="require-page" target-module="./static/js/project/discussionsDetail_06.js" defer type="text/javascript"></script>
+</html>

infoport/discussionsDetail_07.html

@@ -0,0 +1,106 @@
+<!DOCTYPE html
+    PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
+<html xmlns="http://www.w3.org/1999/xhtml" dir="ltr" lang="zh-CN" xml:lang="zh-CN">
+
+<head>
+    <meta charset="utf-8">
+    <title>农村资源信息港</title>
+    <meta http-equiv="Content-Type" content="text/html; charset=utf-8">
+    <meta http-equiv="X-UA-Compatible" content="IE=edge">
+    <meta name="keywords" content="" />
+    <meta name="description" cxontent="" />
+    <link href="static/css/main.css" rel="stylesheet" type="text/css" />
+    <link href="static/css/index.css" rel="stylesheet" type="text/css" />
+    <link href="static/css/newDetail.css" rel="stylesheet" type="text/css" />
+    <style type="text/css">
+        .new_content_content{
+            margin-top: 0;
+        }
+    </style>
+</head>
+
+<body>
+    <div class="main" id="page">
+
+        <div class="new_content">
+            <div class="new_content_left">
+                <div class="new_content_left_tit">
+                    <a href="discussions.html"><i></i></a>
+                    <p id="name"></p>
+                </div>
+                <div class="new_content_content" style="margin-top: 10px;" id="code"></div>
+                <div class="new_content_content" id="biddingType"></div>
+                <div class="new_content_content" id="secondParty"></div>
+                <div class="new_content_content" id="settleType"></div>
+                <div class="new_content_content" id="totalAmount"></div>
+                <div class="new_content_content" id="settledAmount"></div>
+                <div class="new_content_content" id="receivedAmount"></div>
+            </div>
+            <div class="new_content_right">
+                <div class="new_content_right_tit">资源公开列表</div>
+                <div class="new_content_right_main" id="newListContent">
+                    <script id="newListData" type="text/html">
+                        {{each newList as value i}}
+                        <p><a href="discussionsDetail_07.html?id={{value.code}}">{{value.name}}</a></p>
+                        {{/each}}
+                    </script>
+                </div>
+            </div>
+        </div>
+
+        <div class="footer_main" style="margin-top:0;" >
+
+            <div class="footer" id="webContent">
+
+                <script id="webData" type="text/html">
+                    <div class="footer_link">
+                        <!--                    <p class="footer_link_tit">友情链接</p>-->
+                        <!--                    {{each webList.botoom1 as value i}}-->
+                        <!--                        <a class="hotFile" target="_blank" href="{{value.contentUrl}}">{{value.contentValue}}</a>-->
+                        <!--                    {{/each}}-->
+                        <img src="static/images/link_00.png" alt="">
+                        <!--                    <a href=""><img src="static/images/link_01.png" alt="" ></a>-->
+                        <!--                    <a href=""><img src="static/images/link_02.png" alt=""></a>-->
+                        {{each webList.botoom1 as value i}}
+                        <a href="{{value.contentUrl}}" style="background: url('static/images/{{value.contentIcon}}.png') no-repeat center;background-size: 100% 100%;" target="_blank">
+                            <!--                            <img src="static/images/{{value.contentIcon}}.png" alt="" >-->
+                            <p class="link_tt">{{value.contentValue}}</p>
+                        </a>
+                        {{/each}}
+                    </div>
+
+                    <div class="footer_link_filings">
+                        {{each webList.botoom2 as value i}}
+                        <div class="footer_link_filings_left">
+                            <p style="background-image: url('static/images/{{value.contentIcon}}')">{{value.contentTitle}}</p>
+                            <a href="#">{{value.contentValue}}</a>
+                        </div>
+                        {{/each}}
+                    </div>
+
+                    <div class="footer_link_company">
+                        {{each webList.botoom3 as value i}}
+                        <div>
+                            <p>{{value.contentTitle}}</p>
+                            <a target="{{value.contentUrl ? '_blank' : '_self' }}" href="{{value.contentUrl ? value.contentUrl : 'javascript:void(0)' }}">{{value.contentValue}}</a>
+                        </div>
+                        {{/each}}
+                    </div>
+                </script>
+
+            </div>
+
+            <img src="" id="ewm"  alt="">
+
+        </div>
+
+
+        <div id="dialogOp" style="display: none;width: 100vw;height: 100vh;position:absolute;top: 0;left: 0;">
+            <div onclick="closeDia()" style="width: 100vw;height: 100vh;position:absolute;top: 0;left: 0;background: rgba(0,0,0,.5);"></div>
+            <img src="" id="dialogImg" style="position:absolute;left: 50%;top: 50%;transform: translate(-50%,-50%);height: 70vh;" alt=""/>
+        </div>
+
+    </div>
+</body>
+<script src="./static/js/common/require.js" data-main="./static/js/common/main.js?t=101" id="require-page" target-module="./static/js/project/discussionsDetail_07.js" defer type="text/javascript"></script>
+</html>

infoport/discussionsDetail_08.html

@@ -0,0 +1,104 @@
+<!DOCTYPE html
+    PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
+<html xmlns="http://www.w3.org/1999/xhtml" dir="ltr" lang="zh-CN" xml:lang="zh-CN">
+
+<head>
+    <meta charset="utf-8">
+    <title>农村资源信息港</title>
+    <meta http-equiv="Content-Type" content="text/html; charset=utf-8">
+    <meta http-equiv="X-UA-Compatible" content="IE=edge">
+    <meta name="keywords" content="" />
+    <meta name="description" cxontent="" />
+    <link href="static/css/main.css" rel="stylesheet" type="text/css" />
+    <link href="static/css/index.css" rel="stylesheet" type="text/css" />
+    <link href="static/css/newDetail.css" rel="stylesheet" type="text/css" />
+</head>
+
+<body>
+    <div class="main" id="page">
+
+        <div class="new_content">
+            <div class="new_content_left">
+                <div class="new_content_left_tit">
+                    <a href="discussions.html"><i></i></a>
+                    <p id="openName"></p>
+                </div>
+                <div class="new_content_left_come">
+                    <p id="creatBy"></p>
+                    <p id="creatTime"></p>
+                </div>
+                <div class="new_content_content" id="openNy"></div>
+                <div class="new_content_content" id="openPic"></div>
+                <div class="new_content_content" id="openFile"></div>
+                <div class="new_content_content" id="remark"></div>
+            </div>
+            <div class="new_content_right">
+                <div class="new_content_right_tit">零工公开列表</div>
+                <div class="new_content_right_main" id="newListContent">
+                    <script id="newListData" type="text/html">
+                        {{each newList as value i}}
+                        <p><a href="discussionsDetail_03.html?id={{value.id}}">{{value.openName}}</a></p>
+                        {{/each}}
+                    </script>
+                </div>
+            </div>
+        </div>
+
+
+
+        <div class="footer_main" style="margin-top:0;" >
+
+            <div class="footer" id="webContent">
+
+                <script id="webData" type="text/html">
+                    <div class="footer_link">
+    <!--                    <p class="footer_link_tit">友情链接</p>-->
+    <!--                    {{each webList.botoom1 as value i}}-->
+    <!--                        <a class="hotFile" target="_blank" href="{{value.contentUrl}}">{{value.contentValue}}</a>-->
+    <!--                    {{/each}}-->
+                        <img src="static/images/link_00.png" alt="">
+    <!--                    <a href=""><img src="static/images/link_01.png" alt="" ></a>-->
+    <!--                    <a href=""><img src="static/images/link_02.png" alt=""></a>-->
+                        {{each webList.botoom1 as value i}}
+                            <a href="{{value.contentUrl}}" style="background: url('static/images/{{value.contentIcon}}.png') no-repeat center;background-size: 100% 100%;" target="_blank">
+    <!--                            <img src="static/images/{{value.contentIcon}}.png" alt="" >-->
+                                <p class="link_tt">{{value.contentValue}}</p>
+                            </a>
+                        {{/each}}
+                    </div>
+
+                    <div class="footer_link_filings">
+                        {{each webList.botoom2 as value i}}
+                            <div class="footer_link_filings_left">
+                                <p style="background-image: url('static/images/{{value.contentIcon}}')">{{value.contentTitle}}</p>
+                                <a href="#">{{value.contentValue}}</a>
+                            </div>
+                        {{/each}}
+                    </div>
+
+                    <div class="footer_link_company">
+                        {{each webList.botoom3 as value i}}
+                            <div>
+                                <p>{{value.contentTitle}}</p>
+                                <a target="{{value.contentUrl ? '_blank' : '_self' }}" href="{{value.contentUrl ? value.contentUrl : 'javascript:void(0)' }}">{{value.contentValue}}</a>
+                            </div>
+                        {{/each}}
+                    </div>
+                </script>
+
+            </div>
+
+            <img src="" id="ewm"  alt="">
+
+        </div>
+
+
+        <div id="dialogOp" style="display: none;width: 100vw;height: 100vh;position:absolute;top: 0;left: 0;">
+            <div onclick="closeDia()" style="width: 100vw;height: 100vh;position:absolute;top: 0;left: 0;background: rgba(0,0,0,.5);"></div>
+            <img src="" id="dialogImg" style="position:absolute;left: 50%;top: 50%;transform: translate(-50%,-50%);height: 70vh;" alt=""/>
+        </div>
+
+    </div>
+</body>
+<script src="./static/js/common/require.js" data-main="./static/js/common/main.js?t=101" id="require-page" target-module="./static/js/project/discussionsDetail_08.js" defer type="text/javascript"></script>
+</html>

infoport/index.html

@@ -71,7 +71,7 @@
             <input type="search" placeholder="搜索您需要的讯息" id="searchInput" oninput="searchChange()" >
         </div>
 
-        <div class="new">
+        <div class="new" style="justify-content: space-between;">
             <div class="personalTit-banner">
                 <div class="swiper-container" id="bannerFocusNextWrap">
                     <div class="swiper-wrapper" id="bannerFocusNextContent">
@@ -93,10 +93,11 @@
                 </div>
             </div>
 
-            <div class="new_list">
+            <div class="new_list" style="width: 52%;">
                 <div class="new_list_tit">
+                    <img src="static/images/list_icon_02.png" alt="" style="display: block;">
                     <p>资讯</p>
-                    <p id="nowDateNYR">2023.03.15</p>
+                    <p id="nowDateNYR" style="margin-left: auto;">2023.03.15</p>
                 </div>
 
                 <div id="review_box" style="height: 36vh;overflow: hidden;margin-top: 2.5vh;">

infoport/static/css/index.css

@@ -168,8 +168,34 @@
   /*align-items: center;*/
 }
 
+.new_list_main{
+  width: 75%;
+  margin: 0 auto;
+  height: 50vh;
+  margin-top: 3vh;
+  display: flex;
+  justify-content: space-between;
+  /*align-items: center;*/
+}
+
+.new_list_left{
+  background: rgba(225,228,238,0.9);
+  border-radius: 15px;
+  padding: 3vh;
+  width: 30%;
+}
+
+.new_list_right{
+  background: rgba(225,228,238,0.9);
+  border-radius: 15px;
+  padding: 3vh;
+  width: 68%;
+}
+
 .login_form_main{
-  flex: 1;
+  display: flex;
+  align-items: center;
+  height: 100%;
   /*background: linear-gradient(to bottom right, rgb(168, 249, 252), rgb(105, 119, 249));*/
 }
 .login_form_main img{
@@ -179,12 +205,12 @@
 }
 
 .login_from {
-  width: 50%;
+  width: 25%;
   background: #ffffff;
   background-size: 100% 100%;
-  margin: -1PX auto 0;
-  padding: 1.6vh 50px 3.2vh;
-  border-radius: 0 0 20PX 20PX;
+  padding: 3.2vh;
+  border-radius: 20PX 20PX 20PX 20PX;
+  margin-left: 9vh;
 }
 .btn{
   width: 100%;
@@ -195,7 +221,7 @@
   line-height: 4vh;
   text-align: center;
   border: none;
-  background: linear-gradient(to right , #97EDF7 , #2376EC);
+  background: linear-gradient(to right , #47a5ff , #2a39fb);
   border-radius: 5vh;
   cursor: pointer;
 }
@@ -211,7 +237,7 @@
   flex: 1;
   align-items: center;
   background: #E7F0FF;
-  border-radius: 62px;
+  border-radius: 10PX;
   height: 5vh;
 }
 
@@ -292,21 +318,19 @@
 }
 
 .new_list{
-  margin-left: 2%;
-  width: 53%;
-  padding: 1vh 0;
 }
 
 .new_list_tit{
   display: flex;
-  justify-content: space-between;
   align-items: center;
+  border-bottom: 1px solid #b6b6b5;
+  padding-bottom: 15px;
+  margin-bottom: 15px;
 }
 
-.new_list_tit p:first-child{
-  font-size: 18px;
+.new_list_tit p:nth-child(2){
+  font-size: 20px;
   color: #1663ff;
-  border-left: 3px solid #1663ff;
   padding-left: 10px;
   font-weight: bold;
   line-height: 1;
@@ -348,6 +372,11 @@
 
 .new_list_li p{
   transition: all 0.4s ease-in-out;
+  flex: 1;
+}
+
+.new_list_li p:last-child{
+  text-align: right;
 }
 
 .new_list_li a{
@@ -561,13 +590,13 @@
 .tab_box{
   display: flex;
   flex-wrap: wrap;
-  width: 50%;
   justify-content: space-between;
   align-items: center;
 }
 
 .tab_box img{
   display: block;
-  width: 48%;
+  width: 47%;
   cursor: pointer;
+  margin-bottom: 1.5vh;
 }

infoport/static/css/main.css

@@ -2459,7 +2459,7 @@ body {
 
 /*焦点图*/
 /* ===============================================================
-Basic Swiper Styles 
+Basic Swiper Styles
 ================================================================*/
 .swiper-container {
     margin: 0 auto;
@@ -2558,8 +2558,8 @@ Basic Swiper Styles
     position: absolute;
     z-index: 20;
     left: 50%;
-    margin-left: -10px;
     bottom: 10px;
+    transform: translateX(-50%);
 }
 
 .swiper-pagination-switch {
@@ -2580,4 +2580,4 @@ Basic Swiper Styles
 
 .swiper-active-switch {
     background: #fff;
-}
+}

infoport/static/js/api/index.js

@@ -123,3 +123,11 @@ var majorEventPublicList = '/open/villageAffairs/public/majorEventPublicList'//
 var financePublicDetail = '/open/villageAffairs/public/financePublicDetail'
 
 var majorEventPublicDetail = '/open/villageAffairs/public/majorEventPublicDetail'
+
+var orcodeList = '/open/asset/orcode/list'
+
+var assetresourceOrcodeList = '/open/assetresource/orcode/list'
+
+var tempWorkerPublicList = '/open/villageAffairs/public/tempWorkerPublicList'
+
+var tempWorkerPublicDetail = '/open/villageAffairs/public/tempWorkerPublicDetail'

infoport/static/js/project/discussions.js

@@ -10,7 +10,7 @@ define(['jquery', "template", "Tools", 'swiper'], function ($, template, Tools,
             //焦点图数据
             focusList: [],
             communicateList: [],
-            newImgList:[]
+            newImgList:[],
         },
     };
     var tools = new Tools();
@@ -30,6 +30,8 @@ define(['jquery', "template", "Tools", 'swiper'], function ($, template, Tools,
         //     autoplay : 2000,
         //     loop:true
         // })
+        console.log(JSON.parse(tools.getCookie('user')))
+        $("#deptName").html(JSON.parse(tools.getCookie('user')).deptName);
         if (tools.getCookie('user')){
             $("#loginF").css('display','none');
             $("#listB").css('display','flex');
@@ -46,6 +48,33 @@ define(['jquery', "template", "Tools", 'swiper'], function ($, template, Tools,
         }
     }
 
+    module.newsList7 = function (data) {
+        if (data.code == 200) {
+            var content = data.rows;
+            module.data.newList7 = content;
+            var newListData7 = template('newListData7', module.data);
+            $("#newListContent_ul_7").html(newListData7);
+        }
+    }
+
+    module.newsList8 = function (data) {
+        if (data.code == 200) {
+            var content = data.rows;
+            module.data.newList8 = content;
+            var newListData8 = template('newListData8', module.data);
+            $("#newListContent_ul_8").html(newListData8);
+        }
+    }
+
+    module.newsList9 = function (data) {
+        if (data.code == 200) {
+            var content = data.rows;
+            module.data.newList9 = content;
+            var newListData9 = template('newListData9', module.data);
+            $("#newListContent_ul_9").html(newListData9);
+        }
+    }
+
     module.webList = function (data) {
         if (data.code == 200) {
             var content = data.data;
@@ -104,6 +133,9 @@ define(['jquery', "template", "Tools", 'swiper'], function ($, template, Tools,
         $('#new_list_4').css('display','none');
         $('#new_list_5').css('display','none');
         $('#new_list_6').css('display','none');
+        $('#new_list_7').css('display','none');
+        $('#new_list_8').css('display','none');
+        $('#new_list_9').css('display','none');
         switch (type) {
 
             case '1':
@@ -167,6 +199,49 @@ define(['jquery', "template", "Tools", 'swiper'], function ($, template, Tools,
                 $("#nowDateNYR6").html(new Date().getFullYear()+'-'+(new Date().getMonth()+1)+'-'+new Date().getDate());
                 break;
 
+            case '7':
+                tools.doGet(orcodeList, {
+                    translate_dict:1,
+                    orderByColumn: 'code',
+                    isAsc: 'asc',
+                    pageNum:1,
+                    pageSize:10,
+                    bookId: JSON.parse(tools.getCookie('user')).bookId,
+                    deptId: JSON.parse(tools.getCookie('user')).deptId
+                }, module.newsList7 , true);
+                $('#new_list_7').css('display','block');
+                $("#nowDateNYR7").html(new Date().getFullYear()+'-'+(new Date().getMonth()+1)+'-'+new Date().getDate());
+                break;
+
+            case '8':
+                tools.doGet(assetresourceOrcodeList, {
+                    translate_dict:1,
+                    orderByColumn: 'code',
+                    isAsc: 'asc',
+                    pageNum:1,
+                    pageSize:10,
+                    bookId: JSON.parse(tools.getCookie('user')).bookId
+                }, module.newsList8 , true);
+                $('#new_list_8').css('display','block');
+                $("#nowDateNYR8").html(new Date().getFullYear()+'-'+(new Date().getMonth()+1)+'-'+new Date().getDate());
+                break;
+
+            case '9':
+                tools.doGet(tempWorkerPublicList, {
+                    translate_dict:1,
+                    orderByColumn: 'openNy',
+                    isAsc: 'asc',
+                    pageNum:1,
+                    pageSize:10,
+                    bookId: JSON.parse(tools.getCookie('user')).bookId,
+                    deptId: JSON.parse(tools.getCookie('user')).deptId
+                }, module.newsList9 , true);
+                $('#new_list_9').css('display','block');
+                $("#nowDateNYR9").html(new Date().getFullYear()+'-'+(new Date().getMonth()+1)+'-'+new Date().getDate());
+                break;
+            default:
+                    break;
+
         }
 
     }

infoport/static/js/project/discussionsDetail_03.js

@@ -74,7 +74,7 @@ define(['jquery', "template", "Tools"], function ($, template, Tools) {
             if (content.openFile){
                 let arr2 = content.openFile.split(',');
                 for (let i = 0;i < arr2.length; i++){
-                    $('#openFile')[0].innerHTML += '<a href="/api'+arr2[i]+'">';
+                    $('#openFile')[0].innerHTML += '<a style="color: #2a39fb;" href="/api'+arr2[i]+'">'+arr2[i].substr(27,arr2[i].length)+'</a>';
                 }
             }
 

infoport/static/js/project/discussionsDetail_06.js

@@ -0,0 +1,83 @@
+/**
+ * Created by Administrator on 2021/4/5.
+ */
+define(['jquery', "template", "Tools"], function ($, template, Tools) {
+    //数据存储
+    var module = {
+        data: {
+            //服务器地址
+            serverApi:'',
+            //焦点图数据
+            focusList: [],
+            communicateList: [],
+        },
+    };
+    var tools = new Tools();
+
+    module.init = function (page) {
+        //新闻详情
+        tools.doGet(orcodeList, {
+            code:getQueryVariable('id'),
+            translate_dict: '1',
+            bookId: JSON.parse(tools.getCookie('user')).bookId,
+            deptId: JSON.parse(tools.getCookie('user')).deptId
+        }, module.newsDetail , true);
+        //新闻列表
+        tools.doGet(orcodeList, {
+            translate_dict:1,
+            orderByColumn: 'code',
+            isAsc: 'asc',
+            pageNum:1,
+            pageSize:10,
+            bookId: JSON.parse(tools.getCookie('user')).bookId,
+            deptId: JSON.parse(tools.getCookie('user')).deptId
+        }, module.newsList , true);
+        tools.doGet(webList, {}, module.webList , true);
+    };
+
+    //获取地址栏参数
+    function getQueryVariable(variable){
+        var query = window.location.search.substring(1);
+        var vars = query.split("&");
+        for (var i=0;i<vars.length;i++) {
+            var pair = vars[i].split("=");
+            if(pair[0] == variable){return pair[1];}
+        }
+        return(false);
+    }
+
+    module.webList = function (data) {
+        if (data.code == 200) {
+            var content = data.data;
+            module.data.webList = content;
+            var webData = template('webData', module.data);
+            $("#webContent").html(webData);
+            $('#ewm').attr('src', 'static/images/'+content.top.bz);
+        }
+    }
+
+    module.newsDetail = function (data) {
+        if (data.code == 200) {
+            var content = data.rows[0];
+            $('#name').html(content.name);
+            $('#code').html('资产编码：' + content.code);
+            $('#biddingType').html('资产类别：'+content.assetType);
+            $('#secondParty').html('构建时间：'+content.buildTime);
+            $('#settleType').html('使用情况：'+content.useType);
+            $('#totalAmount').html('数量：'+content.netValue);
+            $('#settledAmount').html('单位：'+content.unit);
+            $('#receivedAmount').html('原值：'+content.originalValue);
+        }
+    }
+
+    module.newsList = function (data) {
+        if (data.code == 200) {
+            var content = data.rows;
+            module.data.newList = content;
+            var newListData = template('newListData', module.data);
+            $("#newListContent").html(newListData);
+        }
+    }
+
+    return module;
+});

infoport/static/js/project/discussionsDetail_07.js

@@ -0,0 +1,79 @@
+/**
+ * Created by Administrator on 2021/4/5.
+ */
+define(['jquery', "template", "Tools"], function ($, template, Tools) {
+    //数据存储
+    var module = {
+        data: {
+            //服务器地址
+            serverApi:'',
+            //焦点图数据
+            focusList: [],
+            communicateList: [],
+        },
+    };
+    var tools = new Tools();
+
+    module.init = function (page) {
+        //新闻详情
+        tools.doGet(assetresourceOrcodeList, {
+            code:getQueryVariable('id'),
+            translate_dict: '1',
+            bookId: JSON.parse(tools.getCookie('user')).bookId
+        }, module.newsDetail , true);
+        //新闻列表
+        tools.doGet(assetresourceOrcodeList, {
+            translate_dict:1,
+            orderByColumn: 'code',
+            isAsc: 'asc',
+            pageNum:1,
+            pageSize:10,
+            bookId: JSON.parse(tools.getCookie('user')).bookId
+        }, module.newsList , true);
+        tools.doGet(webList, {}, module.webList , true);
+    };
+
+    //获取地址栏参数
+    function getQueryVariable(variable){
+        var query = window.location.search.substring(1);
+        var vars = query.split("&");
+        for (var i=0;i<vars.length;i++) {
+            var pair = vars[i].split("=");
+            if(pair[0] == variable){return pair[1];}
+        }
+        return(false);
+    }
+
+    module.webList = function (data) {
+        if (data.code == 200) {
+            var content = data.data;
+            module.data.webList = content;
+            var webData = template('webData', module.data);
+            $("#webContent").html(webData);
+            $('#ewm').attr('src', 'static/images/'+content.top.bz);
+        }
+    }
+
+    module.newsDetail = function (data) {
+        if (data.code == 200) {
+            var content = data.rows[0];
+            $('#name').html(content.name);
+            $('#code').html('资产编码：' + content.code);
+            $('#biddingType').html('资源分类：'+content.resourceSort);
+            $('#secondParty').html('资源类型：'+content.resourceType);
+            $('#settleType').html('面积：'+content.totalArea);
+            $('#totalAmount').html('使用情况：'+content.useType);
+        }
+    }
+
+    module.newsList = function (data) {
+        if (data.code == 200) {
+            var content = data.rows;
+            module.data.newList = content;
+            var newListData = template('newListData', module.data);
+            $("#newListContent").html(newListData);
+        }
+    }
+
+    return module;
+});

infoport/static/js/project/discussionsDetail_08.js

@@ -0,0 +1,108 @@
+/**
+ * Created by Administrator on 2021/4/5.
+ */
+define(['jquery', "template", "Tools"], function ($, template, Tools) {
+    //数据存储
+    var module = {
+        data: {
+            //服务器地址
+            serverApi:'',
+            //焦点图数据
+            focusList: [],
+            communicateList: [],
+        },
+    };
+    var tools = new Tools();
+
+    module.init = function (page) {
+        //新闻详情
+        tools.doGet(tempWorkerPublicDetail, {
+            id:getQueryVariable('id'),
+            bookId: JSON.parse(tools.getCookie('user')).bookId,
+            deptId: JSON.parse(tools.getCookie('user')).deptId
+        }, module.newsDetail , true);
+        //新闻列表
+        tools.doGet(tempWorkerPublicList, {
+            translate_dict:1,
+            orderByColumn: 'openNy',
+            isAsc: 'asc',
+            pageNum:1,
+            pageSize:10,
+            bookId: JSON.parse(tools.getCookie('user')).bookId,
+            deptId: JSON.parse(tools.getCookie('user')).deptId
+        }, module.newsList , true);
+        tools.doGet(webList, {}, module.webList , true);
+    };
+
+    //获取地址栏参数
+    function getQueryVariable(variable){
+        var query = window.location.search.substring(1);
+        var vars = query.split("&");
+        for (var i=0;i<vars.length;i++) {
+            var pair = vars[i].split("=");
+            if(pair[0] == variable){return pair[1];}
+        }
+        return(false);
+    }
+
+    module.webList = function (data) {
+        if (data.code == 200) {
+            var content = data.data;
+            module.data.webList = content;
+            var webData = template('webData', module.data);
+            $("#webContent").html(webData);
+            $('#ewm').attr('src', 'static/images/'+content.top.bz);
+        }
+    }
+
+    module.newsDetail = function (data) {
+        if (data.code == 200) {
+            var content = data.data;
+            $('#openName')[0].innerHTML = content.openName;
+            $('#openNy')[0].innerHTML = '公开年月：'+content.openNy;
+
+            $('#openPic')[0].innerHTML = '公开图片：<br/>';
+
+            if (content.openPic){
+                let arr = content.openPic.split(',');
+                for (let i = 0;i < arr.length; i++){
+                    $('#openPic')[0].innerHTML += '<img onclick="openDialog(\'/api'+arr[i]+'\')" src="/api'+arr[i]+'" style="width: 200px;height: 150px;margin-right: 10px;">';
+                }
+            }
+
+            $('#openFile')[0].innerHTML = '附件：<br/>';
+
+            if (content.openFile){
+                let arr2 = content.openFile.split(',');
+                console.log(arr2)
+                for (let i = 0;i < arr2.length; i++){
+                    $('#openFile')[0].innerHTML += '<a style="color: #2a39fb;" href="/api'+arr2[i]+'">'+arr2[i].substr(27,arr2[i].length)+'</a>';
+                }
+            }
+
+            $('#remark')[0].innerHTML = '备注：'+content.remark;
+
+        }
+    }
+
+    openDialog = function (src){
+        $("#dialogOp").css('display','block');
+        $('#dialogImg').attr('src', src);
+    }
+
+    closeDia = function (){
+        $("#dialogOp").css('display','none');
+        $('#dialogImg').attr('src', '');
+    }
+
+    module.newsList = function (data) {
+        if (data.code == 200) {
+            var content = data.rows;
+            module.data.newList = content;
+            var newListData = template('newListData', module.data);
+            $("#newListContent").html(newListData);
+        }
+    }
+
+    return module;
+});

infoport/static/js/project/index.js

@@ -19,12 +19,6 @@ define(['jquery', "template", "Tools", 'swiper'], function ($, template, Tools,
         //新闻列表
         tools.doGet(newsList, {pageNum:1,pageSize:8}, module.newsList , true);
         tools.doGet(webList, {}, module.webList , true);
-        new Swiper('#bannerFocusNextWrap', {
-            paginationClickable: true,
-            pagination: '.a2',
-            autoplay : 2000,
-            loop:true
-        })
 
         $("#nowDateNYR").html(new Date().getFullYear()+'-'+(new Date().getMonth()+1)+'-'+new Date().getDate());
 
@@ -46,7 +40,15 @@ define(['jquery', "template", "Tools", 'swiper'], function ($, template, Tools,
             module.data.newImgList = newImgList;
             var newListDataImg = template('newListDataImg', module.data);
             $("#bannerFocusNextContent").html(newListDataImg);
-            roll(20)
+            if ( content.length > 7){
+                roll(20)
+            }
+            new Swiper('#bannerFocusNextWrap', {
+                paginationClickable: true,
+                pagination: '.a2',
+                autoplay : 2000,
+                loop:true
+            })
         }
     }