Merge branch 'master' of http://47.92.109.230:8080/lu914596513/oa_center

.project

@@ -0,0 +1,28 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<projectDescription>
+	<name>oa_center</name>
+	<comment></comment>
+	<projects>
+	</projects>
+	<buildSpec>
+		<buildCommand>
+			<name>com.aptana.ide.core.unifiedBuilder</name>
+			<arguments>
+			</arguments>
+		</buildCommand>
+	</buildSpec>
+	<natures>
+		<nature>com.aptana.projects.webnature</nature>
+	</natures>
+	<filteredResources>
+		<filter>
+			<id>1510369227063</id>
+			<name></name>
+			<type>26</type>
+			<matcher>
+				<id>org.eclipse.ui.ide.multiFilter</id>
+				<arguments>1.0-name-matches-false-false-node_modules</arguments>
+			</matcher>
+		</filter>
+	</filteredResources>
+</projectDescription>

oa_center.iml

@@ -0,0 +1,12 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<module org.jetbrains.idea.maven.project.MavenProjectsManager.isMavenModule="true" type="JAVA_MODULE" version="4">
+  <component name="NewModuleRootManager" LANGUAGE_LEVEL="JDK_1_5">
+    <output url="file://$MODULE_DIR$/target/classes" />
+    <output-test url="file://$MODULE_DIR$/target/test-classes" />
+    <content url="file://$MODULE_DIR$">
+      <excludeFolder url="file://$MODULE_DIR$/target" />
+    </content>
+    <orderEntry type="inheritedJdk" />
+    <orderEntry type="sourceFolder" forTests="false" />
+  </component>
+</module>

oa_service/oa_service.iml

@@ -0,0 +1,202 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<module org.jetbrains.idea.maven.project.MavenProjectsManager.isMavenModule="true" type="JAVA_MODULE" version="4">
+  <component name="NewModuleRootManager" LANGUAGE_LEVEL="JDK_1_8">
+    <output url="file://$MODULE_DIR$/target/classes" />
+    <output-test url="file://$MODULE_DIR$/target/test-classes" />
+    <content url="file://$MODULE_DIR$">
+      <sourceFolder url="file://$MODULE_DIR$/src/main/java" isTestSource="false" />
+      <sourceFolder url="file://$MODULE_DIR$/src/main/resources" type="java-resource" />
+      <sourceFolder url="file://$MODULE_DIR$/src/test/java" isTestSource="true" />
+      <excludeFolder url="file://$MODULE_DIR$/target" />
+    </content>
+    <orderEntry type="inheritedJdk" />
+    <orderEntry type="sourceFolder" forTests="false" />
+    <orderEntry type="library" name="Maven: net.sourceforge.jexcelapi:jxl:2.6.12" level="project" />
+    <orderEntry type="library" name="Maven: log4j:log4j:1.2.14" level="project" />
+    <orderEntry type="library" name="Maven: com.bjlt.spider:spider-rpc:0.0.4-SNAPSHOT" level="project" />
+    <orderEntry type="library" name="Maven: org.springframework.cloud:spring-cloud-starter-feign:1.3.1.RELEASE" level="project" />
+    <orderEntry type="library" name="Maven: org.springframework.cloud:spring-cloud-commons:1.2.2.RELEASE" level="project" />
+    <orderEntry type="library" name="Maven: org.springframework.security:spring-security-crypto:4.2.2.RELEASE" level="project" />
+    <orderEntry type="library" name="Maven: io.github.openfeign:feign-slf4j:9.5.0" level="project" />
+    <orderEntry type="library" name="Maven: io.github.openfeign:feign-hystrix:9.5.0" level="project" />
+    <orderEntry type="library" name="Maven: com.bjlt.spider:luyn:0.0.7" level="project" />
+    <orderEntry type="library" name="Maven: com.bjlt.spider:contro_rpc:0.0.2-SNAPSHOT" level="project" />
+    <orderEntry type="library" name="Maven: com.bjlt.spider:common:0.0.4-SNAPSHOT" level="project" />
+    <orderEntry type="library" name="Maven: org.jsoup:jsoup:1.7.2" level="project" />
+    <orderEntry type="library" name="Maven: org.apache.httpcomponents:httpclient:4.5.3" level="project" />
+    <orderEntry type="library" name="Maven: commons-codec:commons-codec:1.10" level="project" />
+    <orderEntry type="library" name="Maven: org.apache.httpcomponents:httpcore:4.4.6" level="project" />
+    <orderEntry type="library" name="Maven: org.apache.commons:commons-collections4:4.0" level="project" />
+    <orderEntry type="library" name="Maven: commons-collections:commons-collections:3.2.2" level="project" />
+    <orderEntry type="library" name="Maven: org.springframework.boot:spring-boot-starter-log4j2:1.5.3.RELEASE" level="project" />
+    <orderEntry type="library" name="Maven: org.slf4j:jcl-over-slf4j:1.7.25" level="project" />
+    <orderEntry type="library" name="Maven: org.slf4j:jul-to-slf4j:1.7.25" level="project" />
+    <orderEntry type="library" name="Maven: com.lmax:disruptor:3.3.6" level="project" />
+    <orderEntry type="library" name="Maven: org.apache.commons:commons-lang3:3.5" level="project" />
+    <orderEntry type="library" name="Maven: com.google.guava:guava:18.0" level="project" />
+    <orderEntry type="library" name="Maven: com.google.code.gson:gson:2.8.0" level="project" />
+    <orderEntry type="library" name="Maven: javax.servlet:javax.servlet-api:3.1.0" level="project" />
+    <orderEntry type="library" name="Maven: com.jcraft:jsch:0.1.54" level="project" />
+    <orderEntry type="library" name="Maven: com.alibaba:fastjson:1.2.31" level="project" />
+    <orderEntry type="library" name="Maven: com.alibaba:druid:1.0.29" level="project" />
+    <orderEntry type="module-library">
+      <library name="Maven: com.alibaba:jconsole:1.8.0">
+        <CLASSES>
+          <root url="jar://C:/Program Files/Java/jdk1.8.0_151/lib/jconsole.jar!/" />
+        </CLASSES>
+        <JAVADOC />
+        <SOURCES />
+      </library>
+    </orderEntry>
+    <orderEntry type="module-library">
+      <library name="Maven: com.alibaba:tools:1.8.0">
+        <CLASSES>
+          <root url="jar://C:/Program Files/Java/jdk1.8.0_151/lib/tools.jar!/" />
+        </CLASSES>
+        <JAVADOC />
+        <SOURCES />
+      </library>
+    </orderEntry>
+    <orderEntry type="library" name="Maven: org.apache.logging.log4j:log4j-api:2.2" level="project" />
+    <orderEntry type="library" name="Maven: org.apache.logging.log4j:log4j-core:2.2" level="project" />
+    <orderEntry type="library" name="Maven: org.apache.logging.log4j:log4j-slf4j-impl:2.2" level="project" />
+    <orderEntry type="library" name="Maven: org.apache.logging.log4j:log4j-jcl:2.2" level="project" />
+    <orderEntry type="library" name="Maven: commons-logging:commons-logging:1.2" level="project" />
+    <orderEntry type="library" name="Maven: org.slf4j:slf4j-api:1.7.10" level="project" />
+    <orderEntry type="library" name="Maven: com.fasterxml.jackson.datatype:jackson-datatype-joda:2.9.0.pr3" level="project" />
+    <orderEntry type="library" name="Maven: com.fasterxml.jackson.core:jackson-annotations:2.8.0" level="project" />
+    <orderEntry type="library" name="Maven: com.fasterxml.jackson.core:jackson-core:2.8.8" level="project" />
+    <orderEntry type="library" name="Maven: com.fasterxml.jackson.core:jackson-databind:2.8.8" level="project" />
+    <orderEntry type="library" name="Maven: joda-time:joda-time:2.9.9" level="project" />
+    <orderEntry type="library" name="Maven: com.fasterxml.jackson.datatype:jackson-datatype-jsr310:2.9.0.pr3" level="project" />
+    <orderEntry type="library" name="Maven: org.projectlombok:lombok:1.16.16" level="project" />
+    <orderEntry type="library" name="Maven: mysql:mysql-connector-java:5.1.40" level="project" />
+    <orderEntry type="library" name="Maven: org.springframework.boot:spring-boot-starter-actuator:1.5.3.RELEASE" level="project" />
+    <orderEntry type="library" name="Maven: org.springframework.boot:spring-boot-actuator:1.5.3.RELEASE" level="project" />
+    <orderEntry type="library" name="Maven: org.springframework:spring-context:4.3.8.RELEASE" level="project" />
+    <orderEntry type="library" name="Maven: org.springframework.boot:spring-boot-starter-aop:1.5.3.RELEASE" level="project" />
+    <orderEntry type="library" name="Maven: org.springframework:spring-aop:4.3.8.RELEASE" level="project" />
+    <orderEntry type="library" name="Maven: org.springframework:spring-beans:4.3.8.RELEASE" level="project" />
+    <orderEntry type="library" name="Maven: org.aspectj:aspectjweaver:1.8.10" level="project" />
+    <orderEntry type="library" name="Maven: org.springframework.cloud:spring-cloud-starter-eureka:1.3.1.RELEASE" level="project" />
+    <orderEntry type="library" name="Maven: org.springframework.cloud:spring-cloud-starter:1.2.2.RELEASE" level="project" />
+    <orderEntry type="library" name="Maven: org.springframework.cloud:spring-cloud-context:1.2.2.RELEASE" level="project" />
+    <orderEntry type="library" name="Maven: org.springframework.security:spring-security-rsa:1.0.3.RELEASE" level="project" />
+    <orderEntry type="library" name="Maven: org.bouncycastle:bcpkix-jdk15on:1.55" level="project" />
+    <orderEntry type="library" name="Maven: org.bouncycastle:bcprov-jdk15on:1.55" level="project" />
+    <orderEntry type="library" name="Maven: org.springframework.cloud:spring-cloud-netflix-core:1.3.1.RELEASE" level="project" />
+    <orderEntry type="library" name="Maven: org.springframework.cloud:spring-cloud-netflix-eureka-client:1.3.1.RELEASE" level="project" />
+    <orderEntry type="library" name="Maven: com.netflix.eureka:eureka-client:1.6.2" level="project" />
+    <orderEntry type="library" scope="RUNTIME" name="Maven: org.codehaus.jettison:jettison:1.3.7" level="project" />
+    <orderEntry type="library" scope="RUNTIME" name="Maven: stax:stax-api:1.0.1" level="project" />
+    <orderEntry type="library" scope="RUNTIME" name="Maven: com.netflix.netflix-commons:netflix-eventbus:0.3.0" level="project" />
+    <orderEntry type="library" scope="RUNTIME" name="Maven: com.netflix.netflix-commons:netflix-infix:0.3.0" level="project" />
+    <orderEntry type="library" scope="RUNTIME" name="Maven: commons-jxpath:commons-jxpath:1.3" level="project" />
+    <orderEntry type="library" scope="RUNTIME" name="Maven: org.antlr:antlr-runtime:3.4" level="project" />
+    <orderEntry type="library" scope="RUNTIME" name="Maven: org.antlr:stringtemplate:3.2.1" level="project" />
+    <orderEntry type="library" scope="RUNTIME" name="Maven: antlr:antlr:2.7.7" level="project" />
+    <orderEntry type="library" scope="RUNTIME" name="Maven: org.apache.commons:commons-math:2.2" level="project" />
+    <orderEntry type="library" name="Maven: com.netflix.archaius:archaius-core:0.7.4" level="project" />
+    <orderEntry type="library" scope="RUNTIME" name="Maven: javax.ws.rs:jsr311-api:1.1.1" level="project" />
+    <orderEntry type="library" scope="RUNTIME" name="Maven: com.netflix.servo:servo-core:0.10.1" level="project" />
+    <orderEntry type="library" scope="RUNTIME" name="Maven: com.netflix.servo:servo-internal:0.10.1" level="project" />
+    <orderEntry type="library" scope="RUNTIME" name="Maven: com.sun.jersey:jersey-core:1.19.1" level="project" />
+    <orderEntry type="library" scope="RUNTIME" name="Maven: com.sun.jersey:jersey-client:1.19.1" level="project" />
+    <orderEntry type="library" scope="RUNTIME" name="Maven: com.sun.jersey.contribs:jersey-apache-client4:1.19.1" level="project" />
+    <orderEntry type="library" scope="RUNTIME" name="Maven: com.google.inject:guice:4.1.0" level="project" />
+    <orderEntry type="library" scope="RUNTIME" name="Maven: aopalliance:aopalliance:1.0" level="project" />
+    <orderEntry type="library" name="Maven: com.netflix.eureka:eureka-core:1.6.2" level="project" />
+    <orderEntry type="library" scope="RUNTIME" name="Maven: org.codehaus.woodstox:woodstox-core-asl:4.4.1" level="project" />
+    <orderEntry type="library" scope="RUNTIME" name="Maven: javax.xml.stream:stax-api:1.0-2" level="project" />
+    <orderEntry type="library" scope="RUNTIME" name="Maven: org.codehaus.woodstox:stax2-api:3.1.4" level="project" />
+    <orderEntry type="library" name="Maven: org.springframework.cloud:spring-cloud-starter-archaius:1.3.1.RELEASE" level="project" />
+    <orderEntry type="library" name="Maven: commons-configuration:commons-configuration:1.8" level="project" />
+    <orderEntry type="library" name="Maven: com.netflix.ribbon:ribbon-eureka:2.2.2" level="project" />
+    <orderEntry type="library" name="Maven: com.thoughtworks.xstream:xstream:1.4.9" level="project" />
+    <orderEntry type="library" name="Maven: xmlpull:xmlpull:1.1.3.1" level="project" />
+    <orderEntry type="library" name="Maven: xpp3:xpp3_min:1.1.4c" level="project" />
+    <orderEntry type="library" name="Maven: org.springframework.cloud:spring-cloud-starter-ribbon:1.3.1.RELEASE" level="project" />
+    <orderEntry type="library" name="Maven: com.netflix.ribbon:ribbon:2.2.2" level="project" />
+    <orderEntry type="library" scope="RUNTIME" name="Maven: com.netflix.ribbon:ribbon-transport:2.2.2" level="project" />
+    <orderEntry type="library" scope="RUNTIME" name="Maven: io.reactivex:rxnetty-contexts:0.4.9" level="project" />
+    <orderEntry type="library" scope="RUNTIME" name="Maven: io.reactivex:rxnetty-servo:0.4.9" level="project" />
+    <orderEntry type="library" name="Maven: com.netflix.hystrix:hystrix-core:1.5.12" level="project" />
+    <orderEntry type="library" name="Maven: org.hdrhistogram:HdrHistogram:2.1.9" level="project" />
+    <orderEntry type="library" scope="RUNTIME" name="Maven: javax.inject:javax.inject:1" level="project" />
+    <orderEntry type="library" scope="RUNTIME" name="Maven: io.reactivex:rxnetty:0.4.9" level="project" />
+    <orderEntry type="library" scope="RUNTIME" name="Maven: io.netty:netty-codec-http:4.0.27.Final" level="project" />
+    <orderEntry type="library" scope="RUNTIME" name="Maven: io.netty:netty-codec:4.0.27.Final" level="project" />
+    <orderEntry type="library" scope="RUNTIME" name="Maven: io.netty:netty-handler:4.0.27.Final" level="project" />
+    <orderEntry type="library" scope="RUNTIME" name="Maven: io.netty:netty-transport-native-epoll:4.0.27.Final" level="project" />
+    <orderEntry type="library" scope="RUNTIME" name="Maven: io.netty:netty-common:4.0.27.Final" level="project" />
+    <orderEntry type="library" scope="RUNTIME" name="Maven: io.netty:netty-buffer:4.0.27.Final" level="project" />
+    <orderEntry type="library" scope="RUNTIME" name="Maven: io.netty:netty-transport:4.0.27.Final" level="project" />
+    <orderEntry type="library" name="Maven: com.netflix.ribbon:ribbon-core:2.2.2" level="project" />
+    <orderEntry type="library" name="Maven: commons-lang:commons-lang:2.6" level="project" />
+    <orderEntry type="library" name="Maven: com.netflix.ribbon:ribbon-httpclient:2.2.2" level="project" />
+    <orderEntry type="library" scope="RUNTIME" name="Maven: com.netflix.netflix-commons:netflix-commons-util:0.1.1" level="project" />
+    <orderEntry type="library" name="Maven: com.netflix.ribbon:ribbon-loadbalancer:2.2.2" level="project" />
+    <orderEntry type="library" scope="RUNTIME" name="Maven: com.netflix.netflix-commons:netflix-statistics:0.1.1" level="project" />
+    <orderEntry type="library" name="Maven: io.reactivex:rxjava:1.1.10" level="project" />
+    <orderEntry type="library" name="Maven: org.springframework.boot:spring-boot-starter-data-redis:1.5.3.RELEASE" level="project" />
+    <orderEntry type="library" name="Maven: org.springframework.data:spring-data-redis:1.8.3.RELEASE" level="project" />
+    <orderEntry type="library" name="Maven: org.springframework.data:spring-data-keyvalue:1.2.3.RELEASE" level="project" />
+    <orderEntry type="library" name="Maven: org.springframework.data:spring-data-commons:1.13.3.RELEASE" level="project" />
+    <orderEntry type="library" name="Maven: org.springframework:spring-tx:4.3.8.RELEASE" level="project" />
+    <orderEntry type="library" name="Maven: org.springframework:spring-oxm:4.3.8.RELEASE" level="project" />
+    <orderEntry type="library" name="Maven: redis.clients:jedis:2.9.0" level="project" />
+    <orderEntry type="library" name="Maven: org.apache.commons:commons-pool2:2.4.2" level="project" />
+    <orderEntry type="library" name="Maven: org.springframework.boot:spring-boot-starter-jdbc:1.5.3.RELEASE" level="project" />
+    <orderEntry type="library" name="Maven: org.springframework:spring-jdbc:4.3.8.RELEASE" level="project" />
+    <orderEntry type="library" scope="TEST" name="Maven: org.springframework.boot:spring-boot-starter-test:1.5.3.RELEASE" level="project" />
+    <orderEntry type="library" scope="TEST" name="Maven: org.springframework.boot:spring-boot-test:1.5.3.RELEASE" level="project" />
+    <orderEntry type="library" scope="TEST" name="Maven: org.springframework.boot:spring-boot-test-autoconfigure:1.5.3.RELEASE" level="project" />
+    <orderEntry type="library" scope="TEST" name="Maven: com.jayway.jsonpath:json-path:2.2.0" level="project" />
+    <orderEntry type="library" scope="TEST" name="Maven: net.minidev:json-smart:2.2.1" level="project" />
+    <orderEntry type="library" scope="TEST" name="Maven: net.minidev:accessors-smart:1.1" level="project" />
+    <orderEntry type="library" scope="TEST" name="Maven: org.ow2.asm:asm:5.0.3" level="project" />
+    <orderEntry type="library" scope="TEST" name="Maven: junit:junit:4.12" level="project" />
+    <orderEntry type="library" scope="TEST" name="Maven: org.assertj:assertj-core:2.6.0" level="project" />
+    <orderEntry type="library" scope="TEST" name="Maven: org.mockito:mockito-core:1.10.19" level="project" />
+    <orderEntry type="library" scope="TEST" name="Maven: org.objenesis:objenesis:2.1" level="project" />
+    <orderEntry type="library" scope="TEST" name="Maven: org.hamcrest:hamcrest-core:1.3" level="project" />
+    <orderEntry type="library" scope="TEST" name="Maven: org.hamcrest:hamcrest-library:1.3" level="project" />
+    <orderEntry type="library" scope="TEST" name="Maven: org.skyscreamer:jsonassert:1.4.0" level="project" />
+    <orderEntry type="library" scope="TEST" name="Maven: com.vaadin.external.google:android-json:0.0.20131108.vaadin1" level="project" />
+    <orderEntry type="library" name="Maven: org.springframework:spring-core:4.3.8.RELEASE" level="project" />
+    <orderEntry type="library" scope="TEST" name="Maven: org.springframework:spring-test:4.3.8.RELEASE" level="project" />
+    <orderEntry type="library" name="Maven: org.springframework.boot:spring-boot-starter-thymeleaf:1.5.3.RELEASE" level="project" />
+    <orderEntry type="library" name="Maven: org.thymeleaf:thymeleaf-spring4:2.1.5.RELEASE" level="project" />
+    <orderEntry type="library" name="Maven: org.thymeleaf:thymeleaf:2.1.5.RELEASE" level="project" />
+    <orderEntry type="library" name="Maven: ognl:ognl:3.0.8" level="project" />
+    <orderEntry type="library" name="Maven: org.javassist:javassist:3.21.0-GA" level="project" />
+    <orderEntry type="library" name="Maven: org.unbescape:unbescape:1.1.0.RELEASE" level="project" />
+    <orderEntry type="library" name="Maven: nz.net.ultraq.thymeleaf:thymeleaf-layout-dialect:1.4.0" level="project" />
+    <orderEntry type="library" name="Maven: org.codehaus.groovy:groovy:2.4.10" level="project" />
+    <orderEntry type="library" name="Maven: org.springframework.boot:spring-boot-starter-freemarker:1.5.3.RELEASE" level="project" />
+    <orderEntry type="library" name="Maven: org.freemarker:freemarker:2.3.26-incubating" level="project" />
+    <orderEntry type="library" name="Maven: org.springframework:spring-context-support:4.3.8.RELEASE" level="project" />
+    <orderEntry type="library" name="Maven: org.springframework.boot:spring-boot-starter-web:1.5.3.RELEASE" level="project" />
+    <orderEntry type="library" name="Maven: org.springframework.boot:spring-boot-starter-tomcat:1.5.3.RELEASE" level="project" />
+    <orderEntry type="library" name="Maven: org.apache.tomcat.embed:tomcat-embed-core:8.5.14" level="project" />
+    <orderEntry type="library" name="Maven: org.apache.tomcat.embed:tomcat-embed-el:8.5.14" level="project" />
+    <orderEntry type="library" name="Maven: org.apache.tomcat.embed:tomcat-embed-websocket:8.5.14" level="project" />
+    <orderEntry type="library" name="Maven: org.hibernate:hibernate-validator:5.3.5.Final" level="project" />
+    <orderEntry type="library" name="Maven: javax.validation:validation-api:1.1.0.Final" level="project" />
+    <orderEntry type="library" name="Maven: org.jboss.logging:jboss-logging:3.3.1.Final" level="project" />
+    <orderEntry type="library" name="Maven: com.fasterxml:classmate:1.3.3" level="project" />
+    <orderEntry type="library" name="Maven: org.springframework:spring-web:4.3.8.RELEASE" level="project" />
+    <orderEntry type="library" name="Maven: org.springframework:spring-webmvc:4.3.8.RELEASE" level="project" />
+    <orderEntry type="library" name="Maven: org.springframework:spring-expression:4.3.8.RELEASE" level="project" />
+    <orderEntry type="library" name="Maven: org.springframework.boot:spring-boot-starter:1.5.3.RELEASE" level="project" />
+    <orderEntry type="library" name="Maven: org.springframework.boot:spring-boot:1.5.3.RELEASE" level="project" />
+    <orderEntry type="library" name="Maven: org.springframework.boot:spring-boot-autoconfigure:1.5.3.RELEASE" level="project" />
+    <orderEntry type="library" scope="RUNTIME" name="Maven: org.yaml:snakeyaml:1.17" level="project" />
+    <orderEntry type="library" name="Maven: io.github.openfeign:feign-okhttp:9.5.0" level="project" />
+    <orderEntry type="library" name="Maven: io.github.openfeign:feign-core:9.5.0" level="project" />
+    <orderEntry type="library" name="Maven: org.jvnet:animal-sniffer-annotation:1.0" level="project" />
+    <orderEntry type="library" name="Maven: com.squareup.okhttp3:okhttp:3.6.0" level="project" />
+    <orderEntry type="library" name="Maven: com.squareup.okio:okio:1.11.0" level="project" />
+    <orderEntry type="library" name="Maven: com.bjlt.spider:ip_rpc:0.0.3-SNAPSHOT" level="project" />
+  </component>
+</module>

oa_service/src/main/resources/static/js/paging.js

@@ -11,7 +11,7 @@ layui.define(['layer', 'laypage', 'laytpl'], function (exports) {
     var $ = layui.jquery,
         layer = parent.layui.layer === undefined ? layui.layer : parent.layui.layer,
         laytpl = layui.laytpl;
-
+        
     var Paging = function () {
         this.config = {
             url: undefined, //数据远程地址
@@ -115,7 +115,6 @@ layui.define(['layer', 'laypage', 'laytpl'], function (exports) {
             data: _config.params,
             dataType: 'json',
             success: function (result, status, xhr) {
-            	console.log(result)
                 if (loadIndex !== undefined)
                     layer.close(loadIndex); //关闭等待层
                 if (result.rel) {
@@ -147,8 +146,8 @@ layui.define(['layer', 'laypage', 'laytpl'], function (exports) {
                             pages: pages,
                             jump: function (obj, first) {
                                 //得到了当前页，用于向服务端请求对应数据
-                                console.log(obj)
                                 var curr = obj.curr;
+                                that.mycurr = (curr-1)*pageSize+1;
                                 if (!first) {
                                     that.get({
                                         pageIndex: (curr-1)*pageSize+1,

oa_service/src/main/resources/templates/add2.html

@@ -1,97 +1,159 @@
 <!DOCTYPE html>
 <html>
 
-<head>
-    <meta charset="UTF-8"/>
-    <title>Table</title>
-    <link rel="stylesheet" href="/plugins/layui/css/layui.css" media="all"/>
-    <link rel="stylesheet" href="/css/global.css" media="all"/>
-    <link rel="stylesheet" href="/plugins/font-awesome/css/font-awesome.min.css"/>
-    <link rel="stylesheet" href="/css/table.css"/>
-</head>
+	<head>
+		<meta charset="UTF-8" />
+		<title>Table</title>
+		<link rel="stylesheet" href="/plugins/layui/css/layui.css" media="all" />
+		<link rel="stylesheet" href="/css/global.css" media="all" />
+		<link rel="stylesheet" href="/plugins/font-awesome/css/font-awesome.min.css" />
+		<link rel="stylesheet" href="/css/table.css" />
+	</head>
 
-<body>
-<div class="admin-main">
+	<body>
+		<div class="admin-main">
 
-    <blockquote class="layui-elem-quote">
-        <a href="/toTable2" class="layui-btn layui-btn-small" id="return">返回</a>
-        <a class="layui-btn layui-btn-small" onclick="save()" id="save">保存</a>
-    </blockquote>
-    <fieldset class="layui-elem-field">
-        <legend>数据列表</legend>
-        <div class="layui-field-box layui-form">
-            <table class="layui-table admin-table">
-                <thead>
-                    <!--<tr><td width="20%">ID</td><td><input type="text"/> </td></tr>-->
-                    <tr><td>分组ID</td><td><input  type="text" id="groupId"/> </td></tr>
-                    <tr><td>后缀</td><td><input  type="text" id="postfix"/> </td></tr>
-                    <tr><td>数据源组</td><td><input  type="text" id="sourceGroup"/> </td></tr>
-                    <tr><td>数据源名</td><td><input  type="text" id="sourceName"/> </td></tr>
-                    <tr><td>组内默认数据源</td><td><input  type="text" id="isDefault"/> </td></tr>
-                    <tr><td>搜索接口地址</td><td><input  type="text" id="searchUrl"/> </td></tr>
-                    <tr><td>验证接口地址</td><td><input  type="text" id="verufyUrl"/> </td></tr>
-                    <tr><td>下单接口地址</td><td><input  type="text" id="orderUrl"/> </td></tr>
-                    <tr><td>支付接口地址</td><td><input  type="text" id="payUrl"/> </td></tr>
-                    <!--<tr><td>编辑人</td><td><input  type="text"/> </td></tr>
+			<blockquote class="layui-elem-quote">
+				<a href="/toTable2" class="layui-btn layui-btn-small" id="return">返回</a>
+				<a class="layui-btn layui-btn-small" id="save">保存</a>
+			</blockquote>
+			<fieldset class="layui-elem-field">
+				<legend>数据列表</legend>
+				<div class="layui-field-box layui-form">
+					<table class="layui-table admin-table">
+						<thead>
+							<!--<tr><td width="20%">ID</td><td><input type="text"/> </td></tr>-->
+							<tr>
+								<td>分组ID</td>
+								<td><input type="text" id="groupId" /> </td>
+							</tr>
+							<tr>
+								<td>后缀</td>
+								<td><input type="text" id="postfix" /> </td>
+							</tr>
+							<tr>
+								<td>数据源组</td>
+								<td><input type="text" id="sourceGroup" /> </td>
+							</tr>
+							<tr>
+								<td>数据源名</td>
+								<td><input type="text" id="sourceName" /> </td>
+							</tr>
+							<tr>
+								<td>组内默认数据源</td>
+								<td><input type="text" id="isDefault" /> </td>
+							</tr>
+							<tr>
+								<td>搜索接口地址</td>
+								<td><input type="text" id="searchUrl" /> </td>
+							</tr>
+							<tr>
+								<td>验证接口地址</td>
+								<td><input type="text" id="verufyUrl" /> </td>
+							</tr>
+							<tr>
+								<td>下单接口地址</td>
+								<td><input type="text" id="orderUrl" /> </td>
+							</tr>
+							<tr>
+								<td>支付接口地址</td>
+								<td><input type="text" id="payUrl" /> </td>
+							</tr>
+							<!--<tr><td>编辑人</td><td><input  type="text"/> </td></tr>
                     <tr><td>更新时间</td><td><input  type="text"/> </td></tr>
                     <tr><td>添加时间</td><td><input  type="text"/> </td></tr>-->
-                </thead>
-                <tbody id="content">
-                </tbody>
-            </table>
-        </div>
-    </fieldset>
-    <div class="admin-table-page">
-        <div id="paged" class="page">
-        </div>
-    </div>
-</div>
+						</thead>
+						<tbody id="content">
+						</tbody>
+					</table>
+				</div>
+			</fieldset>
+		</div>
 
-<script src="https://cdn.bootcss.com/jquery/3.2.1/jquery.min.js"></script>
-<script type="text/javascript" src="/plugins/layui/layui.js"></script>
-<script>
+		<script src="https://cdn.bootcss.com/jquery/3.2.1/jquery.min.js"></script>
+		<script type="text/javascript" src="/plugins/layui/layui.js"></script>
+		<script>
+			layui.config({
+				base: 'js/'
+			});
+			layui.use('layer', function() {
+				var layer = layui.layer;
+				//判断组内默认数据源是否为数字
+				function isNumber(isDefault, ele, text) {
+					if(!/^[0-9]*$/.test(isDefault)) {
+						layer.tips(text, ele, {
+							tips: [1, '#FF5722'] //还可配置颜色
+						});
+						return false;
+					}
+				}
+				$("#isDefault").on('blur', function() {
+					var isDefault = $(this).val();
+					console.log(isDefault);
+					isNumber(isDefault, '#isDefault', '请输入数字');
+				})
 
-    function save(){
-        var groupId = $("#groupId").val();
-        var postfix = $("#postfix").val();
-        var sourceGroup = $("#sourceGroup").val();
-        var sourceName = $("#sourceName").val();
-        var isDefault = $("#isDefault").val();
-        var searchUrl = $("#searchUrl").val();
-        var verufyUrl = $("#verufyUrl").val();
-        var orderUrl = $("#orderUrl").val();
-        var payUrl = $("#payUrl").val();
-        $.ajax({
-                type:"post",
-                url: "/airSourceMenu/add",//请求页面
-                async:false,
-                dataType:'json',
-                data:{
-                    groupId : groupId,
-                    postfix : postfix,
-                    sourceGroup : sourceGroup,
-                    sourceName : sourceName,
-                    isDefault : isDefault,
-                    searchUrl : searchUrl,
-                    verufyUrl : verufyUrl,
-                    orderUrl : orderUrl,
-                    payUrl : payUrl
+				function save() {
+					var groupId = $("#groupId").val();
+					var postfix = $("#postfix").val();
+					var sourceGroup = $("#sourceGroup").val();
+					var sourceName = $("#sourceName").val();
+					var isDefault = parseInt($("#isDefault").val());
+					isNumber(isDefault, '#isDefault', '请输入数字');
+					var searchUrl = $("#searchUrl").val();
+					var verufyUrl = $("#verufyUrl").val();
+					var orderUrl = $("#orderUrl").val();
+					var payUrl = $("#payUrl").val();
+					$.ajax({
+						type: "post",
+						url: "/airSourceMenu/add", //请求页面
+						async: false,
+						dataType: 'json',
+						data: {
+							groupId: groupId,
+							postfix: postfix,
+							sourceGroup: sourceGroup,
+							sourceName: sourceName,
+							isDefault: isDefault,
+							searchUrl: searchUrl,
+							verufyUrl: verufyUrl,
+							orderUrl: orderUrl,
+							payUrl: payUrl
+						},
+						success: function(data) {
+							if(data.status == 200) {
+								layer.msg('添加成功，是否继续添加？', {
+									time: 0, //不自动关闭
+									btn: ['返回', '添加'],
+									btn1: function(index) {
+										console.log('yes');
+										window.location.href='toTable2';
+										layer.close(index);
+									},
+									btn2: function(index) {
+										console.log('no');
+										$("#groupId").val('');
+										$("#postfix").val('');
+										$("#sourceGroup").val('');
+										$("#sourceName").val('');
+										$("#isDefault").val('');
+										$("#searchUrl").val('');
+										$("#verufyUrl").val('');
+										$("#orderUrl").val('');
+										$("#payUrl").val('');
+										layer.close(index);
+									}
+								});
+							}
+						}
+					});
 
-
-                },
-                success:function(data){
-                   if(data.status==200){
-                       alert("添加成功");
-                   }
-                }
-        });
-
-
-}
-
-
-
-</script>
-</body>
+				}
+				$('#save').click(function() {
+					save()
+				})
+			});
+		</script>
+	</body>
 
 </html>

oa_service/src/main/resources/templates/change2.html

@@ -1,98 +1,151 @@
 <!DOCTYPE html>
 <html xmlns:th="http://www.w3.org/1999/xhtml">
 
-<head>
-    <meta charset="UTF-8"/>
-    <title>Table</title>
-    <link rel="stylesheet" href="/plugins/layui/css/layui.css" media="all"/>
-    <link rel="stylesheet" href="/css/global.css" media="all"/>
-    <link rel="stylesheet" href="/plugins/font-awesome/css/font-awesome.min.css"/>
-    <link rel="stylesheet" href="/css/table.css"/>
-</head>
+	<head>
+		<meta charset="UTF-8" />
+		<title>Table</title>
+		<link rel="stylesheet" href="/plugins/layui/css/layui.css" media="all" />
+		<link rel="stylesheet" href="/css/global.css" media="all" />
+		<link rel="stylesheet" href="/plugins/font-awesome/css/font-awesome.min.css" />
+		<link rel="stylesheet" href="/css/table.css" />
+	</head>
 
-<body>
-<div class="admin-main">
+	<body>
+		<div class="admin-main">
 
-    <blockquote class="layui-elem-quote">
-        <a href="/toTable2" class="layui-btn layui-btn-small" id="return">返回</a>
-        <a class="layui-btn layui-btn-small" onclick="save()" id="save">保存</a>
-    </blockquote>
-    <fieldset class="layui-elem-field">
-        <legend>数据列表</legend>
-        <div class="layui-field-box layui-form">
-            <table class="layui-table admin-table">
-                <thead>
-                    <tr><td width="20%">ID</td><td><input type="text" id  = "id" th:value="${airSourceMenuVo.id}" disabled="disabled"/> </td></tr>
-                    <tr><td>分组ID</td><td><input  type="text" id="groupId" th:value="${airSourceMenuVo.groupId}"/> </td></tr>
-                    <tr><td>后缀</td><td><input  type="text" id="postfix" th:value="${airSourceMenuVo.postfix}"/> </td></tr>
-                    <tr><td>数据源组</td><td><input  type="text" id="sourceGroup" th:value="${airSourceMenuVo.sourceGroup}"/> </td></tr>
-                    <tr><td>数据源名</td><td><input  type="text" id="sourceName" th:value="${airSourceMenuVo.sourceName}"/> </td></tr>
-                    <tr><td>组内默认数据源</td><td><input  type="text" id="isDefault" th:value="${airSourceMenuVo.isDefault}"/> </td></tr>
-                    <tr><td>搜索接口地址</td><td><input  type="text" id="searchUrl" th:value="${airSourceMenuVo.searchUrl}"/> </td></tr>
-                    <tr><td>验证接口地址</td><td><input  type="text" id="verufyUrl" th:value="${airSourceMenuVo.verufyUrl}"/> </td></tr>
-                    <tr><td>下单接口地址</td><td><input  type="text" id="orderUrl" th:value="${airSourceMenuVo.orderUrl}"/> </td></tr>
-                    <tr><td>支付接口地址</td><td><input  type="text" id="payUrl" th:value="${airSourceMenuVo.payUrl}"/> </td></tr>
-                    <!--<tr><td>编辑人</td><td><input  type="text"/> </td></tr>
+			<blockquote class="layui-elem-quote">
+				<a href="/toTable2" class="layui-btn layui-btn-small" id="return">返回</a>
+				<a class="layui-btn layui-btn-small" id="save">保存</a>
+			</blockquote>
+			<fieldset class="layui-elem-field">
+				<legend>数据列表</legend>
+				<div class="layui-field-box layui-form">
+					<table class="layui-table admin-table">
+						<thead>
+							<tr>
+								<td width="20%">ID</td>
+								<td><input type="text" id="id" th:value="${airSourceMenuVo.id}" disabled="disabled" /> </td>
+							</tr>
+							<tr>
+								<td>分组ID</td>
+								<td><input type="text" id="groupId" th:value="${airSourceMenuVo.groupId}" /> </td>
+							</tr>
+							<tr>
+								<td>后缀</td>
+								<td><input type="text" id="postfix" th:value="${airSourceMenuVo.postfix}" /> </td>
+							</tr>
+							<tr>
+								<td>数据源组</td>
+								<td><input type="text" id="sourceGroup" th:value="${airSourceMenuVo.sourceGroup}" /> </td>
+							</tr>
+							<tr>
+								<td>数据源名</td>
+								<td><input type="text" id="sourceName" th:value="${airSourceMenuVo.sourceName}" /> </td>
+							</tr>
+							<tr>
+								<td>组内默认数据源</td>
+								<td><input type="text" id="isDefault" th:value="${airSourceMenuVo.isDefault}" /> </td>
+							</tr>
+							<tr>
+								<td>搜索接口地址</td>
+								<td><input type="text" id="searchUrl" th:value="${airSourceMenuVo.searchUrl}" /> </td>
+							</tr>
+							<tr>
+								<td>验证接口地址</td>
+								<td><input type="text" id="verufyUrl" th:value="${airSourceMenuVo.verufyUrl}" /> </td>
+							</tr>
+							<tr>
+								<td>下单接口地址</td>
+								<td><input type="text" id="orderUrl" th:value="${airSourceMenuVo.orderUrl}" /> </td>
+							</tr>
+							<tr>
+								<td>支付接口地址</td>
+								<td><input type="text" id="payUrl" th:value="${airSourceMenuVo.payUrl}" /> </td>
+							</tr>
+							<!--<tr><td>编辑人</td><td><input  type="text"/> </td></tr>
                     <tr><td>更新时间</td><td><input  type="text"/> </td></tr>
                     <tr><td>添加时间</td><td><input  type="text"/> </td></tr>-->
-                </thead>
-                <tbody id="content">
-                </tbody>
-            </table>
-        </div>
-    </fieldset>
-    <div class="admin-table-page">
-        <div id="paged" class="page">
-        </div>
-    </div>
-</div>
+						</thead>
+						<tbody id="content">
+						</tbody>
+					</table>
+				</div>
+			</fieldset>
+			<div class="admin-table-page">
+				<div id="paged" class="page">
+				</div>
+			</div>
+		</div>
 
-<script type="text/javascript" src="/plugins/layui/layui.js"></script>
-<script src="https://cdn.bootcss.com/jquery/3.2.1/jquery.min.js"></script>
-<script>
+		<script type="text/javascript" src="/plugins/layui/layui.js"></script>
+		<script src="https://cdn.bootcss.com/jquery/3.2.1/jquery.min.js"></script>
+		<script>
+			layui.use('layer', function() {
+				var layer = layui.layer;
+				//判断组内默认数据源是否为数字
+				function isNumber(isDefault, ele, text) {
+					if(!/^[0-9]*$/.test(isDefault)) {
+						layer.tips(text, ele, {
+							tips: [1, '#FF5722'] //还可配置颜色
+						});
+						return false;
+					}
+				}
+				$("#isDefault").on('blur', function() {
+					var isDefault = $(this).val();
+					console.log(isDefault);
+					isNumber(isDefault, '#isDefault', '请输入数字');
+				})
 
-function save(){
-        var id = $("#id").val();
-        var groupId = $("#groupId").val();
-        var postfix = $("#postfix").val();
-        var sourceGroup = $("#sourceGroup").val();
-        var sourceName = $("#sourceName").val();
-        var isDefault = $("#isDefault").val();
-        var searchUrl = $("#searchUrl").val();
-        var verufyUrl = $("#verufyUrl").val();
-        var orderUrl = $("#orderUrl").val();
-        var payUrl = $("#payUrl").val();
-        $.ajax({
-                type:"post",
-                url: "/airSourceMenu/change",//请求页面
-                async:false,
-                dataType:'json',
-                data:{
-                    id : id,
-                    groupId : groupId,
-                    postfix : postfix,
-                    sourceGroup : sourceGroup,
-                    sourceName : sourceName,
-                    isDefault : isDefault,
-                    searchUrl : searchUrl,
-                    verufyUrl : verufyUrl,
-                    orderUrl : orderUrl,
-                    payUrl : payUrl
-
-
-                },
-                success:function(data){
-                   if(data.status==200){
-                       alert("修改成功");
-                   }
-                }
-        });
-
-
-}
-
-
-</script>
-</body>
+				function save() {
+					var id = $("#id").val();
+					var groupId = $("#groupId").val();
+					var postfix = $("#postfix").val();
+					var sourceGroup = $("#sourceGroup").val();
+					var sourceName = $("#sourceName").val();
+					var isDefault = $("#isDefault").val();
+					isNumber(isDefault, '#isDefault', '请输入数字');
+					var searchUrl = $("#searchUrl").val();
+					var verufyUrl = $("#verufyUrl").val();
+					var orderUrl = $("#orderUrl").val();
+					var payUrl = $("#payUrl").val();
+					$.ajax({
+						type: "post",
+						url: "/airSourceMenu/change", //请求页面
+						async: false,
+						dataType: 'json',
+						data: {
+							id: id,
+							groupId: groupId,
+							postfix: postfix,
+							sourceGroup: sourceGroup,
+							sourceName: sourceName,
+							isDefault: isDefault,
+							searchUrl: searchUrl,
+							verufyUrl: verufyUrl,
+							orderUrl: orderUrl,
+							payUrl: payUrl
+						},
+						success: function(data) {
+							if(data.status == 200) {
+								layer.msg('修改成功!', {
+									time: 0, //不自动关闭
+									btn: ['确认'],
+									btn1: function(index) {
+										console.log('yes');
+										window.history.back(-1);
+										layer.close(index);
+									}
+								})
+							}
+						}
+					});
+				}
+				$('#save').click(function() {
+					save()
+				})
+			})
+		</script>
+	</body>
 
 </html>

oa_service/src/main/resources/templates/table1.html

@@ -8,6 +8,11 @@
 		<link rel="stylesheet" href="/css/global.css" media="all" />
 		<link rel="stylesheet" href="/plugins/font-awesome/css/font-awesome.min.css" />
 		<link rel="stylesheet" href="/css/table.css" />
+		<style>
+			.layui-laypage .layui-laypage-total {
+				background-color: #eee;
+			}
+		</style>
 	</head>
 
 	<body>
@@ -22,7 +27,7 @@
 					<table class="layui-table admin-table">
 						<thead>
 							<tr>
-								<th style="width: 30px;"><input type="checkbox" lay-filter="allselector" lay-skin="primary" /></th>
+								<th style="width: 30px;"><input type="checkbox" lay-filter="allChoose" lay-skin="primary" /></th>
 								<th>序号</th>
 								<!--<th>航司ID</th>-->
 								<th>出发城市三字码代码</th>
@@ -44,6 +49,7 @@
 			<div class="admin-table-page">
 				<div id="paged" class="page"></div>
 			</div>
+			<button class="layui-btn layui-btn-small" id="getSelected">获取选择</button>
 		</div>
 		<script type="text/html" id="tpl">
 			{{# layui.each(d.list, function(index, item){ }}
@@ -90,22 +96,23 @@
 					pageConfig: { //分页参数配置
 						elem: '#paged', //分页容器
 						pageSize: 10, //分页大小
+						skip: true
 					},
 					success: function() { //渲染成功的回调
-						<!--alert('渲染成功');-->
+						//<!--alert('渲染成功');-->
 					},
 					fail: function(msg) { //获取数据失败的回调
 						//alert('获取数据失败')
 					},
 					complate: function() { //完成的回调
-						<!--alert('处理完成');-->
-						<!--alert(data);-->
+						//<!--alert('处理完成');-->
+						//<!--alert(data);-->
 						//重新渲染复选框
 						form.render('checkbox');
 						form.on('checkbox(allselector)', function(data) {
-							<!--consolg(data);-->
+							//<!--consolg(data);-->
 							var elem = data.result;
-							<!--consolg(elem);-->
+							//<!--consolg(elem);-->
 
 							$('#content').children('tr').each(function() {
 								var $that = $(this);
@@ -136,8 +143,18 @@
 										id: id
 									},
 									success: function(data) {
-										layer.msg('删除成功');
 										form.render('checkbox');
+										layer.msg('删除成功!', {
+											time:0,
+											btn: ['确定'],
+											yes: function(index) {
+												layer.close(index);
+												paging.get({
+													pageIndex: paging.mycurr,
+													pageSize: 10
+												});
+											}
+										});
 									}
 								});
 
@@ -161,6 +178,15 @@
 					layer.msg('你选择的名称有：' + names);
 				});
 
+				//全选
+				form.on('checkbox(allChoose)', function(data) {
+					var child = $(data.elem).parents('table').find('tbody input[type="checkbox"]');
+					child.each(function(index, item) {
+						item.checked = data.elem.checked;
+					});
+					form.render('checkbox');
+				});
+
 				$('#search').on('click', function() {
 					parent.layer.alert('你点击了搜索按钮')
 				});

oa_service/src/main/resources/templates/table2.html

@@ -1,80 +1,79 @@
 <!DOCTYPE html>
 <html>
 
-<head>
-    <meta charset="UTF-8"/>
-    <title>Table</title>
-    <link rel="stylesheet" href="plugins/layui/css/layui.css" media="all"/>
-    <link rel="stylesheet" href="css/global.css" media="all"/>
-    <link rel="stylesheet" href="plugins/font-awesome/css/font-awesome.min.css"/>
-    <link rel="stylesheet" href="css/table.css"/>
-</head>
+	<head>
+		<meta charset="UTF-8" />
+		<title>Table</title>
+		<link rel="stylesheet" href="plugins/layui/css/layui.css" media="all" />
+		<link rel="stylesheet" href="css/global.css" media="all" />
+		<link rel="stylesheet" href="plugins/font-awesome/css/font-awesome.min.css" />
+		<link rel="stylesheet" href="css/table.css" />
+	</head>
 
-<body>
-<div class="admin-main">
+	<body>
+		<div class="admin-main">
 
-    <blockquote class="layui-elem-quote">
-        <a href="/toAdd2" class="layui-btn layui-btn-small" id="add">添加信息</a>
-    </blockquote>
-    <fieldset class="layui-elem-field">
-        <legend>数据列表</legend>
-        <div class="layui-field-box layui-form">
-            <table class="layui-table admin-table">
-                <thead>
-                <tr>
-                    <th style="width: 30px;"><input type="checkbox" lay-filter="allselector" lay-skin="primary"/></th>
-                    <th>序号</th>
-                    <!--<th>分组ID</th>-->
-                    <th>后缀</th>
-                    <th>数据源组</th>
-                    <th>数据源名</th>
-                    <th>组内默认数据源</th>
-                    <th>搜索接口地址</th>
-                    <th>验证接口地址</th>
-                    <th>下单接口地址</th>
-                    <th>支付接口地址</th>
-                    <!--<th>编辑人</th>
+			<blockquote class="layui-elem-quote">
+				<a href="/toAdd2" class="layui-btn layui-btn-small" id="add">添加信息</a>
+			</blockquote>
+			<fieldset class="layui-elem-field">
+				<legend>数据列表</legend>
+				<div class="layui-field-box layui-form">
+					<table class="layui-table admin-table">
+						<thead>
+							<tr>
+								<th style="width: 30px;"><input type="checkbox" lay-filter="allselector" lay-skin="primary" /></th>
+								<th>序号</th>
+								<!--<th>分组ID</th>-->
+								<th>后缀</th>
+								<th>数据源组</th>
+								<th>数据源名</th>
+								<th>组内默认数据源</th>
+								<th>搜索接口地址</th>
+								<th>验证接口地址</th>
+								<th>下单接口地址</th>
+								<th>支付接口地址</th>
+								<!--<th>编辑人</th>
                     <th>更新时间</th>
                     <th>添加时间</th>-->
-                    <th>操作</th>
-                </tr>
-                </thead>
-                <tbody id="content">
-                </tbody>
-            </table>
-        </div>
-    </fieldset>
-</div>
-<script type="text/html" id="tpl">
-    {{# layui.each(d.list, function(index, item){ }}
-    <tr>
-        <td><input type="checkbox" lay-skin="primary"/></td>
-        <td>{{ item.id }}</td>
-        <!--<td>{{ item.groupId }}</td>-->
-        <td>{{ item.postfix }}</td>
-        <td>{{ item.sourceGroup }}</td>
-        <td>{{ item.sourceName }}</td>
-        <td>{{ item.isDefault }}</td>
-        <td>{{ item.searchUrl }}</td>
-        <td>{{ item.verufyUrl}}</td>
-        <td>{{ item.orderUrl}}</td>
-        <td>{{ item.payUrl}}</td>
-        <!--<td>{{ item.editUser }}</td>
+								<th>操作</th>
+							</tr>
+						</thead>
+						<tbody id="content">
+						</tbody>
+					</table>
+				</div>
+			</fieldset>
+			<div class="admin-table-page">
+				<div id="paged" class="page"></div>
+			</div>
+		</div>
+		<script type="text/html" id="tpl">
+			{{# layui.each(d.list, function(index, item){ }}
+			<tr>
+				<td><input type="checkbox" lay-skin="primary" /></td>
+				<td>{{ item.id }}</td>
+				<!--<td>{{ item.groupId }}</td>-->
+				<td>{{ item.postfix }}</td>
+				<td>{{ item.sourceGroup }}</td>
+				<td>{{ item.sourceName }}</td>
+				<td>{{ item.isDefault }}</td>
+				<td>{{ item.searchUrl }}</td>
+				<td>{{ item.verufyUrl}}</td>
+				<td>{{ item.orderUrl}}</td>
+				<td>{{ item.payUrl}}</td>
+				<!--<td>{{ item.editUser }}</td>
         <td>{{ item.updateTime }}</td>
         <td>{{ item.addTime }}</td>-->
-        <td>
-            <a href="/toChange2/id={{item.id}}" data-name="{{ item.name }}" data-opt="edit" class="layui-btn layui-btn-mini">编辑</a>
-            <a href="javascript:;" data-id="{{item.id}}" data-opt="del"
-               class="layui-btn layui-btn-danger layui-btn-mini">删除</a>
-        </td>
-    </tr>
-    {{# }); }}
-</script>
-<script type="text/javascript" src="plugins/layui/layui.js"></script>
-<script>
-
-
-
+				<td>
+					<a href="/toChange2/id={{item.id}}" data-name="{{ item.name }}" data-opt="edit" class="layui-btn layui-btn-mini">编辑</a>
+					<a href="javascript:;" data-id="{{item.id}}" data-opt="del" class="layui-btn layui-btn-danger layui-btn-mini">删除</a>
+				</td>
+			</tr>
+			{{# }); }}
+		</script>
+		<script type="text/javascript" src="plugins/layui/layui.js"></script>
+		<script>
 			layui.config({
 				base: 'js/'
 			});
@@ -82,14 +81,12 @@
 			layui.use(['paging', 'form'], function() {
 				var $ = layui.jquery,
 					paging = layui.paging(),
-
 					layerTips = parent.layer === undefined ? layui.layer : parent.layer, //获取父窗口的layer对象
 					layer = layui.layer, //获取当前窗口的layer对象
 					form = layui.form();
-
-                paging.init({
-                    openWait: true,
-                    url: '/airSourceMenu/find', //地址
+				paging.init({
+					openWait: true,
+					url: '/airSourceMenu/find', //地址
 					elem: '#content', //内容容器
 					params: { //发送到服务端的参数
 					},
@@ -100,20 +97,20 @@
 						pageSize: 10 //分页大小
 					},
 					success: function() { //渲染成功的回调
-						<!--alert('渲染成功');-->
+						//alert('渲染成功');
 					},
 					fail: function(msg) { //获取数据失败的回调
 						//alert('获取数据失败')
 					},
 					complate: function() { //完成的回调
-						<!--alert('处理完成');-->
-						<!--alert(data);-->
+						//<!--alert('处理完成');-->
+						//<!--alert(data);-->
 						//重新渲染复选框
 						form.render('checkbox');
 						form.on('checkbox(allselector)', function(data) {
-						<!--consolg(data);-->
+							//<!--consolg(data);-->
 							var elem = data.result;
-							<!--consolg(elem);-->
+							//<!--consolg(elem);-->
 
 							$('#content').children('tr').each(function() {
 								var $that = $(this);
@@ -127,28 +124,37 @@
 						$('#content').children('tr').each(function() {
 							var $that = $(this);
 							$that.children('td:last-child').children('a[data-opt=edit]').on('click', function() {
-								layer.msg('---'+$(this).data('name'));
+								layer.msg('---' + $(this).data('name'));
 							});
 
 						});
-            	//绑定所有编辑按钮事件
+						//绑定所有编辑按钮事件
 						$('#content').children('tr').each(function() {
 							var $that = $(this);
 							$that.children('td:last-child').children('a[data-opt=del]').on('click', function() {
-								layer.msg('SHANCHU---'+$(this).data('id'));
+								layer.msg('SHANCHU---' + $(this).data('id'));
 								var id = $(this).data('id');
-								      $.ajax({
-	            	url:"/airSourceMenu/cut",
-	      	type:"post",
-	     	data:{
-	    id :id
-		},
-		success : function(data){
-		 layer.msg('删除成功');
-		 	form.render('checkbox');
-		}
-	});
-
+								$.ajax({
+									url: "/airSourceMenu/cut",
+									type: "post",
+									data: {
+										id: id
+									},
+									success: function(data) {
+										form.render('checkbox');
+										layer.msg('删除成功!', {
+											time: 0,
+											btn: ['确定'],
+											yes: function(index) {
+												layer.close(index);
+												paging.get({
+													pageIndex: paging.mycurr,
+													pageSize: 10
+												});
+											}
+										});
+									}
+								});
 
 							});
 
@@ -156,7 +162,6 @@
 					},
 				});
 
-
 				//获取所有选择的列
 				$('#getSelected').on('click', function() {
 					var names = '';
@@ -171,7 +176,6 @@
 					layer.msg('你选择的名称有：' + names);
 				});
 
-
 				$('#search').on('click', function() {
 					parent.layer.alert('你点击了搜索按钮')
 				});
@@ -243,14 +247,13 @@
 
 				$('#import').on('click', function() {
 					var that = this;
-					var index = layer.tips('只想提示地精准些', that, { tips: [1, 'white'] });
+					var index = layer.tips('只想提示地精准些', that, {
+						tips: [1, 'white']
+					});
 					$('#layui-layer' + index).children('div.layui-layer-content').css('color', '#000000');
 				});
 			});
-
-
-
-</script>
-</body>
+		</script>
+	</body>
 
 </html>

oa_service/src/main/resources/templates/table6.html

@@ -8,6 +8,14 @@
 	<link rel="stylesheet" href="css/global.css" media="all"/>
 	<link rel="stylesheet" href="plugins/font-awesome/css/font-awesome.min.css"/>
 	<link rel="stylesheet" href="css/table.css"/>
+	<style type="text/css">
+		#content td a{
+			display: block;
+		}
+		.layui-btn+.layui-btn{
+			margin: 3px 0 0 0;
+		}
+	</style>
 </head>
 
 <body>

oa_service/src/main/resources/templates/table7.html

@@ -8,6 +8,14 @@
 	<link rel="stylesheet" href="css/global.css" media="all"/>
 	<link rel="stylesheet" href="plugins/font-awesome/css/font-awesome.min.css"/>
 	<link rel="stylesheet" href="css/table.css"/>
+	<style type="text/css">
+		#content td a{
+			display: block;
+		}
+		.layui-btn+.layui-btn{
+			margin: 3px 0 0 0;
+		}
+	</style>
 </head>
 
 <body>

oa_service/src/main/resources/templates/table8.html

@@ -90,13 +90,13 @@
 						pageSize: 10 //分页大小
 					},
 					success: function() { //渲染成功的回调
-						alert('渲染成功');
+						//alert('渲染成功');
 					},
 					fail: function(msg) { //获取数据失败的回调
 						//alert('获取数据失败')
 					},
 					complate: function() { //完成的回调
-						alert('处理完成');
+						//alert('处理完成');
 						<!--alert(data);-->
 						//重新渲染复选框
 						form.render('checkbox');