czt
2025-12-31 35b0e1f75db13863e5d0a6c95b5e13a4cec47d14
更新框架中库区下拉选择
已修改6个文件
108 ■■■■ 文件已修改
fzzy-igdss-view/src/main/java/com/fzzy/igds/SelectDept.view.xml 4 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
fzzy-igdss-web/src/main/java/com/fzzy/sys/controller/SysIndexController.java 9 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
fzzy-igdss-web/src/main/resources/static/security/video-list-dept.js 40 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
fzzy-igdss-web/src/main/resources/templates/index-topnav.html 22 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
fzzy-igdss-web/src/main/resources/templates/index.html 22 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
fzzy-igdss-web/src/main/resources/templates/security/video-list-dept.html 11 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
fzzy-igdss-view/src/main/java/com/fzzy/igds/SelectDept.view.xml
@@ -16,7 +16,7 @@
      <Reference name="listArea">
        <Property name="dataType">[dtArea]</Property>
        <Property name="parameter">$${this.id}</Property>
        <Property name="dataProvider">selectDeptPR#listArea</Property>
        <Property name="dataProvider">deptPR#getDeptByUserType</Property>
      </Reference>
    </DataType>
    <DataType name="dtArea">
@@ -35,7 +35,7 @@
    <Property name="packages">font-awesome,css-common</Property>
    <DataSet id="dsCompany">
      <Property name="dataType">[dtCompany]</Property>
      <Property name="dataProvider">selectDeptPR#listCompany</Property>
      <Property name="dataProvider">companyPR#getCompanyByUserType</Property>
    </DataSet>
    <DataTree>
      <ClientEvent name="onDataRowDoubleClick">var curNode = self.get(&quot;currentNode&quot;);&#xD;
fzzy-igdss-web/src/main/java/com/fzzy/sys/controller/SysIndexController.java
@@ -93,6 +93,15 @@
        mmap.put("user", user);
        mmap.put("sysName", FrameworkConfig.getName());
        //判断是否显示库区选择弹窗
        String showDeptList = "Y";
        SysDept userDept = iSysDeptService.selectDeptById(user.getDeptId());
        if (Constant.DEPT_TYPE_20.equals(userDept.getType())) {
            showDeptList = "N";
        }
        mmap.put("showDeptList", showDeptList);
        //更新缓存中用户库区id
        ContextUtil.updateSubDept(user.getLoginName(), deptId);
        SysDept dept = iSysDeptService.selectDeptById(Long.valueOf(deptId));
        mmap.put("dept", dept);
fzzy-igdss-web/src/main/resources/static/security/video-list-dept.js
@@ -50,49 +50,9 @@
        table = layui.table;
    });
    showDeptSelect();
    //初始化渲染播放列表
    renderList();
});
/**
 * 弹出切换库区列表
 */
function showDeptSelect() {
    if(showDeptList === "N"){
        $("#deptList").css('display', 'none');
    }
    if(showDeptList === "Y"){
        $("#deptList").css('display', 'block');
    }
}
/**
 * 弹出切换库区列表
 */
function showDepotAreaSelect() {
    layer.open({
        type: 2,
        title: '选择库区',
        area: ['400px', '650px'],
        offset: ['50px', '170px'],
        shade: 0,
        content: "/com.fzzy.igds.SelectDept.d",
        closeBtn: 1
    });
}
/**
 *
 * @param id
 * @returns {boolean}
 */
function onDeptAreaChange(id) {
    window.location.href = "./security/video-dept?type=" + type + "&deptId=" + id;
    return true;
}
/**
 * 渲染监控列表
fzzy-igdss-web/src/main/resources/templates/index-topnav.html
@@ -271,8 +271,8 @@
                </div>
                <!-- 右侧栏 -->
                <ul class="nav navbar-top-links navbar-right welcome-message">
                    <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,
                    <li style="background-color: #03703a;"><a onclick="showDepotAreaSelect()" data-toggle="tooltip" data-trigger="hover" data-placement="bottom" title="库区选择"
                                                              href="javascript:;"><i class="fa fa-refresh"></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-->
@@ -414,6 +414,24 @@
    return true;
}
/**
 * 弹出切换库区列表
 */
function showDepotAreaSelect() {
    if(showDeptList === "N"){
        return false;
    }
    layer.open({
        type: 2,
        title: '选择库区',
        area: ['400px', '650px'],
        offset: ['50px', '1350px'],
        shade: 0,
        content: "com.fzzy.igds.SelectDept.d",
        closeBtn: 1
    });
}
/* 切换菜单 */
function toggleMenu() {
    $.modal.confirm("确认要切换成左侧菜单吗?", function() {
fzzy-igdss-web/src/main/resources/templates/index.html
@@ -101,8 +101,8 @@
                    </a>
                </div>
                <ul class="nav navbar-top-links navbar-right welcome-message">
                    <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,
                    <li style="background-color: #03703a;"><a onclick="showDepotAreaSelect()" data-toggle="tooltip" data-trigger="hover" data-placement="bottom" title="库区选择"
                                                              href="javascript:;"><i class="fa fa-refresh"></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>-->
@@ -256,6 +256,24 @@
        return true;
    }
    /**
     * 弹出切换库区列表
     */
    function showDepotAreaSelect() {
        if(showDeptList === "N"){
            return false;
        }
        layer.open({
            type: 2,
            title: '选择库区',
            area: ['400px', '650px'],
            offset: ['50px', '1350px'],
            shade: 0,
            content: "com.fzzy.igds.SelectDept.d",
            closeBtn: 1
        });
    }
    /** 刷新时访问路径页签 */
    function applyPath(url) {
        $('a[href$="' + decodeURI(url) + '"]').click();
fzzy-igdss-web/src/main/resources/templates/security/video-list-dept.html
@@ -223,13 +223,6 @@
            width: 100%;
            height: 100%;
        }
        .dept{
            margin-left: 150px;
            font-size: 16px;
            color: #FFFFFF;
            width: 400px;
            padding-top: 8px;
        }
    </style>
</head>
@@ -245,10 +238,6 @@
                            <h3>
                                <i></i>视频实时预览
                            </h3>
                            <div id="deptList" class="dept" onclick="showDepotAreaSelect()">
                                <img style="width: 18px" th:src="@{/img/web/security/qh.png}"/>
                                [[${#strings.defaultString(dept.deptName, '-')}]]
                            </div>
                            <div class="fenping_icon">
                                <img onclick="fenping(1)" id="f_1" style="width: 30px" th:src="@{/img/web/group/fp_1_active.png}"/>
                                <img onclick="fenping(4)" id="f_4" style="width: 30px" th:src="@{/img/web/group/fp_4.png}"/>