4 yıl önce · 1624292150
--- a/yinet-admin/src/main/java/com/yinet/web/controller/touchscreen/BaseWebController.java
+++ b/yinet-admin/src/main/java/com/yinet/web/controller/touchscreen/BaseWebController.java
@@ -92,13 +92,18 @@ public class BaseWebController extends BaseController {
 
				     public String GetHelp1(@PathVariable("id") String id, Model model) {
			
 
				         //List<TouchScreenGuidance> guidanceList = touchScreenGuidanceService.selectParentGuidanceList();
			
 
				         //    model.addAttribute("guidanceList", guidanceList);
			
 
				-        String parentId = "0";
			
 
				-        List<TouchScreenGuidance> guidanceList = touchScreenGuidanceService.selectGuidanceListByZNameFindAll(id, parentId);
			
 
				-        model.addAttribute("guidanceList", guidanceList);
			
 
				-        return touchIndex + "nan";
			
 
				+        if (id.equals("zdxq")) {
			
 
				+            List<TouchScreenGuidance> guidanceList = touchScreenGuidanceService.selectGuidanceListByParentId("6577bf17d2844d468065c8f366a3cacd");
			
 
				+            model.addAttribute("guidanceList", guidanceList);
			
 
				+            return touchIndex + "list";
			
 
				+        } else {
			
 
				+            String parentId = "0";
			
 
				+            List<TouchScreenGuidance> guidanceList = touchScreenGuidanceService.selectGuidanceListByZNameFindAll(id, parentId);
			
 
				+            model.addAttribute("guidanceList", guidanceList);
			
 
				+            return touchIndex + "nan";
			
 
				+        }
			
 
				     }
			
 
				 
			
 
				-
			
 
				     /**
			
 
				      * 公示公告
			
 
				      *
			
--- a/yinet-admin/src/main/resources/static/touchscreenstyle/images/pmt.jpg
+++ b/yinet-admin/src/main/resources/static/touchscreenstyle/images/pmt.jpg
--- a/yinet-admin/src/main/resources/templates/touchscreen/web/tong.html
+++ b/yinet-admin/src/main/resources/templates/touchscreen/web/tong.html
@@ -5,7 +5,13 @@
 
				     <script src="/touchscreenstyle/js/highcharts.js"></script>
			
 
				 </head>
			
 
				 <body>
			
 
				-<th:block th:include="include :: touchscreenHeader"/>
			
 
				+<div class="header">
			
 
				+    <img id="sitefav" src="/touchscreenstyle/images/logo.png"/>
			
 
				+    <div class="time" id="clock">
			
 
				+        <p class="date">{{ date }}</p>
			
 
				+        <p class="time1">{{ time }}</p>
			
 
				+    </div>
			
 
				+</div>
			
 
				 <div class="main">
			
 
				     <!-- <div class="zhanshi">
			
 
				          <img src="images/a1.png"/>
			
@@ -35,12 +41,12 @@
 
				         </div>
			
 
				         <p class="weui_tabbar_label">中心介绍</p>
			
 
				     </a>
			
 
				- <!--   <a href="/touchscreen/search" class="weui_tabbar_item">
			
 
				-        <div class="weui_tabbar_icon hig20">
			
 
				-            <i class="fa fa-search"></i>
			
 
				-        </div>
			
 
				-        <p class="weui_tabbar_label">办件查询</p>
			
 
				-    </a>-->
			
 
				+    <!--   <a href="/touchscreen/search" class="weui_tabbar_item">
			
 
				+           <div class="weui_tabbar_icon hig20">
			
 
				+               <i class="fa fa-search"></i>
			
 
				+           </div>
			
 
				+           <p class="weui_tabbar_label">办件查询</p>
			
 
				+       </a>-->
			
 
				     <a href="/touchscreen/nan" class="weui_tabbar_item">
			
 
				         <div class="weui_tabbar_icon hig20">
			
 
				             <i class="fa fa-telegram"></i>
			
@@ -57,7 +63,7 @@
 
				         <div class="weui_tabbar_icon hig20">
			
 
				             <i class="fa fa-bullhorn"></i>
			
 
				         </div>
			
 
				-        <p class="weui_tabbar_label">叫号统计</p>
			
 
				+        <p class="weui_tabbar_label">实时叫号</p>
			
 
				     </a>
			
 
				     <a href="/touchscreen/tong" class="weui_tabbar_item weui_bar_item_on">
			
 
				         <div class="weui_tabbar_icon hig20">
			
@@ -68,7 +74,7 @@
 
				 </div>
			
 
				 <th:block th:include="include :: touchScreenFooter"/>
			
 
				 <script th:inline="javascript">
			
 
				-    var list=[[${tjList}]];
			
 
				+    var list = [[${tjList}]];
			
 
				     shijian();
			
 
				     Highcharts.chart('container', {
			
 
				         chart: {
			
@@ -111,10 +117,6 @@
 
				                 name: '累计办结',
			
 
				                 y: list.allBJCount,
			
 
				                 drilldown: '累计办结'
			
 
				-            }, {
			
 
				-                name: '去年办结',
			
 
				-                y: list.LASTYEAR_ACH,
			
 
				-                drilldown: '今日办结'
			
 
				             }, {
			
 
				                 name: '本年办结',
			
 
				                 y: list.THISYEAR_ACH,
			
@@ -123,6 +125,10 @@
 
				                 name: '上月办结',
			
 
				                 y: list.LASTMONTH_ACH,
			
 
				                 drilldown: '上月办结'
			
 
				+            }, {
			
 
				+                name: '本月办结',
			
 
				+                y: list.THISMONTH_ACH,
			
 
				+                drilldown: '本月办结'
			
 
				             }, {
			
 
				                 name: '昨日办结',
			
 
				                 y: list.LASTDay_ACH,
			
--- a/yinet-system/src/main/resources/mapper/bjtj/FormBjtjMapper.xml
+++ b/yinet-system/src/main/resources/mapper/bjtj/FormBjtjMapper.xml