Merge remote-tracking branch 'origin/feature_dev_20221129_UI' into fix_2nd_period
# Conflicts: # jero-web/src/components/tableCollection/index1.vue # jero-web/src/views/businessSupport/collectionOfRegulatoryOpinions/components/initiatingProcess.vue # jero-web/src/views/documentManage/collection/index.vue # jero-web/src/views/projectManagement/components/ParameterItemCollectionList.vue # jero-web/src/views/projectManagement/components/listOfRegulations.vue # jero-web/src/views/projectManagement/projectStatusBoard/components/projectStatusAndProgress.vue # jero-web/src/views/projectManagement/projectStatusBoard/index.vue
This commit is contained in:
@@ -27,7 +27,7 @@
|
||||
{{$t('addDetailList')}}
|
||||
</div>
|
||||
<div @click="handleModule" class="operator-text" v-has="'params:manifest:change'">
|
||||
<a-icon type="bulb"/>
|
||||
<a-icon type="file-sync"/>
|
||||
{{$t('changeExtension')}}
|
||||
</div>
|
||||
<div @click="handleCody" class="operator-text" v-has="'params:manifest:copy'">
|
||||
@@ -153,14 +153,14 @@
|
||||
columns: [
|
||||
{
|
||||
title: this.$t('title'),
|
||||
align: 'center',
|
||||
align: 'left',
|
||||
dataIndex: 'title',
|
||||
width: 240,
|
||||
scopedSlots: { customRender: 'paramsManifestClick' }
|
||||
},
|
||||
{
|
||||
title: this.$t('status'),
|
||||
align: 'center',
|
||||
align: 'left',
|
||||
width: 80,
|
||||
ellipsis: true,
|
||||
sorter:true,
|
||||
@@ -168,14 +168,14 @@
|
||||
},
|
||||
{
|
||||
title: this.$t('parameterTemplateName'),
|
||||
align: 'center',
|
||||
align: 'left',
|
||||
width: 180,
|
||||
ellipsis: true,
|
||||
dataIndex: 'paramsTemplateName'
|
||||
},
|
||||
{
|
||||
title: this.$t('relatedProjectVersion'),
|
||||
align: 'center',
|
||||
align: 'left',
|
||||
width: 120,
|
||||
ellipsis: true,
|
||||
sorter:true,
|
||||
@@ -183,7 +183,7 @@
|
||||
},
|
||||
{
|
||||
title: this.$t('collectionCompletionTime'),
|
||||
align: 'center',
|
||||
align: 'left',
|
||||
dataIndex: 'finishTime',
|
||||
width: 180,
|
||||
ellipsis: true,
|
||||
@@ -192,7 +192,7 @@
|
||||
},
|
||||
{
|
||||
title: this.$t('Version'),
|
||||
align: 'center',
|
||||
align: 'left',
|
||||
width: 80,
|
||||
ellipsis: true,
|
||||
sorter:true,
|
||||
@@ -200,14 +200,14 @@
|
||||
},
|
||||
{
|
||||
title: this.$t('creator'),
|
||||
align: 'center',
|
||||
align: 'left',
|
||||
width: 110,
|
||||
ellipsis: true,
|
||||
dataIndex: 'createBy'
|
||||
},
|
||||
{
|
||||
title: this.$t('created'),
|
||||
align: 'center',
|
||||
align: 'left',
|
||||
width: 160,
|
||||
ellipsis: true,
|
||||
sorter:true,
|
||||
@@ -215,7 +215,7 @@
|
||||
},
|
||||
{
|
||||
title: this.$t('operation'),
|
||||
align: 'center',
|
||||
align: 'left',
|
||||
fixed: 'right',
|
||||
width: 210,
|
||||
scopedSlots: { customRender: 'operation' }
|
||||
@@ -597,9 +597,9 @@
|
||||
border-radius: 4px;
|
||||
}
|
||||
|
||||
/deep/ .add-padding {
|
||||
margin-left: -89px !important;
|
||||
}
|
||||
///deep/ .add-padding {
|
||||
// margin-left: -89px !important;
|
||||
//}
|
||||
|
||||
.textName {
|
||||
width: 100%;
|
||||
@@ -622,6 +622,14 @@
|
||||
::v-deep .ant-table-body {
|
||||
background: transparent !important;
|
||||
}
|
||||
|
||||
///deep/.ant-table-thead > tr > th {
|
||||
// font-weight: bolder;
|
||||
//}
|
||||
|
||||
///deep/.ant-table-tbody > tr > td {
|
||||
// color: #040B29 ;
|
||||
//}
|
||||
</style>
|
||||
<style>
|
||||
.box-input .ant-select-selection {
|
||||
|
||||
Reference in New Issue
Block a user