大屏逻辑更新、首页更新、

src/main/webapp/jsp/visual/newSourceGISPage.jsp

@@ -479,45 +479,75 @@ pageEncoding="UTF-8"%>
             企业查询
           </h5>
 
-          <!-- <div
+          <!-- 查询条件 -->
+          <div
             class="well well-sm"
             style="
               background: white;
               border: none;
               box-shadow: none;
-              padding: 0;
+              padding: 10px;
+              margin-bottom: 10px;
             "
           >
-            <div class="query-form-group">
-              <label>企业名称/合同编号</label>
-              <div class="input-group">
-                <input
-                  type="text"
-                  class="form-control"
-                  id="company-search-name"
-                  placeholder="请输入企业名称或合同编号"
-                />
-                <span class="input-group-btn">
-                  <button
-                    class="btn btn-primary"
-                    type="button"
-                    onclick="searchCompany()"
-                  >
-                    <i class="glyphicon glyphicon-search"></i> 查询
-                  </button>
-                </span>
+            <div class="row" style="margin-bottom: 8px;">
+              <div class="col-xs-6" style="padding-right: 5px;">
+                <div class="form-group" style="margin-bottom: 0;">
+                  <label style="font-size: 12px; margin-bottom: 3px; display: block;">所属泵站</label>
+                  <select id="company-processSection" class="form-control input-sm" style="width: 100%;">
+                    <option value="">请选择</option>
+                  </select>
+                </div>
+              </div>
+              <div class="col-xs-6" style="padding-left: 5px;">
+                <div class="form-group" style="margin-bottom: 0;">
+                  <label style="font-size: 12px; margin-bottom: 3px; display: block;">管网所有权单位</label>
+                  <select id="company-city" class="form-control input-sm" style="width: 100%;">
+                    <option value="">请选择</option>
+                  </select>
+                </div>
               </div>
             </div>
-          </div> -->
+            <div class="row" style="margin-bottom: 8px;">
+              <div class="col-xs-6" style="padding-right: 5px;">
+                <div class="form-group" style="margin-bottom: 0;">
+                  <label style="font-size: 12px; margin-bottom: 3px; display: block;">是否关联点位</label>
+                  <select id="company-point" class="form-control input-sm" style="width: 100%;">
+                    <option value="">请选择</option>
+                    <option value="true">是</option>
+                    <option value="false">否</option>
+                  </select>
+                </div>
+              </div>
+              <div class="col-xs-6" style="padding-left: 5px;">
+                <div class="form-group" style="margin-bottom: 0;">
+                  <label style="font-size: 12px; margin-bottom: 3px; display: block;">是否录入数据</label>
+                  <select id="company-input" class="form-control input-sm" style="width: 100%;">
+                    <option value="">请选择</option>
+                    <option value="true">是</option>
+                    <option value="false">否</option>
+                  </select>
+                </div>
+              </div>
+            </div>
+            <div class="row">
+              <div class="col-xs-12">
+                <div class="input-group input-group-sm">
+                  <input type="text" id="company-search-name" class="form-control" placeholder="合同编号/单位名称">
+                  <span class="input-group-btn">
+                    <button class="btn btn-primary" type="button" onclick="searchCompany()">
+                      <i class="glyphicon glyphicon-search"></i> 查询
+                    </button>
+                    <button class="btn btn-default" type="button" onclick="resetCompanySearch()" style="margin-left: 5px;">
+                      <i class="glyphicon glyphicon-refresh"></i> 重置
+                    </button>
+                  </span>
+                </div>
+              </div>
+            </div>
+          </div>
 
-          <!-- <div style="margin-bottom: 10px">
-            <label
-              ><input type="checkbox" checked id="company-show-label" />
-              显示标注</label
-            >
-          </div> -->
-
-          <div style="max-height: 500px; overflow-y: auto">
+          <div style="max-height: 400px; overflow-y: auto">
             <table
               class="table table-bordered table-hover table-condensed table-custom"
               style="font-size: 12px; white-space: nowrap"
@@ -1110,7 +1140,7 @@ pageEncoding="UTF-8"%>
       map.addEventListener("zoomstart", function(e) {
         var newZoom = e.zoom;
         console.log("[地图缩放] 当前级别:", currentZoomLevel, "目标级别:", newZoom);
-        if (newZoom <td minZoomLevel) {
+        if (newZoom < minZoomLevel) {
           console.log("[地图缩放] 阻止缩小操作，最小级别:", minZoomLevel);
           map.setZoom(minZoomLevel);
           return false;
@@ -1200,7 +1230,26 @@ pageEncoding="UTF-8"%>
         company: {
           data: [],
           loaded: false,
-          api: { url: '/sparepart/sewage/getList.do', mock: false, params: { page: 1, rows: 1000, sort: 'id', order: 'asc', unitId: '0533JS' } },
+          api: {
+            url: '/sparepart/sewage/getList.do',
+            mock: false,
+            // 动态获取查询参数
+            getParams: function() {
+              return {
+                page: 1,
+                rows: 1000,
+                sort: 'id',
+                order: 'asc',
+                unitId: '0533JS',
+                search_name: $('#company-search-name').val() || '',
+                processSectionId: $('#company-processSection').val() || '',
+                city: $('#company-city').val() || '',
+                _point: $('#company-point').val() || '',
+                _input: $('#company-input').val() || ''
+              };
+            },
+            params: { page: 1, rows: 1000, sort: 'id', order: 'asc', unitId: '0533JS' }
+          },
           tableBody: 'company-table-body',
           icon: 'icon_qy.png',
           transform: function(item, idx) {
@@ -1337,7 +1386,9 @@ pageEncoding="UTF-8"%>
         if (!config || config.loaded) return Promise.resolve(config.data);
 
         var api = config.api;
-        return apiRequest(api.url, api.params, api.mock, api.isStatic).then(function(res) {
+        // 支持动态参数获取（用于企业查询）
+        var params = api.getParams ? api.getParams() : api.params;
+        return apiRequest(api.url, params, api.mock, api.isStatic).then(function(res) {
           // 根据数据源类型提取数据列表
           var list = [];
           if (api.isStatic && res.features) {
@@ -1629,6 +1680,80 @@ pageEncoding="UTF-8"%>
         selectMarker(item.name, 'company');
       }
 
+      // ==================== 企业查询功能 ====================
+      // 初始化企业查询下拉选项
+      function initCompanySearchOptions() {
+        // 加载所属泵站选项
+        $.ajax({
+          url: contextPath + '/sparepart/sewage/getProcessSectionId4Select.do',
+          type: 'POST',
+          data: { companyId: 'JSBZ' },
+          success: function(data) {
+            if (typeof data === 'string') {
+              try { data = JSON.parse(data); } catch(e) { data = []; }
+            }
+            var $select = $('#company-processSection');
+            $select.empty().append('<option value="">请选择</option>');
+            (data || []).forEach(function(item) {
+              $select.append('<option value="' + item.id + '">' + item.text + '</option>');
+            });
+          },
+          error: function() {
+            console.error('[企业查询] 加载泵站选项失败');
+          }
+        });
+
+        // 加载管网所有权单位选项
+        $.ajax({
+          url: contextPath + '/sparepart/sewage/getSewageCity4Select.do',
+          type: 'POST',
+          data: { unitId: '0533JS' },
+          success: function(data) {
+            if (typeof data === 'string') {
+              try { data = JSON.parse(data); } catch(e) { data = []; }
+            }
+            var $select = $('#company-city');
+            $select.empty().append('<option value="">请选择</option>');
+            (data || []).forEach(function(item) {
+              $select.append('<option value="' + item.id + '">' + item.text + '</option>');
+            });
+          },
+          error: function() {
+            console.error('[企业查询] 加载管网所有权单位选项失败');
+          }
+        });
+      }
+
+      // 企业查询
+      function searchCompany() {
+        var config = dataConfig.company;
+        // 重置已加载状态，强制重新加载
+        config.loaded = false;
+        config.data = [];
+        
+        // 获取动态参数
+        var params = config.api.getParams();
+        console.log('[企业查询] 查询参数:', params);
+        
+        // 重新加载数据
+        loadData('company').then(function() {
+          renderTable('company');
+          initMarkers('company');
+        });
+      }
+
+      // 重置企业查询条件
+      function resetCompanySearch() {
+        $('#company-search-name').val('');
+        $('#company-processSection').val('');
+        $('#company-city').val('');
+        $('#company-point').val('');
+        $('#company-input').val('');
+        
+        // 重新加载数据
+        searchCompany();
+      }
+
       // 选择管道并定位
       function selectPipeline(index) {
         var item = dataConfig.pipeline.data[index];
@@ -1729,6 +1854,11 @@ pageEncoding="UTF-8"%>
           renderTable(type);
           initMarkers(type);
         });
+        
+        // 企业 Tab 初始化查询下拉选项
+        if (type === 'company') {
+          initCompanySearchOptions();
+        }
       }
 
       // ==================== 抽屉和调整大小逻辑 ====================