From cf2e6400b3e2af2702c5a4734382acf5412386e7 Mon Sep 17 00:00:00 2001
From: qq787203167 <787203167@qq.com>
Date: Mon, 28 Feb 2022 17:25:08 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E4=B8=AD=E8=8B=B1=E6=96=87?=
=?UTF-8?q?=E5=88=87=E6=8D=A2?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
jero-web/src/assets/less/common.less | 2 +-
jero-web/src/common/lang/en-us.js | 6 ++
jero-web/src/common/lang/zh-cn.js | 6 ++
jero-web/src/components/ImportFile/index.vue | 11 ++-
jero-web/src/components/addForm/index.vue | 31 +++----
.../src/components/libraryAddForm/index.vue | 37 ++++----
jero-web/src/components/page/GlobalLayout.vue | 2 +-
jero-web/src/components/search/index.vue | 16 ++--
jero-web/src/components/tableDate/index.vue | 49 ++++++----
.../views/documentManage/library/index.vue | 30 ++++---
.../documentTools/searchCenter/index.vue | 89 ++++++++++++-------
11 files changed, 175 insertions(+), 104 deletions(-)
diff --git a/jero-web/src/assets/less/common.less b/jero-web/src/assets/less/common.less
index 80c81f7c2..a013555af 100644
--- a/jero-web/src/assets/less/common.less
+++ b/jero-web/src/assets/less/common.less
@@ -1,6 +1,6 @@
/*列表上方操作按钮区域*/
.ant-card-body .table-operator {
- margin-bottom: 18px;
+ margin-bottom: 29px;
text-align: right;
}
diff --git a/jero-web/src/common/lang/en-us.js b/jero-web/src/common/lang/en-us.js
index 27abfbf3e..1a9508129 100644
--- a/jero-web/src/common/lang/en-us.js
+++ b/jero-web/src/common/lang/en-us.js
@@ -343,4 +343,10 @@ module.exports = {
ModificationTime:'Modification time',
ModificationContent:'Modification content',
personnel:'personnel',
+ dataExport:'Data export',
+ exportWithFile:'Export with file',
+ Push:'Push',
+ templateDownload:'Template download',
+ textInformation:'Text information',
+ relatedInformation:'Related information'
}
\ No newline at end of file
diff --git a/jero-web/src/common/lang/zh-cn.js b/jero-web/src/common/lang/zh-cn.js
index e41c3b39c..049e220f5 100644
--- a/jero-web/src/common/lang/zh-cn.js
+++ b/jero-web/src/common/lang/zh-cn.js
@@ -347,4 +347,10 @@ module.exports = {
ModificationTime:'修改时间',
ModificationContent:'修改内容',
personnel:'人员',
+ dataExport:'数据导出',
+ exportWithFile:'带文件导出',
+ Push:'推送',
+ templateDownload:'模板下载',
+ textInformation:'文本信息',
+ relatedInformation:'关联信息'
}
\ No newline at end of file
diff --git a/jero-web/src/components/ImportFile/index.vue b/jero-web/src/components/ImportFile/index.vue
index c684d95e1..81b8f5182 100644
--- a/jero-web/src/components/ImportFile/index.vue
+++ b/jero-web/src/components/ImportFile/index.vue
@@ -1,12 +1,13 @@
@@ -93,6 +94,10 @@
}
-
\ No newline at end of file
diff --git a/jero-web/src/components/addForm/index.vue b/jero-web/src/components/addForm/index.vue
index 44f66efa1..50003bad5 100644
--- a/jero-web/src/components/addForm/index.vue
+++ b/jero-web/src/components/addForm/index.vue
@@ -7,7 +7,7 @@
*
- {{item.db_field_txt}}
+ {{item.db_field_txt}}
*
- {{item.db_field_txt}}
+ {{item.db_field_txt}}
*
- {{item.db_field_txt}}
+ {{item.db_field_txt}}
*
- {{item.db_field_txt}}
+ {{item.db_field_txt}}
*
- {{item.db_field_txt}}
+ {{item.db_field_txt}}
*
- {{item.db_field_txt}}
+ {{item.db_field_txt}}
*
- {{item.db_field_txt}}
+ {{item.db_field_txt}}
*
- {{item.db_field_txt}}
+ {{item.db_field_txt}}
*
- {{item.db_field_txt}}
+ {{item.db_field_txt}}
*
- {{item.db_field_txt}}
+ {{item.db_field_txt}}
*
- {{item.db_field_txt}}
+ {{item.db_field_txt}}
*
- {{item.db_field_txt}}
+ {{item.db_field_txt}}
*
- {{item.db_field_txt}}
+ {{item.db_field_txt}}
*
- {{item.db_field_txt}}
+ {{item.db_field_txt}}
*
- {{item.db_field_txt}}
+ {{item.db_field_txt}}
*
- {{item.db_field_txt}}
+ {{item.db_field_txt}}
*
- {{item.db_field_txt}}
+ {{item.db_field_txt}}
*
- {{item.db_field_txt}}
+ {{item.db_field_txt}}
*
- {{item.db_field_txt}}
+ {{item.db_field_txt}}
*
- {{item.db_field_txt}}
+ {{item.db_field_txt}}
*
- {{item.db_field_txt}}
+ {{item.db_field_txt}}
*
- {{item.db_field_txt}}
+ {{item.db_field_txt}}
*
- {{item.db_field_txt}}
+ {{item.db_field_txt}}
*
- {{item.db_field_txt}}
+ {{item.db_field_txt}}
-
+
*
{{item.db_field_txt}}
@@ -201,7 +201,7 @@
*
- {{item.db_field_txt}}
+ {{item.db_field_txt}}
-
-
-
-
-
-
@@ -138,6 +144,10 @@
this.columns[index].scopedSlots = {
customRender: 'detailClick'
}
+ } else {
+ this.columns[index].scopedSlots = {
+ customRender: 'detailText'
+ }
}
})
let width = 0
@@ -177,6 +187,9 @@
postAction(this.url.tableList, params).then((res) => {
if (res.success) {
this.dataSource = res.result.records
+ this.dataSource.forEach((val) => {
+ val.function_territory = val.function_territory + 'dsfsdfs 收到付款了山东黄搞定;分两个地方骨科大夫的咖啡馆里的法国金弗兰克是的积分流口水的房间的斯洛伐克第三方'
+ })
this.total = res.result.total
this.loading = false
} else {
@@ -209,6 +222,10 @@
.table .ant-table-column-title {
font-weight: bold;
}
+
+ .ant-table td {
+ white-space: nowrap;
+ }
\ No newline at end of file
diff --git a/jero-web/src/views/documentTools/searchCenter/index.vue b/jero-web/src/views/documentTools/searchCenter/index.vue
index 6d107beaf..6f6b61716 100644
--- a/jero-web/src/views/documentTools/searchCenter/index.vue
+++ b/jero-web/src/views/documentTools/searchCenter/index.vue
@@ -71,7 +71,7 @@
-
+
检索范围:
纯电动
@@ -101,11 +101,9 @@
-
+
-
-
+
{
- return res !== item.id
- })
- }else{
- this.checkboxText.push(item.id)
- }
+ if (item.checked) {
+ this.checkboxText = this.checkboxText.filter(res => {
+ return res !== item.id
+ })
+ } else {
+ this.checkboxText.push(item.id)
+ }
console.log(this.checkboxText)
},
selectModel(value) {
@@ -441,7 +439,13 @@
}
}
-
+
\ No newline at end of file