From 5e697a70c7e49e18bc3bc2f75c2e9ad5bda17489 Mon Sep 17 00:00:00 2001
From: zmk <496160012@qq.com>
Date: 星期五, 17 五月 2024 15:40:23 +0800
Subject: [PATCH] Merge branch 'master' of ssh://117.78.1.188:29418/dkyChenJiang

---
 javaweb-plus/javaweb-cms/src/main/resources/templates/geo/projectData/projectData.html |   51 ++++++++++++++++++++++++++++++---------------------
 1 files changed, 30 insertions(+), 21 deletions(-)

diff --git a/javaweb-plus/javaweb-cms/src/main/resources/templates/geo/projectData/projectData.html b/javaweb-plus/javaweb-cms/src/main/resources/templates/geo/projectData/projectData.html
index ec854eb..ef289a1 100644
--- a/javaweb-plus/javaweb-cms/src/main/resources/templates/geo/projectData/projectData.html
+++ b/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>
@@ -66,12 +79,15 @@
         var removeFlag = [[${@permission.hasPermi('geo:projectData:remove')}]];
         var dataTypeDatas = [[${@dict.getType('project_data_type')}]];
         var fileTypeDatas = [[${@dict.getType('project_data_file_type')}]];
+        var projectId=[[${projectId}]];
+        var type=[[${type}]];
         var prefix = ctx + "geo/projectData";
+        console.log("type",type);
 
         $(function() {
             var options = {
-                url: prefix + "/list",
-                createUrl: prefix + "/add",
+                url: prefix + "/list?projectId=" + projectId + "&dataType=" + type,
+                createUrl: prefix + "/add?projectId=" + projectId + "&dataType=" + type,
                 updateUrl: prefix + "/edit/{id}",
                 removeUrl: prefix + "/remove",
                 exportUrl: prefix + "/export",
@@ -87,13 +103,6 @@
                 {
                     field : 'name', 
                     title : '璧勬枡鍚嶇О'
-                },
-                {
-                    field : 'dataType', 
-                    title : '璧勬枡绫诲瀷',
-                    formatter: function(value, row, index) {
-                       return $.table.selectDictLabel(dataTypeDatas, value);
-                    }
                 },
                 {
                     field : 'fileType', 

--
Gitblit v1.9.1