修改禅道已知bug
This commit is contained in:
+6
-3
@@ -216,9 +216,12 @@ public class LawsTechnologyEvaluationItemResultEOServiceImpl extends ServiceImpl
|
|||||||
List<SysCategory> categoryList = sysCategoryService.list();
|
List<SysCategory> categoryList = sysCategoryService.list();
|
||||||
for (LawsTechnologyEvaluationItemResultEO data : datas) {
|
for (LawsTechnologyEvaluationItemResultEO data : datas) {
|
||||||
String evaluationMethods = data.getEvaluationMethods();
|
String evaluationMethods = data.getEvaluationMethods();
|
||||||
List<String> evaluationMethodsList = Arrays.asList(evaluationMethods.split(","));
|
if(StringUtils.isNotEmpty(evaluationMethods)){
|
||||||
String name = getTreeName(cut, categoryList, evaluationMethodsList);
|
List<String> evaluationMethodsList = Arrays.asList(evaluationMethods.split(","));
|
||||||
data.setEvaluationMethodsName(name);
|
String name = getTreeName(cut, categoryList, evaluationMethodsList);
|
||||||
|
data.setEvaluationMethodsName(name);
|
||||||
|
}
|
||||||
|
|
||||||
if(StringUtils.isNotEmpty(data.getComplianceResult())){
|
if(StringUtils.isNotEmpty(data.getComplianceResult())){
|
||||||
data.setComplianceResultName(ComplianceResultEnum.getTextByValue(data.getComplianceResult(),cut));
|
data.setComplianceResultName(ComplianceResultEnum.getTextByValue(data.getComplianceResult(),cut));
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -298,8 +298,7 @@
|
|||||||
}
|
}
|
||||||
|
|
||||||
.title-text {
|
.title-text {
|
||||||
width: 20%;
|
width: 100px;
|
||||||
min-width: 100px;
|
|
||||||
color: #000F16;
|
color: #000F16;
|
||||||
display: inline-block;
|
display: inline-block;
|
||||||
font-weight: 500;
|
font-weight: 500;
|
||||||
@@ -315,7 +314,7 @@
|
|||||||
.box-input {
|
.box-input {
|
||||||
/*min-width: 200px;*/
|
/*min-width: 200px;*/
|
||||||
display: inline-block;
|
display: inline-block;
|
||||||
width: 70%;
|
width: calc(100% - 116px);
|
||||||
height: 38px;
|
height: 38px;
|
||||||
margin-top: 2px;
|
margin-top: 2px;
|
||||||
}
|
}
|
||||||
@@ -324,4 +323,16 @@
|
|||||||
height: 38px;
|
height: 38px;
|
||||||
/*margin-top: 2px;*/
|
/*margin-top: 2px;*/
|
||||||
}
|
}
|
||||||
|
|
||||||
|
::v-deep .ant-select-tree {
|
||||||
|
width: auto;
|
||||||
|
height: 300px;
|
||||||
|
overflow: auto;
|
||||||
|
position: absolute;
|
||||||
|
/*background: #fff;*/
|
||||||
|
}
|
||||||
|
|
||||||
|
::v-deep .ant-select-tree-dropdown {
|
||||||
|
min-height: 320px;
|
||||||
|
}
|
||||||
</style>
|
</style>
|
||||||
+1
-1
@@ -20,7 +20,7 @@
|
|||||||
size="middle"
|
size="middle"
|
||||||
:loading="loading"
|
:loading="loading"
|
||||||
:pagination="false"
|
:pagination="false"
|
||||||
:scroll="{x: '100%'}"
|
:scroll="{x: '100%',y:'calc(100vh - 320px)'}"
|
||||||
:data-source="dataSource"
|
:data-source="dataSource"
|
||||||
:columns="columns"
|
:columns="columns"
|
||||||
>
|
>
|
||||||
|
|||||||
+3
-3
@@ -26,15 +26,15 @@
|
|||||||
</template>
|
</template>
|
||||||
</div>
|
</div>
|
||||||
<div class="box-content-right">
|
<div class="box-content-right">
|
||||||
<div @click="classificationClick" class="operator-text" v-has="'virtual:set:creater'">
|
<div @click="classificationClick" class="operator-text">
|
||||||
<a-icon type="setting"/>
|
<a-icon type="setting"/>
|
||||||
{{$t('classificationMaintenance')}}
|
{{$t('classificationMaintenance')}}
|
||||||
</div>
|
</div>
|
||||||
<div @click="managePublishingClick" class="operator-text" v-has="'virtual:set:creater'">
|
<div @click="managePublishingClick" class="operator-text">
|
||||||
<a-icon type="carry-out"/>
|
<a-icon type="carry-out"/>
|
||||||
{{$t('managePublishing')}}
|
{{$t('managePublishing')}}
|
||||||
</div>
|
</div>
|
||||||
<div @click="newlyAddedClick" class="operator-text" v-has="'virtual:set:creater'">
|
<div @click="newlyAddedClick" class="operator-text">
|
||||||
<a-icon type="plus"/>
|
<a-icon type="plus"/>
|
||||||
{{$t('newlyAdded')}}
|
{{$t('newlyAdded')}}
|
||||||
</div>
|
</div>
|
||||||
|
|||||||
Reference in New Issue
Block a user