fzzy-igdss.git - Gitblit

czt

2026-02-03 e67f52078602f3efb6da02ef8fc8cf0cf7fa7e7a

客户问题优化1

已修改5个文件

	fzzy-igdss-core/src/main/java/com/fzzy/igds/service/GatewaySerService.java	1 ●●●●● 补丁 \| 查看 \| 原始文档 \| blame \| 历史
	fzzy-igdss-view/src/main/java/com/fzzy/igds/InoutList.view.xml	6 ●●●●● 补丁 \| 查看 \| 原始文档 \| blame \| 历史
	fzzy-igdss-view/src/main/java/com/fzzy/igds/InoutLossOver.view.xml	4 ●●●●● 补丁 \| 查看 \| 原始文档 \| blame \| 历史
	fzzy-igdss-web/src/main/resources/templates/index.html	12 ●●●●● 补丁 \| 查看 \| 原始文档 \| blame \| 历史
	fzzy-igdss-web/src/main/resources/templates/login.html	2 ●●●●● 补丁 \| 查看 \| 原始文档 \| blame \| 历史

 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);
    }

 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(&quot;parent&quot;).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>

 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(&quot;#dataGridCamera&quot;).get(&quot;selection&quot;);&#xD;
          <ClientEvent name="onClick">var data = view.get(&quot;#dataGridMain&quot;).get(&quot;selection&quot;);&#xD;
            if(data){&#xD;
            view.get(&quot;#dialogMain&quot;).show();&#xD;
            }else{&#xD;
@@ -191,7 +191,7 @@
          <Property name="iconClass">fa fa-pencil-square-o</Property>
        </ToolBarButton>
        <ToolBarButton>
          <ClientEvent name="onClick">var select = view.get(&quot;#dataGridCamera&quot;).get(&quot;selection&quot;);&#xD;
          <ClientEvent name="onClick">var select = view.get(&quot;#dataGridMain&quot;).get(&quot;selection&quot;);&#xD;
            if(select){&#xD;
            view.get(&quot;#ajaxDel&quot;).set(&quot;parameter&quot;,select).execute(function(result){&#xD;
            if(result){&#xD;

 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">新ICP备2024007717号-2</p>
        </div>
    </nav>
    <!--左侧导航结束-->


 fzzy-igdss-web/src/main/resources/templates/login.html

@@ -211,7 +211,7 @@
        </div>
    </div>
    <div class="login-copy">
        <p>Copyright © 2019-2026 智慧粮库综合管理平台&nbsp;|&nbsp;风正致远信息技术股份有限公司</p>
        <p>新ICP备2024007717号-2 智慧粮库监管系统&nbsp;|&nbsp;伊犁恒硕投资发展有限责任公司</p>
    </div>
</div>

			@@ -53,6 +53,7 @@
			if (StringUtils.isNotBlank(parentId)) {
			queryWrapper.likeRight("dept_id", parentId);
			}
			queryWrapper.orderByAsc("order_num");

			return gatewaySerMapper.selectList(queryWrapper);
			}

			@@ -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>

			@@ -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){

			@@ -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">新ICP备2024007717号-2</p>
			</div>
			</nav>
			<!--左侧导航结束-->

			@@ -211,7 +211,7 @@
			</div>
			</div>
			<div class="login-copy">
			<p>Copyright © 2019-2026 智慧粮库综合管理平台 \| 风正致远信息技术股份有限公司</p>
			<p>新ICP备2024007717号-2 智慧粮库监管系统 \| 伊犁恒硕投资发展有限责任公司</p>
			</div>
			</div>