From e67f52078602f3efb6da02ef8fc8cf0cf7fa7e7a Mon Sep 17 00:00:00 2001
From: czt <czt18638530771@163.com>
Date: 星期二, 03 二月 2026 10:46:45 +0800
Subject: [PATCH] 客户问题优化1
---
fzzy-igdss-view/src/main/java/com/fzzy/igds/InoutLossOver.view.xml | 4 ++--
fzzy-igdss-web/src/main/resources/templates/login.html | 2 +-
fzzy-igdss-core/src/main/java/com/fzzy/igds/service/GatewaySerService.java | 1 +
fzzy-igdss-web/src/main/resources/templates/index.html | 12 +++++++++++-
fzzy-igdss-view/src/main/java/com/fzzy/igds/InoutList.view.xml | 6 +++---
5 files changed, 18 insertions(+), 7 deletions(-)
diff --git a/fzzy-igdss-core/src/main/java/com/fzzy/igds/service/GatewaySerService.java b/fzzy-igdss-core/src/main/java/com/fzzy/igds/service/GatewaySerService.java
index f299811..7139b81 100644
--- a/fzzy-igdss-core/src/main/java/com/fzzy/igds/service/GatewaySerService.java
+++ b/fzzy-igdss-core/src/main/java/com/fzzy/igds/service/GatewaySerService.java
@@ -53,6 +53,7 @@
if (StringUtils.isNotBlank(parentId)) {
queryWrapper.likeRight("dept_id", parentId);
}
+ queryWrapper.orderByAsc("order_num");
return gatewaySerMapper.selectList(queryWrapper);
}
diff --git a/fzzy-igdss-view/src/main/java/com/fzzy/igds/InoutList.view.xml b/fzzy-igdss-view/src/main/java/com/fzzy/igds/InoutList.view.xml
index 17d2574..e99ea9c 100644
--- a/fzzy-igdss-view/src/main/java/com/fzzy/igds/InoutList.view.xml
+++ b/fzzy-igdss-view/src/main/java/com/fzzy/igds/InoutList.view.xml
@@ -584,7 +584,7 @@
</ToolBarButton>
<ToolBarButton id="btnDel">
<ClientEvent name="onClick">showAbnormal();</ClientEvent>
- <Property name="caption">寮傚父鎿嶄綔</Property>
+ <Property name="caption">浣滃簾鎿嶄綔</Property>
<Property name="exClassName">btn4</Property>
<Property name="iconClass">fa fa-minus</Property>
<Property name="width">100</Property>
@@ -1000,14 +1000,14 @@
<Buttons>
<Button>
<ClientEvent name="onClick">todoError();</ClientEvent>
- <Property name="caption">寮傚父缁堟</Property>
+ <Property name="caption">纭浣滃簾</Property>
<Property name="iconClass">fa fa-check</Property>
<Property name="exClassName">btn1</Property>
<Property name="width">120</Property>
</Button>
<Button>
<ClientEvent name="onClick">self.get("parent").close();</ClientEvent>
- <Property name="caption">鍙栨秷鎿嶄綔</Property>
+ <Property name="caption">鍙栨秷</Property>
<Property name="exClassName">btn3</Property>
<Property name="iconClass">fa fa-times-circle</Property>
<Property name="width">120</Property>
diff --git a/fzzy-igdss-view/src/main/java/com/fzzy/igds/InoutLossOver.view.xml b/fzzy-igdss-view/src/main/java/com/fzzy/igds/InoutLossOver.view.xml
index eaa2f8b..a2950ec 100644
--- a/fzzy-igdss-view/src/main/java/com/fzzy/igds/InoutLossOver.view.xml
+++ b/fzzy-igdss-view/src/main/java/com/fzzy/igds/InoutLossOver.view.xml
@@ -179,7 +179,7 @@
<Property name="iconClass">fa fa-plus</Property>
</ToolBarButton>
<ToolBarButton>
- <ClientEvent name="onClick">var data = view.get("#dataGridCamera").get("selection");
+ <ClientEvent name="onClick">var data = view.get("#dataGridMain").get("selection");
if(data){
view.get("#dialogMain").show();
}else{
@@ -191,7 +191,7 @@
<Property name="iconClass">fa fa-pencil-square-o</Property>
</ToolBarButton>
<ToolBarButton>
- <ClientEvent name="onClick">var select = view.get("#dataGridCamera").get("selection");
+ <ClientEvent name="onClick">var select = view.get("#dataGridMain").get("selection");
if(select){
view.get("#ajaxDel").set("parameter",select).execute(function(result){
if(result){
diff --git a/fzzy-igdss-web/src/main/resources/templates/index.html b/fzzy-igdss-web/src/main/resources/templates/index.html
index d329d35..ea3d78f 100644
--- a/fzzy-igdss-web/src/main/resources/templates/index.html
+++ b/fzzy-igdss-web/src/main/resources/templates/index.html
@@ -15,13 +15,20 @@
<link th:href="@{/css/style.min.css}" rel="stylesheet"/>
<link th:href="@{/css/skins.css}" rel="stylesheet"/>
<link th:href="@{/ruoyi/css/ry-ui.css?v=4.7.8}" rel="stylesheet"/>
+ <style>
+ .slimScrollDiv{
+ position: relative;
+ width: auto;
+ height: 92%;
+ }
+ </style>
</head>
<body class="fixed-sidebar full-height-layout gray-bg skin-zcl" th:classappend="${isMobile} ? 'canvas-menu'"
style="overflow: hidden">
<div id="wrapper">
<!--宸︿晶瀵艰埅寮�濮�-->
- <nav class="navbar-default navbar-static-side" role="navigation">
+ <nav class="navbar-default navbar-static-side" role="navigation" style="height: 96%;">
<div class="nav-close">
<i class="fa fa-times-circle"></i>
</div>
@@ -88,6 +95,9 @@
</li>
</ul>
</div>
+ <div style="text-align: center;">
+ <p style="color: #FFFFFF">鏂癐CP澶�2024007717鍙�-2</p>
+ </div>
</nav>
<!--宸︿晶瀵艰埅缁撴潫-->
diff --git a/fzzy-igdss-web/src/main/resources/templates/login.html b/fzzy-igdss-web/src/main/resources/templates/login.html
index d30a247..73bdf65 100644
--- a/fzzy-igdss-web/src/main/resources/templates/login.html
+++ b/fzzy-igdss-web/src/main/resources/templates/login.html
@@ -211,7 +211,7 @@
</div>
</div>
<div class="login-copy">
- <p>Copyright 漏 2019-2026 鏅烘収绮簱缁煎悎绠＄悊骞冲彴 | 椋庢鑷磋繙淇℃伅鎶�鏈偂浠芥湁闄愬叕鍙�</p>
+ <p>鏂癐CP澶�2024007717鍙�-2 鏅烘収绮簱鐩戠绯荤粺 | 浼婄妬鎭掔鎶曡祫鍙戝睍鏈夐檺璐ｄ换鍏徃</p>
</div>
</div>
--
Gitblit v1.9.3