From 1944cd5122eebe93a4e9dc54f62b0b7bbc6c9632 Mon Sep 17 00:00:00 2001
From: sunFlower <787203167@qq.com>
Date: Tue, 29 Nov 2022 10:06:27 +0800
Subject: [PATCH 01/54] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E6=B3=95=E8=A7=84?=
=?UTF-8?q?=E6=B8=85=E5=8D=95=E7=9A=84=E6=8B=96=E5=8A=A8?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
jero-web/package.json | 1 +
jero-web/src/assets/less/common.less | 22 +-
jero-web/src/mixins/header.js | 229 ++++++++++++++++++
.../components/listOfRegulations.vue | 23 +-
4 files changed, 272 insertions(+), 3 deletions(-)
create mode 100644 jero-web/src/mixins/header.js
diff --git a/jero-web/package.json b/jero-web/package.json
index c6b13b18e..1cd46fe3c 100644
--- a/jero-web/package.json
+++ b/jero-web/package.json
@@ -27,6 +27,7 @@
"js-base64": "^3.7.2",
"js-cookie": "^2.2.0",
"jsencrypt": "^3.0.0-rc.1",
+ "lodash": "^4.17.21",
"lodash.get": "^4.4.2",
"lodash.pick": "^4.4.0",
"mammoth": "^1.4.21",
diff --git a/jero-web/src/assets/less/common.less b/jero-web/src/assets/less/common.less
index 801cf50a5..4315c49a9 100644
--- a/jero-web/src/assets/less/common.less
+++ b/jero-web/src/assets/less/common.less
@@ -99,6 +99,26 @@
line-height: 38px;
}
-.ant-table-fixed-left table, .ant-table-fixed-right table .ant-table-fixed{
+.ant-table-fixed-left table, .ant-table-fixed-right table .ant-table-fixed {
width: min-content;
+}
+
+.nio-header-th {
+ position: relative;
+ isolation: isolate;
+}
+
+.nio-drag-handler {
+ position: absolute;
+ right: 0;
+ top: 0;
+ height: 100%;
+ width: 1px;
+ z-index: 1;
+ border-left: 1px #e8e8e8 solid;
+}
+.nio-drag-handler:hover,
+.nio-drag-handler:focus{
+ cursor: col-resize!important;
+ border: 1px solid #0bd9d9!important;
}
\ No newline at end of file
diff --git a/jero-web/src/mixins/header.js b/jero-web/src/mixins/header.js
new file mode 100644
index 000000000..75982d9b0
--- /dev/null
+++ b/jero-web/src/mixins/header.js
@@ -0,0 +1,229 @@
+import _ from 'lodash'
+
+const events = {
+ start: 'mousedown',
+ move: 'mousemove',
+ stop: 'mouseup'
+}
+var columnsAll = []
+var columnsKey = ''
+const DragHandler = {
+ name: 'nio-drag-handler',
+ //获取混入的方法(重新设置表头宽度)
+ inject: ['onResizeColumn'],
+ props: {
+ column: { type: Object, required: true },
+ minWidth: { type: Number, required: true }
+ },
+
+ data() {
+ return {
+ dragging: false,
+ thWidth: 0,// 列头的宽度,用于计算
+ startX: 0,
+ moveEvent: {
+ remove: function() {
+ }
+ },
+ stopEvent: {
+ remove: function() {
+ }
+ }
+ }
+ },
+ //销毁监听
+ beforeDestroy() {
+ this.removeEvents()
+ },
+ methods: {
+ //鼠标开始拖拽
+ handleMouseDown(e) {
+ e.stopPropagation()
+ e.preventDefault()
+ this.handleStart(e)
+ },
+
+ handleStart(e) {
+ console.log(e)
+ this.dragging = true
+ this.removeEvents()
+ this.thWidth = this.$el.parentNode.getBoundingClientRect().width
+ if (e instanceof MouseEvent && e.which !== 1) {
+ return
+ }
+ if (e.stopPropagation) e.stopPropagation()
+ this.startX = e.pageX
+ this.moveEvent = addEventListenerWrap(document.documentElement, events.move, this.handleMove)
+ this.stopEvent = addEventListenerWrap(document.documentElement, events.stop, this.handleStop)
+ },
+
+ handleMove(e) {
+ this.updateWidth(e)
+ },
+ handleStop(e) {
+ this.dragging = false
+ this.updateWidth(e)
+ this.removeEvents()
+ },
+
+ updateWidth(e) {
+ let pageX = e.pageX
+ const tmpDeltaX = this.startX - pageX
+ let w = Math.max(this.thWidth - tmpDeltaX, this.minWidth)
+ w = Math.min(w, Infinity)
+ this.onResizeColumn(w, this.column)
+ },
+
+ removeEvents() {
+ this.moveEvent.remove()
+ this.stopEvent.remove()
+ }
+ },
+ //渲染div 绑定拖拽
+ render(h) {
+ const line = h('div', { class: 'nio-drag-handler-line' }, [])
+ return h('div', { class: 'nio-drag-handler', on: { mousedown: this.handleMouseDown } }, [line])
+ }
+}
+const ResizeHeaderOne = function(val, name) {
+ columnsAll = val
+ columnsKey = name
+ return (h, props, children) => {
+ const { key, column, ...restProps } = props
+ let col = {}
+ // 处理多级表头
+ col = getRenderCoL(key, val)
+ let content = [].concat(children)
+ if (col) {
+ const handlerVNode = h(DragHandler, {
+ props: {
+ width: col.width,
+ minWidth: Math.min(col.width, 100),
+ column: col
+ }
+ }, [])
+ content = content.concat(
+ handlerVNode
+ )
+ }
+ return h('th', {
+ key,
+ props: { col },
+ ...Object.assign({}, restProps, { class: (restProps.class || '') + ' nio-header-th' })
+ }, content)
+ }
+}
+export const ResizeHeader = {
+ methods: {
+ drag(columns, name) {
+ return {
+ header: {
+ cell: ResizeHeaderOne(columns, name)
+ }
+ }
+ }
+ }
+}
+const getRenderCoL = (key, tbCols) => {
+ let result = ''
+ _.forEach(tbCols, (item) => {
+ if (item.children) {
+ result = getRenderCoL(key, item.children)
+ return !result
+ } else {
+ const k = item.dataIndex || item.key
+ if (k === key) {
+ result = item
+ return false
+ }
+ }
+ })
+ return result
+}
+//拖拽的节流方法
+const throttle2 = (fn, delay) => {
+ let valid = true
+ return (...args) => {
+ if (!valid) {
+ return
+ }
+ valid = false
+ setTimeout(() => {
+ fn(...args)
+ valid = true
+ }, delay)
+ }
+}
+//对table组件进行重构的核心方法组件
+
+
+//监听鼠标移动的方法
+function addEventListenerWrap(target, eventType, cb) {
+ if (target && target.addEventListener) {
+ target.addEventListener(eventType, cb)
+ }
+
+ return {
+ remove: () => {
+ if (target && target.removeEventListener) {
+ target.removeEventListener(eventType, cb)
+ }
+ }
+ }
+}
+
+//在table组件中混入的一个方法 provide => onResizeColumn
+//目的是在table重写中(DragHandler方法)
+//可以用到构造的onResizeColumn方法(重新设置表头的宽度)
+export const ResizeColumnProvide = {
+ name: 'ResizeColumnProvideMixin',
+ provide() {
+ return {
+ onResizeColumn: this.onResizeColumn
+ }
+ },
+
+ data() {
+ const onResizeColumn = throttle2(this._resizeColumn, 30)
+ return {
+ moving: false, //这个属性是为了在拖拽时 阻止表头触发排序的功能
+ onResizeColumn
+ }
+ },
+ methods: {
+ _resizeColumn(w, column) {
+ this.moving = true
+ let time = setTimeout(() => {
+ this.moving = false
+ clearTimeout(time)
+ }, 2000)
+ //在拖拽时找到对应表头 重新设置表头的宽度
+ let num = -1
+ let numOne = -1
+ for (let i = 0; i < columnsAll.length; i++) {
+ if (columnsAll[i].dataIndex === column.dataIndex) {
+ num = i
+ break
+ }
+ if (columnsAll[i].children && columnsAll[i].children.length > 0) {
+ for (let j = 0; j < columnsAll[i].children.length; j++) {
+ if (columnsAll[i].children[j].dataIndex === column.dataIndex) {
+ num = i
+ numOne = j
+ break
+ }
+ }
+ }
+ }
+ // const matchedIndex = columns.findIndex(item => item.dataIndex === column.dataIndex)
+ // console.log(matchedIndex)
+ // columns[matchedIndex].width = w
+ if (numOne > -1) {
+ columnsAll[num].children[numOne].width = w
+ } else {
+ columnsAll[num].width = w
+ }
+ this[columnsKey] = columnsAll
+ }
+ }
+}
\ No newline at end of file
diff --git a/jero-web/src/views/projectManagement/components/listOfRegulations.vue b/jero-web/src/views/projectManagement/components/listOfRegulations.vue
index 1fd293f24..eebaee1d0 100644
--- a/jero-web/src/views/projectManagement/components/listOfRegulations.vue
+++ b/jero-web/src/views/projectManagement/components/listOfRegulations.vue
@@ -202,6 +202,7 @@
-
+
\ No newline at end of file
From 31bcf72d31420b35652504ec44da218a6d7aa0d0 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E5=88=98=E5=BD=A6=E6=B3=BD?=
Date: Fri, 2 Dec 2022 13:36:24 +0800
Subject: [PATCH 02/54] =?UTF-8?q?UI=E7=95=8C=E9=9D=A2=E5=8F=98=E6=9B=B4?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
jero-web/src/common/lang/en-us.js | 17 ++++++++------
jero-web/src/common/lang/zh-cn.js | 9 +++++---
.../components/globalAdvancedQuery/index.vue | 6 +++--
.../src/components/tools/HeaderNotice.vue | 2 ++
jero-web/src/components/tools/UserMenu.vue | 2 ++
.../components/evaluationResultsList.vue | 6 +++--
.../components/problemKnowledgeBaseList.vue | 4 ++--
.../problemKnowledgeBaseListView.vue | 2 +-
.../components/modules/defaultTemplate.vue | 8 +++----
.../components/TermInformation.vue | 12 +++++++++-
.../components/initiatingProcess.vue | 2 +-
.../library/docDetail/index.vue | 10 ++++++++-
.../splitting/modules/SplitAddForm.vue | 6 ++++-
.../splitting/modules/SplitDetail.vue | 4 ++--
.../components/documentDataComparison.vue | 6 ++---
.../components/DocumentLibrary.vue | 2 +-
.../searchCenter/components/whole.vue | 12 +++++++---
.../components/engineeringConfirmation.vue | 2 +-
.../ParameterItemCollectionList.vue | 22 ++++++++++++-------
.../components/settingList.vue | 14 ++++++------
.../components/TaskPlanList.vue | 4 ++--
.../projectStatusBoard/index.vue | 6 ++---
.../components/batchProcessing.vue | 2 +-
23 files changed, 104 insertions(+), 56 deletions(-)
diff --git a/jero-web/src/common/lang/en-us.js b/jero-web/src/common/lang/en-us.js
index 2049d8217..b6507fcd6 100644
--- a/jero-web/src/common/lang/en-us.js
+++ b/jero-web/src/common/lang/en-us.js
@@ -99,6 +99,7 @@ module.exports = {
RoleCode: 'Role Code',
createTime: 'Creation Time',
userName: 'User Name',
+ userManual:'User Manual',
selectOneRule: 'Please select a role!',
setAttribute: 'Please set the url.list2 attribute!',
setDelAttribute: 'Please set the url.delete2 attribute!',
@@ -426,6 +427,7 @@ module.exports = {
MessageType: 'Message Type',
NotificationTime: 'Notification Time',
MessageNotification: 'Message Notification',
+ MessageCenter:'Message Center',
SeeMore: 'See More',
OperationSuccessful: 'Operation Successful',
Intheexport: 'In The Export...',
@@ -609,7 +611,7 @@ module.exports = {
Deliverables: 'Deliverables',
personLiable: 'Assignee',
PrehomoConfirmation: 'Pre-Homo Confirmation',
- verificationAndConformityconfirmation: 'Validation Compliance Check',
+ verificationAndConformityconfirmation: 'Validation Compliance Check ',
StandardImplementationDate: 'New Type Execution Date',
regulatoryEngineer: 'Regulation Engineer',
certifiedEngineer: 'Homo Engineer',
@@ -720,11 +722,11 @@ module.exports = {
time: 'Time',
uploadMaximumATime: 'Upload a Maximum of 20 Images at a time',
- confirmationOfRegulationsList: 'Regulation List Confirmation',
- regulatoryTaskConfirmation: 'Regulation Task Confirmation',
- certificationStart: 'Homo Completion',
- preHomoCompletion: 'Pre-Homo Confirmation',
- certificationEnd: 'Homo KO',
+ confirmationOfRegulationsList: 'Regulation List Confirmation ',
+ regulatoryTaskConfirmation: 'Regulation Task Confirmation ',
+ certificationStart: 'Homo Completion ',
+ preHomoCompletion: 'Pre-Homo Confirmation ',
+ certificationEnd: 'Homo KO ',
directoryName: 'Catalogue Name',
batch: 'Batch',
uploadTime: 'Upload Time',
@@ -880,7 +882,7 @@ module.exports = {
number: 'No.',
Deadline: 'Deadline',
toBeConfirmed: 'To Confirm',
- designComplianceReview: 'Design Compliance Confirmation',
+ designComplianceReview: 'Design Compliance Confirmation ',
preHomeConfirmation: 'Pre-Homo Confirmation',
verificationComplianceReview: 'Validation Compliance Confirmation',
Deployment: 'Deploy',
@@ -1170,6 +1172,7 @@ module.exports = {
RemarkInfo: 'Remarks Info',
initiateDocumentComparison: 'Initiate Document Comparison',
comparativeComments: 'Comparative Comments',
+ Comparisonofarticles:'Comparison Of Articles',
viewTheComparisonResults: 'View Results',
addFullTextComment: 'Full Text Comment',
turnOffAutomaticMatching: 'Turn Off Auto Match',
diff --git a/jero-web/src/common/lang/zh-cn.js b/jero-web/src/common/lang/zh-cn.js
index af3986456..d835378b0 100644
--- a/jero-web/src/common/lang/zh-cn.js
+++ b/jero-web/src/common/lang/zh-cn.js
@@ -101,6 +101,7 @@ module.exports = {
RoleCode: '角色编码',
createTime: '创建时间',
userName: '用户名称',
+ userManual:'用户手册',
selectOneRule: '请选择一个角色!',
setAttribute: '请设置url.list2属性!',
setDelAttribute: '请设置url.delete2 属性!',
@@ -431,6 +432,7 @@ module.exports = {
MessageType: '消息类型',
NotificationTime: '通知时间',
MessageNotification: '消息通知',
+ MessageCenter:'消息中心',
SeeMore: '查看更多',
OperationSuccessful: '操作成功',
Intheexport: '导出中...',
@@ -1001,9 +1003,9 @@ module.exports = {
taskConfirmationResponsiblePerson: '责任人任务确认',
or: '或',
warningTime: '预警时间',
- RegulationMonthlyManagement: '法规月报管理',
- RegulationMonthlyFill: '法规月报填写',
- RegulationMonthlyName: '法规月报名称',
+ RegulationMonthlyManagement: '月报管理',
+ RegulationMonthlyFill: '月报填写',
+ RegulationMonthlyName: '月报名称',
monthlyLanguage: '月报语种',
releaseStatus: '发布状态',
uploadedBy: '上传人',
@@ -1175,6 +1177,7 @@ module.exports = {
RemarkInfo: '备注信息',
initiateDocumentComparison: '发起文档对比',
comparativeComments: '对比评论',
+ Comparisonofarticles:'条款对比评论',
viewTheComparisonResults: '查看对比结果',
addFullTextComment: '添加全文评论',
turnOffAutomaticMatching: '关闭自动匹配',
diff --git a/jero-web/src/components/globalAdvancedQuery/index.vue b/jero-web/src/components/globalAdvancedQuery/index.vue
index 3bce861ad..ed1fba712 100644
--- a/jero-web/src/components/globalAdvancedQuery/index.vue
+++ b/jero-web/src/components/globalAdvancedQuery/index.vue
@@ -12,7 +12,8 @@
-
+
+
{{$t('advancedQuery')}}
@@ -21,7 +22,7 @@
{{$t('advancedQuery')}}
diff --git a/jero-web/src/components/tools/UserMenu.vue b/jero-web/src/components/tools/UserMenu.vue
index 65ed8a73a..63059fb63 100644
--- a/jero-web/src/components/tools/UserMenu.vue
+++ b/jero-web/src/components/tools/UserMenu.vue
@@ -33,7 +33,9 @@
diff --git a/jero-web/src/views/businessSupport/collectionOfRegulatoryOpinions/components/evaluationResultsList.vue b/jero-web/src/views/businessSupport/collectionOfRegulatoryOpinions/components/evaluationResultsList.vue
index 85e38ad5a..095f0e8c0 100644
--- a/jero-web/src/views/businessSupport/collectionOfRegulatoryOpinions/components/evaluationResultsList.vue
+++ b/jero-web/src/views/businessSupport/collectionOfRegulatoryOpinions/components/evaluationResultsList.vue
@@ -57,12 +57,14 @@
{{$t('filingExternalOpinions')}}:
-
+
{{$t('clickUpload')}}
+
diff --git a/jero-web/src/views/businessSupport/problemKnowledgeBase/components/problemKnowledgeBaseList.vue b/jero-web/src/views/businessSupport/problemKnowledgeBase/components/problemKnowledgeBaseList.vue
index 9c4249f90..1c1d57c65 100644
--- a/jero-web/src/views/businessSupport/problemKnowledgeBase/components/problemKnowledgeBaseList.vue
+++ b/jero-web/src/views/businessSupport/problemKnowledgeBase/components/problemKnowledgeBaseList.vue
@@ -111,7 +111,7 @@
- {{$t('forward')}}
+ {{$t('share')}}
@@ -174,7 +174,7 @@
{{$t('dataLoading')}}
-
+
diff --git a/jero-web/src/views/businessSupport/problemKnowledgeBase/components/problemKnowledgeBaseListView.vue b/jero-web/src/views/businessSupport/problemKnowledgeBase/components/problemKnowledgeBaseListView.vue
index 4fd6b4a18..8db575b4d 100644
--- a/jero-web/src/views/businessSupport/problemKnowledgeBase/components/problemKnowledgeBaseListView.vue
+++ b/jero-web/src/views/businessSupport/problemKnowledgeBase/components/problemKnowledgeBaseListView.vue
@@ -55,7 +55,7 @@
- {{$t('forward')}}
+ {{$t('share')}}
diff --git a/jero-web/src/views/businessSupport/regulationReport/components/modules/defaultTemplate.vue b/jero-web/src/views/businessSupport/regulationReport/components/modules/defaultTemplate.vue
index e9fb33a95..3baa708c8 100644
--- a/jero-web/src/views/businessSupport/regulationReport/components/modules/defaultTemplate.vue
+++ b/jero-web/src/views/businessSupport/regulationReport/components/modules/defaultTemplate.vue
@@ -48,7 +48,7 @@
{{$t('technicalField')}}
-
+
{{$t('scopeOfApplication')}}
-
+
{{$t('status')}}
-
+
{{$t('usage')}}
-
+
-
+
@@ -322,6 +322,16 @@
}
+
+
+
\ No newline at end of file
From d0f261b43d6bf25545a3c71bc906cd35a3c0b6c8 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E5=88=98=E5=BD=A6=E6=B3=BD?=
Date: Tue, 27 Dec 2022 17:57:34 +0800
Subject: [PATCH 10/54] =?UTF-8?q?UI=E7=95=8C=E9=9D=A2=E5=8F=98=E6=9B=B4-?=
=?UTF-8?q?=E6=90=9C=E7=B4=A2=E4=B8=AD=E5=BF=83?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
.../components/DocumentLibrary.vue | 28 ++++++++++++-------
.../searchCenter/components/whole.vue | 10 ++++++-
2 files changed, 27 insertions(+), 11 deletions(-)
diff --git a/jero-web/src/views/documentTools/searchCenter/components/DocumentLibrary.vue b/jero-web/src/views/documentTools/searchCenter/components/DocumentLibrary.vue
index 9f2c56347..775dc9048 100644
--- a/jero-web/src/views/documentTools/searchCenter/components/DocumentLibrary.vue
+++ b/jero-web/src/views/documentTools/searchCenter/components/DocumentLibrary.vue
@@ -261,21 +261,21 @@
columns: [
{
title: this.$t('standard'),
- align: 'center',
+ align: 'left',
dataIndex: 'serial_number',
width: 170,
scopedSlots: { customRender: 'serial_number' }
},
{
title: this.$t('title'),
- align: 'center',
+ align: 'left',
dataIndex: 'title',
width: 170,
scopedSlots: { customRender: 'titleName' }
},
{
title: this.$t('fileName'),
- align: 'center',
+ align: 'left',
dataIndex: 'file_name',
ellipsis: true,
width: 170,
@@ -283,7 +283,7 @@
},
{
title: this.$t('status'),
- align: 'center',
+ align: 'left',
width: 140,
sorter: true,
ellipsis: true,
@@ -291,7 +291,7 @@
},
{
title: this.$t('zoneOfApplication'),
- align: 'center',
+ align: 'left',
width: 170,
sorter: true,
ellipsis: true,
@@ -304,14 +304,14 @@
// },
{
title: this.$t('technicalField'),
- align: 'center',
+ align: 'left',
ellipsis: true,
width: 170,
dataIndex: 'technology_territory'
},
{
title: this.$t('releaseDate'),
- align: 'center',
+ align: 'left',
ellipsis: true,
width: 170,
sorter: true,
@@ -319,7 +319,7 @@
},
{
title: this.$t('vehicleInProductionDate'),
- align: 'center',
+ align: 'left',
ellipsis: true,
width: 210,
sorter: true,
@@ -327,7 +327,7 @@
},
{
title: this.$t('ImplementationDate'),
- align: 'center',
+ align: 'left',
ellipsis: true,
sorter: true,
width: 210,
@@ -335,7 +335,7 @@
},
{
title: this.$t('operation'),
- align: 'center',
+ align: 'left',
fixed: 'right',
width: 200,
scopedSlots: { customRender: 'operation' }
@@ -955,4 +955,12 @@
/*::v-deep .ant-select {*/
/* max-width: calc(100% - 126px) !important;*/
/*}*/
+
+ /deep/.ant-table-thead > tr > th {
+ font-weight: bolder;
+ }
+
+ ///deep/.ant-table-tbody > tr > td {
+ // color: #040B29 ;
+ //}
\ No newline at end of file
diff --git a/jero-web/src/views/documentTools/searchCenter/components/whole.vue b/jero-web/src/views/documentTools/searchCenter/components/whole.vue
index b896339b6..a0f74948c 100644
--- a/jero-web/src/views/documentTools/searchCenter/components/whole.vue
+++ b/jero-web/src/views/documentTools/searchCenter/components/whole.vue
@@ -283,16 +283,24 @@
}
}
-
diff --git a/jero-web/src/components/SplitDetailTable/index.vue b/jero-web/src/components/SplitDetailTable/index.vue
index ea4f0014d..486c723e4 100644
--- a/jero-web/src/components/SplitDetailTable/index.vue
+++ b/jero-web/src/components/SplitDetailTable/index.vue
@@ -171,7 +171,7 @@
this.columns.push({
title: res.db_field_txt,
dataIndex: res.db_field_name,
- align: 'center',
+ align: 'left',
ellipsis: true,
sorter: res.sort
})
@@ -201,7 +201,7 @@
if (this.showAction) {
this.columns.push({
title: this.$t('operation'),
- align: 'center',
+ align: 'left',
fixed: 'right',
width: width,
scopedSlots: { customRender: 'operation' }
diff --git a/jero-web/src/components/SplitSearch/index.vue b/jero-web/src/components/SplitSearch/index.vue
index c15b6b177..a1ce0b7c8 100644
--- a/jero-web/src/components/SplitSearch/index.vue
+++ b/jero-web/src/components/SplitSearch/index.vue
@@ -2,7 +2,7 @@
-
+
{{item.db_field_txt}}
@@ -69,7 +69,7 @@
-
+
{{item.db_field_txt}}
diff --git a/jero-web/src/components/SplitTable/DocTable.vue b/jero-web/src/components/SplitTable/DocTable.vue
index a6746e610..d829a1782 100644
--- a/jero-web/src/components/SplitTable/DocTable.vue
+++ b/jero-web/src/components/SplitTable/DocTable.vue
@@ -158,7 +158,7 @@
this.columns.push({
title: res.db_field_txt,
dataIndex: res.db_field_name,
- align: 'center',
+ align: 'left',
ellipsis: true,
sorter: res.sort,
width: 170
@@ -187,7 +187,7 @@
if (this.showAction) {
this.columns.push({
title: this.$t('operation'),
- align: 'center',
+ align: 'left',
fixed: 'right',
width: width,
scopedSlots: { customRender: 'operation' }
diff --git a/jero-web/src/components/search/index.vue b/jero-web/src/components/search/index.vue
index 4bf3a540b..5262de6d1 100644
--- a/jero-web/src/components/search/index.vue
+++ b/jero-web/src/components/search/index.vue
@@ -373,7 +373,7 @@
}
.title-text {
- width: 100px;
+ width: 110px;
color: #000F16;
display: inline-block;
font-weight: 500;
diff --git a/jero-web/src/views/documentManage/splitting/modules/SplitDetail.vue b/jero-web/src/views/documentManage/splitting/modules/SplitDetail.vue
index c8fe72fa5..327a2fba2 100644
--- a/jero-web/src/views/documentManage/splitting/modules/SplitDetail.vue
+++ b/jero-web/src/views/documentManage/splitting/modules/SplitDetail.vue
@@ -1193,7 +1193,7 @@ export default {
.split-detail-left {
/*height: 100%;*/
- width: 230px;
+ width: 280px;
float: left;
padding-right: 20px;
/*border-right: 1px solid #E6E7EC;*/
@@ -1222,7 +1222,7 @@ export default {
.split-detail-right {
padding-left: 20px;
- width: calc(100% - 230px);
+ width: calc(100% - 280px);
float: right;
border-left: 1px solid #E6E7EC;
/*flex: 1;*/
From 8bbfb2eca2eb8e34c0f4bf49ec08b7c127e11088 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E5=88=98=E5=BD=A6=E6=B3=BD?=
Date: Wed, 28 Dec 2022 13:36:55 +0800
Subject: [PATCH 12/54] =?UTF-8?q?UI=E7=95=8C=E9=9D=A2=E5=8F=98=E6=9B=B4-?=
=?UTF-8?q?=E8=A1=A8=E5=A4=B4=E5=AD=97=E4=BD=93=E5=8A=A0=E7=B2=97?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
jero-web/src/assets/less/common.less | 4 ++++
1 file changed, 4 insertions(+)
diff --git a/jero-web/src/assets/less/common.less b/jero-web/src/assets/less/common.less
index 4315c49a9..ae083bfe0 100644
--- a/jero-web/src/assets/less/common.less
+++ b/jero-web/src/assets/less/common.less
@@ -121,4 +121,8 @@
.nio-drag-handler:focus{
cursor: col-resize!important;
border: 1px solid #0bd9d9!important;
+}
+
+.ant-table-column-title{
+ font-weight: bold!important;
}
\ No newline at end of file
From cb0041944a21d4cd41f500448aeb225bcd5796db Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E5=88=98=E5=BD=A6=E6=B3=BD?=
Date: Wed, 28 Dec 2022 13:44:20 +0800
Subject: [PATCH 13/54] =?UTF-8?q?UI=E7=95=8C=E9=9D=A2=E5=8F=98=E6=9B=B4-?=
=?UTF-8?q?=E6=96=87=E6=A1=A3=E7=BF=BB=E8=AF=91?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
.../components/RetrieveFilesList.vue | 12 ++++++------
.../documentTranslation/index.vue | 18 +++++++++---------
2 files changed, 15 insertions(+), 15 deletions(-)
diff --git a/jero-web/src/views/documentTools/documentTranslation/components/RetrieveFilesList.vue b/jero-web/src/views/documentTools/documentTranslation/components/RetrieveFilesList.vue
index 69a95a94e..0cff12aca 100644
--- a/jero-web/src/views/documentTools/documentTranslation/components/RetrieveFilesList.vue
+++ b/jero-web/src/views/documentTools/documentTranslation/components/RetrieveFilesList.vue
@@ -130,7 +130,7 @@
columns: [
{
title: this.$t('number'),
- align: 'center',
+ align: 'left',
width: 70,
customRender: function(t, r, index) {
return parseInt(index) + 1
@@ -139,31 +139,31 @@
{
title: this.$t('standard'),
dataIndex: 'serial_number',
- align: 'center',
+ align: 'left',
ellipsis: true
},
{
title: this.$t('title'),
dataIndex: 'title',
- align: 'center',
+ align: 'left',
ellipsis: true
},
{
title: this.$t('TextStatus'),
dataIndex: 'state',
- align: 'center',
+ align: 'left',
ellipsis: true
},
{
title: this.$t('fileName'),
dataIndex: 'file_name',
- align: 'center',
+ align: 'left',
ellipsis: true
},
{
title: this.$t('textInformation'),
dataIndex: 'text_info',
- align: 'center',
+ align: 'left',
ellipsis: true
}
],
diff --git a/jero-web/src/views/documentTools/documentTranslation/index.vue b/jero-web/src/views/documentTools/documentTranslation/index.vue
index c78b81e2a..074c64ab8 100644
--- a/jero-web/src/views/documentTools/documentTranslation/index.vue
+++ b/jero-web/src/views/documentTools/documentTranslation/index.vue
@@ -166,7 +166,7 @@
columns: [
{
title: this.$t('standard'),
- align: 'center',
+ align: 'left',
dataIndex: 'serialNumber',
width: 170,
ellipsis: true,
@@ -174,7 +174,7 @@
},
{
title: this.$t('title'),
- align: 'center',
+ align: 'left',
dataIndex: 'title',
width: 170,
ellipsis: true,
@@ -182,48 +182,48 @@
},
{
title: this.$t('TextStatus'),
- align: 'center',
+ align: 'left',
width: 170,
ellipsis: true,
dataIndex: 'textStatus_dictText'
},
{
title: this.$t('fileName'),
- align: 'center',
+ align: 'left',
width: 170,
ellipsis: true,
dataIndex: 'fileName'
},
{
title: this.$t('translationLanguage'),
- align: 'center',
+ align: 'left',
dataIndex: 'targetLanguage_dictText',
width: 240,
scopedSlots: { customRender: 'translationLanguage' }
},
{
title: this.$t('translationResults'),
- align: 'center',
+ align: 'left',
dataIndex: 'translationResult_dictText',
width: 170
},
{
title: this.$t('conversionTime'),
- align: 'center',
+ align: 'left',
width: 170,
ellipsis: true,
dataIndex: 'translationTime'
},
{
title: this.$t('releaseSituation'),
- align: 'center',
+ align: 'left',
width: 170,
ellipsis: true,
dataIndex: 'releaseCondition_dictText'
},
{
title: this.$t('operation'),
- align: 'center',
+ align: 'left',
fixed: 'right',
width: 260,
scopedSlots: { customRender: 'operation' }
From 26a901b9f29814a24627b9b4c780a2d1447c08ec Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E5=88=98=E5=BD=A6=E6=B3=BD?=
Date: Wed, 28 Dec 2022 13:52:23 +0800
Subject: [PATCH 14/54] =?UTF-8?q?UI=E7=95=8C=E9=9D=A2=E5=8F=98=E6=9B=B4-?=
=?UTF-8?q?=E6=96=87=E6=A1=A3=E5=AF=B9=E6=AF=94-=E8=A1=A8=E6=A0=BC?=
=?UTF-8?q?=E5=86=85=E5=AE=B9=E5=B7=A6=E5=AF=B9=E9=BD=90?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
.../components/initiateComparison.vue | 10 +++++-----
.../documentComparison/index.vue | 20 +++++++++----------
2 files changed, 15 insertions(+), 15 deletions(-)
diff --git a/jero-web/src/views/documentTools/documentComparison/components/initiateComparison.vue b/jero-web/src/views/documentTools/documentComparison/components/initiateComparison.vue
index 7375c90ee..47ebf74c6 100644
--- a/jero-web/src/views/documentTools/documentComparison/components/initiateComparison.vue
+++ b/jero-web/src/views/documentTools/documentComparison/components/initiateComparison.vue
@@ -209,7 +209,7 @@
columns: [
{
title: this.$t('number'),
- align: 'center',
+ align: 'left',
width: 70,
customRender: function(t, r, index) {
return parseInt(index) + 1
@@ -217,25 +217,25 @@
},
{
title: this.$t('standard'),
- align: 'center',
+ align: 'left',
ellipsis: true,
dataIndex: 'serialNumber'
},
{
title: this.$t('title'),
- align: 'center',
+ align: 'left',
ellipsis: true,
dataIndex: 'title'
},
{
title: this.$t('TextStatus'),
- align: 'center',
+ align: 'left',
ellipsis: true,
dataIndex: 'fileType'
},
{
title: this.$t('fileName'),
- align: 'center',
+ align: 'left',
ellipsis: true,
dataIndex: 'fileName'
}
diff --git a/jero-web/src/views/documentTools/documentComparison/index.vue b/jero-web/src/views/documentTools/documentComparison/index.vue
index d08a1cac3..7ff56f4fa 100644
--- a/jero-web/src/views/documentTools/documentComparison/index.vue
+++ b/jero-web/src/views/documentTools/documentComparison/index.vue
@@ -137,7 +137,7 @@
columns: [
{
title: this.$t('standard') + ' 1',
- align: 'center',
+ align: 'left',
dataIndex: 'serialNumberLeft',
width: 170,
ellipsis: true,
@@ -145,7 +145,7 @@
},
{
title: this.$t('title') + ' 1',
- align: 'center',
+ align: 'left',
dataIndex: 'titleLeft',
width: 170,
ellipsis: true,
@@ -153,7 +153,7 @@
},
{
title: this.$t('TextStatus') + ' 1',
- align: 'center',
+ align: 'left',
width: 200,
ellipsis: true,
dataIndex: 'fileTypeLeft'
@@ -168,7 +168,7 @@
// },
{
title: this.$t('standard') + ' 2',
- align: 'center',
+ align: 'left',
dataIndex: 'serialNumberRight',
ellipsis: true,
scopedSlots: { customRender: 'serialNumberRight' },
@@ -176,7 +176,7 @@
},
{
title: this.$t('title') + ' 2',
- align: 'center',
+ align: 'left',
dataIndex: 'titleRight',
scopedSlots: { customRender: 'serialNumberRight' },
ellipsis: true,
@@ -184,7 +184,7 @@
},
{
title: this.$t('TextStatus') + ' 2',
- align: 'center',
+ align: 'left',
width: 200,
ellipsis: true,
dataIndex: 'fileTypeRight'
@@ -199,28 +199,28 @@
// },
{
title: this.$t('releaseSituation'),
- align: 'center',
+ align: 'left',
width: 170,
ellipsis: true,
dataIndex: 'releaseStateTitle'
},
{
title: this.$t('creater'),
- align: 'center',
+ align: 'left',
width: 170,
ellipsis: true,
dataIndex: 'createBy'
},
{
title: this.$t('remarks'),
- align: 'center',
+ align: 'left',
ellipsis: true,
width: 270,
dataIndex: 'remark'
},
{
title: this.$t('operation'),
- align: 'center',
+ align: 'left',
fixed: 'right',
width: 310,
scopedSlots: { customRender: 'operation' }
From 47594359b7cec4c436148f0bf00ac86c60111d84 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E5=88=98=E5=BD=A6=E6=B3=BD?=
Date: Wed, 28 Dec 2022 14:24:15 +0800
Subject: [PATCH 15/54] =?UTF-8?q?UI=E7=95=8C=E9=9D=A2=E5=8F=98=E6=9B=B4-?=
=?UTF-8?q?=E6=B3=95=E8=A7=84=E9=A2=84=E8=AD=A6-=E8=99=9A=E6=8B=9F?=
=?UTF-8?q?=E6=B8=85=E5=8D=95-=E8=A1=A8=E6=A0=BC=E5=86=85=E5=AE=B9?=
=?UTF-8?q?=E5=B7=A6=E5=AF=B9=E9=BD=90?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
jero-web/src/components/UpdateLog/index.vue | 13 +++-
.../components/virtualListDetails.vue | 69 ++++++++++---------
.../views/documentTools/virtualList/index.vue | 8 +--
.../views/regulatoryEarlyWarning/index.vue | 14 ++--
4 files changed, 57 insertions(+), 47 deletions(-)
diff --git a/jero-web/src/components/UpdateLog/index.vue b/jero-web/src/components/UpdateLog/index.vue
index 5a5a763dc..2529dde05 100644
--- a/jero-web/src/components/UpdateLog/index.vue
+++ b/jero-web/src/components/UpdateLog/index.vue
@@ -21,7 +21,7 @@
:loading="loading"
>
-
+
@@ -63,14 +63,14 @@
{
title: this.$t('OperationDetails'),
dataIndex: 'logContent',
- align: 'center',
+ align: 'left',
ellipsis: true,
scopedSlots: { customRender: 'content' }
},
{
title: this.$t('OperationTime'),
dataIndex: 'createTime',
- align: 'center',
+ align: 'left',
ellipsis: true,
width: 180
},
@@ -121,4 +121,11 @@
text-align: right;
margin-top: 20px;
}
+ /deep/.tooltipColor .ant-tooltip-inner {
+ color: #333;
+ background-color: #fff !important;
+ }
+ /deep/.tooltipColor .ant-tooltip-arrow::before {
+ background-color: #fff;
+ }
\ No newline at end of file
diff --git a/jero-web/src/views/documentTools/virtualList/components/virtualListDetails.vue b/jero-web/src/views/documentTools/virtualList/components/virtualListDetails.vue
index ffad9f9d9..515d103e5 100644
--- a/jero-web/src/views/documentTools/virtualList/components/virtualListDetails.vue
+++ b/jero-web/src/views/documentTools/virtualList/components/virtualListDetails.vue
@@ -285,13 +285,13 @@
{
title: this.$t('deliverableTemplate'),
dataIndex: 'fileName',
- align: 'center',
+ align: 'left',
width: 260,
ellipsis: true
},
{
title: this.$t('operation'),
- align: 'center',
+ align: 'left',
width: 130,
scopedSlots: { customRender: 'fileOperation' }
}
@@ -316,7 +316,7 @@
columnsAll: [
{
title: this.$t('standard'),
- align: 'center',
+ align: 'left',
dataIndex: 'serialNumber',
width: 180,
fixed: 'left',
@@ -324,7 +324,7 @@
},
{
title: this.$t('title'),
- align: 'center',
+ align: 'left',
dataIndex: 'title',
width: 180,
fixed: 'left',
@@ -332,105 +332,105 @@
},
{
title: this.$t('subtitle'),
- align: 'center',
+ align: 'left',
dataIndex: 'subtitle',
width: 180,
ellipsis: true
},
{
title: this.$t('zoneOfApplication'),
- align: 'center',
+ align: 'left',
width: 150,
ellipsis: true,
dataIndex: 'region_dictText'
},
{
title: this.$t('scopeOfApplication'),
- align: 'center',
+ align: 'left',
width: 180,
ellipsis: true,
dataIndex: 'shi4Yong4Fan4Wei2_dictText'
},
{
title: this.$t('status'),
- align: 'center',
+ align: 'left',
width: 100,
ellipsis: true,
dataIndex: 'state_dictText'
},
{
title: this.$t('correspondingStandard'),
- align: 'center',
+ align: 'left',
width: 140,
ellipsis: true,
dataIndex: 'correspondingStandard'
},
{
title: this.$t('implementationCategory'),
- align: 'center',
+ align: 'left',
width: 140,
ellipsis: true,
dataIndex: 'implementType_dictText'
},
{
title: this.$t('ImplementationDate'),
- align: 'center',
+ align: 'left',
width: 200,
ellipsis: true,
dataIndex: 'xin1Che1Xing2Shi2Shi1Ri4Qi1'
},
{
title: this.$t('vehicleInProductionDate'),
- align: 'center',
+ align: 'left',
width: 210,
ellipsis: true,
dataIndex: 'implementTime'
},
{
title: 'WVTA ID',
- align: 'center',
+ align: 'left',
dataIndex: 'wvtaId',
width: 180,
ellipsis: true
},
{
title: this.$t('certificationType'),
- align: 'center',
+ align: 'left',
width: 180,
ellipsis: true,
dataIndex: 'attestationType_dictText'
},
{
title: this.$t('certificationLevel'),
- align: 'center',
+ align: 'left',
width: 200,
ellipsis: true,
dataIndex: 'attestationRank_dictText'
},
{
title: this.$t('applicableSupplement'),
- align: 'center',
+ align: 'left',
width: 200,
ellipsis: true,
dataIndex: 'applicableSupplement'
},
{
title: this.$t('technicalField'),
- align: 'center',
+ align: 'left',
width: 180,
ellipsis: true,
dataIndex: 'technologyTerritoryName'
},
{
title: this.$t('areaOfResponsibility'),
- align: 'center',
+ align: 'left',
width: 180,
ellipsis: true,
dataIndex: 'dutyTerritory_dictText'
},
{
title: this.$t('remarks'),
- align: 'center',
+ align: 'left',
dataIndex: 'remark',
width: 180,
ellipsis: true
@@ -444,7 +444,7 @@
title: this.$t('Deliverables'),
dataIndex: 'designDeliverableTemplateName',
ellipsis: true,
- align: 'center',
+ align: 'left',
width: 180,
scopedSlots: { customRender: 'designDeliverableTemplateName' }
},
@@ -453,19 +453,19 @@
dataIndex: 'designInitiator_dictText',
width: 180,
ellipsis: true,
- align: 'center'
+ align: 'left'
},
{
title: this.$t('personLiable'),
dataIndex: 'designDuty_dictText',
width: 180,
ellipsis: true,
- align: 'center'
+ align: 'left'
},
{
title: this.$t('descriptionDeliverables'),
dataIndex: 'designRemark',
- align: 'center',
+ align: 'left',
width: 220,
ellipsis: true
}
@@ -478,7 +478,7 @@
title: this.$t('Deliverables'),
dataIndex: 'prehomoDeliverableTemplateName',
ellipsis: true,
- align: 'center',
+ align: 'left',
width: 180,
scopedSlots: { customRender: 'prehomoDeliverableTemplateName' }
},
@@ -487,19 +487,19 @@
dataIndex: 'prehomoInitiator_dictText',
width: 180,
ellipsis: true,
- align: 'center'
+ align: 'left'
},
{
title: this.$t('personLiable'),
dataIndex: 'prehomoDuty_dictText',
width: 180,
ellipsis: true,
- align: 'center'
+ align: 'left'
},
{
title: this.$t('descriptionDeliverables'),
dataIndex: 'prehomoRemark',
- align: 'center',
+ align: 'left',
width: 220,
ellipsis: true
}
@@ -512,7 +512,7 @@
title: this.$t('Deliverables'),
dataIndex: 'verifyDeliverableTemplateName',
ellipsis: true,
- align: 'center',
+ align: 'left',
width: 180,
scopedSlots: { customRender: 'verifyDeliverableTemplateName' }
},
@@ -520,20 +520,20 @@
title: this.$t('Sponsor'),
dataIndex: 'verifyInitiator_dictText',
width: 180,
- align: 'center',
+ align: 'left',
ellipsis: true
},
{
title: this.$t('personLiable'),
dataIndex: 'verifyDuty_dictText',
width: 180,
- align: 'center',
+ align: 'left',
ellipsis: true
},
{
title: this.$t('descriptionDeliverables'),
dataIndex: 'verifyRemark',
- align: 'center',
+ align: 'left',
width: 220,
ellipsis: true
}
@@ -541,7 +541,7 @@
},
{
title: this.$t('operation'),
- align: 'center',
+ align: 'left',
fixed: 'right',
width: 140,
scopedSlots: { customRender: 'operation' }
@@ -1092,6 +1092,9 @@
padding-bottom: 0!important;
overflow: scroll!important;
}
+ /deep/.ant-table-column-title{
+ font-weight: bold!important;
+ }
\ No newline at end of file
diff --git a/jero-web/src/views/documentTools/virtualList/index.vue b/jero-web/src/views/documentTools/virtualList/index.vue
index d329acfc3..dd90a033b 100644
--- a/jero-web/src/views/documentTools/virtualList/index.vue
+++ b/jero-web/src/views/documentTools/virtualList/index.vue
@@ -216,7 +216,7 @@
columns: [
{
title: this.$t('VirtualListName'),
- align: 'center',
+ align: 'left',
dataIndex: 'name',
width: '25%',
ellipsis: true,
@@ -224,21 +224,21 @@
},
{
title: this.$t('listStatus'),
- align: 'center',
+ align: 'left',
width: '25%',
ellipsis: true,
dataIndex: 'state_dictText'
},
{
title: this.$t('creater'),
- align: 'center',
+ align: 'left',
width: '25%',
ellipsis: true,
dataIndex: 'createBy'
},
{
title: this.$t('operation'),
- align: 'center',
+ align: 'left',
fixed: 'right',
width: 400,
scopedSlots: { customRender: 'operation' }
diff --git a/jero-web/src/views/regulatoryEarlyWarning/index.vue b/jero-web/src/views/regulatoryEarlyWarning/index.vue
index 3929579f3..e129d6f5d 100644
--- a/jero-web/src/views/regulatoryEarlyWarning/index.vue
+++ b/jero-web/src/views/regulatoryEarlyWarning/index.vue
@@ -155,7 +155,7 @@
columnsAll: [
{
title: this.$t('standard'),
- align: 'center',
+ align: 'left',
dataIndex: 'serial_number',
ellipsis: true,
width: 170,
@@ -163,7 +163,7 @@
},
{
title: this.$t('title'),
- align: 'center',
+ align: 'left',
dataIndex: 'title',
ellipsis: true,
width: 170,
@@ -171,28 +171,28 @@
},
{
title: this.$t('status'),
- align: 'center',
+ align: 'left',
width: 140,
ellipsis: true,
dataIndex: 'state'
},
{
title: this.$t('zoneOfApplication'),
- align: 'center',
+ align: 'left',
width: 170,
ellipsis: true,
dataIndex: 'region'
},
{
title: this.$t('technicalField'),
- align: 'center',
+ align: 'left',
ellipsis: true,
width: 170,
dataIndex: 'technology_territory'
},
{
title: this.$t('vehicleInProductionDate'),
- align: 'center',
+ align: 'left',
ellipsis: true,
width: 210,
dataIndex: 'implement_time',
@@ -200,7 +200,7 @@
},
{
title: this.$t('ImplementationDate'),
- align: 'center',
+ align: 'left',
ellipsis: true,
width: 210,
dataIndex: 'xin1_che1_xing2_shi2_shi1_ri4_qi1',
From e618da8108e22411ea5be5609f3416f01e8bf0ed Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E5=88=98=E5=BD=A6=E6=B3=BD?=
Date: Wed, 28 Dec 2022 15:49:05 +0800
Subject: [PATCH 16/54] =?UTF-8?q?UI=E7=95=8C=E9=9D=A2=E5=8F=98=E6=9B=B4-?=
=?UTF-8?q?=E9=A1=B9=E7=9B=AE=E5=BA=93-=E8=A1=A8=E5=8D=95=E5=AE=BD?=
=?UTF-8?q?=E5=BA=A6-=E8=A1=A8=E6=A0=BC=E5=86=85=E5=AE=B9=E5=B7=A6?=
=?UTF-8?q?=E5=AF=B9=E9=BD=90?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
.../src/components/viewFileModel/index.vue | 4 +--
.../library/docDetail/index.vue | 6 ++--
.../projectManagement/components/TaskList.vue | 22 +++++++------
.../components/TaskParameterCollection.vue | 32 ++++++++++++-------
.../components/certificationDirectory.vue | 16 +++++-----
.../components/historicalVersionList.vue | 6 ++--
.../components/listAddModel.vue | 10 +++---
.../components/listOfRegulations.vue | 10 +++---
.../components/listOfRelevantPersonnel.vue | 22 +++++++++----
.../components/nonConformance.vue | 24 +++++++++-----
.../components/transferList.vue | 8 ++---
.../components/versionStatistics.vue | 4 +--
.../projectLibrary/index.vue | 10 +++---
13 files changed, 101 insertions(+), 73 deletions(-)
diff --git a/jero-web/src/components/viewFileModel/index.vue b/jero-web/src/components/viewFileModel/index.vue
index 19a707125..1ebca4b9e 100644
--- a/jero-web/src/components/viewFileModel/index.vue
+++ b/jero-web/src/components/viewFileModel/index.vue
@@ -54,13 +54,13 @@
{
title: this.$t('fileName'),
dataIndex: 'fileName',
- align: 'center',
+ align: 'left',
width: 260,
ellipsis: true
},
{
title: this.$t('operation'),
- align: 'center',
+ align: 'left',
width: 130,
scopedSlots: { customRender: 'fileOperation' }
}
diff --git a/jero-web/src/views/documentManage/library/docDetail/index.vue b/jero-web/src/views/documentManage/library/docDetail/index.vue
index f273308e3..a201b7ef7 100644
--- a/jero-web/src/views/documentManage/library/docDetail/index.vue
+++ b/jero-web/src/views/documentManage/library/docDetail/index.vue
@@ -293,7 +293,7 @@
{
title: this.$t('standardName'),
dataIndex: 'title',
- align: 'center',
+ align: 'left',
ellipsis: true,
scopedSlots: { customRender: 'operation' }
}
@@ -302,13 +302,13 @@
{
title: this.$t('fileName'),
dataIndex: 'fileName',
- align: 'center',
+ align: 'left',
width: 260,
ellipsis: true
},
{
title: this.$t('operation'),
- align: 'center',
+ align: 'left',
width: 130,
scopedSlots: { customRender: 'fileOperation' }
}
diff --git a/jero-web/src/views/projectManagement/components/TaskList.vue b/jero-web/src/views/projectManagement/components/TaskList.vue
index f8bda2c74..47eb73f9d 100644
--- a/jero-web/src/views/projectManagement/components/TaskList.vue
+++ b/jero-web/src/views/projectManagement/components/TaskList.vue
@@ -244,7 +244,7 @@
columns: [
{
title: this.$t('number'),
- align: 'center',
+ align: 'left',
width: 70,
customRender: function(t, r, index) {
return parseInt(index) + 1
@@ -252,49 +252,49 @@
},
{
title: this.$t('standardInformation'),
- align: 'center',
+ align: 'left',
dataIndex: 'standard',
width: 202,
scopedSlots: { customRender: 'standardInformation' }
},
{
title: this.$t('areaOfResponsibility'),
- align: 'center',
+ align: 'left',
width: 180,
dataIndex: 'areaOfResponsibility',
scopedSlots: { customRender: 'areaOfResponsibility' }
},
{
title: this.$t('confirmationOfDesignConformity'),
- align: 'center',
+ align: 'left',
width: 240,
dataIndex: 'confirmationOfDesignConformity',
scopedSlots: { customRender: 'confirmationOfDesignConformity' }
},
{
title: this.$t('PrehomoConfirmation'),
- align: 'center',
+ align: 'left',
width: 240,
dataIndex: 'PrehomoConfirmation',
scopedSlots: { customRender: 'PrehomoConfirmation' }
},
{
title: this.$t('verificationAndConformityconfirmation'),
- align: 'center',
+ align: 'left',
width: 240,
dataIndex: 'verificationAndConformityconfirmation',
scopedSlots: { customRender: 'verificationAndConformityconfirmation' }
},
{
title: this.$t('CertificationProgress'),
- align: 'center',
+ align: 'left',
width: 150,
dataIndex: 'CertificationProgress',
scopedSlots: { customRender: 'CertificationProgress' }
},
{
title: this.$t('CurrentStatus'),
- align: 'center',
+ align: 'left',
width: 150,
dataIndex: 'CurrentProjectStatusEvaluation',
scopedSlots: { customRender: 'CurrentProjectStatusEvaluation' }
@@ -672,7 +672,7 @@
}
.title-text {
- width: 64px;
+ width: 110px;
color: #000F16;
display: inline-block;
font-weight: 500;
@@ -862,6 +862,10 @@
text-justify: inter-ideograph;
word-break: break-all
}
+
+ ///deep/.taskTable .ant-table-thead > tr > th {
+ // font-weight: bolder;
+ //}
\ No newline at end of file
diff --git a/jero-web/src/views/projectManagement/components/nonConformance.vue b/jero-web/src/views/projectManagement/components/nonConformance.vue
index bac8f1274..327f543f5 100644
--- a/jero-web/src/views/projectManagement/components/nonConformance.vue
+++ b/jero-web/src/views/projectManagement/components/nonConformance.vue
@@ -96,7 +96,7 @@
columns: [
{
title: this.$t('standard'),
- align: 'center',
+ align: 'left',
dataIndex: 'serialNumber',
scopedSlots: { customRender: 'standard' },
ellipsis: true,
@@ -104,7 +104,7 @@
},
{
title: this.$t('title'),
- align: 'center',
+ align: 'left',
dataIndex: 'title',
ellipsis: true,
width: 180,
@@ -112,35 +112,35 @@
},
{
title: this.$t('ProcessType'),
- align: 'center',
+ align: 'left',
dataIndex: 'flowType',
ellipsis: true,
width: 180
},
{
title: this.$t('areaOfResponsibility'),
- align: 'center',
+ align: 'left',
dataIndex: 'dutyTerritory',
ellipsis: true,
width: 180
},
{
title: this.$t('problemType'),
- align: 'center',
+ align: 'left',
dataIndex: 'problemType',
ellipsis: true,
width: 180
},
{
title: this.$t('Sponsor'),
- align: 'center',
+ align: 'left',
dataIndex: 'initiator',
ellipsis: true,
width: 140
},
{
title: this.$t('personLiable'),
- align: 'center',
+ align: 'left',
dataIndex: 'duty',
ellipsis: true,
width: 140
@@ -300,7 +300,7 @@
}
.title-text {
- width: 32px;
+ width: 110px;
color: #000F16;
display: inline-block;
font-weight: 500;
@@ -341,4 +341,12 @@
text-justify: inter-ideograph;
word-break: break-all
}
+
+ /deep/.ant-table-thead > tr > th {
+ font-weight: bolder;
+ }
+
+ /*/deep/.ant-table-tbody > tr > td {*/
+ /* color: #040B29 ;*/
+ /*}*/
\ No newline at end of file
diff --git a/jero-web/src/views/projectManagement/components/transferList.vue b/jero-web/src/views/projectManagement/components/transferList.vue
index 30f90c44b..c089917d2 100644
--- a/jero-web/src/views/projectManagement/components/transferList.vue
+++ b/jero-web/src/views/projectManagement/components/transferList.vue
@@ -78,25 +78,25 @@
{
title: this.$t('VirtualListName'),
dataIndex: 'name',
- align: 'center',
+ align: 'left',
ellipsis: true
},
{
title: this.$t('instructionForUse'),
dataIndex: 'useExplain',
- align: 'center',
+ align: 'left',
ellipsis: true
},
{
title: this.$t('updateTime'),
dataIndex: 'updateTime',
- align: 'center',
+ align: 'left',
ellipsis: true
},
{
title: this.$t('creater'),
dataIndex: 'createBy',
- align: 'center',
+ align: 'left',
ellipsis: true
}
],
diff --git a/jero-web/src/views/projectManagement/components/versionStatistics.vue b/jero-web/src/views/projectManagement/components/versionStatistics.vue
index a8e087be0..7adb84e0f 100644
--- a/jero-web/src/views/projectManagement/components/versionStatistics.vue
+++ b/jero-web/src/views/projectManagement/components/versionStatistics.vue
@@ -76,14 +76,14 @@
{
title: this.$t('VersionNumber'),
dataIndex: 'projectVersion',
- align: 'center',
+ align: 'left',
ellipsis: true,
width: 200
},
{
title: this.$t('describe'),
dataIndex: 'explanation',
- align: 'center',
+ align: 'left',
ellipsis: true,
width: 500
}
diff --git a/jero-web/src/views/projectManagement/projectLibrary/index.vue b/jero-web/src/views/projectManagement/projectLibrary/index.vue
index 2d1d6d2e8..4421aa9b0 100644
--- a/jero-web/src/views/projectManagement/projectLibrary/index.vue
+++ b/jero-web/src/views/projectManagement/projectLibrary/index.vue
@@ -222,14 +222,14 @@
// },
{
title: this.$t('StudioEngineer'),
- align: 'center',
+ align: 'left',
width: 180,
ellipsis: true,
dataIndex: 'studioEngineerName'
},
{
title: this.$t('explain'),
- align: 'center',
+ align: 'left',
width: 280,
ellipsis: true,
dataIndex: 'explanation'
@@ -243,21 +243,21 @@
// },
{
title: this.$t('ModelPlatform'),
- align: 'center',
+ align: 'left',
width: 180,
ellipsis: true,
dataIndex: 'vehiclePlatform'
},
{
title: this.$t('DigitalPlatform'),
- align: 'center',
+ align: 'left',
width: 180,
ellipsis: true,
dataIndex: 'digitalPlatform'
},
{
title: this.$t('operation'),
- align: 'center',
+ align: 'left',
fixed: 'right',
width: 302,
scopedSlots: { customRender: 'operation' }
From c1a32e7ef8178e8a19a831e6ab53632367461b5e Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E5=88=98=E5=BD=A6=E6=B3=BD?=
Date: Wed, 28 Dec 2022 17:34:35 +0800
Subject: [PATCH 17/54] =?UTF-8?q?UI=E7=95=8C=E9=9D=A2=E5=8F=98=E6=9B=B4-?=
=?UTF-8?q?=E6=9C=AA=E7=AC=A6=E5=90=88=E9=A1=B9=E8=B7=9F=E8=B8=AA-?=
=?UTF-8?q?=E6=B3=95=E8=A7=84=E7=AC=A6=E5=90=88=E6=80=A7=E7=9C=8B=E6=9D=BF?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
.../views/parameter/parameterlist/index.vue | 12 +++++-----
.../projectNonConformance/index.vue | 16 ++++++-------
.../components/projectStatusAndProgress.vue | 22 ++++++++++-------
.../projectStatusBoard/index.vue | 24 +++++++++++--------
.../regulationsKanban/components/addModel.vue | 10 ++++----
.../src/views/regulationsKanban/index.vue | 22 ++++++++++-------
6 files changed, 60 insertions(+), 46 deletions(-)
diff --git a/jero-web/src/views/parameter/parameterlist/index.vue b/jero-web/src/views/parameter/parameterlist/index.vue
index 68c210b30..ea04682ba 100644
--- a/jero-web/src/views/parameter/parameterlist/index.vue
+++ b/jero-web/src/views/parameter/parameterlist/index.vue
@@ -156,7 +156,7 @@ export default {
columns: [
{
title: this.$t('NiONumber'),
- align: 'center',
+ align: 'left',
width: 130,
dataIndex: 'nioNumber',
sorter: true,
@@ -164,35 +164,35 @@ export default {
},
{
title: this.$t('ParameterName'),
- align: 'center',
+ align: 'left',
dataIndex: 'paramsName',
width: 160,
ellipsis: true,
},
{
title: this.$t('ParameterDescription'),
- align: 'center',
+ align: 'left',
dataIndex: 'description',
ellipsis: true,
// scopedSlots: { customRender: 'titleName' }
},
{
title: this.$t('areaOfResponsibility'),
- align: 'center',
+ align: 'left',
dataIndex: 'dutyTerritory_dictText',
width: 150,
ellipsis: true,
},
{
title: this.$t('created'),
- align: 'center',
+ align: 'left',
dataIndex: 'createTime',
width: 180,
ellipsis: true,
},
{
title: this.$t('operation'),
- align: 'center',
+ align: 'left',
fixed: 'right',
width: 120,
scopedSlots: { customRender: 'operation' }
diff --git a/jero-web/src/views/projectManagement/projectNonConformance/index.vue b/jero-web/src/views/projectManagement/projectNonConformance/index.vue
index 3c58f2543..cd13e94cd 100644
--- a/jero-web/src/views/projectManagement/projectNonConformance/index.vue
+++ b/jero-web/src/views/projectManagement/projectNonConformance/index.vue
@@ -202,55 +202,55 @@
columns: [
{
title: this.$t('standard'),
- align: 'center',
+ align: 'left',
dataIndex: 'serialNumber',
width: 170,
scopedSlots: { customRender: 'standard' }
},
{
title: this.$t('title'),
- align: 'center',
+ align: 'left',
dataIndex: 'title',
width: 170,
scopedSlots: { customRender: 'standard' }
},
{
title: this.$t('ProcessType'),
- align: 'center',
+ align: 'left',
dataIndex: 'flowType',
width: 180,
ellipsis: true
},
{
title: this.$t('areaOfResponsibility'),
- align: 'center',
+ align: 'left',
dataIndex: 'dutyTerritory',
width: 180,
ellipsis: true
},
{
title: this.$t('RelatedItems'),
- align: 'center',
+ align: 'left',
dataIndex: 'projectName',
width: 180,
ellipsis: true
},
{
title: this.$t('problemType'),
- align: 'center',
+ align: 'left',
dataIndex: 'problemType',
width: 140,
ellipsis: true
},
{
title: this.$t('Sponsor'),
- align: 'center',
+ align: 'left',
dataIndex: 'initiator',
width: 140
},
{
title: this.$t('personLiable'),
- align: 'center',
+ align: 'left',
dataIndex: 'duty',
width: 140
}
diff --git a/jero-web/src/views/projectManagement/projectStatusBoard/components/projectStatusAndProgress.vue b/jero-web/src/views/projectManagement/projectStatusBoard/components/projectStatusAndProgress.vue
index e24ca3362..99122171e 100644
--- a/jero-web/src/views/projectManagement/projectStatusBoard/components/projectStatusAndProgress.vue
+++ b/jero-web/src/views/projectManagement/projectStatusBoard/components/projectStatusAndProgress.vue
@@ -67,61 +67,61 @@
columns: [
{
title: this.$t('entryName'),
- align: 'center',
+ align: 'left',
dataIndex: 'projectName',
width: 180,
ellipsis: true
},
{
title: this.$t('targetMarket'),
- align: 'center',
+ align: 'left',
dataIndex: 'targetMarket',
width: 180,
ellipsis: true
},
{
- align: 'center',
+ align: 'left',
dataIndex: 'projectStatus',
scopedSlots: { title: 'projectStatusTitle' },
width: 240,
ellipsis: true
},
{
- align: 'center',
+ align: 'left',
dataIndex: 'certificationProgress',
width: 380,
ellipsis: true,
scopedSlots: { title: 'CertificationProgressTitle' }
},
{
- align: 'center',
+ align: 'left',
dataIndex: 'inventory',
width: 340,
ellipsis: true,
scopedSlots: { title: 'listConfirmationStatusTitle' }
},
{
- align: 'center',
+ align: 'left',
dataIndex: 'task',
width: 340,
ellipsis: true,
scopedSlots: { title: 'taskAffirmStatusTitle' }
},
{
- align: 'center',
+ align: 'left',
dataIndex: 'design',
width: 440,
scopedSlots: { title: 'designComplianceReviewTitle' }
},
{
dataIndex: 'pre',
- align: 'center',
+ align: 'left',
width: 440,
scopedSlots: { title: 'preHomeConfirmationTitle' }
},
{
dataIndex: 'verify',
- align: 'center',
+ align: 'left',
width: 440,
scopedSlots: { title: 'verificationComplianceReviewTitle' }
}
@@ -229,4 +229,8 @@
::v-deep .ant-table-body {
background: transparent!important;
}
+
+ /deep/.ant-table-column-title{
+ font-weight: bold!important;
+ }
\ No newline at end of file
diff --git a/jero-web/src/views/projectManagement/projectStatusBoard/index.vue b/jero-web/src/views/projectManagement/projectStatusBoard/index.vue
index ffd69bdce..bf84b45c4 100644
--- a/jero-web/src/views/projectManagement/projectStatusBoard/index.vue
+++ b/jero-web/src/views/projectManagement/projectStatusBoard/index.vue
@@ -23,7 +23,7 @@
:triggerChange="false" :dictCode="'region'"/>
-
+
{{$t('query')}}
{{$t('reset')}}
@@ -174,7 +174,7 @@
columns: [
{
title: this.$t('entryName'),
- align: 'center',
+ align: 'left',
dataIndex: 'projectName',
scopedSlots: { customRender: 'projectName' },
width: 180,
@@ -182,54 +182,54 @@
},
{
title: this.$t('targetMarket'),
- align: 'center',
+ align: 'left',
dataIndex: 'targetMarket',
width: 180,
ellipsis: true
},
{
- align: 'center',
+ align: 'left',
dataIndex: 'projectStatus',
scopedSlots: { title: 'projectStatusTitle' },
width: 240,
ellipsis: true
},
{
- align: 'center',
+ align: 'left',
dataIndex: 'certificationProgress',
width: 380,
ellipsis: true,
scopedSlots: { title: 'CertificationProgressTitle' }
},
{
- align: 'center',
+ align: 'left',
dataIndex: 'inventory',
width: 340,
ellipsis: true,
scopedSlots: { title: 'listConfirmationStatusTitle' }
},
{
- align: 'center',
+ align: 'left',
dataIndex: 'task',
width: 340,
ellipsis: true,
scopedSlots: { title: 'taskAffirmStatusTitle' }
},
{
- align: 'center',
+ align: 'left',
dataIndex: 'design',
width: 440,
scopedSlots: { title: 'designComplianceReviewTitle' }
},
{
dataIndex: 'pre',
- align: 'center',
+ align: 'left',
width: 440,
scopedSlots: { title: 'preHomeConfirmationTitle' }
},
{
dataIndex: 'verify',
- align: 'center',
+ align: 'left',
width: 440,
scopedSlots: { title: 'verificationComplianceReviewTitle' }
}
@@ -721,4 +721,8 @@
width: 100px;
z-index: 101;
}
+
+ /deep/.ant-table-column-title{
+ font-weight: bold!important;
+ }
\ No newline at end of file
diff --git a/jero-web/src/views/regulationsKanban/components/addModel.vue b/jero-web/src/views/regulationsKanban/components/addModel.vue
index 3f7b32d2d..ed5a9a2ef 100644
--- a/jero-web/src/views/regulationsKanban/components/addModel.vue
+++ b/jero-web/src/views/regulationsKanban/components/addModel.vue
@@ -180,19 +180,19 @@
title: this.$t('areaOfResponsibility'),
dataIndex: 'dutyTerritory_dicText',
width: 120,
- align: 'center',
+ align: 'left',
ellipsis: true
},
{
title: this.$t('RelatedItems'),
- align: 'center',
+ align: 'left',
width: 120,
dataIndex: 'projectName',
ellipsis: true
},
{
title: this.$t('designComplianceReview'),
- align: 'center',
+ align: 'left',
width: 250,
dataIndex: 'designFlowTaskStatus_dicText',
scopedSlots: { customRender: 'status' },
@@ -200,7 +200,7 @@
},
{
title: this.$t('preHomeConfirmation'),
- align: 'center',
+ align: 'left',
width: 270,
dataIndex: 'prehomoFlowTaskStatus_dicText',
scopedSlots: { customRender: 'statusprehomo' },
@@ -208,7 +208,7 @@
},
{
title: this.$t('verificationComplianceReview'),
- align: 'center',
+ align: 'left',
width: 270,
dataIndex: 'verifyFlowTaskStatus_dicText',
scopedSlots: { customRender: 'filstatuse' },
diff --git a/jero-web/src/views/regulationsKanban/index.vue b/jero-web/src/views/regulationsKanban/index.vue
index 0ce17f0a4..d2347b0fb 100644
--- a/jero-web/src/views/regulationsKanban/index.vue
+++ b/jero-web/src/views/regulationsKanban/index.vue
@@ -32,6 +32,7 @@
:triggerChange="false" :dictCode="'state'"/>
+
@@ -50,14 +51,19 @@
/>
-
+
+
+ :fieldList="fieldList" MarginRight='2px'/>
{{ $t('query') }}
- {{ $t('reset') }}
+
+ {{ !toggleSearchStatus ? $t('open') : $t('away') }}
+
+
@@ -168,7 +174,7 @@ export default {
columns: [
{
title: this.$t('standard'),
- align: 'center',
+ align: 'left',
dataIndex: 'serialNumber',
width: 300,
ellipsis: true,
@@ -176,7 +182,7 @@ export default {
},
{
title: this.$t('title'),
- align: 'center',
+ align: 'left',
dataIndex: 'title',
width: 300,
ellipsis: true,
@@ -184,7 +190,7 @@ export default {
},
{
title: this.$t('status'),
- align: 'center',
+ align: 'left',
ellipsis: true,
dataIndex: 'state_dicText',
width: 120
@@ -196,7 +202,7 @@ export default {
// },
{
title: this.$t('technicalField'),
- align: 'center',
+ align: 'left',
dataIndex: 'technologyTerritory_dicText',
width: 250,
ellipsis: true,
@@ -204,7 +210,7 @@ export default {
},
{
title: this.$t('evaluationResults'),
- align: 'center',
+ align: 'left',
fixed: 'right',
width: 180,
scopedSlots: { customRender: 'operation' }
From bdbe0ebb17597e142e910639bce1c741698d8c48 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E5=88=98=E5=BD=A6=E6=B3=BD?=
Date: Wed, 28 Dec 2022 17:49:54 +0800
Subject: [PATCH 18/54] =?UTF-8?q?UI=E7=95=8C=E9=9D=A2=E5=8F=98=E6=9B=B4-?=
=?UTF-8?q?=E8=AE=A4=E8=AF=81=E7=AE=A1=E7=90=86=E3=80=81?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
jero-web/src/components/exporthistory/index.vue | 6 +++---
jero-web/src/components/tableCollection/index1.vue | 4 ++--
.../src/views/parameter/ParameterTemplate/index.vue | 12 ++++++------
.../src/views/parameter/escalationlibrary/index.vue | 10 +++++-----
.../src/views/parameter/parameterexport/index.vue | 12 ++++++------
5 files changed, 22 insertions(+), 22 deletions(-)
diff --git a/jero-web/src/components/exporthistory/index.vue b/jero-web/src/components/exporthistory/index.vue
index a2d883e27..a5c39758d 100644
--- a/jero-web/src/components/exporthistory/index.vue
+++ b/jero-web/src/components/exporthistory/index.vue
@@ -100,19 +100,19 @@ export default {
// },
{
title: this.$t('Exporttype'),
- align: 'center',
+ align: 'left',
dataIndex: 'exportType',
ellipsis: true
},
{
title: this.$t('Exporttime'),
- align: 'center',
+ align: 'left',
dataIndex: 'exportTime',
ellipsis: true
},
{
title: this.$t('file'),
- align: 'center',
+ align: 'left',
dataIndex: 'exportFileName',
scopedSlots: { customRender: 'file' },
ellipsis: true
diff --git a/jero-web/src/components/tableCollection/index1.vue b/jero-web/src/components/tableCollection/index1.vue
index 24c653458..0d7656f59 100644
--- a/jero-web/src/components/tableCollection/index1.vue
+++ b/jero-web/src/components/tableCollection/index1.vue
@@ -487,7 +487,7 @@
if (res.type) {
this.columns.push({
dataIndex: res.db_field_name,
- align: 'center',
+ align: 'left',
ellipsis: true,
sorter: res.sort,
width: 500
@@ -503,7 +503,7 @@
this.columns.push({
title: res.db_field_txt,
dataIndex: res.db_field_name,
- align: 'center',
+ align: 'left',
ellipsis: true,
sorter: res.sort,
width: 160
diff --git a/jero-web/src/views/parameter/ParameterTemplate/index.vue b/jero-web/src/views/parameter/ParameterTemplate/index.vue
index e29fd17b3..db757c6a7 100644
--- a/jero-web/src/views/parameter/ParameterTemplate/index.vue
+++ b/jero-web/src/views/parameter/ParameterTemplate/index.vue
@@ -156,14 +156,14 @@ export default {
columns: [
{
title: this.$t('zoneOfApplication'),
- align: 'center',
+ align: 'left',
width: 160,
ellipsis: true,
dataIndex: 'region_dictText',
},
{
title: this.$t('parameterTemplate'),
- align: 'center',
+ align: 'left',
width: 180,
ellipsis: true,
dataIndex: 'paramsTemplateName',
@@ -171,28 +171,28 @@ export default {
},
{
title: this.$t('contentDescription'),
- align: 'center',
+ align: 'left',
ellipsis: true,
dataIndex: 'description',
// scopedSlots: { customRender: 'titleName' }
},
{
title: this.$t('created'),
- align: 'center',
+ align: 'left',
dataIndex: 'createTime',
width: 160,
ellipsis: true,
},
{
title: this.$t('updated'),
- align: 'center',
+ align: 'left',
width: 160,
ellipsis: true,
dataIndex: 'updateTime'
},
{
title: this.$t('operation'),
- align: 'center',
+ align: 'left',
fixed: 'right',
width: 200,
scopedSlots: { customRender: 'operation' }
diff --git a/jero-web/src/views/parameter/escalationlibrary/index.vue b/jero-web/src/views/parameter/escalationlibrary/index.vue
index b7199aa7d..9b75232e5 100644
--- a/jero-web/src/views/parameter/escalationlibrary/index.vue
+++ b/jero-web/src/views/parameter/escalationlibrary/index.vue
@@ -153,24 +153,24 @@
columns: [
{
title: this.$t('entryName'),
- align: 'center',
+ align: 'left',
width: '17%',
dataIndex: 'projectName',
scopedSlots: { customRender: 'projectName' }
},
{
title: this.$t('ListTitle'),
- align: 'center',
+ align: 'left',
dataIndex: 'title'
},
{
title: this.$t('Version'),
- align: 'center',
+ align: 'left',
dataIndex: 'version'
},
{
title: this.$t('operation'),
- align: 'center',
+ align: 'left',
fixed: 'right',
width: 200,
scopedSlots: { customRender: 'operation' }
@@ -347,7 +347,7 @@
color: #000F16;
display: inline-block;
font-weight: 500;
- font-size: 16px;
+ font-size: 14px;
margin-right: 16px;
margin-top: 3px;
text-align: right;
diff --git a/jero-web/src/views/parameter/parameterexport/index.vue b/jero-web/src/views/parameter/parameterexport/index.vue
index b60c0964e..675d4b389 100644
--- a/jero-web/src/views/parameter/parameterexport/index.vue
+++ b/jero-web/src/views/parameter/parameterexport/index.vue
@@ -148,7 +148,7 @@ export default {
// },
{
title: this.$t('templateName'),
- align: 'center',
+ align: 'left',
dataIndex: 'templateName',
ellipsis: true,
width: 300,
@@ -156,7 +156,7 @@ export default {
},
{
title: this.$t('contentDescription'),
- align: 'center',
+ align: 'left',
dataIndex: 'description',
ellipsis: true,
width: 300,
@@ -164,28 +164,28 @@ export default {
},
{
title: this.$t('status'),
- align: 'center',
+ align: 'left',
width: 120,
ellipsis: true,
dataIndex: 'state_dictText'
},
{
title: this.$t('creater'),
- align: 'center',
+ align: 'left',
width: 120,
ellipsis: true,
dataIndex: 'createBy'
},
{
title: this.$t('Latestupdatetime'),
- align: 'center',
+ align: 'left',
width: 180,
ellipsis: true,
dataIndex: 'updateTime'
},
{
title: this.$t('operation'),
- align: 'center',
+ align: 'left',
fixed: 'right',
width: 200,
scopedSlots: { customRender: 'operation' }
From 1205f85d34a788148d5d7b65cd2bff3486d86562 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E5=88=98=E5=BD=A6=E6=B3=BD?=
Date: Thu, 29 Dec 2022 09:04:14 +0800
Subject: [PATCH 19/54] =?UTF-8?q?UI=E7=95=8C=E9=9D=A2=E5=8F=98=E6=9B=B4-?=
=?UTF-8?q?=E6=B3=95=E8=A7=84=E6=9C=88=E6=8A=A5?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
.../components/RegulationMonthlyFill.vue | 16 ++++++++--------
.../components/RegulationMonthlyManagement.vue | 12 ++++++------
.../components/modules/addModel.vue | 10 +++++-----
.../components/modules/fillTable.vue | 8 ++++----
4 files changed, 23 insertions(+), 23 deletions(-)
diff --git a/jero-web/src/views/businessSupport/regulationReport/components/RegulationMonthlyFill.vue b/jero-web/src/views/businessSupport/regulationReport/components/RegulationMonthlyFill.vue
index b5514a0ed..d6ad1628a 100644
--- a/jero-web/src/views/businessSupport/regulationReport/components/RegulationMonthlyFill.vue
+++ b/jero-web/src/views/businessSupport/regulationReport/components/RegulationMonthlyFill.vue
@@ -165,56 +165,56 @@
columns: [
{
title: this.$t('firstLevelDirectory'),
- align: 'center',
+ align: 'left',
dataIndex: 'memoriesChapterOneName',
ellipsis: true,
width: 170
},
{
title: this.$t('secondaryDirectory'),
- align: 'center',
+ align: 'left',
dataIndex: 'memoriesChapterName',
ellipsis: true,
width: 170
},
{
title: this.$t('chineseTitle'),
- align: 'center',
+ align: 'left',
dataIndex: 'titleCn',
ellipsis: true,
width: 170
},
{
title: this.$t('englishTitle'),
- align: 'center',
+ align: 'left',
width: 170,
ellipsis: true,
dataIndex: 'titleEn'
},
{
title: this.$t('regulatoryContact'),
- align: 'center',
+ align: 'left',
width: 170,
ellipsis: true,
dataIndex: 'lawsContactName'
},
{
title: this.$t('completedBy'),
- align: 'center',
+ align: 'left',
ellipsis: true,
width: 170,
dataIndex: 'createBy'
},
{
title: this.$t('exportStatus'),
- align: 'center',
+ align: 'left',
ellipsis: true,
width: 170,
dataIndex: 'exportStateName'
},
{
title: this.$t('operation'),
- align: 'center',
+ align: 'left',
fixed: 'right',
width: 190,
scopedSlots: { customRender: 'operation' }
diff --git a/jero-web/src/views/businessSupport/regulationReport/components/RegulationMonthlyManagement.vue b/jero-web/src/views/businessSupport/regulationReport/components/RegulationMonthlyManagement.vue
index a89cbe2cd..62fb77d65 100644
--- a/jero-web/src/views/businessSupport/regulationReport/components/RegulationMonthlyManagement.vue
+++ b/jero-web/src/views/businessSupport/regulationReport/components/RegulationMonthlyManagement.vue
@@ -116,7 +116,7 @@
columns: [
{
title: this.$t('RegulationMonthlyName'),
- align: 'center',
+ align: 'left',
dataIndex: 'name',
width: 190,
ellipsis: true,
@@ -124,7 +124,7 @@
},
{
title: this.$t('monthlyLanguage'),
- align: 'center',
+ align: 'left',
dataIndex: 'language',
width: 170,
ellipsis: true,
@@ -132,28 +132,28 @@
},
{
title: this.$t('releaseStatus'),
- align: 'center',
+ align: 'left',
width: 140,
ellipsis: true,
dataIndex: 'issueStatus_dictText'
},
{
title: this.$t('uploadTime'),
- align: 'center',
+ align: 'left',
width: 170,
ellipsis: true,
dataIndex: 'createTime'
},
{
title: this.$t('uploadedBy'),
- align: 'center',
+ align: 'left',
ellipsis: true,
width: 170,
dataIndex: 'createBy'
},
{
title: this.$t('operation'),
- align: 'center',
+ align: 'left',
fixed: 'right',
width: 240,
scopedSlots: { customRender: 'operation' }
diff --git a/jero-web/src/views/businessSupport/regulationReport/components/modules/addModel.vue b/jero-web/src/views/businessSupport/regulationReport/components/modules/addModel.vue
index 46165dcc5..9d76d32f0 100644
--- a/jero-web/src/views/businessSupport/regulationReport/components/modules/addModel.vue
+++ b/jero-web/src/views/businessSupport/regulationReport/components/modules/addModel.vue
@@ -108,19 +108,19 @@
{
title: this.$t('standard'),
dataIndex: 'serial_number',
- align: 'center',
+ align: 'left',
ellipsis: true
},
{
title: this.$t('title'),
dataIndex: 'title',
- align: 'center',
+ align: 'left',
ellipsis: true
},
{
title: this.$t('zoneOfApplication'),
dataIndex: 'region',
- align: 'center',
+ align: 'left',
ellipsis: true
},
// {
@@ -138,13 +138,13 @@
{
title: this.$t('ImplementationDate'),
dataIndex: 'xin1_che1_xing2_shi2_shi1_ri4_qi1',
- align: 'center',
+ align: 'left',
ellipsis: true
},
{
title: this.$t('vehicleInProductionDate'),
dataIndex: 'implement_time',
- align: 'center',
+ align: 'left',
ellipsis: true
}
// {
diff --git a/jero-web/src/views/businessSupport/regulationReport/components/modules/fillTable.vue b/jero-web/src/views/businessSupport/regulationReport/components/modules/fillTable.vue
index 57e4d207a..b2ce78ebc 100644
--- a/jero-web/src/views/businessSupport/regulationReport/components/modules/fillTable.vue
+++ b/jero-web/src/views/businessSupport/regulationReport/components/modules/fillTable.vue
@@ -74,7 +74,7 @@
columns: [
{
title: this.$t('number'),
- align: 'center',
+ align: 'left',
width: 70,
customRender: function(t, r, index) {
return parseInt(index) + 1
@@ -82,21 +82,21 @@
},
{
title: this.$t('chineseTitle'),
- align: 'center',
+ align: 'left',
dataIndex: 'titleCn',
ellipsis: true,
width: 320
},
{
title: this.$t('englishTitle'),
- align: 'center',
+ align: 'left',
width: 320,
ellipsis: true,
dataIndex: 'titleEn'
},
{
title: this.$t('operation'),
- align: 'center',
+ align: 'left',
fixed: 'right',
width: 280,
scopedSlots: { customRender: 'operation' }
From ffe5c287c66830dc847faa3b06f60522174d28ad Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E5=88=98=E5=BD=A6=E6=B3=BD?=
Date: Thu, 29 Dec 2022 09:11:54 +0800
Subject: [PATCH 20/54] =?UTF-8?q?UI=E7=95=8C=E9=9D=A2=E5=8F=98=E6=9B=B4-?=
=?UTF-8?q?=E6=B3=95=E8=A7=84=E6=84=8F=E8=A7=81=E6=94=B6=E9=9B=86?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
.../components/evaluationResultsList.vue | 14 +++++++-------
.../components/initiatingProcess.vue | 12 ++++++------
.../collectionOfRegulatoryOpinions/index.vue | 16 ++++++++--------
3 files changed, 21 insertions(+), 21 deletions(-)
diff --git a/jero-web/src/views/businessSupport/collectionOfRegulatoryOpinions/components/evaluationResultsList.vue b/jero-web/src/views/businessSupport/collectionOfRegulatoryOpinions/components/evaluationResultsList.vue
index 095f0e8c0..253f6a7f0 100644
--- a/jero-web/src/views/businessSupport/collectionOfRegulatoryOpinions/components/evaluationResultsList.vue
+++ b/jero-web/src/views/businessSupport/collectionOfRegulatoryOpinions/components/evaluationResultsList.vue
@@ -101,35 +101,35 @@
columns: [
{
title: this.$t('relevantSections'),
- align: 'center',
+ align: 'left',
dataIndex: 'relatedSection',
ellipsis: true,
width: 180
},
{
title: this.$t('questionsSuggestions'),
- align: 'center',
+ align: 'left',
width: 180,
ellipsis: true,
dataIndex: 'issueOrSuggest'
},
{
title: this.$t('reason'),
- align: 'center',
+ align: 'left',
width: 180,
ellipsis: true,
dataIndex: 'reason'
},
{
title: this.$t('clauseContent'),
- align: 'center',
+ align: 'left',
width: 180,
ellipsis: true,
dataIndex: 'clauseContent'
},
{
title: this.$t('enclosure'),
- align: 'center',
+ align: 'left',
width: 180,
ellipsis: true,
dataIndex: 'accessoryFile',
@@ -137,14 +137,14 @@
},
{
title: this.$t('Assessor'),
- align: 'center',
+ align: 'left',
width: 100,
ellipsis: true,
dataIndex: 'createBy'
},
{
title: this.$t('proposedTime'),
- align: 'center',
+ align: 'left',
width: 150,
ellipsis: true,
dataIndex: 'submitTime'
diff --git a/jero-web/src/views/businessSupport/collectionOfRegulatoryOpinions/components/initiatingProcess.vue b/jero-web/src/views/businessSupport/collectionOfRegulatoryOpinions/components/initiatingProcess.vue
index 8981f9504..0578a5bb8 100644
--- a/jero-web/src/views/businessSupport/collectionOfRegulatoryOpinions/components/initiatingProcess.vue
+++ b/jero-web/src/views/businessSupport/collectionOfRegulatoryOpinions/components/initiatingProcess.vue
@@ -177,7 +177,7 @@
columns: [
{
title: this.$t('standard'),
- align: 'center',
+ align: 'left',
dataIndex: 'serial_number',
width: 170,
ellipsis: true,
@@ -185,7 +185,7 @@
},
{
title: this.$t('title'),
- align: 'center',
+ align: 'left',
dataIndex: 'title',
ellipsis: true,
width: 170,
@@ -193,28 +193,28 @@
},
{
title: this.$t('status'),
- align: 'center',
+ align: 'left',
width: 140,
ellipsis: true,
dataIndex: 'state'
},
{
title: this.$t('zoneOfApplication'),
- align: 'center',
+ align: 'left',
width: 170,
ellipsis: true,
dataIndex: 'region'
},
{
title: this.$t('technicalField'),
- align: 'center',
+ align: 'left',
ellipsis: true,
width: 170,
dataIndex: 'technology_territory'
},
{
title: this.$t('correspondingStandard'),
- align: 'center',
+ align: 'left',
ellipsis: true,
width: 170,
dataIndex: 'corresponding_standard'
diff --git a/jero-web/src/views/businessSupport/collectionOfRegulatoryOpinions/index.vue b/jero-web/src/views/businessSupport/collectionOfRegulatoryOpinions/index.vue
index c9328aa3a..5468d6cfc 100644
--- a/jero-web/src/views/businessSupport/collectionOfRegulatoryOpinions/index.vue
+++ b/jero-web/src/views/businessSupport/collectionOfRegulatoryOpinions/index.vue
@@ -166,7 +166,7 @@
columns: [
{
title: this.$t('standard'),
- align: 'center',
+ align: 'left',
dataIndex: 'serialNumber',
ellipsis: true,
width: 170,
@@ -174,49 +174,49 @@
},
{
title: this.$t('title'),
- align: 'center',
+ align: 'left',
dataIndex: 'title',
ellipsis: true,
width: 280
},
{
title: this.$t('technicalField'),
- align: 'center',
+ align: 'left',
width: 170,
ellipsis: true,
dataIndex: 'technologyTerritoryName'
},
{
title: this.$t('ProcessStatus'),
- align: 'center',
+ align: 'left',
width: 140,
ellipsis: true,
dataIndex: 'gatherResultShow'
},
{
title: this.$t('Sponsor'),
- align: 'center',
+ align: 'left',
width: 140,
ellipsis: true,
dataIndex: 'createBy'
},
{
title: this.$t('dateOfInitiation'),
- align: 'center',
+ align: 'left',
ellipsis: true,
width: 140,
dataIndex: 'startTime'
},
{
title: this.$t('closingDate'),
- align: 'center',
+ align: 'left',
ellipsis: true,
width: 140,
dataIndex: 'endTime'
},
{
title: this.$t('operation'),
- align: 'center',
+ align: 'left',
fixed: 'right',
width: 210,
scopedSlots: { customRender: 'operation' }
From 57131581532a15b9c385b0f9d9c3af4759c5d458 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E5=88=98=E5=BD=A6=E6=B3=BD?=
Date: Thu, 29 Dec 2022 09:23:25 +0800
Subject: [PATCH 21/54] =?UTF-8?q?UI=E7=95=8C=E9=9D=A2=E5=8F=98=E6=9B=B4-?=
=?UTF-8?q?=E6=96=87=E6=A1=A3=E6=8B=86=E5=88=86-=E6=8B=86=E5=88=86?=
=?UTF-8?q?=E6=96=87=E6=A1=A3=E8=AF=A6=E6=83=85-=E5=B7=A6=E5=8F=B3?=
=?UTF-8?q?=E7=A9=BA=E9=97=B4=E5=AE=BD=E5=BA=A6?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
.../views/documentManage/splitting/modules/SplitDetail.vue | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/jero-web/src/views/documentManage/splitting/modules/SplitDetail.vue b/jero-web/src/views/documentManage/splitting/modules/SplitDetail.vue
index 327a2fba2..c8fe72fa5 100644
--- a/jero-web/src/views/documentManage/splitting/modules/SplitDetail.vue
+++ b/jero-web/src/views/documentManage/splitting/modules/SplitDetail.vue
@@ -1193,7 +1193,7 @@ export default {
.split-detail-left {
/*height: 100%;*/
- width: 280px;
+ width: 230px;
float: left;
padding-right: 20px;
/*border-right: 1px solid #E6E7EC;*/
@@ -1222,7 +1222,7 @@ export default {
.split-detail-right {
padding-left: 20px;
- width: calc(100% - 280px);
+ width: calc(100% - 230px);
float: right;
border-left: 1px solid #E6E7EC;
/*flex: 1;*/
From 6d2a59834282bda65e668721d3af70b800d28f6a Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E5=88=98=E5=BD=A6=E6=B3=BD?=
Date: Thu, 29 Dec 2022 10:10:52 +0800
Subject: [PATCH 22/54] =?UTF-8?q?UI=E7=95=8C=E9=9D=A2=E5=8F=98=E6=9B=B4-?=
=?UTF-8?q?=E5=AF=B9=E5=A4=96=E6=8A=A5=E5=91=8A=E7=AE=A1=E7=90=86-?=
=?UTF-8?q?=E6=B3=95=E8=A7=84=E6=8A=80=E6=9C=AF=E8=AF=84=E4=BC=B0?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
.../components/TermInformation.vue | 12 ++---
.../components/evaluationResultsWhole.vue | 14 ++++--
.../components/initiatingProcess.vue | 14 +++---
.../components/standardDecompositionSheet.vue | 10 ++--
.../technologyAssessment/index.vue | 20 ++++----
jero-web/src/views/externalReports/index.vue | 48 ++++++++++++++-----
6 files changed, 73 insertions(+), 45 deletions(-)
diff --git a/jero-web/src/views/businessSupport/technologyAssessment/components/TermInformation.vue b/jero-web/src/views/businessSupport/technologyAssessment/components/TermInformation.vue
index ba8af1d8a..ba0867e02 100644
--- a/jero-web/src/views/businessSupport/technologyAssessment/components/TermInformation.vue
+++ b/jero-web/src/views/businessSupport/technologyAssessment/components/TermInformation.vue
@@ -150,37 +150,37 @@
{
title: this.$t('clauseNo'),
dataIndex: 'itemNum',
- align: 'center',
+ align: 'left',
ellipsis: true,
width: 120
},
{
title: this.$t('clauseName'),
dataIndex: 'itemName',
- align: 'center',
+ align: 'left',
ellipsis: true
},
{
title: this.$t('clauseContent'),
dataIndex: 'itemContent',
- align: 'center',
+ align: 'left',
scopedSlots: { customRender: 'clauseContent' }
},
{
title: this.$t('evaluationMethod'),
dataIndex: 'evaluationMethods',
- align: 'center',
+ align: 'left',
scopedSlots: { customRender: 'evaluationMethod' }
},
{
title: this.$t('Assessor'),
dataIndex: 'Assessor',
- align: 'center',
+ align: 'left',
scopedSlots: { customRender: 'Assessor' }
},
{
title: this.$t('operation'),
- align: 'center',
+ align: 'left',
width: 120,
scopedSlots: { customRender: 'operation' }
}
diff --git a/jero-web/src/views/businessSupport/technologyAssessment/components/evaluationResultsWhole.vue b/jero-web/src/views/businessSupport/technologyAssessment/components/evaluationResultsWhole.vue
index a0007ad92..a2f18b9d5 100644
--- a/jero-web/src/views/businessSupport/technologyAssessment/components/evaluationResultsWhole.vue
+++ b/jero-web/src/views/businessSupport/technologyAssessment/components/evaluationResultsWhole.vue
@@ -109,7 +109,7 @@
{
title: this.$t('engineer'),
dataIndex: 'createBy',
- align: 'center',
+ align: 'left',
width: 160,
ellipsis: true,
customRender: (value, row, index) => {
@@ -128,7 +128,7 @@
{
title: this.$t('complianceResults'),
dataIndex: 'complianceResultName',
- align: 'center',
+ align: 'left',
width: 160,
ellipsis: true,
customRender: (value, row, index) => {
@@ -147,20 +147,20 @@
{
title: this.$t('relevantSections'),
dataIndex: 'relatedSection',
- align: 'center',
+ align: 'left',
width: 160,
ellipsis: true
},
{
title: this.$t('problemDescription'),
dataIndex: 'issueOrSuggest',
- align: 'center',
+ align: 'left',
ellipsis: true
},
{
title: this.$t('enclosure'),
dataIndex: 'accessoryFile',
- align: 'center',
+ align: 'left',
width: 160,
ellipsis: true,
scopedSlots: { customRender: 'accessoryFile' }
@@ -425,6 +425,10 @@
.operator-text-feed {
margin-top: 27px;
}
+
+ /deep/.ant-table-column-title{
+ font-weight: bold!important;
+ }
\ No newline at end of file
From 51e1b82e34b24e8121a7de7b312f088117677ad4 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E5=88=98=E5=BD=A6=E6=B3=BD?=
Date: Thu, 29 Dec 2022 14:44:43 +0800
Subject: [PATCH 24/54] =?UTF-8?q?UI=E7=95=8C=E9=9D=A2=E5=8F=98=E6=9B=B4-?=
=?UTF-8?q?=E9=A1=B9=E7=9B=AE=E6=B3=95=E8=A7=84=E4=BB=BB=E5=8A=A1?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
.../library/docDetail/index.vue | 10 ++++---
.../components/circulationHistory.vue | 11 ++++----
.../components/engineeringConfirmation.vue | 1 +
.../components/standardContentList.vue | 26 ++++++++++++-------
.../components/taskCirculationHistory.vue | 10 +++++++
.../components/SentList.vue | 25 ++++++++++++------
.../components/dealtWith.vue | 15 ++++++-----
.../components/doneList.vue | 17 ++++++------
.../toDoCenter/taskConfirmation/index.vue | 14 +++++-----
9 files changed, 80 insertions(+), 49 deletions(-)
diff --git a/jero-web/src/views/documentManage/library/docDetail/index.vue b/jero-web/src/views/documentManage/library/docDetail/index.vue
index a201b7ef7..042865733 100644
--- a/jero-web/src/views/documentManage/library/docDetail/index.vue
+++ b/jero-web/src/views/documentManage/library/docDetail/index.vue
@@ -819,10 +819,12 @@
cursor: pointer;
}
- /deep/.table .ant-table-thead > tr > th {
- font-weight: bolder;
- }
-
+ ///deep/.table .ant-table-thead > tr > th {
+ // font-weight: bolder;
+ //}
+ ///deep/.ant-table-thead > tr > th {
+ // background: #f3f6f6;
+ //}
///deep/.table .ant-table-tbody > tr > td {
// color: #040B29 ;
//}
diff --git a/jero-web/src/views/processCenter/components/circulationHistory.vue b/jero-web/src/views/processCenter/components/circulationHistory.vue
index c05bcabbd..914ec232c 100644
--- a/jero-web/src/views/processCenter/components/circulationHistory.vue
+++ b/jero-web/src/views/processCenter/components/circulationHistory.vue
@@ -43,32 +43,32 @@
{
title: this.$t('OperationNode'),
dataIndex: 'name',
- align: 'center',
+ align: 'left',
width:'20%',
},
{
title: this.$t('Operator'),
dataIndex: 'assignee',
- align: 'center',
+ align: 'left',
width:'20%',
},
{
title: this.$t('result'),
dataIndex: 'approvalResult',
- align: 'center',
+ align: 'left',
width:'20%',
scopedSlots: { customRender: 'approvalResult' }
},
{
title: this.$t('opinion'),
dataIndex: 'approvalOpinion',
- align: 'center',
+ align: 'left',
width:'20%',
},
{
title: this.$t('OperationTime'),
dataIndex: 'createTime',
- align: 'center',
+ align: 'left',
width:'20%',
customRender: function(t, r, index) {
return moment(t).format('YYYY-MM-DD HH:mm:ss')
@@ -95,6 +95,7 @@
\ No newline at end of file
diff --git a/jero-web/src/views/processCenter/components/taskCirculationHistory.vue b/jero-web/src/views/processCenter/components/taskCirculationHistory.vue
index c474671e7..2f3375a25 100644
--- a/jero-web/src/views/processCenter/components/taskCirculationHistory.vue
+++ b/jero-web/src/views/processCenter/components/taskCirculationHistory.vue
@@ -98,6 +98,7 @@
\ No newline at end of file
diff --git a/jero-web/src/views/toDoCenter/projectRegulationTasks/components/SentList.vue b/jero-web/src/views/toDoCenter/projectRegulationTasks/components/SentList.vue
index a282c6bd0..71260b266 100644
--- a/jero-web/src/views/toDoCenter/projectRegulationTasks/components/SentList.vue
+++ b/jero-web/src/views/toDoCenter/projectRegulationTasks/components/SentList.vue
@@ -54,7 +54,7 @@
columns: [
{
title: this.$t('RelatedItems'),
- align: 'center',
+ align: 'left',
dataIndex: 'projectName',
scopedSlots: { customRender: 'RelatedItems' },
ellipsis: true,
@@ -62,7 +62,7 @@
},
{
title: this.$t('standardInformation'),
- align: 'center',
+ align: 'left',
dataIndex: 'standardInfo',
scopedSlots: { customRender: 'standardInformation' },
ellipsis: true,
@@ -70,42 +70,42 @@
},
{
title: this.$t('taskType'),
- align: 'center',
+ align: 'left',
dataIndex: 'flowTypeShow',
ellipsis: true,
width: 170
},
{
title: this.$t('LastProcessor'),
- align: 'center',
+ align: 'left',
dataIndex: 'lastAssigneeName',
ellipsis: true,
width: 170
},
{
title: this.$t('CurrentProcessor'),
- align: 'center',
+ align: 'left',
dataIndex: 'assigneeName',
ellipsis: true,
width: 170
},
{
title: this.$t('TaskCutOffTime'),
- align: 'center',
+ align: 'left',
dataIndex: 'endTime',
ellipsis: true,
width: 170
},
{
title: this.$t('taskStatus'),
- align: 'center',
+ align: 'left',
dataIndex: 'statusShow',
ellipsis: true,
width: 170
},
{
title: this.$t('operation'),
- align: 'center',
+ align: 'left',
fixed: 'right',
width: 120,
scopedSlots: { customRender: 'operation' }
@@ -343,6 +343,7 @@
\ No newline at end of file
diff --git a/jero-web/src/views/toDoCenter/projectRegulationTasks/components/dealtWith.vue b/jero-web/src/views/toDoCenter/projectRegulationTasks/components/dealtWith.vue
index 118d34cae..bdce2d3ec 100644
--- a/jero-web/src/views/toDoCenter/projectRegulationTasks/components/dealtWith.vue
+++ b/jero-web/src/views/toDoCenter/projectRegulationTasks/components/dealtWith.vue
@@ -55,7 +55,7 @@
columns: [
{
title: this.$t('RelatedItems'),
- align: 'center',
+ align: 'left',
dataIndex: 'projectName',
ellipsis: true,
scopedSlots: { customRender: 'RelatedItems' },
@@ -63,7 +63,7 @@
},
{
title: this.$t('standardInformation'),
- align: 'center',
+ align: 'left',
dataIndex: 'standardInfo',
ellipsis: true,
scopedSlots: { customRender: 'standardInformation' },
@@ -71,21 +71,21 @@
},
{
title: this.$t('taskType'),
- align: 'center',
+ align: 'left',
dataIndex: 'flowTypeShow',
ellipsis: true,
width: 170
},
{
title: this.$t('Sponsor'),
- align: 'center',
+ align: 'left',
dataIndex: 'createBy',
ellipsis: true,
width: 170
},
{
title: this.$t('TaskCutOffTime'),
- align: 'center',
+ align: 'left',
dataIndex: 'endTime',
ellipsis: true,
width: 170,
@@ -93,14 +93,14 @@
},
{
title: this.$t('taskStatus'),
- align: 'center',
+ align: 'left',
dataIndex: 'statusShow',
ellipsis: true,
width: 170
},
{
title: this.$t('operation'),
- align: 'center',
+ align: 'left',
fixed: 'right',
width: 120,
scopedSlots: { customRender: 'operation' }
@@ -327,6 +327,7 @@
\ No newline at end of file
diff --git a/jero-web/src/assets/less/common.less b/jero-web/src/assets/less/common.less
index ae083bfe0..8683c2b46 100644
--- a/jero-web/src/assets/less/common.less
+++ b/jero-web/src/assets/less/common.less
@@ -125,4 +125,15 @@
.ant-table-column-title{
font-weight: bold!important;
+}
+
+.ant-table-thead > tr > th {
+ background: #f3f6f6!important;
+}
+.ant-tooltip-inner {
+ color: #333;
+ background-color: #fff!important;
+}
+.ant-tooltip-arrow::before {
+ background-color: #fff;
}
\ No newline at end of file
diff --git a/jero-web/src/components/onlineForm/OnlineForm.css b/jero-web/src/components/onlineForm/OnlineForm.css
index ea188d397..1c5efed9a 100644
--- a/jero-web/src/components/onlineForm/OnlineForm.css
+++ b/jero-web/src/components/onlineForm/OnlineForm.css
@@ -1,3 +1,7 @@
+.box-input{
+ height: 38px!important;
+}
+
.group-query-strig[data-v-16acf936] {
width: 30px;
text-align: center;
diff --git a/jero-web/src/components/onlineForm/onlineForm.js b/jero-web/src/components/onlineForm/onlineForm.js
index b5893b218..363a74bd5 100644
--- a/jero-web/src/components/onlineForm/onlineForm.js
+++ b/jero-web/src/components/onlineForm/onlineForm.js
@@ -45401,31 +45401,31 @@
reportUrlText: "",
columns: [{
title: "报表名称",
- align: "center",
+ align: "left",
dataIndex: "name"
}, {
title: "编码",
- align: "center",
+ align: "left",
dataIndex: "code"
}, {
title: "查询SQL",
- align: "center",
+ align: "left",
dataIndex: "cgrSql",
scopedSlots: {
customRender: "cgrSql"
}
}, {
title: "数据源",
- align: "center",
+ align: "left",
dataIndex: "dbSource_dictText"
}, {
title: "创建时间",
- align: "center",
+ align: "left",
dataIndex: "createTime"
}, {
title: "操作",
dataIndex: "action",
- align: "center",
+ align: "left",
scopedSlots: {
customRender: "action"
}
@@ -72384,6 +72384,7 @@
label: "表名"
}
}, [n("a-input", {
+ staticClass: "box-input",
attrs: {
placeholder: "请输入表名"
},
@@ -72429,8 +72430,9 @@
label: "表描述"
}
}, [n("a-input", {
+ staticClass: "box-input",
attrs: {
- placeholder: "请输入表描述"
+ placeholder: "请输入表描述",
},
model: {
value: e.queryParam.tableTxt,
@@ -72913,13 +72915,13 @@
dataIndex: "",
key: "rowIndex",
width: 60,
- align: "center",
+ align: "left",
customRender: function(e, t, n) {
return parseInt(n) + 1
}
}, {
title: "表类型",
- align: "center",
+ align: "left",
sorter: !0,
dataIndex: "tableType",
customRender: function(t, n) {
@@ -72930,19 +72932,19 @@
}, {
title: "表名",
sorter: !0,
- align: "center",
+ align: "left",
dataIndex: "tableName"
}, {
title: "表描述",
- align: "center",
+ align: "left",
dataIndex: "tableTxt"
}, {
title: "版本",
- align: "center",
+ align: "left",
dataIndex: "tableVersion"
}, {
title: "同步状态",
- align: "center",
+ align: "left",
sorter: !0,
dataIndex: "isDbSynch",
scopedSlots: {
@@ -72950,13 +72952,13 @@
}
}, {
title: "创建时间",
- align: "center",
+ align: "left",
sorter: !0,
dataIndex: "createTime"
}, {
title: "操作",
dataIndex: "action",
- align: "center",
+ align: "left",
scopedSlots: {
customRender: "action"
}
diff --git a/jero-web/src/views/system/QuartzJobList.vue b/jero-web/src/views/system/QuartzJobList.vue
index db0d65e90..60e047a36 100644
--- a/jero-web/src/views/system/QuartzJobList.vue
+++ b/jero-web/src/views/system/QuartzJobList.vue
@@ -140,14 +140,14 @@
dataIndex: '',
key:'rowIndex',
width:60,
- align:"center",
+ align:"left",
customRender:function (t,r,index) {
return parseInt(index)+1;
}
},
{
title: '任务类名',
- align:"center",
+ align:"left",
dataIndex: 'jobClassName',
sorter: true,
/* customRender:function (text) {
@@ -156,26 +156,26 @@
},
{
title: 'cron表达式',
- align:"center",
+ align:"left",
dataIndex: 'cronExpression'
},
{
title: '参数',
- align:"center",
+ align:"left",
width: 150,
dataIndex: 'parameter',
scopedSlots: {customRender: 'parameterRender'},
},
{
title: '描述',
- align:"center",
+ align:"left",
width: 250,
dataIndex: 'description',
scopedSlots: {customRender: 'description'},
},
{
title: '状态',
- align:"center",
+ align:"left",
dataIndex: 'status',
scopedSlots: { customRender: 'customRenderStatus' },
filterMultiple: false,
@@ -187,7 +187,7 @@
{
title: '操作',
dataIndex: 'action',
- align:"center",
+ align:"left",
width:180,
scopedSlots: { customRender: 'action' },
}
@@ -287,5 +287,5 @@
}
\ No newline at end of file
diff --git a/jero-web/src/views/system/SysCheckRuleList.vue b/jero-web/src/views/system/SysCheckRuleList.vue
index 75a96d8c3..7f4027e44 100644
--- a/jero-web/src/views/system/SysCheckRuleList.vue
+++ b/jero-web/src/views/system/SysCheckRuleList.vue
@@ -126,29 +126,29 @@
title: '#',
key: 'rowIndex',
width: 60,
- align: 'center',
+ align: 'left',
customRender: (t, r, i) => i + 1
},
{
title: '规则名称',
- align: 'center',
+ align: 'left',
dataIndex: 'ruleName'
},
{
title: '规则Code',
- align: 'center',
+ align: 'left',
dataIndex: 'ruleCode'
},
{
title: '规则描述',
- align: 'center',
+ align: 'left',
dataIndex: 'ruleDescription',
customRender: (t) => ()
},
{
title: '操作',
dataIndex: 'action',
- align: 'center',
+ align: 'left',
scopedSlots: { customRender: 'action' },
}
],
@@ -174,5 +174,5 @@
}
\ No newline at end of file
diff --git a/jero-web/src/views/system/SysDataSourceList.vue b/jero-web/src/views/system/SysDataSourceList.vue
index 0ccde8d2d..7954fe32e 100644
--- a/jero-web/src/views/system/SysDataSourceList.vue
+++ b/jero-web/src/views/system/SysDataSourceList.vue
@@ -119,50 +119,50 @@
dataIndex: '',
key: 'rowIndex',
width: 60,
- align: 'center',
+ align: 'left',
customRender: (t, r, index) => index + 1
},
{
title: '数据源编码',
- align: 'center',
+ align: 'left',
dataIndex: 'code'
},
{
title: '数据源名称',
- align: 'center',
+ align: 'left',
dataIndex: 'name'
},
{
title: '数据库类型',
- align: 'center',
+ align: 'left',
dataIndex: 'dbType_dictText'
},
{
title: '驱动类',
- align: 'center',
+ align: 'left',
dataIndex: 'dbDriver',
customRender: (t) => ellipsis(t)
},
{
title: '数据源地址',
- align: 'center',
+ align: 'left',
dataIndex: 'dbUrl',
customRender: (t) => ellipsis(t)
},
{
title: '数据库名称',
- align: 'center',
+ align: 'left',
dataIndex: 'dbName'
},
{
title: '用户名',
- align: 'center',
+ align: 'left',
dataIndex: 'dbUsername'
},
{
title: '操作',
dataIndex: 'action',
- align: 'center',
+ align: 'left',
scopedSlots: { customRender: 'action' },
}
],
@@ -184,5 +184,5 @@
}
\ No newline at end of file
diff --git a/jero-web/src/views/system/SysFillRuleList.vue b/jero-web/src/views/system/SysFillRuleList.vue
index 1989c2f8a..6a2b1242b 100644
--- a/jero-web/src/views/system/SysFillRuleList.vue
+++ b/jero-web/src/views/system/SysFillRuleList.vue
@@ -115,33 +115,33 @@
dataIndex: '',
key: 'rowIndex',
width: 60,
- align: 'center',
+ align: 'left',
customRender: (t, r, index) => 1 + index
},
{
title: '规则名称',
- align: 'center',
+ align: 'left',
dataIndex: 'ruleName'
},
{
title: '规则Code',
- align: 'center',
+ align: 'left',
dataIndex: 'ruleCode'
},
{
title: '规则实现类',
- align: 'center',
+ align: 'left',
dataIndex: 'ruleClass'
},
{
title: '规则参数',
- align: 'center',
+ align: 'left',
dataIndex: 'ruleParams'
},
{
title: '操作',
dataIndex: 'action',
- align: 'center',
+ align: 'left',
scopedSlots: { customRender: 'action' },
}
],
@@ -183,5 +183,5 @@
}
\ No newline at end of file
From 98b4712ca757666a995a8b8176ae77a97d420ebb Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E5=88=98=E5=BD=A6=E6=B3=BD?=
Date: Thu, 29 Dec 2022 22:40:59 +0800
Subject: [PATCH 32/54] =?UTF-8?q?UI=E7=95=8C=E9=9D=A2=E5=8F=98=E6=9B=B4-?=
=?UTF-8?q?=E6=96=87=E6=A1=A3OCR=E8=AF=86=E5=88=AB-=E8=B0=83=E5=8F=96?=
=?UTF-8?q?=E5=B7=B2=E5=85=A5=E5=BA=93=E6=96=87=E4=BB=B6?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
jero-web/src/components/OcrTable/DocTable.vue | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/jero-web/src/components/OcrTable/DocTable.vue b/jero-web/src/components/OcrTable/DocTable.vue
index 0d0fa270d..7448e00be 100644
--- a/jero-web/src/components/OcrTable/DocTable.vue
+++ b/jero-web/src/components/OcrTable/DocTable.vue
@@ -162,7 +162,7 @@
this.columns.push({
title: res.db_field_txt,
dataIndex: res.db_field_name,
- align: 'center',
+ align: 'left',
ellipsis: true,
sorter: res.sort
})
@@ -190,7 +190,7 @@
if (this.showAction) {
this.columns.push({
title: this.$t('operation'),
- align: 'center',
+ align: 'left',
fixed: 'right',
width: width,
scopedSlots: { customRender: 'operation' }
From 1a84828956751e5e77515561687d48018556d839 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E5=88=98=E5=BD=A6=E6=B3=BD?=
Date: Thu, 29 Dec 2022 22:44:31 +0800
Subject: [PATCH 33/54] =?UTF-8?q?UI=E7=95=8C=E9=9D=A2=E5=8F=98=E6=9B=B4-?=
=?UTF-8?q?=E6=B3=95=E8=A7=84=E7=AC=A6=E5=90=88=E6=80=A7=E7=9C=8B=E6=9D=BF?=
=?UTF-8?q?-=E8=A1=A8=E5=8D=95?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
jero-web/src/views/regulationsKanban/index.vue | 10 +++++-----
1 file changed, 5 insertions(+), 5 deletions(-)
diff --git a/jero-web/src/views/regulationsKanban/index.vue b/jero-web/src/views/regulationsKanban/index.vue
index d2347b0fb..64ef0226d 100644
--- a/jero-web/src/views/regulationsKanban/index.vue
+++ b/jero-web/src/views/regulationsKanban/index.vue
@@ -21,6 +21,7 @@
v-model="queryParam.title">
+
@@ -32,7 +33,6 @@
:triggerChange="false" :dictCode="'state'"/>
-
@@ -52,15 +52,15 @@
-
+
+ :fieldList="fieldList"/>
{{ $t('query') }}
- {{ $t('reset') }}
-
+
{{ !toggleSearchStatus ? $t('open') : $t('away') }}
From abacc01901e1386645a2745370e1f02a0e51fa14 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E5=88=98=E5=BD=A6=E6=B3=BD?=
Date: Thu, 29 Dec 2022 22:54:18 +0800
Subject: [PATCH 34/54] =?UTF-8?q?UI=E7=95=8C=E9=9D=A2=E5=8F=98=E6=9B=B4-?=
=?UTF-8?q?=E6=B3=95=E8=A7=84=E6=9C=88=E6=8A=A5-=E6=96=B0=E5=A2=9E?=
=?UTF-8?q?=E5=86=85=E5=AE=B9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
.../regulationReport/components/modules/defaultTemplate.vue | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/jero-web/src/views/businessSupport/regulationReport/components/modules/defaultTemplate.vue b/jero-web/src/views/businessSupport/regulationReport/components/modules/defaultTemplate.vue
index 3baa708c8..9876a2c47 100644
--- a/jero-web/src/views/businessSupport/regulationReport/components/modules/defaultTemplate.vue
+++ b/jero-web/src/views/businessSupport/regulationReport/components/modules/defaultTemplate.vue
@@ -569,7 +569,7 @@
.itemModel-multi-one {
border: 1px solid #d9d9d9;
border-radius: 4px;
- padding: 0 8px;
+ padding: 0 0px;
box-sizing: border-box;
}
\ No newline at end of file
From 325e78d3c672dd1cda299992881efc497ea14f9a Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E5=88=98=E5=BD=A6=E6=B3=BD?=
Date: Fri, 30 Dec 2022 09:09:34 +0800
Subject: [PATCH 35/54] =?UTF-8?q?UI=E7=95=8C=E9=9D=A2=E5=8F=98=E6=9B=B4-?=
=?UTF-8?q?=E6=96=87=E6=A1=A3=E6=8B=86=E5=88=86-=E6=8B=86=E5=88=86?=
=?UTF-8?q?=E6=96=87=E6=A1=A3=E8=AF=A6=E6=83=85?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
jero-web/src/components/SplitSearch/index.vue | 2 +-
jero-web/src/components/SplitTable/index.vue | 8 ++++++--
2 files changed, 7 insertions(+), 3 deletions(-)
diff --git a/jero-web/src/components/SplitSearch/index.vue b/jero-web/src/components/SplitSearch/index.vue
index a1ce0b7c8..077aa9be9 100644
--- a/jero-web/src/components/SplitSearch/index.vue
+++ b/jero-web/src/components/SplitSearch/index.vue
@@ -1,7 +1,7 @@
-
+
diff --git a/jero-web/src/components/SplitTable/index.vue b/jero-web/src/components/SplitTable/index.vue
index 434f7052a..108b61945 100644
--- a/jero-web/src/components/SplitTable/index.vue
+++ b/jero-web/src/components/SplitTable/index.vue
@@ -189,7 +189,7 @@
this.columns.push({
title: res.db_field_txt,
dataIndex: res.db_field_name,
- align: 'center',
+ align: 'left',
ellipsis: true,
sorter: res.sort,
width: 170
@@ -218,7 +218,7 @@
if (this.showAction) {
this.columns.push({
title: this.$t('operation'),
- align: 'center',
+ align: 'left',
fixed: 'right',
width: width,
scopedSlots: { customRender: 'operation' }
@@ -318,4 +318,8 @@
text-justify: inter-ideograph;
word-break: break-all
}
+
+ /*/deep/.table .ant-table-tbody > tr > td {*/
+ /* color: #040B29 ;*/
+ /*}*/
From c4cdb277b9b8125670a6ac288a9e5a3feb3e8c19 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E5=88=98=E5=BD=A6=E6=B3=BD?=
Date: Fri, 30 Dec 2022 09:58:55 +0800
Subject: [PATCH 36/54] =?UTF-8?q?UI=E7=95=8C=E9=9D=A2=E5=8F=98=E6=9B=B4-?=
=?UTF-8?q?=E6=B3=95=E8=A7=84=E6=B8=85=E5=8D=95?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
.../components/listOfRegulations.vue | 55 ++++++++++---------
1 file changed, 28 insertions(+), 27 deletions(-)
diff --git a/jero-web/src/views/projectManagement/components/listOfRegulations.vue b/jero-web/src/views/projectManagement/components/listOfRegulations.vue
index c3a00e797..63e82bfc2 100644
--- a/jero-web/src/views/projectManagement/components/listOfRegulations.vue
+++ b/jero-web/src/views/projectManagement/components/listOfRegulations.vue
@@ -24,6 +24,7 @@
v-model="queryParam.title">
+
@@ -35,7 +36,6 @@
:triggerChange="false" :dictCode="'duty_territory'"/>
-
@@ -77,15 +77,15 @@
-
+
+ :fieldList="fieldList"/>
{{ $t('query') }}
- {{ $t('reset') }}
-
+
{{ !toggleSearchStatus ? $t('open') : $t('away') }}
@@ -266,39 +266,39 @@
{{ record.designDeliverableTypeName }}
-
- {{ record.designDeliverableTemplateName.length > 10 ? record.designDeliverableTemplateName.slice(0, 9) + '...' :record.designDeliverableTemplateName}}
-
- {{ $t('viewFile') }}
+
+
+
+
+
+
+
--
{{ record.prehomoDeliverableTypeName }}
-
- {{ record.prehomoDeliverableTemplateName.length > 10 ? record.prehomoDeliverableTemplateName.slice(0, 9) + '...' :record.prehomoDeliverableTemplateName}}
-
- {{ $t('viewFile') }}
+
+
+
+
+
+
+
--
{{ record.verifyDeliverableTypeName }}
-
- {{ record.verifyDeliverableTemplateName.length > 10 ? record.verifyDeliverableTemplateName.slice(0, 9) + '...' :record.verifyDeliverableTemplateName}}
-
- {{ $t('viewFile') }}
+
+
+
+
+
+
+
--
@@ -2557,7 +2557,8 @@
.tableList .ant-table-thead > tr > th {
padding: 0px 16px !important;
- font-weight: bolder;
+ //font-weight: bold;
+ //background: #f3f6f6;
}
//.tableList .ant-table-tbody > tr > td{
From 6111aff6b7deca9e2ee93beacd09602ac114f556 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E5=88=98=E5=BD=A6=E6=B3=BD?=
Date: Fri, 30 Dec 2022 10:07:30 +0800
Subject: [PATCH 37/54] =?UTF-8?q?UI=E7=95=8C=E9=9D=A2=E5=8F=98=E6=9B=B4-?=
=?UTF-8?q?=E9=A1=B9=E7=9B=AE=E8=AF=A6=E6=83=85-=E4=BB=BB=E5=8A=A1?=
=?UTF-8?q?=E6=B8=85=E5=8D=95?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
.../views/projectManagement/components/TaskList.vue | 10 ++++++++++
1 file changed, 10 insertions(+)
diff --git a/jero-web/src/views/projectManagement/components/TaskList.vue b/jero-web/src/views/projectManagement/components/TaskList.vue
index 47eb73f9d..82c544d38 100644
--- a/jero-web/src/views/projectManagement/components/TaskList.vue
+++ b/jero-web/src/views/projectManagement/components/TaskList.vue
@@ -34,6 +34,7 @@
:triggerChange="false" :dictCode="'certification_progress'"/>
+
@@ -66,10 +67,15 @@
+
{{$t('query')}}
{{$t('reset')}}
+
+ {{ !toggleSearchStatus ? $t('open') : $t('away') }}
+
+
@@ -241,6 +247,7 @@
props: ['isDisplayNum', 'areaOfResponsibility'],
data() {
return {
+ toggleSearchStatus: false,
columns: [
{
title: this.$t('number'),
@@ -383,6 +390,9 @@
},
methods: {
...mapGetters(['userInfo']),
+ handleToggleSearch() {
+ this.toggleSearchStatus = !this.toggleSearchStatus
+ },
searchQuery() {
this.getList()
},
From 0e3e93bb43f576b166489d4c99e35089b9153004 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E5=88=98=E5=BD=A6=E6=B3=BD?=
Date: Fri, 30 Dec 2022 10:36:14 +0800
Subject: [PATCH 38/54] =?UTF-8?q?UI=E7=95=8C=E9=9D=A2=E5=8F=98=E6=9B=B4-?=
=?UTF-8?q?=E8=99=9A=E6=8B=9F=E6=B8=85=E5=8D=95?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
.../virtualList/components/addModel.vue | 22 ++++++---
.../components/virtualListDetails.vue | 48 +++++++++----------
2 files changed, 40 insertions(+), 30 deletions(-)
diff --git a/jero-web/src/views/documentTools/virtualList/components/addModel.vue b/jero-web/src/views/documentTools/virtualList/components/addModel.vue
index 316fb63fe..c946cdf25 100644
--- a/jero-web/src/views/documentTools/virtualList/components/addModel.vue
+++ b/jero-web/src/views/documentTools/virtualList/components/addModel.vue
@@ -21,6 +21,7 @@
v-model="queryParam.serial_number">
+
@@ -41,6 +42,7 @@
:triggerChange="false" :dictCode="'state'"/>
+
{{$t('query')}}
{{$t('reset')}}
+
+ {{ !toggleSearchStatus ? $t('open') : $t('away') }}
+
+
@@ -104,6 +110,7 @@
},
data() {
return {
+ toggleSearchStatus: false,
visible: false,
confirmLoading: false,
selectedRowKeys: [],
@@ -112,19 +119,19 @@
{
title: this.$t('standard'),
dataIndex: 'serial_number',
- align: 'center',
+ align: 'left',
ellipsis: true
},
{
title: this.$t('title'),
dataIndex: 'title',
- align: 'center',
+ align: 'left',
ellipsis: true
},
{
title: this.$t('zoneOfApplication'),
dataIndex: 'region',
- align: 'center',
+ align: 'left',
ellipsis: true
},
// {
@@ -142,13 +149,13 @@
{
title: this.$t('ImplementationDate'),
dataIndex: 'xin1_che1_xing2_shi2_shi1_ri4_qi1',
- align: 'center',
+ align: 'left',
ellipsis: true
},
{
title: this.$t('vehicleInProductionDate'),
dataIndex: 'implement_time',
- align: 'center',
+ align: 'left',
ellipsis: true
}
// {
@@ -173,6 +180,9 @@
},
methods: {
+ handleToggleSearch() {
+ this.toggleSearchStatus = !this.toggleSearchStatus
+ },
addModel() {
this.visible = true
this.queryParam = {}
@@ -310,7 +320,7 @@
}
.title-text {
- width: 33px;
+ width: 110px;
color: #000F16;
display: inline-block;
font-weight: 500;
diff --git a/jero-web/src/views/documentTools/virtualList/components/virtualListDetails.vue b/jero-web/src/views/documentTools/virtualList/components/virtualListDetails.vue
index 515d103e5..7da775c0c 100644
--- a/jero-web/src/views/documentTools/virtualList/components/virtualListDetails.vue
+++ b/jero-web/src/views/documentTools/virtualList/components/virtualListDetails.vue
@@ -65,7 +65,7 @@
-
+
{{$t('subtitle')}}
{{record.designDeliverableTypeName}}
-
- {{ record.designDeliverableTemplateName.length > 10 ? record.designDeliverableTemplateName.slice(0, 9) + '...' :record.designDeliverableTemplateName}}
-
- {{$t('viewFile')}}
+
+
+
+
+
+
+
--
{{record.prehomoDeliverableTypeName}}
-
- {{ record.prehomoDeliverableTemplateName.length > 10 ? record.prehomoDeliverableTemplateName.slice(0, 9) + '...' :record.prehomoDeliverableTemplateName}}
-
- {{$t('viewFile')}}
+
+
+
+
+
+
+
--
{{record.verifyDeliverableTypeName}}
-
- {{ record.verifyDeliverableTemplateName.length > 10 ? record.verifyDeliverableTemplateName.slice(0, 9) + '...' :record.verifyDeliverableTemplateName}}
-
- {{$t('viewFile')}}
+
+
+
+
+
+
+
--
@@ -963,14 +963,14 @@
}
.title-text {
- width: 36px;
+ width: 110px;
color: #000F16;
display: inline-block;
font-weight: 500;
font-size: 14px;
margin-right: 16px;
margin-top: 3px;
- text-align: left;
+ text-align: right;
white-space: nowrap;
overflow: hidden;
text-overflow: ellipsis;
From cc4abf64da4f729d4c83e989b76231087d90e117 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E5=88=98=E5=BD=A6=E6=B3=BD?=
Date: Fri, 30 Dec 2022 10:54:09 +0800
Subject: [PATCH 39/54] =?UTF-8?q?UI=E7=95=8C=E9=9D=A2=E5=8F=98=E6=9B=B4-?=
=?UTF-8?q?=E9=A1=B9=E7=9B=AE=E8=AF=A6=E6=83=85-=E8=AE=A4=E8=AF=81?=
=?UTF-8?q?=E5=8F=82=E6=95=B0=E5=88=97=E8=A1=A8?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
.../views/projectManagement/dialog/ParameterTemplateAdd.vue | 4 ++--
.../src/views/projectManagement/dialog/historicalVersion.vue | 4 ++--
2 files changed, 4 insertions(+), 4 deletions(-)
diff --git a/jero-web/src/views/projectManagement/dialog/ParameterTemplateAdd.vue b/jero-web/src/views/projectManagement/dialog/ParameterTemplateAdd.vue
index b4e221ac3..e3bb38d67 100644
--- a/jero-web/src/views/projectManagement/dialog/ParameterTemplateAdd.vue
+++ b/jero-web/src/views/projectManagement/dialog/ParameterTemplateAdd.vue
@@ -194,12 +194,12 @@
title: this.$t('zoneOfApplication'),
dataIndex: 'region_dictText',
key: 'showArea',
- align: 'center',
+ align: 'left',
ellipsis: true
},
{
title: this.$t('parameterTemplate'),
- align: 'center',
+ align: 'left',
dataIndex: 'paramsTemplateName',
ellipsis: true
}
diff --git a/jero-web/src/views/projectManagement/dialog/historicalVersion.vue b/jero-web/src/views/projectManagement/dialog/historicalVersion.vue
index e97f96fd8..f61a78c4d 100644
--- a/jero-web/src/views/projectManagement/dialog/historicalVersion.vue
+++ b/jero-web/src/views/projectManagement/dialog/historicalVersion.vue
@@ -39,12 +39,12 @@ export default {
{
title: this.$t('VersionNumber'),
dataIndex: 'version',
- align: 'center',
+ align: 'left',
ellipsis: true
},
{
title: this.$t('operation'),
- align: 'center',
+ align: 'left',
dataIndex: 'paramsTemplateName',
ellipsis: true,
scopedSlots: { customRender: 'action' }
From a7fb5b2ce6212d10d2b381c276b9425d5256699e Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E5=88=98=E5=BD=A6=E6=B3=BD?=
Date: Fri, 30 Dec 2022 11:03:49 +0800
Subject: [PATCH 40/54] =?UTF-8?q?UI=E7=95=8C=E9=9D=A2=E5=8F=98=E6=9B=B4-?=
=?UTF-8?q?=E4=B8=8A=E6=8A=A5=E5=BA=93=E7=AE=A1=E7=90=86-=E5=8F=82?=
=?UTF-8?q?=E6=95=B0=E9=A1=B9=E6=9F=A5=E7=9C=8B=E9=A1=B5?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
.../src/views/parameter/managementdetails/index.vue | 12 +++++++++++-
1 file changed, 11 insertions(+), 1 deletion(-)
diff --git a/jero-web/src/views/parameter/managementdetails/index.vue b/jero-web/src/views/parameter/managementdetails/index.vue
index f0282dbb7..c53290333 100644
--- a/jero-web/src/views/parameter/managementdetails/index.vue
+++ b/jero-web/src/views/parameter/managementdetails/index.vue
@@ -42,6 +42,7 @@
v-model="formInline.paramsName">
+
@@ -70,10 +71,15 @@
v-model="formInline.sdtName"/>
+
{{$t('query')}}
{{$t('reset')}}
+
+ {{ !toggleSearchStatus ? $t('open') : $t('away') }}
+
+
@@ -163,6 +169,7 @@
},
data() {
return {
+ toggleSearchStatus: false,
columns: [],
selectedRowKeys: [],
formInline: {},
@@ -236,6 +243,9 @@
document.title = this.$t('ParameterViewPage')
},
methods: {
+ handleToggleSearch() {
+ this.toggleSearchStatus = !this.toggleSearchStatus
+ },
Getlist() {
getAction(this.url.tableHeader, { paramsManifestId: this.$route.query.id, flag: 8 }).then((res) => {
if (res.success) {
@@ -474,7 +484,7 @@
.Virtual-detail-content {
margin-top: 68px;
- padding: 0 38px 0 38px;
+ padding: 0 0 0 38px;
box-sizing: border-box;
font-size: 16px;
From ddfed94cd8285a3e9a48a71f1460eb707460d6ef Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E5=88=98=E5=BD=A6=E6=B3=BD?=
Date: Fri, 30 Dec 2022 11:41:04 +0800
Subject: [PATCH 41/54] =?UTF-8?q?UI=E7=95=8C=E9=9D=A2=E5=8F=98=E6=9B=B4-?=
=?UTF-8?q?=E6=B3=95=E8=A7=84=E6=9C=88=E6=8A=A5?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
.../regulationReport/components/modules/addModel.vue | 12 +++++++++++-
1 file changed, 11 insertions(+), 1 deletion(-)
diff --git a/jero-web/src/views/businessSupport/regulationReport/components/modules/addModel.vue b/jero-web/src/views/businessSupport/regulationReport/components/modules/addModel.vue
index 9d76d32f0..3a8fe55a9 100644
--- a/jero-web/src/views/businessSupport/regulationReport/components/modules/addModel.vue
+++ b/jero-web/src/views/businessSupport/regulationReport/components/modules/addModel.vue
@@ -21,6 +21,7 @@
v-model="queryParam.serial_number">
+
@@ -41,6 +42,7 @@
:triggerChange="false" :dictCode="'state'"/>
+
{{$t('query')}}
{{$t('reset')}}
+
+ {{ !toggleSearchStatus ? $t('open') : $t('away') }}
+
+
@@ -100,6 +106,7 @@
},
data() {
return {
+ toggleSearchStatus: false,
visible: false,
confirmLoading: false,
selectedRowKeys: [],
@@ -170,6 +177,9 @@
},
methods: {
+ handleToggleSearch() {
+ this.toggleSearchStatus = !this.toggleSearchStatus
+ },
addModel() {
this.visible = true
this.queryParam = {}
@@ -295,7 +305,7 @@
}
.title-text {
- width: 69px;
+ width: 110px;
color: #000F16;
display: inline-block;
font-weight: 500;
From a45b1874accff4ff59b702141f4f6009be2cc199 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E5=88=98=E5=BD=A6=E6=B3=BD?=
Date: Fri, 30 Dec 2022 11:41:39 +0800
Subject: [PATCH 42/54] =?UTF-8?q?UI=E7=95=8C=E9=9D=A2=E5=8F=98=E6=9B=B4-?=
=?UTF-8?q?=E7=9F=A5=E8=AF=86=E5=88=86=E4=BA=AB-=E7=AE=A1=E7=90=86?=
=?UTF-8?q?=E5=8F=91=E5=B8=83?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
.../problemKnowledgeBase/components/listAddModel.vue | 12 +++++++++++-
.../components/problemKnowledgeBaseRelease.vue | 2 +-
2 files changed, 12 insertions(+), 2 deletions(-)
diff --git a/jero-web/src/views/businessSupport/problemKnowledgeBase/components/listAddModel.vue b/jero-web/src/views/businessSupport/problemKnowledgeBase/components/listAddModel.vue
index 1837c9e10..c7f6de84b 100644
--- a/jero-web/src/views/businessSupport/problemKnowledgeBase/components/listAddModel.vue
+++ b/jero-web/src/views/businessSupport/problemKnowledgeBase/components/listAddModel.vue
@@ -21,6 +21,7 @@
v-model="queryParam.serial_number">
+
@@ -41,6 +42,7 @@
:triggerChange="false" :dictCode="'state'"/>
+
{{$t('query')}}
{{$t('reset')}}
+
+ {{ !toggleSearchStatus ? $t('open') : $t('away') }}
+
+
@@ -96,6 +102,7 @@
props: ['url'],
data() {
return {
+ toggleSearchStatus: false,
visible: false,
queryParam: {},
confirmLoading: false,
@@ -148,6 +155,9 @@
},
methods: {
+ handleToggleSearch() {
+ this.toggleSearchStatus = !this.toggleSearchStatus
+ },
addModel(value) {
this.pageNo = 1
this.visible = true
@@ -290,7 +300,7 @@
}
.title-text {
- width: 33px;
+ width: 110px;
color: #000F16;
display: inline-block;
font-weight: 500;
diff --git a/jero-web/src/views/businessSupport/problemKnowledgeBase/components/problemKnowledgeBaseRelease.vue b/jero-web/src/views/businessSupport/problemKnowledgeBase/components/problemKnowledgeBaseRelease.vue
index b65366ba9..ad1d489e9 100644
--- a/jero-web/src/views/businessSupport/problemKnowledgeBase/components/problemKnowledgeBaseRelease.vue
+++ b/jero-web/src/views/businessSupport/problemKnowledgeBase/components/problemKnowledgeBaseRelease.vue
@@ -252,7 +252,7 @@