diff --git a/jero-web/src/common/lang/en-us.js b/jero-web/src/common/lang/en-us.js index 7affbefb3..6aca60ca4 100644 --- a/jero-web/src/common/lang/en-us.js +++ b/jero-web/src/common/lang/en-us.js @@ -601,7 +601,8 @@ module.exports = { selectSplitListDisplay: 'Please select whether to split the document list for display', selectDisplayList: 'Please select whether to display in list', documentSplitDisplay: 'Document splitting module display', - VirtualListName: 'Market Regulation List', + VirtualListName: 'Market Regulation List Name', + marketCertificationListName:'Market Certification List Name', CertificationListName:'Homologation List', listStatus: 'List Status', creater: 'Created by', @@ -1925,4 +1926,5 @@ module.exports = { processInitiationOne:'Process Initiation', taskHandlingOne:'Task Handling', taskReview:'Task Review', + maintenanceTemplate:'Maintenance template', } \ No newline at end of file diff --git a/jero-web/src/common/lang/zh-cn.js b/jero-web/src/common/lang/zh-cn.js index 963d9d20c..f7e2c1205 100644 --- a/jero-web/src/common/lang/zh-cn.js +++ b/jero-web/src/common/lang/zh-cn.js @@ -612,6 +612,7 @@ module.exports = { selectDisplayList: '请选择是否列表展示', documentSplitDisplay: '文档拆分模块展示', VirtualListName: '市场法规清单名称', + marketCertificationListName: '市场认证清单名称', CertificationListName: '认证清单名称', VirtualList: '市场清单', listStatus: '清单状态', @@ -3881,4 +3882,5 @@ module.exports = { processInitiationOne:'任务发起', taskHandlingOne:'任务办理', taskReview:'任务审查', + maintenanceTemplate:'维护模板', } \ No newline at end of file diff --git a/jero-web/src/components/CollectionType/index.vue b/jero-web/src/components/CollectionType/index.vue index 8c6ff90ca..93a9fda3c 100644 --- a/jero-web/src/components/CollectionType/index.vue +++ b/jero-web/src/components/CollectionType/index.vue @@ -5,7 +5,7 @@
+ style="display: inline-block" class="valflexOne">
@@ -124,7 +124,7 @@
+ style="display: inline-block" class="valflexOne">
@@ -164,7 +164,7 @@
+ style="display: inline-block" class="valflexOne">
+ style="display: inline-block" class="valflexOne">
{{ (itemval.dataValue === 'null' || itemval.dataValue === '' || - itemval.dataValue == null) ? $t('clickUpload') : $t('viewUploadedFiles') }} + itemval.dataValue == null) ? $t('clickUpload') : $t('viewFileOne') }}
@@ -255,7 +255,7 @@
+ style="display: inline-block" class="valflexTwo">
+ class="valflexTwo">
+ style="display: inline-block" class="valflexTwo">
@@ -624,7 +624,7 @@ {{ (itemval.dataValue === 'null' || itemval.dataValue === '' || - itemval.dataValue == null) ? $t('clickUpload') : $t('viewUploadedFiles') }} + itemval.dataValue == null) ? $t('clickUpload') : $t('viewFileOne') }}
@@ -645,7 +645,7 @@
+ :key="index1" style="display: inline-block" class="valflexTwo">
{{ (itemval.dataValue === 'null' || itemval.dataValue === '' || - itemval.dataValue == null) ? $t('clickUpload') : $t('viewUploadedFiles') }} + itemval.dataValue == null) ? $t('clickUpload') : $t('viewFileOne') }}
@@ -687,7 +687,7 @@
+ class="valflexTwo">
{{ (itemval.dataValue === 'null' || itemval.dataValue === '' || - itemval.dataValue == null) ? $t('clickUpload') : $t('viewUploadedFiles') }} + itemval.dataValue == null) ? $t('clickUpload') : $t('viewFileOne') }}
@@ -728,7 +728,7 @@
+ style="display: inline-block" class="valflexThere">
{{ (itemval.dataValue === 'null' || itemval.dataValue === '' || - itemval.dataValue == null) ? $t('clickUpload') : $t('viewUploadedFiles') }} + itemval.dataValue == null) ? $t('clickUpload') : $t('viewFileOne') }}
@@ -1188,12 +1188,21 @@ export default { flex-direction: column; } -.valflex { +.valflexOne { + width: calc(100% - 16px); + margin-right: 6px; + margin-bottom: 6px; +} +.valflexTwo { + width: calc(50% - 16px); + margin-right: 6px; + margin-bottom: 6px; +} +.valflexThere { width: calc(33% - 16px); margin-right: 6px; margin-bottom: 6px; } - .iconRow, .valflex { display: flex; } diff --git a/jero-web/src/components/CollectionTypeDisabled/index.vue b/jero-web/src/components/CollectionTypeDisabled/index.vue index 4dfcab9c5..33d578313 100644 --- a/jero-web/src/components/CollectionTypeDisabled/index.vue +++ b/jero-web/src/components/CollectionTypeDisabled/index.vue @@ -5,7 +5,7 @@
+ style="display: inline-block" class='valflexOne'>
@@ -112,7 +112,7 @@
+ style="display: inline-block" class='valflexOne'>
@@ -148,7 +148,7 @@
+ style="display: inline-block" class='valflexOne'>
+ style="display: inline-block" class='valflexOne'>
{{ (itemval.dataValue === 'null' || itemval.dataValue === '' || - itemval.dataValue == null) ? $t('clickUpload') : $t('viewUploadedFiles')}} + itemval.dataValue == null) ? $t('clickUpload') : $t('viewFileOne')}}
@@ -230,7 +230,7 @@
+ style="display: inline-block" class='valflexTwo'>
+ class='valflexTwo'>
+ style="display: inline-block" class='valflexTwo'>
@@ -566,7 +566,7 @@ {{ (itemval.dataValue === 'null' || itemval.dataValue === '' || - itemval.dataValue == null) ? $t('clickUpload') : $t('viewUploadedFiles')}} + itemval.dataValue == null) ? $t('clickUpload') : $t('viewFileOne')}}
@@ -584,7 +584,7 @@
+ :key='index1' style="display: inline-block" class='valflexTwo'>
{{ (itemval.dataValue === 'null' || itemval.dataValue === '' || - itemval.dataValue == null) ? $t('clickUpload') : $t('viewUploadedFiles')}} + itemval.dataValue == null) ? $t('clickUpload') : $t('viewFileOne')}}
@@ -623,7 +623,7 @@
+ class='valflexTwo'>
{{ (itemval.dataValue === 'null' || itemval.dataValue === '' || - itemval.dataValue == null) ? $t('clickUpload') : $t('viewUploadedFiles')}} + itemval.dataValue == null) ? $t('clickUpload') : $t('viewFileOne')}}
@@ -661,7 +661,7 @@
+ style="display: inline-block" class='valflexThere'>
{{ (itemval.dataValue === 'null' || itemval.dataValue === '' || - itemval.dataValue == null) ? $t('clickUpload') : $t('viewUploadedFiles')}} + itemval.dataValue == null) ? $t('clickUpload') : $t('viewFileOne')}}
@@ -1060,7 +1060,17 @@ flex-direction: column; } - .valflex { + .valflexOne { + width: calc(100% - 16px); + margin-right: 6px; + margin-bottom: 6px; + } + .valflexTwo { + width: calc(50% - 16px); + margin-right: 6px; + margin-bottom: 6px; + } + .valflexThere { width: calc(33% - 16px); margin-right: 6px; margin-bottom: 6px; diff --git a/jero-web/src/components/tableCollection/index.vue b/jero-web/src/components/tableCollection/index.vue index 2565d1db8..598cb8ea0 100644 --- a/jero-web/src/components/tableCollection/index.vue +++ b/jero-web/src/components/tableCollection/index.vue @@ -804,7 +804,7 @@ align: 'left', ellipsis: true, sorter: res.sort, - width: 600 + width: 300 }) num++ this.content.push(res) @@ -879,7 +879,7 @@ }) this.columns = [...this.columns] this.colIndexs.forEach((item) => { - this.minWidthColumns.push([this.columns[item], 500]) + this.minWidthColumns.push([this.columns[item], 300]) }) this.$emit('getcustomizeList', checkedList) this.$forceUpdate() @@ -905,7 +905,7 @@ align: 'left', ellipsis: true, sorter: res.sort, - width: 600 + width: 300 }) num++ this.content.push(res) @@ -971,7 +971,7 @@ }) this.columns = [...this.columns] this.colIndexs.forEach((item) => { - this.minWidthColumns.push([this.columns[item], 500]) + this.minWidthColumns.push([this.columns[item], 300]) }) this.$emit('getcustomizeList', checkedList) this.$forceUpdate() @@ -1256,6 +1256,24 @@ .textData { font-family: cursive; } + .nio-drag-handler { + position: absolute; + right: 0; + top: 0; + height: 100%; + width: 5px; + z-index: 1; + border-right: 1px #e8e8e8 solid; + } + .nio-drag-handler:hover, + .nio-drag-handler:focus{ + cursor: col-resize!important; + border-right: 2px solid #0bd9d9!important; + } + .nio-header-th { + position: relative; + isolation: isolate; + } \ No newline at end of file diff --git a/jero-web/src/views/parameter/parameterlist/index.vue b/jero-web/src/views/parameter/parameterlist/index.vue index a6dd547cd..0425c38e7 100644 --- a/jero-web/src/views/parameter/parameterlist/index.vue +++ b/jero-web/src/views/parameter/parameterlist/index.vue @@ -41,7 +41,7 @@
-
+
{{$t('newlyAdded')}} @@ -85,8 +85,12 @@ {{ text && text.length > 10 ? text.slice(0, 9) + '...' : text }} - {{$t('edit')}} - {{$t('deleteLib')}} + {{$t('edit')}} + {{$t('deleteLib')}} + {{$t('view')}}
@@ -341,6 +345,17 @@ export default { } }) }, + view(item){ + let _this = this + getAction(_this.url.queryById, { id: item.id }).then((res) => { + if (res.success) { + this.certCategoryParamsInfoEOList = res.result.certCategoryParamsInfoEOList + this.$refs.addModelRef.viewModel(JSON.parse(JSON.stringify(res.result))) + } else { + this.$message.warning(res.message) + } + }) + }, //删除 deleteLib(val) { let _this = this diff --git a/jero-web/src/views/projectManagement/components/parameterCollectionProgress.vue b/jero-web/src/views/projectManagement/components/parameterCollectionProgress.vue index 5bbfbc3a9..3e7bd272a 100644 --- a/jero-web/src/views/projectManagement/components/parameterCollectionProgress.vue +++ b/jero-web/src/views/projectManagement/components/parameterCollectionProgress.vue @@ -91,16 +91,27 @@ syncReportpercentage: [], syncReportquantity: [], url: { - getProjectDetailsStatistics: '/project/projectLibraryBase/getProjectDetailsStatisticsCollectManifestData' - } + getProjectDetailsStatistics: '/project/projectLibraryBase/getProjectDetailsStatisticsCollectManifestData', + queryById: 'project/projectLibraryBase/queryById', + }, + queryForm:{}, } }, mounted() { - this.getoptions() this.getEcharts() - + this.getForm() }, methods: { + getForm() { + getAction(this.url.queryById, { id: this.$route.query.id }).then((res) => { + if (res.success) { + this.queryForm = res.result[0] || {} + } else { + this.queryForm = {} + } + this.getoptions() + }) + }, getData(item) { getAction(this.url.getProjectDetailsStatistics, { paramsManifestId: item }).then((res) => { if (res.success) { @@ -124,7 +135,7 @@ id = this.$route.query.parentId ? this.$route.query.parentId : this.$route.query.id // id = this.$route.query.id } - getAction('project/projectLibraryBase/getProjectDetailsStatisticsCollectManifestLabel', { id: id }).then((res) => { + getAction('project/projectLibraryBase/getProjectDetailsStatisticsCollectManifestLabel', { id: id ,projectVersion:this.queryForm.projectVersion}).then((res) => { if (res.success) { this.options = res.result this.queryParam.ctype = this.options[0].value diff --git a/jero-web/src/views/virtualAuthenticationList/virtualAuthenticationListDesign/certificationListMaintenance.vue b/jero-web/src/views/virtualAuthenticationList/virtualAuthenticationListDesign/certificationListMaintenance.vue index 803374ea9..974aacf88 100644 --- a/jero-web/src/views/virtualAuthenticationList/virtualAuthenticationListDesign/certificationListMaintenance.vue +++ b/jero-web/src/views/virtualAuthenticationList/virtualAuthenticationListDesign/certificationListMaintenance.vue @@ -20,8 +20,8 @@
- - {{$t('CertificationListName')}} + + {{$t('marketCertificationListName')}} {{$route.query.name}} @@ -729,7 +729,7 @@ font-weight: 400; color: #6F7385; display: inline-block; - width: 100px; + width: 130px; text-overflow: ellipsis; white-space: nowrap; overflow: hidden;