Merge branch 'master' of ssh://117.78.1.188:29418/dkyChenJiang

zmk

2024-05-17 5e697a70c7e49e18bc3bc2f75c2e9ad5bda17489

 javaweb-plus/javaweb-cms/src/main/resources/templates/geo/projectData/projectData.html

@@ -8,21 +8,16 @@
        <div class="row">
            <div class="col-sm-12 search-collapse">
                <form id="formId">
                    <div class="select-list">

                    <!--        条件表达式            -->
                    <div th:if="${type}=='3'" class="select-list">
                        <ul>
                            <li>
                                <p>资料名称：</p>
                                <input type="text" name="name"/>
                            </li>
                            <li>
                                <p>资料类型：</p>
                                <select name="dataType" th:with="type=${@dict.getType('project_data_type')}">
                                    <option value="">所有</option>
                                    <option th:each="dict : ${type}" th:text="${dict.dictLabel}" th:value="${dict.dictValue}"></option>
                                </select>
                            </li>
                            <li>
                                <p>文件类型：</p>
                                <p>业务类型：</p>
                                <select name="fileType" th:with="type=${@dict.getType('project_data_file_type')}">
                                    <option value="">所有</option>
                                    <option th:each="dict : ${type}" th:text="${dict.dictLabel}" th:value="${dict.dictValue}"></option>
@@ -38,6 +33,24 @@
                            </li>
                        </ul>
                    </div>
                    <!--        条件表达式            -->
                    <div th:if="${type}!='3'" class="select-list">
                        <ul>
                            <li>
                                <p>资料名称：</p>
                                <input type="text" name="name"/>
                            </li>
                            <li>
                                <p>标签：</p>
                                <input type="text" name="labels"/>
                            </li>
                            <li>
                                <a class="btn btn-primary btn-rounded btn-sm" onclick="$.table.search()"><i class="fa fa-search"></i>&nbsp;搜索</a>
                                <a class="btn btn-warning btn-rounded btn-sm" onclick="$.form.reset()"><i class="fa fa-refresh"></i>&nbsp;重置</a>
                            </li>
                        </ul>
                    </div>

                </form>
            </div>

@@ -51,9 +64,9 @@
                <a class="btn btn-danger multiple disabled" onclick="$.operate.removeAll()" shiro:hasPermission="geo:projectData:remove">
                    <i class="fa fa-remove"></i> 删除
                </a>
                <a class="btn btn-warning" onclick="$.table.exportExcel()" shiro:hasPermission="geo:projectData:export">
                    <i class="fa fa-download"></i> 导出
                 </a>
<!--                <a class="btn btn-warning" onclick="$.table.exportExcel()" shiro:hasPermission="geo:projectData:export">-->
<!--                    <i class="fa fa-download"></i> 导出-->
<!--                 </a>-->
            </div>
            <div class="col-sm-12 select-table table-striped">
                <table id="bootstrap-table"></table>
@@ -90,13 +103,6 @@
                {
                    field : 'name', 
                    title : '资料名称'
                },
                {
                    field : 'dataType', 
                    title : '资料类型',
                    formatter: function(value, row, index) {
                       return $.table.selectDictLabel(dataTypeDatas, value);
                    }
                },
                {
                    field : 'fileType',