xiaoguangbin/AnalysisSystemForRadionuclide_vue
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge branch 'master-dev' of http://git.hivekion.com:3000/xiaoguangbin/AnalysisSystemForRadionuclide_vue into master-dev

Browse Source
This commit is contained in:
orgin 2023-11-08 14:35:58 +08:00
commit 4a337648ae
2 changed files with 21 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
src/components/SearchForm/index.vue
View File

@ -10,7 +10,10 @@
:style="item.style"
>
<a-form-model-item :label="item.label" :prop="item.name" :labelCol="item.labelCol">
<component :is="item.type" v-bind="item.props" v-model="formModel[item.name]" v-on="item.on"></component>
<a-checkbox v-if="item.type == 'a-checkbox'" v-model="formModel[item.name]" v-on="item.on">
{{ item.innerLabel }}
</a-checkbox>
<component v-else :is="item.type" v-bind="item.props" v-model="formModel[item.name]" v-on="item.on"></component>
</a-form-model-item>
</a-col>
<a-button class="search-btn" type="primary" @click="onSearch">

31
src/views/system/DataBase.vue
View File

@ -292,7 +292,7 @@ export default {
props: {
allowClear: true,
style: {
width: '190px',
width: '187px',
},
},
style: {
@ -315,7 +315,7 @@ export default {
filterOption: this.filterOption,
allowClear: true,
style: {
width: '190px',
width: '187px',
},
},
style: {
@ -338,7 +338,7 @@ export default {
filterOption: this.filterOption,
allowClear: true,
style: {
width: '190px',
width: '187px',
},
},
style: {
@ -355,7 +355,7 @@ export default {
valueFormat: 'YYYY-MM-DD HH:mm:ss',
style: {
minWidth: 'auto',
width: '282px',
width: '279px',
},
},
style: {
@ -372,7 +372,7 @@ export default {
valueFormat: 'YYYY-MM-DD HH:mm:ss',
style: {
minWidth: 'auto',
width: '282px',
width: '279px',
},
},
style: {
@ -380,16 +380,19 @@ export default {
},
},
{
label: '',
type: 'a-checkbox-group',
props: {
options: [
{ label: 'Collect Stop', value: 'collectStop' },
{ label: 'Acq.Start', value: 'acqDotStart' },
],
},
type: 'a-checkbox',
name: 'collectStopCheck',
innerLabel: 'Collect Stop',
style: {
width: '230px',
width: '132px',
},
},
{
type: 'a-checkbox',
name: 'acqDotStartCheck',
innerLabel: 'Acq.Start',
style: {
width: '113px',
},
},
]