From 7255f9d3595d79a4385d6b16f295950f2f82459e Mon Sep 17 00:00:00 2001 From: qq787203167 <787203167@qq.com> Date: Tue, 17 May 2022 12:28:49 +0800 Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E8=99=9A=E6=8B=9F=E6=B8=85?= =?UTF-8?q?=E5=8D=95bug?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- jero-web/src/App.vue | 10 + jero-web/src/common/lang/en-us.js | 2 +- jero-web/src/common/lang/zh-cn.js | 2 +- jero-web/src/components/OcrAddForm/index.vue | 6 +- .../src/components/SplitBatForm/index.vue | 6 +- jero-web/src/components/addForm/index.vue | 6 +- .../src/components/libraryAddForm/index.vue | 6 +- .../splitting/modules/SplitAddForm.vue | 4 +- .../virtualList/components/batSetting.vue | 6 +- .../virtualList/components/editModel.vue | 26 ++- .../ParameterTemplate/components/addModel.vue | 2 +- .../parameterlist/components/addModel.vue | 4 +- .../projectManagement/components/addModel.vue | 4 +- .../components/batSetting.vue | 2 +- .../components/listEditModel.vue | 6 +- .../components/listOfRelevantPersonnel.vue | 2 +- .../components/settingList.vue | 2 +- .../projectManagement/dialog/configure.vue | 2 +- .../projectStatusBoard/index.vue | 175 +++++++++--------- 19 files changed, 146 insertions(+), 127 deletions(-) diff --git a/jero-web/src/App.vue b/jero-web/src/App.vue index 8834ccdf6..5b0de0a85 100644 --- a/jero-web/src/App.vue +++ b/jero-web/src/App.vue @@ -132,4 +132,14 @@ cursor: not-allowed !important; } + .itemModel-multi { + width: calc(100% - 130px)!important; + display: inline-block!important; + margin-top: 2px!important; + height: 40px!important; + } + + .itemModel-multi .ant-form-explain, .ant-form-extra { + margin-top: -10px; + } \ No newline at end of file diff --git a/jero-web/src/common/lang/en-us.js b/jero-web/src/common/lang/en-us.js index dff2d1037..f4cfa8b04 100644 --- a/jero-web/src/common/lang/en-us.js +++ b/jero-web/src/common/lang/en-us.js @@ -804,7 +804,7 @@ module.exports = { Deadline: 'Deadline', toBeConfirmed: 'To be confirmed', designComplianceReview: 'Confirm design conformance', - preHomeConfirmation: 'PreHomo confirmation', + preHomeConfirmation: 'Pre-Homo confirmation', verificationComplianceReview: 'Verify conformance validation', Deployment: 'Deployment', pleaseDesignConformityConfirmation: 'Please complete the data of design conformity confirmation', diff --git a/jero-web/src/common/lang/zh-cn.js b/jero-web/src/common/lang/zh-cn.js index c0f6d1d8c..15875d4e4 100644 --- a/jero-web/src/common/lang/zh-cn.js +++ b/jero-web/src/common/lang/zh-cn.js @@ -811,7 +811,7 @@ module.exports = { number: '序号', Deadline: '截止时间', designComplianceReview: '设计符合性确认', - preHomeConfirmation: 'PreHomo确认', + preHomeConfirmation: 'Pre-Homo确认', verificationComplianceReview: '验证符合性确认', pleaseDesignConformityConfirmation: '请补全设计符合性确认的数据', pleaseConfirmedByPrehomo: '请补全 PreHomo确认的数据', diff --git a/jero-web/src/components/OcrAddForm/index.vue b/jero-web/src/components/OcrAddForm/index.vue index 9aa8fecd9..ee84c9eb9 100644 --- a/jero-web/src/components/OcrAddForm/index.vue +++ b/jero-web/src/components/OcrAddForm/index.vue @@ -25,7 +25,7 @@ {{item.db_field_txt}} - + {{item.db_field_en_name}}
--> {{item.db_field_txt}} - + {{item.db_field_en_name}}
--> {{item.db_field_txt}} - + {{item.db_field_en_name}}
--> {{item.db_field_txt}} - + * {{item.db_field_txt}} - + * {{item.db_field_txt}} - + * {{item.db_field_txt}} - + * {{item.db_field_txt}} - + * {{item.db_field_txt}} - + * {{item.db_field_txt}} - + {{$t('zoneOfApplication')}} - + {{$t('scopeOfApplication')}} - +
+ * {{$t('areaOfResponsibility')}}
- +
+ * {{$t('certificationLevel')}}
@@ -249,7 +251,7 @@ {{$t('zoneOfApplication')}}
- + @@ -553,7 +555,7 @@ trigger: 'blur' } ], - applicableSupplement:[ + applicableSupplement: [ { max: 100, message: this.$t('applicableSupplement') + this.$t('cannotExceed') + 100 + this.$t('Characters'), @@ -566,6 +568,20 @@ message: this.$t('remarks') + this.$t('cannotExceed') + 300 + this.$t('Characters'), trigger: 'blur' } + ], + attestationRank: [ + { + required: true, + message: this.$t('certificationLevel') + this.$t('cannotEmpty'), + trigger: 'change' + } + ], + dutyTerritory: [ + { + required: true, + message: this.$t('areaOfResponsibility') + this.$t('cannotEmpty'), + trigger: 'change' + } ] }, formInline: {}, @@ -672,7 +688,7 @@ .formAdd .ant-form-item-control-wrapper { display: inline-block; - width: calc(100% - 130px); + width: 100%; } /*.formAdd .ant-form-item {*/ @@ -814,7 +830,7 @@ position: absolute; bottom: 0; width: 100%; - z-index:100; + z-index: 100; border-top: 1px solid #e8e8e8; padding: 10px 16px; text-align: right; diff --git a/jero-web/src/views/parameter/ParameterTemplate/components/addModel.vue b/jero-web/src/views/parameter/ParameterTemplate/components/addModel.vue index 6b00a5848..48460962b 100644 --- a/jero-web/src/views/parameter/ParameterTemplate/components/addModel.vue +++ b/jero-web/src/views/parameter/ParameterTemplate/components/addModel.vue @@ -207,7 +207,7 @@ export default { .formAdd .ant-form-item-control-wrapper { display: inline-block; - width: calc(100% - 130px); + width: 100%; } /*.formAdd .ant-form-item {*/ diff --git a/jero-web/src/views/parameter/parameterlist/components/addModel.vue b/jero-web/src/views/parameter/parameterlist/components/addModel.vue index 2c75fad57..71b4cab15 100644 --- a/jero-web/src/views/parameter/parameterlist/components/addModel.vue +++ b/jero-web/src/views/parameter/parameterlist/components/addModel.vue @@ -139,7 +139,7 @@ {{$t('certificationCategory')}}
- + * {{$t('targetMarket')}} - + {{$t('areaOfResponsibility')}} - + {{$t('zoneOfApplication')}} - + @@ -1081,7 +1081,7 @@ .formAdd .ant-form-item-control-wrapper { display: inline-block; - width: calc(100% - 130px); + width: 100%; } .itemModel .ant-form-item-control-wrapper { diff --git a/jero-web/src/views/projectManagement/components/listOfRelevantPersonnel.vue b/jero-web/src/views/projectManagement/components/listOfRelevantPersonnel.vue index 5251da81f..654908e3b 100644 --- a/jero-web/src/views/projectManagement/components/listOfRelevantPersonnel.vue +++ b/jero-web/src/views/projectManagement/components/listOfRelevantPersonnel.vue @@ -68,7 +68,7 @@ {{$t('areaOfResponsibility')}} - + {{$t('regulatoryCertificationTaskPlan')}}
-
- +
+
+ 2022-10 +
+
+ 2022-10 +
+
+ 2022-10 +
+
+ 2022-10 +
+
+ 2022-10 +
+
+ 2022-10 +
+
+ 2022-10 +
+
+ 2022-10 +
+
+
+
111111
+
哈哈哈
+
哈哈哈
+
哈哈哈
+
+
+
+ + + + +
+
+
+
@@ -159,7 +199,6 @@ }, mounted() { this.getList() - this.getEcharts() }, methods: { searchQuery() { @@ -180,93 +219,6 @@ this.dataSource = [] } }) - }, - getEcharts() { - var chartDom = document.getElementById('main') - var myChart = echarts.init(chartDom) - var option - -// prettier-ignore - const hours = [ - '12a', '1a', '2a', '3a', '4a', '5a', '6a', - '7a', '8a', '9a', '10a', '11a', - '12p', '1p', '2p', '3p', '4p', '5p', - '6p', '7p', '8p', '9p', '10p', '11p' - ] -// prettier-ignore - const days = [ - 'Saturday', 'Friday', 'Thursday', - 'Wednesday', 'Tuesday', 'Monday', 'Sunday' - ] -// prettier-ignore - const data = [[0, 5, 2], [0, 1, 1], [0, 2, 0], [0, 3, 0], [0, 4, 0], - [0, 5, 0], [0, 6, 0], [0, 7, 0], [0, 8, 0], [0, 9, 0], [0, 10, 0], - [0, 11, 2], [0, 12, 4], [0, 13, 1], [0, 14, 1], [0, 15, 3], - [0, 16, 4], [0, 17, 6], [0, 18, 4], [0, 19, 4], [0, 20, 3], [0, 21, 3], - [0, 22, 2], [0, 23, 5], [1, 0, 7], [1, 1, 0], [1, 2, 0], - [1, 3, 0], [1, 4, 0], [1, 5, 0], [1, 6, 0], [1, 7, 0], [1, 8, 0], [1, 9, 0], - [1, 10, 5], [1, 11, 2], [1, 12, 2], [1, 13, 6], [1, 14, 9], - [1, 15, 11], [1, 16, 6], [1, 17, 7], [1, 18, 8], [1, 19, 12], [1, 20, 5], - [1, 21, 5], [1, 22, 7], [1, 23, 2], [2, 0, 1], [2, 1, 1], [2, 2, 0], - [2, 3, 0], [2, 4, 0], [2, 5, 0], [2, 6, 0], [2, 7, 0], [2, 8, 0], [2, 9, 0], - [2, 10, 3], [2, 11, 2], [2, 12, 1], [2, 13, 9], [2, 14, 8], [2, 15, 10], [2, 16, 6], - [2, 17, 5], [2, 18, 5], [2, 19, 5], [2, 20, 7], [2, 21, 4], [2, 22, 2], [2, 23, 4], - [3, 0, 7], [3, 1, 3], [3, 2, 0], [3, 3, 0], [3, 4, 0], [3, 5, 0], [3, 6, 0], [3, 7, 0], - [3, 8, 1], [3, 9, 0], [3, 10, 5], [3, 11, 4], [3, 12, 7], [3, 13, 14], [3, 14, 13], - [3, 15, 12], [3, 16, 9], [3, 17, 5], [3, 18, 5], [3, 19, 10], [3, 20, 6], [3, 21, 4], - [3, 22, 4], [3, 23, 1], [4, 0, 1], [4, 1, 3], [4, 2, 0], [4, 3, 0], [4, 4, 0], - [4, 5, 1], [4, 6, 0], [4, 7, 0], [4, 8, 0], [4, 9, 2], [4, 10, 4], [4, 11, 4], - [4, 12, 2], [4, 13, 4], [4, 14, 4], [4, 15, 14], [4, 16, 12], [4, 17, 1], [4, 18, 8], - [4, 19, 5], [4, 20, 3], [4, 21, 7], [4, 22, 3], [4, 23, 0], [5, 0, 2], [5, 1, 1], - [5, 2, 0], [5, 3, 3], [5, 4, 0], [5, 5, 0], [5, 6, 0], [5, 7, 0], [5, 8, 2], [5, 9, 0], - [5, 10, 4], [5, 11, 1], [5, 12, 5], [5, 13, 10], [5, 14, 5], [5, 15, 7], [5, 16, 11], - [5, 17, 6], [5, 18, 0], [5, 19, 5], [5, 20, 3], [5, 21, 4], [5, 22, 2], [5, 23, 0], - [6, 0, 1], [6, 1, 0], [6, 2, 0], [6, 3, 0], [6, 4, 0], [6, 5, 0], [6, 6, 0], [6, 7, 0], - [6, 8, 0], [6, 9, 0], [6, 10, 1], [6, 11, 0], [6, 12, 2], [6, 13, 1], [6, 14, 3], [6, 15, 4], - [6, 16, 0], [6, 17, 0], [6, 18, 0], [6, 19, 0], [6, 20, 1], [6, 21, 2], [6, 22, 2], [6, 23, 6]] - const title = [] - const singleAxis = [] - const series = [] - days.forEach(function(day, idx) { - title.push({ - textBaseline: 'middle', - top: ((idx + 0.5) * 100) / 7 + '%', - text: day - }) - singleAxis.push({ - left: 150, - type: 'category', - boundaryGap: false, - data: hours, - top: (idx * 100) / 7 + 5 + '%', - height: 100 / 7 - 10 + '%', - axisLabel: { - interval: 2 - } - }) - series.push({ - singleAxisIndex: idx, - coordinateSystem: 'singleAxis', - type: 'scatter', - data: [], - symbolSize: function(dataItem) { - return dataItem[1] * 4 - } - }) - }) - data.forEach(function(dataItem) { - series[dataItem[0]].data.push([dataItem[1], dataItem[2]]) - }) - option = { - tooltip: { - position: 'top' - }, - title: title, - singleAxis: singleAxis, - series: series - } - - option && myChart.setOption(option) } } } @@ -315,7 +267,48 @@ width: 100%; height: 400px; margin-bottom: 20px; - overflow: auto; + } + + .box-top-content-left { + width: 240px; + float: left; + padding: 0 20px; + box-sizing: border-box; + text-align: center; + } + + .box-top-content-right { + width: calc(100% - 240px); + float: left; + } + + .box-top-content-text { + height: 80px; + line-height: 80px; + } + + .box-top-content-text { + width: 100%; + height: 80px; + line-height: 80px; + font-size: 16px; + font-weight: 500; + color: #000F16; + } + + .box-top-content-time { + width: calc(100% - 240px); + margin-left: 240px; + height: 80px; + line-height: 80px; + display: flex; + justify-content: space-between; + } + + .box-top-content-time-text { + font-size: 16px; + font-weight: 500; + color: #000F16; } .box-button {