czt
2025-12-22 4529da5a2710d53a6268125c1a38d8eaf82f4a03
调整左侧菜单首页,及锁屏功能
已修改7个文件
60 ■■■■■ 文件已修改
fzzy-igdss-web/src/main/java/com/fzzy/sys/controller/SysIndexController.java 4 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
fzzy-igdss-web/src/main/resources/application-dev.yml 2 ●●● 补丁 | 查看 | 原始文档 | blame | 历史
fzzy-igdss-web/src/main/resources/static/inout/inout-handle.js 6 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
fzzy-igdss-web/src/main/resources/templates/group/index.html 4 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
fzzy-igdss-web/src/main/resources/templates/group/video.html 3 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
fzzy-igdss-web/src/main/resources/templates/index.html 38 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
fzzy-igdss-web/src/main/resources/templates/lock.html 3 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
fzzy-igdss-web/src/main/java/com/fzzy/sys/controller/SysIndexController.java
@@ -150,6 +150,10 @@
    public String lockscreen(ModelMap mmap) {
        mmap.put("user", getSysUser());
        ServletUtils.getSession().setAttribute(ShiroConstants.LOCK_SCREEN, true);
        // 取身份信息
        SysUser user = getSysUser();
        mmap.put("deptId", user.getDeptId());
        return "lock";
    }
fzzy-igdss-web/src/main/resources/application-dev.yml
@@ -87,7 +87,7 @@
#系统架构配置
framework:
  companyId: "1000"
  companyId: "5372"
  doradoMode: debug
  # 名称
  name: 智慧粮库监管系统
fzzy-igdss-web/src/main/resources/static/inout/inout-handle.js
@@ -28,7 +28,7 @@
        //上传
        upload.render({
            elem: '#kccz-r-btn1',
            url: '/basic/file/update-file', //上传接口
            url: '/file/update-file', //上传接口
            size: 4 * 1024, //限制文件大小,单位KB, 最大上传4MB
            accept: 'images',
            before: function (obj) {
@@ -52,7 +52,7 @@
        });
        upload.render({
            elem: '#kccz-r-btn2',
            url: '/basic/file/update-file', //上传接口
            url: '/file/update-file', //上传接口
            size: 4 * 1024, //限制文件大小,单位KB, 最大上传4MB
            accept: 'images',
            before: function (obj) {
@@ -76,7 +76,7 @@
        });
        upload.render({
            elem: '#kccz-r-btn3',
            url: '/basic/file/update-file', //上传接口
            url: '/file/update-file', //上传接口
            size: 4 * 1024, //限制文件大小,单位KB, 最大上传4MB
            accept: 'images',
            before: function (obj) {
fzzy-igdss-web/src/main/resources/templates/group/index.html
@@ -436,9 +436,9 @@
<script th:src="@{/common/igds-common.js}"></script>
<script th:src="@{/group/mapList.js}"></script>
<script th:src="@{/group/index.js}"></script>
<script th:inline="javascript">
    var userId = [[${loginUser.loginName}]];
<script th:inline="javascript">    var userId = [[${loginUser.loginName}]];
    var companyId = [[${loginUser.companyId}]];
    var deptId = [[${deptId}]];
    var dicSlogan = [[${dicSlogan}]];
    var deptList = [[${deptList}]];
fzzy-igdss-web/src/main/resources/templates/group/video.html
@@ -401,7 +401,8 @@
<script th:src="@{/common/igds-common.js}"></script>
<script th:src="@{/group/video.js}"></script>
<script th:inline="javascript">
    var userId = [[${loginUser.loginName}]];
    var companyId = [[${loginUser.companyId}]];
    var bizType = [[${bizType}]];
    var bizTag = [[${bizTag}]];
    var deptCur = [[${deptInfo}]]
fzzy-igdss-web/src/main/resources/templates/index.html
@@ -25,7 +25,7 @@
        <div class="nav-close">
            <i class="fa fa-times-circle"></i>
        </div>
        <a th:href="@{/index}">
        <a onclick="onDeptChange()" href="javascript:;">
            <li class="logo hidden-xs">
                <span class="logo-lg" th:text="${sysName}">智慧粮库管理系统</span>
            </li>
@@ -49,10 +49,7 @@
                        </div>
                    </div>
                </li>
                <li>
                    <a class="menuItem" th:href="@{/eoms/index}"><i class="fa fa-home"></i> <span
                            class="nav-label">首页</span> </a>
                </li>
                <li th:each="menu : ${menus}">
                    <a th:class="@{${!#strings.isEmpty(menu.url) && menu.url != '#'} ? ${menu.target}}"
                       th:href="@{${#strings.isEmpty(menu.url)} ? |#| : ${menu.url}}"
@@ -104,9 +101,14 @@
                    </a>
                </div>
                <ul class="nav navbar-top-links navbar-right welcome-message">
                    <li><a data-toggle="tooltip" data-trigger="hover" data-placement="bottom" title="开发文档"
                           href="https://fzzygf-company.feishu.cn/wiki/ZgS5wQuyMi2uDKk9xN6cx8jlnuf" target="_blank"><i class="fa fa-question-circle"></i>
                        文档</a></li>
                    <li style="background-color: #03703a;"><a data-toggle="tooltip" data-trigger="hover" data-placement="bottom" th:title="${dept.deptName}"
                                                              href="javascript:;"><i class="fa fa-map-o"></i> [[${#strings.defaultString(dept.deptName,
                        '-')}]]</a></li>
<!--                    <li><a data-toggle="tooltip" data-trigger="hover" data-placement="bottom" title="开发文档"-->
<!--                           href="https://fzzygf-company.feishu.cn/wiki/ZgS5wQuyMi2uDKk9xN6cx8jlnuf" target="_blank"><i class="fa fa-question-circle"></i>-->
<!--                        文档</a></li>-->
                    <li><a data-toggle="tooltip" data-trigger="hover" data-placement="bottom" title="大屏"
                           href="/index-gateway" id="index-gateway"><i class="fa fa-laptop"></i> 大屏</a></li>
                    <li><a data-toggle="tooltip" data-trigger="hover" data-placement="bottom" title="锁定屏幕"
                           href="javascript:;" id="lockScreen"><i class="fa fa-lock"></i> 锁屏</a></li>
                    <li><a data-toggle="tooltip" data-trigger="hover" data-placement="bottom" title="全屏显示"
@@ -150,7 +152,7 @@
            </button>
            <nav class="page-tabs menuTabs">
                <div class="page-tabs-content">
                    <a href="javascript:;" class="active menuTab" th:data-id="@{/eoms/index}">首页</a>
                    <a th:href="@{/index}" class="active menuTab" th:data-id="${welcomeUrl}">欢迎</a>
                </div>
            </nav>
            <button class="roll-nav roll-right tabRight">
@@ -163,8 +165,8 @@
        </a>
        <div class="row mainContent" id="content-main" th:classappend="${mainClass}">
            <iframe class="RuoYi_iframe" name="iframe0" width="100%" height="100%" th:data-id="@{/eoms/index}"
                    th:src="@{/eoms/index}" frameborder="0" seamless></iframe>
            <iframe class="RuoYi_iframe" name="iframe0" width="100%" height="100%" th:data-id="${welcomeUrl}"
                    th:src="${welcomeUrl}" frameborder="0" seamless></iframe>
        </div>
        <div th:if="${footer}" class="footer">
@@ -189,6 +191,9 @@
    window.history.forward(1);
    var ctx = [[@{/}]];
    var lockscreen = [[${session.lockscreen}]];
    var dept = [[${dept}]];
    var deptId = [[${deptId}]];
    var showDeptList = [[${showDeptList}]];
    if (lockscreen) {
        window.top.location = ctx + "lockscreen";
    }
@@ -240,6 +245,17 @@
        })
    }
    /**
     * 重新切换页面
     */
    function onDeptChange() {
        onDeptAreaChange(deptId);
    }
    function onDeptAreaChange(id) {
        window.location.href = "./index?deptId=" + id;
        return true;
    }
    /** 刷新时访问路径页签 */
    function applyPath(url) {
        $('a[href$="' + decodeURI(url) + '"]').click();
fzzy-igdss-web/src/main/resources/templates/lock.html
@@ -42,6 +42,7 @@
</body>
<script th:inline="javascript">
    var ctx = [[@{/}]];
    var deptId = [[${deptId}]];
    Date.prototype.format = function(fmt) {
      var o = {
        "M+" : this.getMonth()+1,                 //月份
@@ -99,7 +100,7 @@
            },
            success: function(result) {
                if (result.code == web_status.SUCCESS) {
                    location.href = ctx + 'index';
                    location.href = ctx + 'index' + "?deptId=" + deptId;
                } else {
                    $.modal.msg(result.msg);
                    $("input[name='password']").val("");