diff --git a/jero-web/src/views/externalReports/index.vue b/jero-web/src/views/externalReports/index.vue index 200150c2b..e49685c2e 100644 --- a/jero-web/src/views/externalReports/index.vue +++ b/jero-web/src/views/externalReports/index.vue @@ -139,7 +139,6 @@ :columns="columns" > - {{ text && text.length > 15 ? text.slice(0, 14) + '...' : text }} @@ -186,30 +185,72 @@ :label-col="labelCol" :wrapper-col="wrapperCol" > - - - - - - - - - - - - - + + +
+
+ * + {{$t('Foldername')}} +
+ + + +
+
+
+ + +
+
+ {{$t('Administrativeprivileges')}} +
+ + + +
+
+
+ + +
+
+ {{$t('Checkthepermissions')}} +
+ + + +
+
+
+ + +
+
+ * + {{$t('Folderorder')}} +
+ + + + +
+
+
@@ -324,6 +365,7 @@ export default { title: this.$t('fileDeclaration'), align: 'center', dataIndex: 'fileDescription', + scopedSlots: { customRender: 'projectName' } }, { title: this.$t('uploadedBy'), @@ -1028,32 +1070,33 @@ export default { .box-title-text { line-height: 1.4; display: flex; - align-items: center; - margin-bottom: 10px; + /*align-items: center;*/ } .title-text { - width: 20%; - min-width: 80px; - color: #000F16; + width: 114px; + text-align: right; display: inline-block; font-weight: 500; font-size: 14px; margin-right: 16px; - margin-top: 3px; - text-align: right; - white-space: nowrap; overflow: hidden; text-overflow: ellipsis; + white-space: nowrap; + height: 42px; + line-height: 48px; } .box-input { display: inline-block; - width: 70%; height: 38px; + width: 100%; +} +.itemModel { + width: calc(100% - 130px); + display: inline-block; margin-top: 2px; } - .add-input { width: 82%; } @@ -1097,6 +1140,10 @@ export default { height: 38px; width: 100%; } +.Required { + color: red; + margin-right: 4px; +} .split-detail { /*height: 100% !important;*/ diff --git a/jero-web/src/views/parameter/parameterexport/components/addModel.vue b/jero-web/src/views/parameter/parameterexport/components/addModel.vue index a9b8f0f65..c45d83779 100644 --- a/jero-web/src/views/parameter/parameterexport/components/addModel.vue +++ b/jero-web/src/views/parameter/parameterexport/components/addModel.vue @@ -213,11 +213,11 @@ export default { Action(url, query).then((res) => { if (res.success) { this.confirmLoading = false - this.$message.success(res.message) + this.$message.success(this.$t('OperationSuccessful')) this.visible = false this.$emit('addModelList') } else { - this.$message.warning(res.message) + this.$message.warning(this.$t('operationFailed')) this.confirmLoading = false } })