diff --git a/jero-web/src/components/tableCollection/index.vue b/jero-web/src/components/tableCollection/index.vue index 598cb8ea0..188eaeab6 100644 --- a/jero-web/src/components/tableCollection/index.vue +++ b/jero-web/src/components/tableCollection/index.vue @@ -15,28 +15,28 @@ sticky :columns="columns" :rowClassName="rowClassName" - @onHeaderRow='onHeaderRow' + @onHeaderRow="onHeaderRow" > {{ text }} - {{text}} + {{ text }}
- - {{ item.db_field_txt }} - {{$t('See')}} + + {{ item.db_field_txt }} + {{ $t('See') }}
- {{$t('See')}} + {{ $t('See') }} {{ text && text.length > 8 ? text.slice(0, 7) + '...' : text }} @@ -47,14 +47,16 @@ {{ (record.dataValue == null || record.dataValue == 'undefined')? '--': record.dataValue}} + @click="areaOfResponsibility(record)">{{ (record.dataValue == null || record.dataValue == 'undefined') ? '--' : record.dataValue }} - {{ (record.dataValue == null || record.dataValue == 'undefined')? '--': record.dataValue}} + {{ (record.dataValue == null || record.dataValue == 'undefined') ? '--' : record.dataValue }} - {{ (record.dataValue == null || record.dataValue == 'undefined')? '--': record.dataValue}} + {{ (record.dataValue == null || record.dataValue == 'undefined') ? '--' : record.dataValue }} @@ -62,27 +64,36 @@ - {{ (record.dataValue == null || record.dataValue == 'undefined' || record.dataValue == '')? '--': record.dataValue }} + {{ (record.dataValue == null || record.dataValue == 'undefined' || record.dataValue == '') ? '--' : record.dataValue + }} - {{ (record.dataValue == null || record.dataValue == 'undefined' || record.dataValue == '')? '--': record.dataValue }} + {{ (record.dataValue == null || record.dataValue == 'undefined' || record.dataValue == '') ? '--' : record.dataValue + }} - {{ (record.dataValue == null || record.dataValue == 'undefined' || record.dataValue == '')? '--': record.dataValue }} + {{ (record.dataValue == null || record.dataValue == 'undefined' || record.dataValue == '') ? '--' : record.dataValue + }} - + @collectionForm="collectionForm" />
+
+ {{ $t('explain') + ': ' }} + {{ $t('parameterCollectionDescription') }} +
- - - - + + + @@ -125,27 +136,27 @@ - - - - + + + @@ -158,7 +169,7 @@ @input="handleInput('queryzr')" :placeholder="$t('PleaseSelect')+$t('areaOfResponsibility')" :type="'select'" - :triggerChange="false" :dictCode="'duty_territory'"/> + :triggerChange="false" :dictCode="'duty_territory'" /> @@ -167,9 +178,9 @@ @@ -183,7 +194,7 @@ @ok="handleOk" @cancel="handleCancel" > - + @@ -220,48 +231,48 @@ - +
- {{$t('configurationName')}}: + {{ $t('configurationName') }}: {{configDetail.configName}} + >{{ configDetail.configName }}
- {{$t('Model')}}: + {{ $t('Model') }}: {{configDetail.carType}} + >{{ configDetail.carType }}
- {{$t('electricMachinery')}}: + {{ $t('electricMachinery') }}: {{configDetail.motor}} + >{{ configDetail.motor }}
- {{$t('Version')}}: + {{ $t('Version') }}: {{configDetail.version}} + >{{ configDetail.version }}
- {{$t('Battery')}}: + {{ $t('Battery') }}: {{configDetail.battery}} + >{{ configDetail.battery }}
- +
- {{$t('ParameterDescription')}}: + {{ $t('ParameterDescription') }}: {{this.description}} + >{{ this.description }}
@@ -270,1148 +281,1159 @@ - diff --git a/jero-web/src/views/projectManagement/components/ParameterItemCollectionList.vue b/jero-web/src/views/projectManagement/components/ParameterItemCollectionList.vue index 83806afa0..630d05229 100644 --- a/jero-web/src/views/projectManagement/components/ParameterItemCollectionList.vue +++ b/jero-web/src/views/projectManagement/components/ParameterItemCollectionList.vue @@ -3,7 +3,7 @@
- {{$t('ParameteItemCollectionList')}}({{this.$route.query.type == '1' ? $t(this.$route.query.projectName) : $t(this.$route.query.projectName.slice(0,-3)) + '-' + $t(this.$route.query.projectVersion)}}) — {{$t(this.$route.query.title)}} — {{$t(this.$route.query.version)}} + {{ $t('ParameteItemCollectionList') }}({{ this.$route.query.type == '1' ? $t(this.$route.query.projectName) : $t(this.$route.query.projectName.slice(0, -3)) + '-' + $t(this.$route.query.projectVersion) }}) — {{ $t(this.$route.query.title) }} — {{ $t(this.$route.query.version) }}
@@ -22,8 +22,8 @@
- - {{rolename}} + + {{ rolename }}
@@ -33,13 +33,13 @@
-
+
- +
- {{$t('ParameterNo')}} + {{ $t('ParameterNo') }}
@@ -48,7 +48,7 @@
- {{$t('NParameterName')}} + {{ $t('NParameterName') }}
@@ -68,7 +68,7 @@
- {{$t('NareaOfResponsibility')}} + {{ $t('NareaOfResponsibility') }}
- {{ item.value}} + {{ item.value }} @@ -94,18 +94,18 @@
- {{$t('certificationCategory')}} + {{ $t('certificationCategory') }}
+ :triggerChange="false" :dictCode="'cert_category'" />
- {{$t('dre')}} + {{ $t('dre') }}
@@ -114,7 +114,7 @@
- {{$t('sdt')}} + {{ $t('sdt') }}
@@ -123,7 +123,7 @@
- {{$t('status')}} + {{ $t('status') }}
- {{ item.text}} + {{ item.text }} @@ -148,13 +148,15 @@ {{ !toggleSearchStatus ? $t('open') : $t('away') }} - + - {{$t('reset')}} - {{$t('query')}} + {{ $t('reset') }} + {{ $t('query') }} + :fieldList="fieldList" /> @@ -169,12 +171,12 @@ - + @@ -257,66 +259,66 @@
- - {{$t('distributionAndCollection')}} + + {{ $t('distributionAndCollection') }}
- - {{$t('Assignedby')}} + + {{ $t('Assignedby') }}
- - {{$t('dataExport')}} + + {{ $t('dataExport') }}
- - {{$t('Derivedlist')}} + + {{ $t('Derivedlist') }}
- - {{$t('referenceparameter')}} + + {{ $t('referenceparameter') }}
- - {{$t('tempSave')}} + + {{ $t('tempSave') }}
- - {{$t('submit')}} + + {{ $t('submit') }}
- - {{$t('sendBack')}} + + {{ $t('sendBack') }}
- +
- - {{$t('export')}} + + {{ $t('export') }}
- - {{$t('CompulsoryWithdrawal')}} + + {{ $t('CompulsoryWithdrawal') }}
@@ -347,7 +349,7 @@
- + {{ $t('customize') }}
@@ -365,53 +367,50 @@
- - {{$t('dataExport')}} + + {{ $t('dataExport') }}
- - {{$t('Derivedlist')}} + + {{ $t('Derivedlist') }}
- -
-
- {{$t('explain')+': '}} - {{$t('parameterCollectionDescription')}} + @listReset="listReset" @LoginUserType="LoginUserType" />
+
- - + + - + - - - + + + @@ -425,64 +424,65 @@ -
- {{$t('Attentionfreeze')}} +
+ {{ $t('Attentionfreeze') }}
- - + + - - + + - + - + - - + + - - + + - - + + - + @@ -521,7 +521,7 @@
* - {{$t('roleSwitching')}} + {{ $t('roleSwitching') }}
- - {{$t('NiOnumberis')}} + + {{ $t('NiOnumberis') }} - - {{ item.nioNumber }}、 + + {{ item.nioNumber }}、 - - {{$t('Filledperson')}} + + {{ $t('Filledperson') }} -
-
{{$t('NiOnumberis')}}{{ item.nioNumber }},{{$t('Statusis')}}{{ item.state }},{{$t('NoOperationPermissionForthisbutton')}}。 +
+
{{ $t('NiOnumberis') }}{{ item.nioNumber }},{{ $t('Statusis') }}{{ item.state }},{{ $t('NoOperationPermissionForthisbutton') }}。
-
- {{ currentPersonRole =='homo'? $t('certifiedEngineer'): (currentPersonRole =='sdt'? - $t('engineeringInterfacePerson'): $t('completedBy')) }}{{jurisdiction === 'homoQZTH'? $t('Datastateexcept') - : $t('Datastatusis')}} +
+ {{ currentPersonRole == 'homo' ? $t('certifiedEngineer') : (currentPersonRole == 'sdt' ? + $t('engineeringInterfacePerson') : $t('completedBy')) + }}{{ jurisdiction === 'homoQZTH' ? $t('Datastateexcept') + : $t('Datastatusis') }} - '{{$t('CollectionInitiated')}}'、'{{$t('ReturnedPerson')}}'{{$t('or')}}'{{$t('alteration')}}' + '{{ $t('CollectionInitiated') }}'、'{{ $t('ReturnedPerson') }}'{{ $t('or') }}'{{ $t('alteration') }}' - '{{$t('Submitted')}}'{{$t('or')}}'{{$t('alteration')}}' + '{{ $t('Submitted') }}'{{ $t('or') }}'{{ $t('alteration') }}' - '{{$t('CollectionInitiated')}}' + '{{ $t('CollectionInitiated') }}' - '{{$t('handledInterface')}}'{{$t('or')}}'{{$t('Filledreturn')}}' + '{{ $t('handledInterface') }}'{{ $t('or') }}'{{ $t('Filledreturn') }}' - '{{$t('completed')}}''{{$t('or')}}'{{$t('Filledreturn')}}''{{$t('or')}}'{{$t('ReturnedEngineer')}}' + '{{ $t('completed') }}''{{ $t('or') }}'{{ $t('Filledreturn') }}''{{ $t('or') }}'{{ $t('ReturnedEngineer') }}' - '{{$t('completed')}}'{{$t('or')}}'{{$t('ReturnedEngineer')}}'{{$t('or')}}'{{$t('alteration')}}' + '{{ $t('completed') }}'{{ $t('or') }}'{{ $t('ReturnedEngineer') }}'{{ $t('or') }}'{{ $t('alteration') }}' - - {{$t('Submitted')}} + + {{ $t('Submitted') }} -

'{{$t('handledInterface')}}'

- {{$t('or')}} -

'{{$t('Filledreturn')}}'

+

'{{ $t('handledInterface') }}'

+ {{ $t('or') }} +

'{{ $t('Filledreturn') }}'

-

'{{$t('completed')}}'

- {{$t('or')}} -

'{{$t('ReturnedEngineer')}}'

+

'{{ $t('completed') }}'

+ {{ $t('or') }} +

'{{ $t('ReturnedEngineer') }}'

-

'{{$t('SynchronizedLibrary')}}'

- {{$t('or')}} -

'{{$t('CollectionInitiated')}}'

+

'{{ $t('SynchronizedLibrary') }}'

+ {{ $t('or') }} +

'{{ $t('CollectionInitiated') }}'

- - {{$t('completed')}} + + {{ $t('completed') }} - - {{$t('Submitted')}} + + {{ $t('Submitted') }} - {{$t('timeoperation')}} + {{ $t('timeoperation') }}
@@ -653,8 +654,8 @@ :loading="loading" > - {{$t('download')}} - {{$t('delete')}} + {{ $t('download') }} + {{ $t('delete') }} @@ -685,29 +686,29 @@ @cancel="handleCancel" >
-
+
* - {{$t('exportOption')}} + {{ $t('exportOption') }}
- {{$t('includeTitle')}} + {{ $t('includeTitle') }} - {{$t('Notitleincluded')}} + {{ $t('Notitleincluded') }} @@ -727,9 +728,9 @@ > -
- {{$t('Exportsuccessexportlist')}} + {{ $t('Exportsuccessexportlist') }} @@ -737,1024 +738,785 @@ - {{this.$t('pleaseWaitWhileRunning')}} - + {{ this.$t('pleaseWaitWhileRunning') }} +
- \ No newline at end of file