云迹拉取修改

house365-hgs-web/src/main/webapp/WEB-INF/views/cloudactivity/pages/addcloud.jsp

@@ -14,7 +14,7 @@
             <ul class="breadcrumb">
                 <li>
                     <span class="divider" style="color:#26a0da;font-weight:bold;">/</span>
-                    <a href="${ctx}/cloudactivity/list">云迹活动列表</a>
+                    <a href="${ctx}/cloudactivity/pullList">云迹拉取数据列表</a>
                 </li>
                 <li class="active">
                     <span class="divider" style="color:#26a0da;font-weight:bold;">/</span>

house365-hgs-web/src/main/webapp/WEB-INF/views/cloudactivity/pages/list.jsp

@@ -30,7 +30,7 @@
                 <a class="btn" onclick="btnSubmit();">搜索</a>
             </div>
             <div style="margin-left: 80%">
-                <button type="button" class="btn btn-default" onclick="toAddCloud()">创建活动</button>
+                <%--<button type="button" class="btn btn-default" onclick="toAddCloud()">创建活动</button>--%>
                 <shiro:hasPermission name="FUNC:CUSTOMCLOUD">
                     <button type="button" class="btn btn-default" onclick="showModalNew()" style="margin-left: 10px">定制云迹数据</button>
                 </shiro:hasPermission>
@@ -240,9 +240,9 @@
         $("#cloudModal").modal('show');
     };
 
-    var toAddCloud = function () {
-        window.open("/house365-hgs-web/cloudactivity/toAdd", "_blank");
-    };
+//    var toAddCloud = function () {
+//        window.open("/house365-hgs-web/cloudactivity/toAdd", "_blank");
+//    };
 
     var checkNum = 0;
     function checkAll(btn) {

house365-hgs-web/src/main/webapp/WEB-INF/views/cloudactivity/pages/pullList.jsp

@@ -29,6 +29,9 @@
                             class="m-wrap small" placeholder="活动名称">    
                 <a class="btn" onclick="btnSubmit();">搜索</a>
             </div>
+            <div style="margin-left: 80%">
+                <button type="button" class="btn btn-default" onclick="toAddCloud()">创建活动</button>
+            </div>
         </form>
 
         <table class="table table-bordered table-advance table-hover">
@@ -116,6 +119,10 @@
         window.open("/house365-hgs-web/cloudcustomer/list/" + id, "_blank");
     }
 
+    var toAddCloud = function () {
+        window.open("/house365-hgs-web/cloudactivity/toAdd", "_blank");
+    };
+
 </script>
 </body>
 </html>