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

UI界面变更-项目详情-法规清单

Browse Source
This commit is contained in:
刘彦泽
2022-12-21 09:24:35 +08:00
parent 64f41aaab4
commit 72fa5d26cb
3 changed files with 100 additions and 63 deletions
Download Patch File Download Diff File Expand all files Collapse all files
jero-web/src/components/globalAdvancedQuery/index.vue
+6 -2
View File
@@ -11,7 +11,7 @@
<a @click="handleReset">{{$t('empty')}}</a>
</template>
<a-button-group>
<a-button type="primary" @click="handleOpen" style="margin-right: 8px;height: 38px">
<a-button type="primary" @click="handleOpen" style="height: 38px":style='`marginRight:${MarginRight?MarginRight:"8px"}`'>
<!-- <a-icon type="appstore" theme="twoTone" spin/>-->
<a-icon type="filter" theme="filled"/>
<span>{{$t('advancedQuery')}}</span>
@@ -19,7 +19,7 @@
<a-button style="margin-right: 8px;height: 38px" v-if="izMobile" type="primary" icon="delete" @click="handleReset"/>
</a-button-group>
</a-tooltip>
<a-button v-else style="margin-right: 8px;height: 38px" type="primary" icon="filter" @click="handleOpen">{{$t('advancedQuery')}}</a-button>
<a-button v-else style="height: 38px" type="primary" icon="filter" @click="handleOpen" :style='`marginRight:${MarginRight?MarginRight:"8px"}`'>{{$t('advancedQuery')}}</a-button>
</slot>
<j-modal
:title="$t('advancedQuery')"
@@ -264,6 +264,10 @@
mixins: [mixinDevice],
components: { JAreaLinkage, JMultiSelectTag, JDate, JSelectDepart, JSelectMultiUser ,PersonnelSelection},
props: {
MarginRight:{
type:String,
required:false
},
/*
fieldList: [{
value:'',
jero-web/src/views/projectManagement/ProjectDetails/index.vue
+4 -4
View File
@@ -2,7 +2,7 @@
<div class="doc-detail">
<div class="Virtual-detail-header" style="position: fixed;top: 0">
<div class="Virtual-detail-title">
<span style="line-height: 74px;display: inline-block;float: left">
<span style="line-height: 64px;display: inline-block;float: left">
<a-icon @click="backClick" type="left-circle" theme="filled"
style="margin-right: 8px;font-size: 30px;color: #21c9cc;"/>
</span>
@@ -340,8 +340,8 @@
.Virtual-detail-header {
width: 100%;
height: 68px;
line-height: 68px;
height: 56px;
line-height: 56px;
padding: 0 32px 0 32px;
box-sizing: border-box;
display: flex;
@@ -357,7 +357,7 @@
font-size: 20px;
font-weight: 400;
color: #040B29;
line-height: 68px;
line-height: 55px;
}
.doc-detail-right {
jero-web/src/views/projectManagement/components/listOfRegulations.vue
+90 -57
View File
@@ -35,6 +35,7 @@
:triggerChange="false" :dictCode="'duty_territory'"/>
</div>
</a-col>
<template v-if="toggleSearchStatus">
<a-col :md="6" :sm="8">
<div class="box-title-text">
<div class="title-text" :title="$t('listConfirmationStatus')">
@@ -75,14 +76,19 @@
</a-select>
</div>
</a-col>
<span style="float: right;overflow: hidden;margin-right: 11px" class="table-page-search-submitButtons">
</template>
<span style="float: right;overflow: hidden;margin-right: 0px; " class="table-page-search-submitButtons">
<a-col :md="6" :sm="24">
<globalAdvancedQuery ref="globalAdvancedQueryRef"
@handleSuperQuery="handleSuperQuery"
:fieldList="fieldList"/>
:fieldList="fieldList" MarginRight='2px'/>
<a-button class="box-button" type="primary" @click="searchQuery">{{ $t('query') }}</a-button>
<a-button class="box-button" style="margin-left: 8px"
<a-button class="box-button" style="margin-left: 2px"
@click="searchReset">{{ $t('reset') }}</a-button>
<a @click="handleToggleSearch" style="margin-left: 2px">
{{ !toggleSearchStatus ? $t('open') : $t('away') }}
<a-icon :type="toggleSearchStatus ? 'up' : 'down'"/>
</a>
</a-col>
</span>
</a-row>
@@ -100,18 +106,11 @@
<a-icon type="file-protect"/>
{{ $t('initiateTaskConfirmation') }}
</div>
<div class="operator-text" @click="alterationClick">
<a-icon type="file-search"/>
{{ $t('alteration') }}
</div>
<div class="operator-text" @click="fixedPlateClick">
<a-icon type="bulb"/>
{{ $t('fixedPlate') }}
</div>
</div>
<div style="float: right;margin-top: 1px;" v-if="isDisplay">
<a-popconfirm overlayClassName='popconfirm' placement="bottomRight">
<template slot="title" id="popconfirm">
<div style="height:320px;overflow:scroll;overflow-x: auto;">
<div class="operator-text-title">
<ImportFile :url="url" :projectLibraryId=$route.query.id :isTrue="true" :accept="'.zip'"
@getList="getPersonnelList"/>
@@ -129,7 +128,7 @@
{{ $t('BatchDelete') }}
</div>
<div class="operator-text-title" @click="ExportReportClick">
<a-icon type="export"/>
<a-icon type="export" :rotate="-90"/>
{{ $t('ExportReport') }}
</div>
<div class="operator-text-title" @click="batSettingClick">
@@ -141,9 +140,22 @@
{{ $t('batchSettingPersonnel') }}
</div>
<div class="operator-text-title" @click="questionClick">
<a-icon type="apartment"/>
<a-icon type="sound"/>
{{ $t('question') }}
</div>
<div class="operator-text-title" @click="alterationClick">
<a-icon type="file-search"/>
{{ $t('alteration') }}
</div>
<div class="operator-text-title" @click="fixedPlateClick">
<a-icon type="pushpin"/>
{{ $t('fixedPlate') }}
</div>
<div @click="copyClick" class="operator-text-title">
<a-icon type="copy"/>
{{ $t('copy') }}
</div>
</div>
</template>
<div class="operator-text" style="position: relative">
<span style="position: absolute;left: -13px;top: -4px">...</span>{{ $t('more') }}
@@ -157,10 +169,6 @@
<a-icon type="profile"/>
{{ $t('Transfer') }}
</div>
<div @click="copyClick" class="operator-text">
<a-icon type="copy"/>
{{ $t('copy') }}
</div>
<div @click="handleAdd" class="operator-text">
<a-icon type="plus"/>
{{ $t('add') }}
@@ -486,12 +494,13 @@
mixins: [ResizeColumnProvide,ResizeHeader],
data() {
return {
toggleSearchStatus: false,
roleSwitchingList: [],
listTitle: '',
columnsAll: [
{
title: this.$t('standard'),
align: 'center',
align: 'left',
dataIndex: 'serialNumber',
width: 180,
fixed: 'left',
@@ -499,7 +508,7 @@
},
{
title: this.$t('title'),
align: 'center',
align: 'left',
dataIndex: 'title',
width: 180,
fixed: 'left',
@@ -507,21 +516,21 @@
},
{
title: this.$t('subtitle'),
align: 'center',
align: 'left',
dataIndex: 'subtitle',
ellipsis: true,
width: 180
},
{
title: this.$t('listConfirmationStatus'),
align: 'center',
align: 'left',
dataIndex: 'inventoryAffirmStatusName',
width: 240,
ellipsis: true
},
{
title: this.$t('taskAffirmStatus'),
align: 'center',
align: 'left',
dataIndex: 'taskAffirmStatusName',
width: 240,
ellipsis: true
@@ -533,98 +542,98 @@
// },
{
title: this.$t('zoneOfApplication'),
align: 'center',
align: 'left',
dataIndex: 'region_dictText',
width: 180,
ellipsis: true
},
{
title: this.$t('correspondingStandard'),
align: 'center',
align: 'left',
dataIndex: 'correspondingStandard',
width: 180,
ellipsis: true
},
{
title: this.$t('implementationCategory'),
align: 'center',
align: 'left',
dataIndex: 'implementType_dictText',
width: 180,
ellipsis: true
},
{
title: this.$t('ImplementationDate'),
align: 'center',
align: 'left',
width: 200,
dataIndex: 'xin1Che1Xing2Shi2Shi1Ri4Qi1',
ellipsis: true
},
{
title: this.$t('vehicleInProductionDate'),
align: 'center',
align: 'left',
width: 220,
dataIndex: 'implementTime',
ellipsis: true
},
{
title: this.$t('certificationType'),
align: 'center',
align: 'left',
dataIndex: 'attestationType_dictText',
width: 180,
ellipsis: true
},
{
title: this.$t('certificationLevel'),
align: 'center',
align: 'left',
dataIndex: 'attestationRank_dictText',
width: 180,
ellipsis: true
},
{
title: this.$t('applicableSupplement'),
align: 'center',
align: 'left',
width: 220,
dataIndex: 'applicableSupplement',
ellipsis: true
},
{
title: 'WVTA ID',
align: 'center',
align: 'left',
dataIndex: 'wvtaId',
width: 180,
ellipsis: true
},
{
title: this.$t('areaOfResponsibility'),
align: 'center',
align: 'left',
ellipsis: true,
dataIndex: 'dutyTerritory_dictText',
width: 180
},
{
title: this.$t('regulatoryEngineer'),
align: 'center',
align: 'left',
ellipsis: true,
dataIndex: 'regulationOwnerName',
width: 180
},
{
title: this.$t('certifiedEngineer'),
align: 'center',
align: 'left',
ellipsis: true,
dataIndex: 'homologationEngineerName',
width: 180
},
{
title: this.$t('engineeringInterfacePerson'),
align: 'center',
align: 'left',
ellipsis: true,
dataIndex: 'engineeringInterfacePersonName',
width: 180
},
{
title: this.$t('remarks'),
align: 'center',
align: 'left',
dataIndex: 'remark',
width: 180,
ellipsis: true
@@ -635,7 +644,7 @@
{
title: this.$t('Deliverables'),
dataIndex: 'designDeliverableTemplateName',
align: 'center',
align: 'left',
width: 180,
ellipsis: true,
scopedSlots: { customRender: 'designDeliverableTemplateName' }
@@ -643,28 +652,28 @@
{
title: this.$t('Sponsor'),
dataIndex: 'designInitiatorName',
align: 'center',
align: 'left',
width: 180,
ellipsis: true
},
{
title: this.$t('personLiable'),
dataIndex: 'designDutyName',
align: 'center',
align: 'left',
width: 180,
ellipsis: true
},
{
title: this.$t('TaskCutOffTime'),
dataIndex: 'designDueDate',
align: 'center',
align: 'left',
ellipsis: true,
width: 140
},
{
title: this.$t('descriptionDeliverables'),
dataIndex: 'designRemark',
align: 'center',
align: 'left',
width: 220,
ellipsis: true
}
@@ -676,7 +685,7 @@
{
title: this.$t('Deliverables'),
dataIndex: 'prehomoDeliverableTemplateName',
align: 'center',
align: 'left',
width: 180,
ellipsis: true,
scopedSlots: { customRender: 'prehomoDeliverableTemplateName' }
@@ -684,28 +693,28 @@
{
title: this.$t('Sponsor'),
dataIndex: 'prehomoInitiatorName',
align: 'center',
align: 'left',
width: 180,
ellipsis: true
},
{
title: this.$t('personLiable'),
dataIndex: 'prehomoDutyName',
align: 'center',
align: 'left',
width: 180,
ellipsis: true
},
{
title: this.$t('TaskCutOffTime'),
dataIndex: 'prehomoDueDate',
align: 'center',
align: 'lefft',
width: 140,
ellipsis: true
},
{
title: this.$t('descriptionDeliverables'),
dataIndex: 'prehomoRemark',
align: 'center',
align: 'left',
width: 220,
ellipsis: true
}
@@ -717,7 +726,7 @@
{
title: this.$t('Deliverables'),
dataIndex: 'verifyDeliverableTemplateName',
align: 'center',
align: 'left',
width: 180,
ellipsis: true,
scopedSlots: { customRender: 'verifyDeliverableTemplateName' }
@@ -725,28 +734,28 @@
{
title: this.$t('Sponsor'),
dataIndex: 'verifyInitiatorName',
align: 'center',
align: 'left',
width: 180,
ellipsis: true
},
{
title: this.$t('personLiable'),
dataIndex: 'verifyDutyName',
align: 'center',
align: 'left',
width: 180,
ellipsis: true
},
{
title: this.$t('TaskCutOffTime'),
dataIndex: 'verifyDueDate',
align: 'center',
align: 'left',
ellipsis: true,
width: 140
},
{
title: this.$t('descriptionDeliverables'),
dataIndex: 'verifyRemark',
align: 'center',
align: 'left',
width: 220,
ellipsis: true
}
@@ -754,14 +763,14 @@
},
{
title: this.$t('operation'),
align: 'center',
align: 'left',
fixed: 'right',
width: 240,
scopedSlots: { customRender: 'operation' }
},
{
title: this.$t('operation'),
align: 'center',
align: 'left',
fixed: 'right',
width: 140,
scopedSlots: { customRender: 'operationOne' }
@@ -771,20 +780,20 @@
{
title: this.$t('deliverableTemplate'),
dataIndex: 'fileName',
align: 'center',
align: 'left',
width: 260,
ellipsis: true
},
{
title: this.$t('resultReported'),
dataIndex: 'fileName',
align: 'center',
align: 'left',
width: 260,
ellipsis: true
},
{
title: this.$t('operation'),
align: 'center',
align: 'left',
width: 130,
scopedSlots: { customRender: 'fileOperation' }
}
@@ -1054,6 +1063,9 @@
},
methods: {
...mapGetters(['userInfo']),
handleToggleSearch() {
this.toggleSearchStatus = !this.toggleSearchStatus
},
viewClick(row) {
let roleCodeIndex
if (this.isDisplay) {
@@ -2526,6 +2538,14 @@
display: none !important;
}
//.popconfirm .ant-popover-inner-content{
// padding: 0px 16px;
//}
//
//.popconfirm .ant-popover-message{
// padding: 23px 0 1px;
//}
.ant-table-placeholder {
padding: 0;
border-top: none;
@@ -2536,8 +2556,21 @@
}
.tableList .ant-table-thead > tr > th {
padding: 7px 16px !important;
padding: 0px 16px !important;
font-weight: bolder;
}
.tableList .ant-table-tbody > tr > td{
color: #040B29 ;
}
//.tableList .ant-table-thead > tr{
// padding: 2px 16px !important;
//}
//.tableList .ant-table-thead >tr{
// height: 56px !important;
//}
</style>
<style lang="less">
/* vue-draggable-resizable@2.1.0 begin */