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

Merge remote-tracking branch 'origin/dev_third_stage' into dev_third_stage

Browse Source
This commit is contained in:
zyx.net
2022-07-07 09:53:34 +08:00
parent 76e1054cc9 9d27eabd99
commit e935986154
2 changed files with 18 additions and 15 deletions
Download Patch File Download Diff File Expand all files Collapse all files
jero-web/src/views/projectManagement/components/ParameterItemCollectionList.vue
+16 -13
View File
@@ -304,7 +304,7 @@
<!-- 错误数据提示--> <!-- 错误数据提示-->
<a-modal <a-modal
:title="$t('operationFailed')" :title="$t('operationFailed')"
:width="700" :width="860"
v-model="visibleoperationFailed" v-model="visibleoperationFailed"
:maskClosable="false" :maskClosable="false"
:footer="null" :footer="null"
@@ -330,47 +330,47 @@
</div> </div>
</div> </div>
<!-- 认证工程师-提示--> <!-- 认证工程师-提示-->
<div style='font-size: 16px;color: red;display: flex;justify-content: center' v-if='NoEngineer === 1'> <div style='font-size: 16px;color: red;text-align: center' v-if='NoEngineer === 1'>
{{ currentPersonRole =='homo'? $t('certifiedEngineer'): (currentPersonRole =='sdt'? {{ currentPersonRole =='homo'? $t('certifiedEngineer'): (currentPersonRole =='sdt'?
$t('engineeringInterfacePerson'): $t('completedBy')) }}{{$t('Datastatusis')}} $t('engineeringInterfacePerson'): $t('completedBy')) }}{{$t('Datastatusis')}}
<!-- 下发收集时--> <!-- 下发收集时-->
<span v-if='jurisdiction === "HOMOZFSJ"'> <span v-if='jurisdiction === "HOMOZFSJ"' class="text-wraning">
'{{$t('CollectionInitiated')}}'、'{{$t('ReturnedPerson')}}'{{$t('or')}}'{{$t('alteration')}}' '{{$t('CollectionInitiated')}}'、'{{$t('ReturnedPerson')}}'{{$t('or')}}'{{$t('alteration')}}'
</span> </span>
<!-- 同步上报库--> <!-- 同步上报库-->
<span v-else-if='jurisdiction === "HOMOTBSBK"'> <span v-else-if='jurisdiction === "HOMOTBSBK"' class="text-wraning">
'{{$t('Submitted')}}'{{$t('or')}}'{{$t('alteration')}}' '{{$t('Submitted')}}'{{$t('or')}}'{{$t('alteration')}}'
</span> </span>
<!-- 截止时间--> <!-- 截止时间-->
<span v-else-if='jurisdiction === "HOMOJZSJ"'> <span v-else-if='jurisdiction === "HOMOJZSJ"' class="text-wraning">
'{{$t('CollectionInitiated')}}' '{{$t('CollectionInitiated')}}'
</span> </span>
<!-- 分配填写人 --> <!-- 分配填写人 -->
<span v-else-if='jurisdiction === "SDTFPTXR"'> <span v-else-if='jurisdiction === "SDTFPTXR"' class="text-wraning">
'{{$t('handledInterface')}}'{{$t('or')}}'{{$t('Filledreturn')}}' '{{$t('handledInterface')}}'{{$t('or')}}'{{$t('Filledreturn')}}'
</span> </span>
<!-- 引用参数--> <!-- 引用参数-->
<span v-else-if='jurisdiction === "DREYYCS"'> <span v-else-if='jurisdiction === "DREYYCS"' class="text-wraning">
'{{$t('completed')}}'{{$t('or')}}'{{$t('ReturnedEngineer')}}' '{{$t('completed')}}'{{$t('or')}}'{{$t('ReturnedEngineer')}}'
</span> </span>
<!-- 退回--> <!-- 退回-->
<span v-else-if='jurisdiction === "homoTH"'> <span v-else-if='jurisdiction === "homoTH"' class="text-wraning">
{{$t('Submitted')}} {{$t('Submitted')}}
</span> </span>
<span v-else-if='jurisdiction === "sdtTH"'> <span v-else-if='jurisdiction === "sdtTH"' class="text-wraning">
'{{$t('handledInterface')}}'{{$t('or')}}'{{$t('Filledreturn')}}' '{{$t('handledInterface')}}'{{$t('or')}}'{{$t('Filledreturn')}}'
</span> </span>
<span v-else-if='jurisdiction === "dreTH"'> <span v-else-if='jurisdiction === "dreTH"' class="text-wraning">
'{{$t('completed')}}'{{$t('or')}}'{{$t('ReturnedEngineer')}}' '{{$t('completed')}}'{{$t('or')}}'{{$t('ReturnedEngineer')}}'
</span> </span>
<!-- 强制撤回--> <!-- 强制撤回-->
<span v-else-if='jurisdiction === "homoQZTH"'> <span v-else-if='jurisdiction === "homoQZTH"' class="text-wraning">
'{{$t('handledInterface')}}'{{$t('or')}}'{{$t('Filledreturn')}}' '{{$t('handledInterface')}}'{{$t('or')}}'{{$t('Filledreturn')}}'
</span> </span>
<span v-else-if='jurisdiction === "sdtQZTH"'> <span v-else-if='jurisdiction === "sdtQZTH"' class="text-wraning">
{{$t('completed')}} {{$t('completed')}}
</span> </span>
<span v-else-if='jurisdiction === "dreQZTH"'> <span v-else-if='jurisdiction === "dreQZTH"' class="text-wraning">
{{$t('Submitted')}} {{$t('Submitted')}}
</span> </span>
{{$t('timeoperation')}} {{$t('timeoperation')}}
@@ -1674,4 +1674,7 @@
} }
} }
} }
.text-wraning{
word-break: break-word;
}
</style> </style>
jero-web/src/views/projectManagement/components/TaskParameterCollection.vue
+2 -2
View File
@@ -155,14 +155,14 @@
title: this.$t('collectionCompletionTime'), title: this.$t('collectionCompletionTime'),
align: 'center', align: 'center',
dataIndex: 'finishTime', dataIndex: 'finishTime',
width: 160, width: 180,
ellipsis: true, ellipsis: true,
scopedSlots: { customRender: 'collectionCompletionTime' } scopedSlots: { customRender: 'collectionCompletionTime' }
}, },
{ {
title: this.$t('Version'), title: this.$t('Version'),
align: 'center', align: 'center',
width: 50, width: 80,
ellipsis: true, ellipsis: true,
dataIndex: 'version' dataIndex: 'version'
}, },