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

Merge remote-tracking branch 'origin/feature_dev_20221129_UI' into fix_2nd_period

Browse Source 
# 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:
高嵩
2022-12-30 15:53:39 +08:00
parent 07c02abef6 2154e4edfe
commit b0b8f36e92
129 changed files with 1418 additions and 765 deletions
Download Patch File Download Diff File Expand all files Collapse all files
jero-web/src/views/documentManage/collection/index.vue
+6 -6
View File
@@ -125,14 +125,14 @@
dataIndex: 'serialNumber',
key: 'serialNumber',
scopedSlots: { customRender: 'serialNumber' },
align: 'center',
align: 'left',
sorter:true,
ellipsis: true,
width: 180
},
{
title: this.$t('title'),
align: 'center',
align: 'left',
scopedSlots: { customRender: 'serialtitle' },
width: 180,
ellipsis: true,
@@ -140,7 +140,7 @@
},
{
title: this.$t('status'),
align: 'center',
align: 'left',
width: 180,
ellipsis: true,
sorter:true,
@@ -148,7 +148,7 @@
},
{
title: this.$t('collectionTime'),
align: 'center',
align: 'left',
width: 180,
ellipsis: true,
sorter:true,
@@ -158,7 +158,7 @@
title: this.$t('operation'),
dataIndex: 'action',
scopedSlots: { customRender: 'action' },
align: 'center',
align: 'left',
fixed: 'right',
width: 170
}
@@ -345,7 +345,7 @@
}
.title-text {
width: 43px;
width: 110px;
color: #000F16;
display: inline-block;
font-weight: 500;
jero-web/src/views/documentManage/library/docDetail/index.vue
+26 -8
View File
@@ -184,7 +184,7 @@
:loading="loading"
>
<span slot="content" slot-scope="text,record">
<a-tooltip placement="topLeft">
<a-tooltip placement="topLeft" overlayClassName="tooltipColor">
<template slot="title">
<span v-html="text"></span>
</template>
@@ -293,7 +293,7 @@
{
title: this.$t('standardName'),
dataIndex: 'title',
align: 'center',
align: 'left',
ellipsis: true,
scopedSlots: { customRender: 'operation' }
}
@@ -302,13 +302,13 @@
{
title: this.$t('fileName'),
dataIndex: 'fileName',
align: 'center',
align: 'left',
width: 260,
ellipsis: true
},
{
title: this.$t('operation'),
align: 'center',
align: 'left',
width: 130,
scopedSlots: { customRender: 'fileOperation' }
}
@@ -331,21 +331,21 @@
{
title: this.$t('ModificationContent'),
dataIndex: 'content',
align: 'center',
align: 'left',
ellipsis: true,
scopedSlots: { customRender: 'content' }
},
{
title: this.$t('ModificationTime'),
dataIndex: 'createTime',
align: 'center',
align: 'left',
ellipsis: true,
width: 180
},
{
title: this.$t('personnel'),
dataIndex: 'createBy',
align: 'center',
align: 'left',
ellipsis: true,
width: 180
}
@@ -575,9 +575,17 @@
.uploadFile .ant-upload {
display: none !important;
}
.tooltipColor .ant-tooltip-inner {
color: #333;
background-color: #fff !important;
}
.tooltipColor .ant-tooltip-arrow::before {
background-color: #fff;
}
</style>
<style lang="less" scoped>
@import '~@assets/less/common.less';
@import'~@assets/less/common.less';
.doc-detail {
background: #fff;
@@ -810,4 +818,14 @@
color: #00B3BE !important;
cursor: pointer;
}
///deep/.table .ant-table-thead > tr > th {
// font-weight: bolder;
//}
///deep/.ant-table-thead > tr > th {
// background: #f3f6f6;
//}
///deep/.table .ant-table-tbody > tr > td {
// color: #040B29 ;
//}
</style>
jero-web/src/views/documentManage/library/index.vue
+1 -1
View File
@@ -17,7 +17,7 @@
{{$t('exportWithFile')}}
</div>
<div @click="handleCompare" class="operator-text" v-has="'document:pullMessage'">
<a-icon type="rocket" :rotate="45"/>
<a-icon type="share-alt"/>
{{$t('share')}}
</div>
<div @click="handleModule" class="operator-text" v-has="'document:exportTemplate'">
jero-web/src/views/documentManage/ocr/index.vue
+2 -2
View File
@@ -7,11 +7,11 @@
</div>
<div class="table-operator">
<div class="operator-text" @click="handleUpload" v-has="'ocr:ocrRestful:addOcrRecord'">
<a-icon type="plus" />
<a-icon type="cloud-upload" />
{{ $t('upload1') }}
</div>
<div class="operator-text" @click="handleFileExport" v-has="'document:ocrPageInfo'">
<a-icon type="export" />
<a-icon type="database" />
{{ $t('RetrieveFiles') }}
</div>
<div class="operator-text" @click="handleDel" v-has="'ocr:ocrRecord:deleteBatch'">
jero-web/src/views/documentManage/splitting/index.vue
+1 -1
View File
@@ -10,7 +10,7 @@
{{ $t('SplitText') }}
</div>
<div class="operator-text" @click="handleExport" v-has="'split:sarFileSplitInfo:splitResult'">
<a-icon type="export"/>
<a-icon type="import" :rotate="-90"/>
{{ $t('ImportResults') }}
</div>
<div class="operator-text" @click="handleDel" v-has="'split:sarFileSplitInfo:deleteBatch'">
jero-web/src/views/documentManage/splitting/modules/SplitAddForm.vue
+5 -1
View File
@@ -1280,8 +1280,12 @@
justify-content: space-around;
.title-flex {
width: 75px;
height: 35px;
text-align: center;
border-radius: 5px;
border: 1px solid #d9d9d9;
padding: 10px 40px;
padding: 7px;
cursor: pointer;
}
jero-web/src/views/documentManage/splitting/modules/SplitDetail.vue
+2 -2
View File
@@ -1258,7 +1258,7 @@ export default {
.split-detail-left {
/*height: 100%;*/
width: 300px;
width: 230px;
float: left;
padding-right: 20px;
/*border-right: 1px solid #E6E7EC;*/
@@ -1287,7 +1287,7 @@ export default {
.split-detail-right {
padding-left: 20px;
width: calc(100% - 300px);
width: calc(100% - 230px);
float: right;
border-left: 1px solid #E6E7EC;
/*flex: 1;*/
jero-web/src/views/documentManage/subscribtion/index.vue
+6 -6
View File
@@ -123,7 +123,7 @@
title: this.$t('standard'),
dataIndex: 'serialNumber',
key: 'serialNumber',
align: 'center',
align: 'left',
width: 180,
scopedSlots: { customRender: 'serialNumber' },
sorter:true,
@@ -131,7 +131,7 @@
},
{
title: this.$t('title'),
align: 'center',
align: 'left',
width: 180,
dataIndex: 'title',
scopedSlots: { customRender: 'serialtitle' },
@@ -139,7 +139,7 @@
},
{
title: this.$t('status'),
align: 'center',
align: 'left',
width: 180,
dataIndex: 'state',
sorter:true,
@@ -147,7 +147,7 @@
},
{
title: this.$t('subscriptionTime'),
align: 'center',
align: 'left',
width: 180,
dataIndex: 'createTime',
sorter:true,
@@ -158,7 +158,7 @@
dataIndex: 'action',
fixed: 'right',
scopedSlots: { customRender: 'action' },
align: 'center',
align: 'left',
width: 170
}
],
@@ -357,7 +357,7 @@
}
.title-text {
width: 33px;
width: 110px;
color: #000F16;
display: inline-block;
font-weight: 500;
jero-web/src/views/documentManage/tags/dialog/AreaManage.vue
+5 -5
View File
@@ -117,27 +117,27 @@
title: this.$t('DisplayArea'),
dataIndex: 'showArea',
key: 'showArea',
align: "center",
align: "left",
width: 100,
ellipsis: true,
},
{
title: this.$t('enName'),
align: "center",
align: "left",
width: 100,
dataIndex: 'enName',
ellipsis: true,
},
{
title: this.$t('Module'),
align: "center",
align: "left",
width: 100,
dataIndex: 'isModelName',
ellipsis: true,
},
{
title: this.$t('SortNumber'),
align: "center",
align: "left",
width: 40,
dataIndex: 'sort',
},
@@ -145,7 +145,7 @@
title: this.$t('operation'),
dataIndex: 'action',
scopedSlots: {customRender: 'action'},
align: "center",
align: "left",
width: 60
}
],
jero-web/src/views/documentManage/tags/dialog/ListTable.vue
+4 -4
View File
@@ -48,20 +48,20 @@
title: this.$t('name'),
dataIndex: 'itemText',
key: 'itemText',
align: "center",
align: "left",
ellipsis: true,
width: 100,
},
{
title: this.$t('enName'),
align: "center",
align: "left",
width: 100,
ellipsis: true,
dataIndex: 'enName',
},
{
title: this.$t('describe'),
align: "center",
align: "left",
width: 100,
ellipsis: true,
dataIndex: 'description',
@@ -70,7 +70,7 @@
title: this.$t('operation'),
dataIndex: 'action',
scopedSlots: {customRender: 'action'},
align: "center",
align: "left",
width: 170
}
],
jero-web/src/views/documentManage/tags/tabs/TagContent.vue
+6 -6
View File
@@ -140,19 +140,19 @@
title: this.$t('LabelName'),
dataIndex: 'dictName',
key: 'dictName',
align: 'center',
align: 'left',
ellipsis: true,
width: 100
},
{
title: this.$t('LabelType'),
align: 'center',
align: 'left',
width: 100,
dataIndex: 'attributeTypeName'
},
{
title: this.$t('describe'),
align: 'center',
align: 'left',
dataIndex: 'description',
scopedSlots: { customRender: 'describe' },
ellipsis: true,
@@ -160,7 +160,7 @@
},
{
title: this.$t('DisplayOrder'),
align: 'center',
align: 'left',
width: 100,
dataIndex: 'orderNum'
},
@@ -168,7 +168,7 @@
title: this.$t('operation'),
dataIndex: 'action',
scopedSlots: { customRender: 'action' },
align: 'center',
align: 'left',
width: 170
}
],
@@ -508,7 +508,7 @@
}
.title-text {
width: 60px;
width: 110px;
color: #000F16;
display: inline-block;
font-weight: 500;
jero-web/src/views/documentManage/tags/tabs/TagItem.vue
+15 -15
View File
@@ -46,7 +46,7 @@
{{$t('newlyAdded')}}
</div>
<div class="operator-text" @click="handleShow" v-if="key=='1'">
<a-icon type="rocket" :rotate="45"/>
<a-icon type="unordered-list"/>
{{$t('ExhibitionAreaManagement')}}
</div>
<div class="operator-text" @click="batDelete" v-has="'tag:logicDeleteBatch'">
@@ -133,37 +133,37 @@
taglabColumns: [
{
title: this.$t('ChineseName'),
align: 'center',
align: 'left',
width: 100,
dataIndex: 'dbFieldTxt'
},
{
title: this.$t('enName'),
align: 'center',
align: 'left',
width: 100,
dataIndex: 'dbFieldEnName'
},
{
title: this.$t('AttributeType'),
align: 'center',
align: 'left',
width: 100,
dataIndex: 'fieldShowTypeName'
},
{
title: this.$t('FieldLength'),
align: 'center',
align: 'left',
width: 80,
dataIndex: 'dbLength'
},
{
title: this.$t('DisplayOrder'),
align: 'center',
align: 'left',
width: 80,
dataIndex: 'orderNum'
},
{
title: this.$t('DisplayArea'),
align: 'center',
align: 'left',
width: 80,
dataIndex: 'showAreaName'
},
@@ -171,38 +171,38 @@
title: this.$t('operation'),
dataIndex: 'action',
scopedSlots: { customRender: 'action' },
align: 'center',
align: 'left',
width: 170
}
],
taglabColumns1: [
{
title: this.$t('ChineseName'),
align: 'center',
align: 'left',
width: 100,
dataIndex: 'dbFieldTxt'
},
{
title: this.$t('enName'),
align: 'center',
align: 'left',
width: 100,
dataIndex: 'dbFieldEnName'
},
{
title: this.$t('AttributeType'),
align: 'center',
align: 'left',
width: 100,
dataIndex: 'fieldShowTypeName'
},
{
title: this.$t('FieldLength'),
align: 'center',
align: 'left',
width: 80,
dataIndex: 'dbLength'
},
{
title: this.$t('DisplayOrder'),
align: 'center',
align: 'left',
width: 80,
dataIndex: 'orderNum'
},
@@ -210,7 +210,7 @@
title: this.$t('operation'),
dataIndex: 'action',
scopedSlots: { customRender: 'action' },
align: 'center',
align: 'left',
width: 170
}
],
@@ -572,7 +572,7 @@
}
.title-text {
width: 60px;
width: 110px;
color: #000F16;
display: inline-block;
font-weight: 500;