Merge branch 'master' of http://git.yvanui.com/hust/wuhan_epi

admin-ui/app/whepi/tugou/dialogTugou.js

@@ -3,6 +3,8 @@ define(function (require) {
 
     var $dlg, $form;
 
+    var isLoading = false;
+
     function queryGrid1(data) {
       console.log(data);
     }
@@ -158,6 +160,12 @@ define(function (require) {
       buttons: [
         {
           text: "保存", iconCls: "fa fa-save", onClick: function () {
+            if (isLoading === true) {
+              return;
+            }
+            else {
+              isLoading = true;
+            }
             if ($form.formGet().uptownIds.trim() == '') {
               $.yvan.msg('请先选择小区');
               return;
@@ -174,6 +182,7 @@ define(function (require) {
             $.yvan.postForm($form, {
               url: (context.isEdit ? api('/yeweihui/tgStatus') : api('/yeweihui/tgPublish')),
               success: function (data) {
+                isLoading = false;
                 if (data.data == 1) {
                   $.yvan.msg('保存成功');
                   $dlg.window('close');

admin-ui/app/whepi/tugou/tugou.js

@@ -39,7 +39,6 @@ define(function (require) {
       function queryGrid1() {
         var queryUrl = '/yeweihui/tglist';// 自行替换此参数
         var queryForm = $form.formGet();
-        queryForm.roleCode = App.currentRoleCode;
         $grid1.reload({
           mtype: 'POST',
           url: api(queryUrl),
@@ -177,7 +176,7 @@ define(function (require) {
               xtype: 'grid',
               toolbar:
               gridToolbar,
-              idField: 'joId',
+              idField: 'jmId',
               autoSizeColumns: true,//序号多  正确显示
               columns:
                 [

whepi-web/src/main/java/com/bofeng/dao/UptownMapper.java

@@ -19,4 +19,6 @@ public interface UptownMapper extends BaseMapper<Uptown> {
     List<Uptown> getAllUptown(@Param("area") Integer area);
 
     List<Uptown> getUptowns(PageDb pageDb, Map<String, Object> queryParam);
+
+    List<Uptown> getUptowns(Map<String, Object> queryParam);
 }

whepi-web/src/main/java/com/bofeng/wx/controller/YeWeiHuiController.java

@@ -409,8 +409,8 @@ public class YeWeiHuiController {
   }
 
   @PostMapping("/whepi/getAllUptown")
-  public Model<List<Uptown>> getAllUptown(HttpParameterParser parser, PageDb pageDb) {
-    return Model.newSuccess(pageDb, uptownMapper.getUptowns(pageDb, parser.getMap()));
+  public Model<List<Uptown>> getAllUptown(HttpParameterParser parser) {
+    return Model.newSuccess(uptownMapper.getUptowns(parser.getMap()));
   }
 
   @PostMapping("/whepi/getSelectOne")

whepi-web/src/main/resources/application.yml

@@ -43,7 +43,7 @@ endpoints:
 #  whitelabel.enabled: false
 
 spring:
-  profiles.active: maoyunfeng
+  profiles.active: lll
 
   application:
     name: bofeng-web