wuhongjian
/
hi-ucs
1
0
Fork 0
Code Issues Pull Requests Projects Releases 10 Wiki Activity

Merge branch 'hi-ucs-dev' of http://192.168.124.50:80/wuhongjian/hi-ucs into hi-ucs-dev

This commit is contained in:
gongjiale 2022-11-04 13:59:57 +08:00
parent 0f479dfec4 bfaac75b43
commit 2e7131ad14
2 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
back/src/components/ren-region-tree/src/ren-region-tree.vue
View File

@ -26,7 +26,7 @@
</el-tree> </el-tree>
<template slot="footer"> <template slot="footer">
<el-button type="default" @click="cancelHandle()" size="mini">{{ $t('cancel') }}</el-button> <el-button type="default" @click="cancelHandle()" size="mini">{{ $t('cancel') }}</el-button>
<el-button type="info" @click="clearHandle()" size="mini">{{ $t('clear') }}</el-button> <!-- <el-button type="info" @click="clearHandle()" size="mini">{{ $t('clear') }}</el-button> -->
<el-button type="primary" @click="commitHandle()" size="mini">{{ $t('confirm') }}</el-button> <el-button type="primary" @click="commitHandle()" size="mini">{{ $t('confirm') }}</el-button>
</template> </template>
</el-dialog> </el-dialog>

4
back/src/views/modules/myAgent/ConferenceRoom.vue
View File

@ -252,8 +252,8 @@ export default {
{ required: true, message: '请填写描述内容', trigger: 'blur' }, { required: true, message: '请填写描述内容', trigger: 'blur' },
{ {
min: 1, min: 1,
max: 500, max: 255,
message: '长度在 1 到 500 个字符', message: '长度在 1 到 255 个字符',
trigger: 'blur' trigger: 'blur'
} }
] ]