Merge remote-tracking branch 'origin/master'

测试服内存配置

builds/Dockerfile

@@ -5,7 +5,7 @@ LABEL Author="axzsd" \
       Description="创盈支付服务端"
 
 ENV SPRING_PROFILES_ACTIVE="dev"
-ENV JAVA_OPTIONS "-Xms800m -Xmx800m \
+ENV JAVA_OPTIONS "-Xms1024m -Xmx2048m \
 -XX:+HeapDumpOnOutOfMemoryError \
 -Dfile.encoding=UTF-8 \
 -Djava.awt.headless=true \

builds/docker-compose-test.yml

@@ -20,7 +20,7 @@ services:
     deploy:
       resources:
         limits:
-          memory: 800MB
+          memory: 2048MB
     healthcheck:
       test: ["CMD", "curl", "-f", "http://localhost:48080/actuator/health"]
       timeout: 30s

yudao-ui-admin/src/views/index.vue

@@ -4,7 +4,7 @@
       <div slot="header" class="clearfix">
     <el-form  :model="queryParams" ref="queryForm" size="small" :inline="true"  label-width="100px">
       <el-form-item label="快速查看" class="width100" prop="type">
-        <el-radio-group v-model="queryParams.type" type="button"  class="mr20"  size="small" @change="getList">
+        <el-radio-group v-model="queryParams.type" type="button"  class="mr20"  size="small" @change="handleChange">
           <el-radio-button  v-for="(item,i) in lookList" :label=i+1 :key="i">{{item.name}}</el-radio-button>
         </el-radio-group>
       </el-form-item>
@@ -113,10 +113,13 @@ export default {
   created() {
     this.getList();
   },
-  computed:{
-  },
   methods: {
+    handleChange(){
+      this.queryParams ={type:this.queryParams.type}
+      this.getList()
+    },
     onchangeTime(value){
+      this.queryParams.type = null
       this.queryParams.startTime = value[0]
       this.queryParams.endTime = value[1]
     },

yudao-ui-admin/src/views/member/allpromoter/index.vue

@@ -5,7 +5,6 @@
     <el-form :model="queryParams" ref="queryForm" size="small" :inline="true" v-show="showSearch" label-width="110px">
       <el-form-item label="所属组织" prop="deptId">
         <treeselect style="width: 240px;" v-model="queryParams.deptId" :options="deptOptions" :show-count="true"
-                    :clearable="false"
                     placeholder="请选择所属组织" :normalizer="normalizer" />
       </el-form-item>
 <!--      <el-form-item label="启用状态" prop="status">-->
@@ -18,7 +17,7 @@
         <el-input v-model="queryParams.nickname" placeholder="请输入"  clearable @keyup.enter.native="handleQuery"/>
       </el-form-item>
       <el-form-item label="注册来源" prop="sourceType">
-        <el-select v-model="queryParams.sourceType" placeholder="请选择来源" clearable  @keyup.enter.native="handleQuery">
+        <el-select v-model="queryParams.sourceType" placeholder="请选择来源" clearable  @keyup.enter.native="handleQuery" @clear="()=>{queryParams.sourceType = undefined}">
           <el-option value="1" label="后台注册"/>
           <el-option value="2" label="扫码注册"/>
         </el-select>

yudao-ui-admin/src/views/member/promoter/index.vue

@@ -5,7 +5,6 @@
     <el-form :model="queryParams" ref="queryForm" size="small" :inline="true" v-show="showSearch" label-width="110px">
       <el-form-item label="所属组织" prop="deptId">
         <treeselect style="width: 240px;" v-model="queryParams.deptId" :options="deptOptions" :show-count="true"
-                    :clearable="false"
                     placeholder="请选择所属组织" :normalizer="normalizer"/>
       </el-form-item>
       <el-form-item label="启用状态" prop="status">
@@ -18,7 +17,7 @@
         <el-input v-model="queryParams.nickname" placeholder="请输入"  clearable @keyup.enter.native="handleQuery"/>
       </el-form-item>
       <el-form-item label="注册来源" prop="sourceType">
-        <el-select v-model="queryParams.sourceType" placeholder="请选择来源" clearable  @keyup.enter.native="handleQuery">
+        <el-select v-model="queryParams.sourceType" placeholder="请选择来源" clearable  @keyup.enter.native="handleQuery" @clear="()=>{queryParams.sourceType = undefined}">
           <el-option value="1" label="后台注册"/>
           <el-option value="2" label="扫码注册"/>
         </el-select>