WL/laws_weilai
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge remote-tracking branch 'origin/fix_2nd_20230103' into fix_2nd_20230103

Browse Source
This commit is contained in:
高嵩
2023-01-12 18:41:56 +08:00
parent c57ec9ff59 dc540cee33
commit 8e94c26f09
2 changed files with 15 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files
jero-web/src/views/projectManagement/components/listAddModel.vue
+7 -5
View File
@@ -12,7 +12,7 @@
<div class="table-page-search-wrapper">
<a-form layout="inline" @keyup.enter.native="searchQuery">
<a-row :gutter="24">
<a-col :md="12" :sm="8">
<a-col :md="12" :sm="5">
<div class="box-title-text">
<div class="title-text" :title="$t('standard')">
<span>{{$t('standard')}}</span>
@@ -21,7 +21,7 @@
v-model="queryParam.serial_number"></a-input>
</div>
</a-col>
<a-col :md="12" :sm="8">
<a-col :md="12" :sm="5">
<div class="box-title-text">
<div class="title-text" :title="$t('title')">
<span>{{$t('title')}}</span>
@@ -30,7 +30,7 @@
v-model="queryParam.title"></a-input>
</div>
</a-col>
<a-col :md="12" :sm="8">
<a-col :md="12" :sm="5">
<div class="box-title-text">
<div class="title-text" :title="$t('status')">
<span>{{$t('status')}}</span>
@@ -301,7 +301,8 @@
}
.title-text {
width: 33px;
width: 20%;
min-width: 110px;
color: #000F16;
display: inline-block;
font-weight: 500;
@@ -316,8 +317,9 @@
.box-input {
display: inline-block;
width: 100%;
width: 70%;
height: 38px;
margin-top: 2px;
}
.box-button {
jero-web/src/views/projectManagement/dialog/ParameterTemplateAdd.vue
+8 -5
View File
@@ -45,7 +45,7 @@
<a-form-model-item class="itemModel" prop='projectVersion'>
<a-select
class="box-input propbox"
style="width: 100%"
style="width: 109%"
v-model='formData.projectVersion'
:placeholder="$t('PleaseSelect')+$t('relatedProjectVersion')">
<!-- <a-select-option :value="null">{{$t('pleaseSelect')}}</a-select-option>-->
@@ -66,13 +66,13 @@
<!-- <a-col :span='6'>-->
<!-- </a-col>-->
</a-row>
<a-row :gutter="24" style="border-bottom: 1px #f5f5f5 solid;margin-bottom: 10px">
<a-row :gutter="24" style="border-bottom: 1px #e8e8e8 solid;margin-bottom: 10px">
<a-col :span="22">
<div class="box-title-text">
<div class="title-text">
<span class="title-text-text" :title="$t('explain')">{{$t('explain')}}</span>
</div>
<a-form-model-item class="itemModel" prop="explanation">
<a-form-model-item class="itemModel explainbox" prop="explanation">
<a-textarea
:placeholder="$t('PleaseEnter')+$t('explain')"
v-model.trim="formData.explanation" :rows="4"/>
@@ -467,7 +467,7 @@
.diolag-area {
.table-area {
margin: 20px 0;
//margin: 20px 0;
.action-edit {
margin-right: 10px;
@@ -481,6 +481,9 @@
/deep/.propbox .ant-form-explain{
margin-top: -17px !important;
}
/deep/.explainbox .ant-form-item-control{
width: 104%;
}
.drawer-bootom-button {
position: absolute;
bottom: 0;
@@ -506,7 +509,7 @@
}
.title-text {
width: 84px;
width: 100px;
text-align: right;
display: inline-block;
font-weight: 500;