Compare commits

..

No commits in common. "e85f2e75a7860181d9fc8ecf8f61e8f9d8b95785" and "1813516c54cf35b523f5f3dc79caad33ff389753" have entirely different histories.

5 changed files with 9 additions and 10 deletions

View File

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

View File

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

View File

@ -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="handleChange">
<el-radio-group v-model="queryParams.type" type="button" class="mr20" size="small" @change="getList">
<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,13 +113,10 @@ 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]
},

View File

@ -5,6 +5,7 @@
<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">-->
@ -17,7 +18,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" @clear="()=>{queryParams.sourceType = undefined}">
<el-select v-model="queryParams.sourceType" placeholder="请选择来源" clearable @keyup.enter.native="handleQuery">
<el-option value="1" label="后台注册"/>
<el-option value="2" label="扫码注册"/>
</el-select>

View File

@ -5,6 +5,7 @@
<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">
@ -17,7 +18,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" @clear="()=>{queryParams.sourceType = undefined}">
<el-select v-model="queryParams.sourceType" placeholder="请选择来源" clearable @keyup.enter.native="handleQuery">
<el-option value="1" label="后台注册"/>
<el-option value="2" label="扫码注册"/>
</el-select>