From 718d5a707a37ff967059f4e4fc7c2648480f18d7 Mon Sep 17 00:00:00 2001
From: qq787203167 <787203167@qq.com>
Date: Thu, 11 Aug 2022 09:30:12 +0800
Subject: [PATCH 01/12] =?UTF-8?q?=E5=AF=B9=E6=8E=A5=E7=9F=A5=E8=AF=86?=
=?UTF-8?q?=E5=BA=93?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
.../components/countryCardReleaseAdd.vue | 5 +++--
.../components/countryCardView.vue | 17 ++++++++++++-----
.../components/problemKnowledgeBaseAdd.vue | 8 ++++++--
3 files changed, 21 insertions(+), 9 deletions(-)
diff --git a/jero-web/src/views/businessSupport/problemKnowledgeBase/components/countryCardReleaseAdd.vue b/jero-web/src/views/businessSupport/problemKnowledgeBase/components/countryCardReleaseAdd.vue
index 301721aff..5ba9e0e3c 100644
--- a/jero-web/src/views/businessSupport/problemKnowledgeBase/components/countryCardReleaseAdd.vue
+++ b/jero-web/src/views/businessSupport/problemKnowledgeBase/components/countryCardReleaseAdd.vue
@@ -62,7 +62,8 @@
{
this.contentList.forEach(res1 => {
if (res1.name == val.lableName) {
- res1.list.push({
- lableName: val.content,
- lableType: val.lableType
- })
+ if (val.lableType == 3) {
+ res1.list.push({
+ lableName: val.contentDropDownValue,
+ lableType: val.lableType
+ })
+ } else {
+ res1.list.push({
+ lableName: val.content,
+ lableType: val.lableType
+ })
+ }
}
})
})
diff --git a/jero-web/src/views/businessSupport/problemKnowledgeBase/components/problemKnowledgeBaseAdd.vue b/jero-web/src/views/businessSupport/problemKnowledgeBase/components/problemKnowledgeBaseAdd.vue
index 4b5d678f1..c954fe235 100644
--- a/jero-web/src/views/businessSupport/problemKnowledgeBase/components/problemKnowledgeBaseAdd.vue
+++ b/jero-web/src/views/businessSupport/problemKnowledgeBase/components/problemKnowledgeBaseAdd.vue
@@ -133,8 +133,9 @@
{{$t('content')}}
-
+
\ No newline at end of file
From 8d009c6b15dcc072dc73ff2457040de8fb48e7bd Mon Sep 17 00:00:00 2001
From: "zyx.net"
Date: Thu, 11 Aug 2022 09:32:37 +0800
Subject: [PATCH 02/12] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E5=AF=B9=E5=A4=96?=
=?UTF-8?q?=E6=8A=A5=E5=91=8A=E7=AE=A1=E7=90=86=E6=8C=89=E9=92=AE=E6=9D=83?=
=?UTF-8?q?=E9=99=90=E9=97=AE=E9=A2=98?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
jero-web/src/common/lang/en-us.js | 2 +-
jero-web/src/views/externalReports/index.vue | 6 ++++--
2 files changed, 5 insertions(+), 3 deletions(-)
diff --git a/jero-web/src/common/lang/en-us.js b/jero-web/src/common/lang/en-us.js
index 7596c76db..04fce3a33 100644
--- a/jero-web/src/common/lang/en-us.js
+++ b/jero-web/src/common/lang/en-us.js
@@ -475,7 +475,7 @@ module.exports = {
away: 'Collapse',
toDoProcess: 'To Do',
processDone: 'Completed',
- sentProcess: 'Create',
+ sentProcess: 'Initiated',
monitoringProcess: 'Monitor',
ConfirmDeployment: 'Confirm Deployment?',
terminationProcess: 'Termination Process',
diff --git a/jero-web/src/views/externalReports/index.vue b/jero-web/src/views/externalReports/index.vue
index b714d81cd..82ea5c65e 100644
--- a/jero-web/src/views/externalReports/index.vue
+++ b/jero-web/src/views/externalReports/index.vue
@@ -40,7 +40,7 @@
{{title && title.length > 18?title.slice(0,17)+'...':title}}
-
+
{{$t('Addingfolder')}}
{{$t('Addingsubfolders')}}
@@ -296,6 +296,7 @@ export default {
pageSize: 10,
pageNo: 1,
disabled:false,
+ manager:false,
total: 0,
tableData: [],
selectedRowKeys: [],
@@ -503,8 +504,9 @@ export default {
getAction(`extRepo/extRepoFolder/list`, {}).then(res => {
if (res.success) {
// this.data = this.toTree(res.result)
- this.data = res.result
+ this.data = res.result.list
this.menuId = this.data[0].key
+ this.manager = res.result.manager
console.log(this.menuId)
let queryParam = {
supFolder: this.menuId
From 2e3c94de2aa941fb15b1d7c59564d3a575fab7b5 Mon Sep 17 00:00:00 2001
From: qq787203167 <787203167@qq.com>
Date: Thu, 11 Aug 2022 09:50:14 +0800
Subject: [PATCH 03/12] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E7=A6=85=E9=81=93?=
=?UTF-8?q?=E5=B7=B2=E7=9F=A5bug?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
.../components/modules/defaultTemplate.vue | 4 ++--
.../components/modules/fillAdd.vue | 12 ++++++++++++
.../components/modules/fillTable.vue | 5 +++--
.../documentTools/documentTranslation/index.vue | 14 ++++++++------
4 files changed, 25 insertions(+), 10 deletions(-)
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 d091d3d9b..ace3619da 100644
--- a/jero-web/src/views/businessSupport/regulationReport/components/modules/defaultTemplate.vue
+++ b/jero-web/src/views/businessSupport/regulationReport/components/modules/defaultTemplate.vue
@@ -391,8 +391,8 @@
this.formInline = { ...this.formInline }
} else {
this.formInline = {}
- this.formInline.lawsContact = this.userInfo().username
- this.formInline.lawsContactName = this.userInfo().id
+ this.formInline.lawsContact = this.userInfo().id
+ this.formInline.lawsContactName = this.userInfo().username
this.formInline = { ...this.formInline }
}
})
diff --git a/jero-web/src/views/businessSupport/regulationReport/components/modules/fillAdd.vue b/jero-web/src/views/businessSupport/regulationReport/components/modules/fillAdd.vue
index ca2803ca7..ffa3a6543 100644
--- a/jero-web/src/views/businessSupport/regulationReport/components/modules/fillAdd.vue
+++ b/jero-web/src/views/businessSupport/regulationReport/components/modules/fillAdd.vue
@@ -384,4 +384,16 @@
height: 38px;
margin-top: 4px;
}
+
+ ::v-deep .ant-select-tree-treenode-switcher-close {
+ width: 255px;
+ overflow: hidden;
+ text-overflow: ellipsis;
+ white-space: nowrap;
+ }
+ ::v-deep .ant-select-tree-node-content-wrapper{
+ overflow: hidden;
+ text-overflow: ellipsis;
+ white-space: nowrap;
+ }
\ No newline at end of file
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 df745bf88..55010c29d 100644
--- a/jero-web/src/views/businessSupport/regulationReport/components/modules/fillTable.vue
+++ b/jero-web/src/views/businessSupport/regulationReport/components/modules/fillTable.vue
@@ -84,12 +84,13 @@
title: this.$t('chineseTitle'),
align: 'center',
dataIndex: 'titleCn',
- width: 210
+ ellipsis: true,
+ width: 320
},
{
title: this.$t('englishTitle'),
align: 'center',
- width: 210,
+ width: 320,
ellipsis: true,
dataIndex: 'titleEn'
},
diff --git a/jero-web/src/views/documentTools/documentTranslation/index.vue b/jero-web/src/views/documentTools/documentTranslation/index.vue
index e0521ba0c..aea26d78f 100644
--- a/jero-web/src/views/documentTools/documentTranslation/index.vue
+++ b/jero-web/src/views/documentTools/documentTranslation/index.vue
@@ -100,8 +100,8 @@
v-if="record.createBy == userInfoQuery.username && record.releaseCondition == 'draft'"
@click="deleteData(record)">{{$t('delete')}}
-
- {{ text && text.length > 15 ? text.slice(0, 14) + '...' : text }}
+
+ {{ text}}
@@ -150,7 +150,7 @@
},
toggleSearchStatus: false,
loading: false,
- dataSource: [{}],
+ dataSource: [],
selectedRowKeys: [],
total: 0,
pageSize: 10,
@@ -164,14 +164,16 @@
align: 'center',
dataIndex: 'serialNumber',
width: 170,
- scopedSlots: { customRender: 'title' }
+ ellipsis: true,
+ scopedSlots: { customRender: 'standardTitle' }
},
{
title: this.$t('title'),
align: 'center',
dataIndex: 'title',
width: 170,
- scopedSlots: { customRender: 'title' }
+ ellipsis: true,
+ scopedSlots: { customRender: 'standardTitle' }
},
{
title: this.$t('TextStatus'),
@@ -254,7 +256,7 @@
this.pageNo = page
this.getList()
},
- SizeChange(page,pageSize) {
+ SizeChange(page, pageSize) {
this.pageNo = 1
this.pageSize = pageSize
this.getList()
From 3d498fc459f7e92bb0ee1e7e147499878ccb5104 Mon Sep 17 00:00:00 2001
From: "zyx.net"
Date: Thu, 11 Aug 2022 09:51:07 +0800
Subject: [PATCH 04/12] =?UTF-8?q?=E5=8C=BA=E5=88=86=E6=96=B0=E5=A2=9E?=
=?UTF-8?q?=E5=AD=90=E6=96=87=E4=BB=B6=E5=A4=B9=E6=88=96=E5=90=8C=E7=BA=A7?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
jero-web/src/views/externalReports/index.vue | 4 ++++
1 file changed, 4 insertions(+)
diff --git a/jero-web/src/views/externalReports/index.vue b/jero-web/src/views/externalReports/index.vue
index 82ea5c65e..5c19aec74 100644
--- a/jero-web/src/views/externalReports/index.vue
+++ b/jero-web/src/views/externalReports/index.vue
@@ -298,6 +298,7 @@ export default {
disabled:false,
manager:false,
total: 0,
+ addSub:true,
tableData: [],
selectedRowKeys: [],
dataSource: [],
@@ -615,6 +616,7 @@ export default {
this.form = {}
let supFolder = ''
this.supFolder = this.nodeItem.key
+ this.addSub = false
this.menuRightVisible = true
},
@@ -624,6 +626,7 @@ export default {
this.form = {}
let supFolder = ''
this.supFolder = this.nodeItem.key
+ this.addSub = true
this.menuRightVisible = true
},
//树形修改
@@ -682,6 +685,7 @@ export default {
if (!this.isEdit) {
let params = {
supFolder: this.supFolder,
+ addSub: this.addSub,
...this.form
}
this.$refs.ruleForm.validate(valid => {
From d7a8e4a34f58b036bfaba952dc09f9e3f7db4b0b Mon Sep 17 00:00:00 2001
From: qq787203167 <787203167@qq.com>
Date: Thu, 11 Aug 2022 10:13:47 +0800
Subject: [PATCH 05/12] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E7=A6=85=E9=81=93?=
=?UTF-8?q?=E5=B7=B2=E7=9F=A5bug?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
.../regulationReport/components/modules/fillAdd.vue | 13 +++++++++----
1 file changed, 9 insertions(+), 4 deletions(-)
diff --git a/jero-web/src/views/businessSupport/regulationReport/components/modules/fillAdd.vue b/jero-web/src/views/businessSupport/regulationReport/components/modules/fillAdd.vue
index ffa3a6543..3f9010c48 100644
--- a/jero-web/src/views/businessSupport/regulationReport/components/modules/fillAdd.vue
+++ b/jero-web/src/views/businessSupport/regulationReport/components/modules/fillAdd.vue
@@ -387,11 +387,16 @@
::v-deep .ant-select-tree-treenode-switcher-close {
width: 255px;
- overflow: hidden;
- text-overflow: ellipsis;
- white-space: nowrap;
}
- ::v-deep .ant-select-tree-node-content-wrapper{
+
+ ::v-deep .ant-select-tree-node-content-wrapper {
+ float: right;
+ margin-top: -2px!important;
+ }
+
+ ::v-deep .ant-select-tree-title {
+ width: 100%;
+ display: block;
overflow: hidden;
text-overflow: ellipsis;
white-space: nowrap;
From 88ff2361ad85f387c051470578c2049cb29dc2e1 Mon Sep 17 00:00:00 2001
From: gaosong
Date: Thu, 11 Aug 2022 10:23:55 +0800
Subject: [PATCH 06/12] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E5=AF=B9=E5=A4=96?=
=?UTF-8?q?=E6=8A=A5=E5=91=8A-=E4=BF=AE=E6=94=B9=E5=88=9B=E5=BB=BA?=
=?UTF-8?q?=E6=96=87=E4=BB=B6=E5=A4=B9=E9=97=AE=E9=A2=98?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
.../controller/ExtRepoDataController.java | 33 +++++-----------
.../controller/ExtRepoFolderController.java | 39 +++++++++++++++----
.../modules/extRepo/entity/ExtRepoFolder.java | 3 ++
3 files changed, 43 insertions(+), 32 deletions(-)
diff --git a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/extRepo/controller/ExtRepoDataController.java b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/extRepo/controller/ExtRepoDataController.java
index c459fcc97..0fec9671c 100644
--- a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/extRepo/controller/ExtRepoDataController.java
+++ b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/extRepo/controller/ExtRepoDataController.java
@@ -11,7 +11,6 @@ import com.jero.common.system.vo.LoginUser;
import com.jero.common.util.oss.CosBootUtil;
import com.jero.modules.extRepo.entity.ExtRepoData;
import com.jero.modules.extRepo.entity.ExtRepoDataPage;
-import com.jero.modules.extRepo.entity.ExtRepoFolder;
import com.jero.modules.extRepo.service.IExtRepoDataService;
import com.jero.modules.extRepo.service.IExtRepoFolderService;
import io.swagger.annotations.Api;
@@ -185,29 +184,20 @@ public class ExtRepoDataController extends JeroController result = new Result();
ExtRepoData erd = extRepoDataService.queryById(id);
if (null != erd) {
- int count = getRootFolderCount();
- if (erd.getSupFolder().equals("root") && count <= 1) {
+ LoginUser sysUser = (LoginUser) SecurityUtils.getSubject().getPrincipal();
+ if (extRepoFolderService.isManager() || sysUser.getUsername().equals(erd.getCreateBy())) {
+ extRepoDataService.deleteById(id);
+ CosBootUtil.delete(erd.getFileKey());
if (CutEnum.CN.getValue().equals(cut)) {
- result.error500("此文件夹不可删除！");
+ result.success("删除成功!");
} else {
- result.error500("This folder cannot be deleted!");
+ result.success("Data deletion successfully!");
}
} else {
- LoginUser sysUser = (LoginUser) SecurityUtils.getSubject().getPrincipal();
- if (sysUser.getUsername().equals(erd.getCreateBy())) {
- extRepoDataService.deleteById(id);
- CosBootUtil.delete(erd.getFileKey());
- if (CutEnum.CN.getValue().equals(cut)) {
- result.success("删除成功!");
- } else {
- result.success("Data deletion successfully!");
- }
+ if (CutEnum.CN.getValue().equals(cut)) {
+ result.error500("没有权限！");
} else {
- if (CutEnum.CN.getValue().equals(cut)) {
- result.error500("没有权限！");
- } else {
- result.error500("You do not have permission!");
- }
+ result.error500("You do not have permission!");
}
}
} else {
@@ -220,11 +210,6 @@ public class ExtRepoDataController extends JeroController queryWrapper = new LambdaQueryWrapper<>();
- queryWrapper.eq(ExtRepoFolder::getSupFolder, "root");
- return extRepoFolderService.count(queryWrapper);
- }
/**
* 批量删除
diff --git a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/extRepo/controller/ExtRepoFolderController.java b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/extRepo/controller/ExtRepoFolderController.java
index 37be9b9e1..a77ed3230 100644
--- a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/extRepo/controller/ExtRepoFolderController.java
+++ b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/extRepo/controller/ExtRepoFolderController.java
@@ -1,5 +1,6 @@
package com.jero.modules.extRepo.controller;
+import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
import com.jero.common.api.vo.Result;
import com.jero.common.aspect.annotation.AutoLog;
import com.jero.common.constant.enums.CutEnum;
@@ -63,6 +64,11 @@ public class ExtRepoFolderController extends JeroController add(@Validated @RequestBody ExtRepoFolder extRepoFolder) {
Result result = new Result();
if (extRepoFolderService.haveManageAuth(extRepoFolder.getSupFolder())) {
+ if (!extRepoFolder.isAddSub()) {
+ //增加同级文件夹
+ ExtRepoFolder folder = extRepoFolderService.queryById(extRepoFolder.getSupFolder());
+ extRepoFolder.setSupFolder(folder.getSupFolder());
+ }
extRepoFolderService.add(extRepoFolder);
if (CutEnum.CN.getValue().equals(extRepoFolder.getCut())) {
result.success("添加成功！");
@@ -122,15 +128,25 @@ public class ExtRepoFolderController extends JeroController resList = extRepoFolderService.getListBySupFolder(id);
if (resList.isEmpty()) {
- List erdList = extRepoDataService.queryByFolder(id);
- for (ExtRepoData erd : erdList) {
- extRepoDataService.deleteById(erd.getId());
- }
- extRepoFolderService.deleteById(id);
- if (CutEnum.CN.getValue().equals(cut)) {
- result.success("删除成功！");
+ ExtRepoFolder erf = extRepoFolderService.queryById(id);
+ int count = getRootFolderCount();
+ if (erf.getSupFolder().equals("root") && count <= 1) {
+ if (CutEnum.CN.getValue().equals(cut)) {
+ result.error500("此文件夹不可删除！");
+ } else {
+ result.error500("This folder cannot be deleted!");
+ }
} else {
- result.success("Data deletion successfully!");
+ List erdList = extRepoDataService.queryByFolder(id);
+ for (ExtRepoData erd : erdList) {
+ extRepoDataService.deleteById(erd.getId());
+ }
+ extRepoFolderService.deleteById(id);
+ if (CutEnum.CN.getValue().equals(cut)) {
+ result.success("删除成功！");
+ } else {
+ result.success("Data deletion successfully!");
+ }
}
} else {
if (CutEnum.CN.getValue().equals(cut)) {
@@ -149,6 +165,13 @@ public class ExtRepoFolderController extends JeroController queryWrapper = new LambdaQueryWrapper<>();
+ queryWrapper.eq(ExtRepoFolder::getSupFolder, "root");
+ return extRepoFolderService.count(queryWrapper);
+ }
+
/**
* 通过id查询
*
diff --git a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/extRepo/entity/ExtRepoFolder.java b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/extRepo/entity/ExtRepoFolder.java
index c34293c87..a99d600d7 100644
--- a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/extRepo/entity/ExtRepoFolder.java
+++ b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/extRepo/entity/ExtRepoFolder.java
@@ -96,4 +96,7 @@ public class ExtRepoFolder implements Serializable {
@TableField(exist = false)
private String cut;
+
+ @TableField(exist = false)
+ private boolean addSub;
}
From 742c824672b62370f4bd04db071a7b6754c32a0e Mon Sep 17 00:00:00 2001
From: gaosong
Date: Thu, 11 Aug 2022 10:36:27 +0800
Subject: [PATCH 07/12] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E5=AF=B9=E5=A4=96?=
=?UTF-8?q?=E6=8A=A5=E5=91=8A-=E4=BF=AE=E6=94=B9sql?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
jero-boot/db/蔚来标准sql/dev_third_record.sql | 201 +++++++++---------
1 file changed, 99 insertions(+), 102 deletions(-)
diff --git a/jero-boot/db/蔚来标准sql/dev_third_record.sql b/jero-boot/db/蔚来标准sql/dev_third_record.sql
index e09c41e5a..0db7ddb5f 100644
--- a/jero-boot/db/蔚来标准sql/dev_third_record.sql
+++ b/jero-boot/db/蔚来标准sql/dev_third_record.sql
@@ -511,26 +511,23 @@ INSERT INTO `laws_weilai`.`sys_permission`(`id`, `parent_id`, `name`, `url`, `co
-- 角色表-增加对外报告管理员角色 2022-7-28 已同步生产环境
INSERT INTO `sys_role` VALUES ('1552536424587862017', '对外报告管理员', 'ExternalReportsManager', '对外报告文件夹列表的管理员', 'admin', '2022-7-28 14:08:23', NULL, NULL, NULL, NULL);
--- 菜单管理 添加对外报告文件夹管理按钮权限 2022-07-28 已同步生产环境
-INSERT INTO `sys_permission` VALUES ('1552182885208608770', '1549937961282908162', '对外报告文件夹管理', '', NULL, NULL, NULL, 2, 'externalReports:folder', '1', 1.00, 0, NULL, 1, 1, 0, 0, NULL, 'admin', '2022-7-27 14:43:33', NULL, NULL, 0, 0, '1', 0, 'External Report Folder Management ');
-
-- 对外报告文件夹表 2022-7-29 已同步生产环境
DROP TABLE IF EXISTS `ext_repo_folder`;
CREATE TABLE `ext_repo_folder` (
- `id` varchar(36) NOT NULL,
- `create_by` varchar(50) DEFAULT NULL COMMENT '创建人',
- `create_time` datetime DEFAULT NULL COMMENT '创建日期',
- `update_by` varchar(50) DEFAULT NULL COMMENT '更新人',
- `update_time` datetime DEFAULT NULL COMMENT '更新日期',
- `sys_org_code` varchar(64) DEFAULT NULL COMMENT '所属部门',
- `folder_name` varchar(255) DEFAULT NULL COMMENT '文件夹名称',
- `order_id` int(11) DEFAULT NULL COMMENT '文件夹排序',
- `sup_folder` varchar(36) DEFAULT NULL COMMENT '所属文件夹',
- `auth_view_ids_name` varchar(2000) DEFAULT NULL COMMENT '查看权限人员',
- `auth_manage_ids_name` varchar(2000) DEFAULT NULL COMMENT '管理权限人员',
- `auth_view_ids` varchar(2000) DEFAULT NULL COMMENT '查看权限人员id',
- `auth_manage_ids` varchar(2000) DEFAULT NULL COMMENT '管理权限人员id',
- PRIMARY KEY (`id`)
+ `id` varchar(36) NOT NULL,
+ `create_by` varchar(50) DEFAULT NULL COMMENT '创建人',
+ `create_time` datetime DEFAULT NULL COMMENT '创建日期',
+ `update_by` varchar(50) DEFAULT NULL COMMENT '更新人',
+ `update_time` datetime DEFAULT NULL COMMENT '更新日期',
+ `sys_org_code` varchar(64) DEFAULT NULL COMMENT '所属部门',
+ `folder_name` varchar(255) DEFAULT NULL COMMENT '文件夹名称',
+ `order_id` int(11) DEFAULT NULL COMMENT '文件夹排序',
+ `sup_folder` varchar(36) DEFAULT NULL COMMENT '所属文件夹',
+ `auth_view_ids_name` varchar(2000) DEFAULT NULL COMMENT '查看权限人员',
+ `auth_manage_ids_name` varchar(2000) DEFAULT NULL COMMENT '管理权限人员',
+ `auth_view_ids` varchar(2000) DEFAULT NULL COMMENT '查看权限人员id',
+ `auth_manage_ids` varchar(2000) DEFAULT NULL COMMENT '管理权限人员id',
+ PRIMARY KEY (`id`)
) ENGINE=InnoDB DEFAULT CHARSET=utf8mb4;
INSERT INTO `ext_repo_folder` VALUES ('1552846304994131970', 'admin', '2022-07-01 11:11:11', 'admin', '2022-11-11 11:11:11', 'A01', '文件夹', '1', 'root', '', '', '', '');
@@ -538,17 +535,17 @@ INSERT INTO `ext_repo_folder` VALUES ('1552846304994131970', 'admin', '2022-07-0
-- 对外报告数据表 2022-7-29 已同步生产环境
DROP TABLE IF EXISTS `ext_repo_data`;
CREATE TABLE `ext_repo_data` (
- `id` varchar(36) NOT NULL,
- `create_by` varchar(50) DEFAULT NULL COMMENT '创建人',
- `create_time` datetime DEFAULT NULL COMMENT '创建日期',
- `update_by` varchar(50) DEFAULT NULL COMMENT '更新人',
- `update_time` datetime DEFAULT NULL COMMENT '更新日期',
- `sys_org_code` varchar(64) DEFAULT NULL COMMENT '所属部门',
- `file_key` varchar(255) DEFAULT NULL COMMENT '文件标识',
- `file_name` varchar(255) DEFAULT NULL COMMENT '文件名称',
- `file_description` varchar(255) DEFAULT NULL COMMENT '文件说明',
- `sup_folder` varchar(36) DEFAULT NULL COMMENT '所属文件夹',
- PRIMARY KEY (`id`)
+ `id` varchar(36) NOT NULL,
+ `create_by` varchar(50) DEFAULT NULL COMMENT '创建人',
+ `create_time` datetime DEFAULT NULL COMMENT '创建日期',
+ `update_by` varchar(50) DEFAULT NULL COMMENT '更新人',
+ `update_time` datetime DEFAULT NULL COMMENT '更新日期',
+ `sys_org_code` varchar(64) DEFAULT NULL COMMENT '所属部门',
+ `file_key` varchar(255) DEFAULT NULL COMMENT '文件标识',
+ `file_name` varchar(255) DEFAULT NULL COMMENT '文件名称',
+ `file_description` varchar(255) DEFAULT NULL COMMENT '文件说明',
+ `sup_folder` varchar(36) DEFAULT NULL COMMENT '所属文件夹',
+ PRIMARY KEY (`id`)
) ENGINE=InnoDB DEFAULT CHARSET=utf8mb4;
-- 参数项收集清单 认证类别取消列表显示 2022-08-02 已同步生产环境
@@ -731,100 +728,100 @@ CREATE TABLE `laws_weilai`.`country_card_manage_release_detail` (
-- 文档对比信息表 2022-08-07 已同步生产环境
DROP TABLE IF EXISTS `sar_file_compare_info`;
CREATE TABLE `sar_file_compare_info` (
- `id` varchar(36) NOT NULL,
- `create_by` varchar(50) DEFAULT NULL COMMENT '创建人',
- `create_time` datetime DEFAULT NULL COMMENT '创建日期',
- `update_by` varchar(50) DEFAULT NULL COMMENT '更新人',
- `update_time` datetime DEFAULT NULL COMMENT '更新日期',
- `sys_org_code` varchar(64) DEFAULT NULL COMMENT '所属部门',
- `file_id_left` varchar(36) DEFAULT NULL COMMENT '文档1',
- `file_key_left` varchar(32) DEFAULT NULL COMMENT '文档key1',
- `serial_number_left` varchar(36) DEFAULT NULL COMMENT '编号1',
- `title_left` varchar(255) DEFAULT NULL COMMENT '标题1',
- `file_type_left` varchar(36) DEFAULT NULL COMMENT '文本状态1',
- `file_name_left` varchar(255) DEFAULT NULL COMMENT '文件名称1',
- `file_id_right` varchar(36) DEFAULT NULL COMMENT '文档2',
- `file_key_right` varchar(32) DEFAULT NULL COMMENT '文档key2',
- `serial_number_right` varchar(36) DEFAULT NULL COMMENT '编号2',
- `title_right` varchar(255) DEFAULT NULL COMMENT '标题2',
- `file_type_right` varchar(36) DEFAULT NULL COMMENT '文本状态2',
- `file_name_right` varchar(255) DEFAULT NULL COMMENT '文件名称2',
- `release_state` varchar(36) DEFAULT NULL COMMENT '发布状态',
- `remark` varchar(1000) DEFAULT NULL COMMENT '备注',
- `comments` varchar(1000) DEFAULT NULL COMMENT '评论',
- PRIMARY KEY (`id`)
+ `id` varchar(36) NOT NULL,
+ `create_by` varchar(50) DEFAULT NULL COMMENT '创建人',
+ `create_time` datetime DEFAULT NULL COMMENT '创建日期',
+ `update_by` varchar(50) DEFAULT NULL COMMENT '更新人',
+ `update_time` datetime DEFAULT NULL COMMENT '更新日期',
+ `sys_org_code` varchar(64) DEFAULT NULL COMMENT '所属部门',
+ `file_id_left` varchar(36) DEFAULT NULL COMMENT '文档1',
+ `file_key_left` varchar(32) DEFAULT NULL COMMENT '文档key1',
+ `serial_number_left` varchar(36) DEFAULT NULL COMMENT '编号1',
+ `title_left` varchar(255) DEFAULT NULL COMMENT '标题1',
+ `file_type_left` varchar(36) DEFAULT NULL COMMENT '文本状态1',
+ `file_name_left` varchar(255) DEFAULT NULL COMMENT '文件名称1',
+ `file_id_right` varchar(36) DEFAULT NULL COMMENT '文档2',
+ `file_key_right` varchar(32) DEFAULT NULL COMMENT '文档key2',
+ `serial_number_right` varchar(36) DEFAULT NULL COMMENT '编号2',
+ `title_right` varchar(255) DEFAULT NULL COMMENT '标题2',
+ `file_type_right` varchar(36) DEFAULT NULL COMMENT '文本状态2',
+ `file_name_right` varchar(255) DEFAULT NULL COMMENT '文件名称2',
+ `release_state` varchar(36) DEFAULT NULL COMMENT '发布状态',
+ `remark` varchar(1000) DEFAULT NULL COMMENT '备注',
+ `comments` varchar(1000) DEFAULT NULL COMMENT '评论',
+ PRIMARY KEY (`id`)
) ENGINE=InnoDB DEFAULT CHARSET=utf8mb4;
-- 文档对比信息条目表 2022-08-07 已同步生产环境
DROP TABLE IF EXISTS `sar_file_compare_item`;
CREATE TABLE `sar_file_compare_item` (
- `id` varchar(36) NOT NULL,
- `create_by` varchar(50) DEFAULT NULL COMMENT '创建人',
- `create_time` datetime DEFAULT NULL COMMENT '创建日期',
- `update_by` varchar(50) DEFAULT NULL COMMENT '更新人',
- `update_time` datetime DEFAULT NULL COMMENT '更新日期',
- `sys_org_code` varchar(64) DEFAULT NULL COMMENT '所属部门',
- `info_id` varchar(36) DEFAULT NULL COMMENT '文档对比信息id',
- `menu_id` varchar(36) DEFAULT NULL COMMENT '目录id',
- `items_name` varchar(255) DEFAULT NULL COMMENT '条款名称',
- `items_num` varchar(255) DEFAULT NULL COMMENT '条款编号',
- `items_text` longtext COMMENT '条款正文',
- `items_display_num` int(11) DEFAULT NULL COMMENT '条款展示编号',
- `target_stand` int(11) DEFAULT NULL COMMENT '对应相似条目',
- `left_or_right` varchar(36) DEFAULT NULL COMMENT '条款位置',
- `reviewed` int(11) DEFAULT NULL COMMENT '是否被评论(0或1)',
- PRIMARY KEY (`id`)
+ `id` varchar(36) NOT NULL,
+ `create_by` varchar(50) DEFAULT NULL COMMENT '创建人',
+ `create_time` datetime DEFAULT NULL COMMENT '创建日期',
+ `update_by` varchar(50) DEFAULT NULL COMMENT '更新人',
+ `update_time` datetime DEFAULT NULL COMMENT '更新日期',
+ `sys_org_code` varchar(64) DEFAULT NULL COMMENT '所属部门',
+ `info_id` varchar(36) DEFAULT NULL COMMENT '文档对比信息id',
+ `menu_id` varchar(36) DEFAULT NULL COMMENT '目录id',
+ `items_name` varchar(255) DEFAULT NULL COMMENT '条款名称',
+ `items_num` varchar(255) DEFAULT NULL COMMENT '条款编号',
+ `items_text` longtext COMMENT '条款正文',
+ `items_display_num` int(11) DEFAULT NULL COMMENT '条款展示编号',
+ `target_stand` int(11) DEFAULT NULL COMMENT '对应相似条目',
+ `left_or_right` varchar(36) DEFAULT NULL COMMENT '条款位置',
+ `reviewed` int(11) DEFAULT NULL COMMENT '是否被评论(0或1)',
+ PRIMARY KEY (`id`)
) ENGINE=InnoDB DEFAULT CHARSET=utf8mb4;
-- 文档对比信息条目评论表 2022-08-07 已同步生产环境
DROP TABLE IF EXISTS `sar_file_compare_item_comment`;
CREATE TABLE `sar_file_compare_item_comment` (
- `id` varchar(36) NOT NULL,
- `create_by` varchar(50) DEFAULT NULL COMMENT '创建人',
- `create_time` datetime DEFAULT NULL COMMENT '创建日期',
- `update_by` varchar(50) DEFAULT NULL COMMENT '更新人',
- `update_time` datetime DEFAULT NULL COMMENT '更新日期',
- `sys_org_code` varchar(64) DEFAULT NULL COMMENT '所属部门',
- `info_id` varchar(36) DEFAULT NULL COMMENT '文档对比信息id',
- `items_id_left` varchar(36) DEFAULT NULL COMMENT '条款id左',
- `items_id_right` varchar(36) DEFAULT NULL COMMENT '条款id右',
- `comment` longtext COMMENT '评论',
- PRIMARY KEY (`id`)
+ `id` varchar(36) NOT NULL,
+ `create_by` varchar(50) DEFAULT NULL COMMENT '创建人',
+ `create_time` datetime DEFAULT NULL COMMENT '创建日期',
+ `update_by` varchar(50) DEFAULT NULL COMMENT '更新人',
+ `update_time` datetime DEFAULT NULL COMMENT '更新日期',
+ `sys_org_code` varchar(64) DEFAULT NULL COMMENT '所属部门',
+ `info_id` varchar(36) DEFAULT NULL COMMENT '文档对比信息id',
+ `items_id_left` varchar(36) DEFAULT NULL COMMENT '条款id左',
+ `items_id_right` varchar(36) DEFAULT NULL COMMENT '条款id右',
+ `comment` longtext COMMENT '评论',
+ PRIMARY KEY (`id`)
) ENGINE=InnoDB DEFAULT CHARSET=utf8mb4;
-- 文档对比信息目录表 2022-08-07 已同步生产环境
DROP TABLE IF EXISTS `sar_file_compare_menu`;
CREATE TABLE `sar_file_compare_menu` (
- `id` varchar(36) NOT NULL,
- `create_by` varchar(50) DEFAULT NULL COMMENT '创建人',
- `create_time` datetime DEFAULT NULL COMMENT '创建日期',
- `update_by` varchar(50) DEFAULT NULL COMMENT '更新人',
- `update_time` datetime DEFAULT NULL COMMENT '更新日期',
- `sys_org_code` varchar(64) DEFAULT NULL COMMENT '所属部门',
- `menu_id` varchar(36) DEFAULT NULL COMMENT '目录ID',
- `info_id` varchar(36) DEFAULT NULL COMMENT '信息ID',
- `name` varchar(200) DEFAULT NULL COMMENT '目录名称',
- `parent_id` varchar(36) DEFAULT NULL COMMENT '父级目录ID',
- `display_seq` int(11) DEFAULT NULL COMMENT '排序序号',
- `left_or_right` varchar(32) DEFAULT NULL COMMENT '目录位置',
- `item_name` varchar(255) DEFAULT NULL COMMENT '条款名称',
- `remarks` varchar(255) DEFAULT NULL COMMENT '备注',
- PRIMARY KEY (`id`)
+ `id` varchar(36) NOT NULL,
+ `create_by` varchar(50) DEFAULT NULL COMMENT '创建人',
+ `create_time` datetime DEFAULT NULL COMMENT '创建日期',
+ `update_by` varchar(50) DEFAULT NULL COMMENT '更新人',
+ `update_time` datetime DEFAULT NULL COMMENT '更新日期',
+ `sys_org_code` varchar(64) DEFAULT NULL COMMENT '所属部门',
+ `menu_id` varchar(36) DEFAULT NULL COMMENT '目录ID',
+ `info_id` varchar(36) DEFAULT NULL COMMENT '信息ID',
+ `name` varchar(200) DEFAULT NULL COMMENT '目录名称',
+ `parent_id` varchar(36) DEFAULT NULL COMMENT '父级目录ID',
+ `display_seq` int(11) DEFAULT NULL COMMENT '排序序号',
+ `left_or_right` varchar(32) DEFAULT NULL COMMENT '目录位置',
+ `item_name` varchar(255) DEFAULT NULL COMMENT '条款名称',
+ `remarks` varchar(255) DEFAULT NULL COMMENT '备注',
+ PRIMARY KEY (`id`)
) ENGINE=InnoDB DEFAULT CHARSET=utf8mb4;
-- 文档对比信息结果表 2022-08-07 已同步生产环境
DROP TABLE IF EXISTS `sar_file_compare_res_comment`;
CREATE TABLE `sar_file_compare_res_comment` (
- `id` varchar(36) NOT NULL,
- `create_by` varchar(50) DEFAULT NULL COMMENT '创建人',
- `create_time` datetime DEFAULT NULL COMMENT '创建日期',
- `update_by` varchar(50) DEFAULT NULL COMMENT '更新人',
- `update_time` datetime DEFAULT NULL COMMENT '更新日期',
- `sys_org_code` varchar(64) DEFAULT NULL COMMENT '所属部门',
- `info_id` varchar(36) DEFAULT NULL COMMENT '文档对比信息id',
- `parent_id` varchar(36) DEFAULT NULL COMMENT '回复评论ID',
- `comment` longtext COMMENT '评论',
- PRIMARY KEY (`id`)
+ `id` varchar(36) NOT NULL,
+ `create_by` varchar(50) DEFAULT NULL COMMENT '创建人',
+ `create_time` datetime DEFAULT NULL COMMENT '创建日期',
+ `update_by` varchar(50) DEFAULT NULL COMMENT '更新人',
+ `update_time` datetime DEFAULT NULL COMMENT '更新日期',
+ `sys_org_code` varchar(64) DEFAULT NULL COMMENT '所属部门',
+ `info_id` varchar(36) DEFAULT NULL COMMENT '文档对比信息id',
+ `parent_id` varchar(36) DEFAULT NULL COMMENT '回复评论ID',
+ `comment` longtext COMMENT '评论',
+ PRIMARY KEY (`id`)
) ENGINE=InnoDB DEFAULT CHARSET=utf8mb4;
-- 法规技术评估-条款信息评估结果表 字段增加长度 2022-08-08
From 328ce7742b256eab129fe8907948af6b1ef81e09 Mon Sep 17 00:00:00 2001
From: "zyx.net"
Date: Thu, 11 Aug 2022 11:00:45 +0800
Subject: [PATCH 08/12] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E7=BF=BB=E8=AF=91?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
jero-web/src/common/lang/en-us.js | 18 +++++++++---------
jero-web/src/components/processForm/index.vue | 4 ++--
.../components/circulationHistory.vue | 4 ++--
.../regulatoryCirculationHistory.vue | 4 ++--
.../components/taskCirculationHistory.vue | 2 +-
5 files changed, 16 insertions(+), 16 deletions(-)
diff --git a/jero-web/src/common/lang/en-us.js b/jero-web/src/common/lang/en-us.js
index 04fce3a33..858bfb1d5 100644
--- a/jero-web/src/common/lang/en-us.js
+++ b/jero-web/src/common/lang/en-us.js
@@ -1115,25 +1115,25 @@ module.exports = {
RegulationTaskConfirmationNotification: 'Regulation Task Confirmation Notification',
evaluationMethod: 'Evaluation method',
uploadRelevantMaterials: 'Upload relevant materials',
- processBackground: 'Process background',
- selectedStandard: 'Selected standard',
+ processBackground: 'Process Background',
+ selectedStandard: 'Selected Standard',
standardDecompositionDocument: 'Standard decomposition document',
pleaseSelectStandardFirst: 'Please select a standard first',
RelevantMaterials: 'RelevantMaterials',
- evaluatorFeedback: 'Evaluator feedback',
+ evaluatorFeedback: 'Evaluator Feedback',
nameTechnicalDocument: 'Name of technical document',
chapter: 'chapter',
- problemDescription: 'Problem description',
+ problemDescription: 'Problem Description',
filingExternalOpinions: 'Filing of external opinions',
regulatoryTechnicalEvaluationResults: 'Regulatory technical evaluation results',
initiateProcessForCurrentStandard: 'Initiate process for current standard',
engineerFeedbackResults: 'Engineer feedback results',
- fileExport: 'File export',
- feedbackTime: 'Feedback time',
+ fileExport: 'File Export',
+ feedbackTime: 'Feedback Time',
regulatoryTechnologyAssessmentProcess: 'Regulatory technology assessment process',
- feedbackEvaluation: 'Feedback evaluation',
- clauseEvaluation: 'Clause evaluation',
- standardDocuments: 'Standard documents',
+ feedbackEvaluation: 'Feedback Evaluation',
+ clauseEvaluation: 'Clause Evaluation',
+ standardDocuments: 'Standard Documents',
pleaseCompleteTheEvaluationMethodorEvaluator: 'Please complete the evaluation method or evaluator in the list',
reviewComments: 'Review comments',
PleaseCompleteList: 'Please complete the compliance results in the list',
diff --git a/jero-web/src/components/processForm/index.vue b/jero-web/src/components/processForm/index.vue
index 61576bc93..4c6cd5e4b 100644
--- a/jero-web/src/components/processForm/index.vue
+++ b/jero-web/src/components/processForm/index.vue
@@ -147,12 +147,12 @@
key: 'role',
},
{
- title: this.$t('operationContent'),
+ title: this.$t('OperationContent'),
dataIndex: 'content',
key: 'content',
},
{
- title: this.$t('operationTime'),
+ title: this.$t('OperationTime'),
dataIndex: 'time',
key: 'time',
},
diff --git a/jero-web/src/views/processCenter/components/circulationHistory.vue b/jero-web/src/views/processCenter/components/circulationHistory.vue
index 29856b886..9066f1762 100644
--- a/jero-web/src/views/processCenter/components/circulationHistory.vue
+++ b/jero-web/src/views/processCenter/components/circulationHistory.vue
@@ -41,7 +41,7 @@
},
columns: [
{
- title: this.$t('operationNode'),
+ title: this.$t('OperationNode'),
dataIndex: 'name',
align: 'center',
width:'20%',
@@ -66,7 +66,7 @@
width:'20%',
},
{
- title: this.$t('operationTime'),
+ title: this.$t('OperationTime'),
dataIndex: 'createTime',
align: 'center',
width:'20%',
diff --git a/jero-web/src/views/processCenter/components/regulatoryCirculationHistory.vue b/jero-web/src/views/processCenter/components/regulatoryCirculationHistory.vue
index 6fda1fd06..65bf69caf 100644
--- a/jero-web/src/views/processCenter/components/regulatoryCirculationHistory.vue
+++ b/jero-web/src/views/processCenter/components/regulatoryCirculationHistory.vue
@@ -32,7 +32,7 @@
loading: false,
columns: [
{
- title: this.$t('operationContent'),
+ title: this.$t('OperationContent'),
dataIndex: 'taskDefinitionKeyName',
align: 'center',
width: '25%'
@@ -50,7 +50,7 @@
width: '25%'
},
{
- title: this.$t('operationTime'),
+ title: this.$t('OperationTime'),
dataIndex: 'createTime',
align: 'center',
width: '25%',
diff --git a/jero-web/src/views/processCenter/components/taskCirculationHistory.vue b/jero-web/src/views/processCenter/components/taskCirculationHistory.vue
index bc076dc53..8c64c8228 100644
--- a/jero-web/src/views/processCenter/components/taskCirculationHistory.vue
+++ b/jero-web/src/views/processCenter/components/taskCirculationHistory.vue
@@ -43,7 +43,7 @@
},
columns: [
{
- title: this.$t('operationNode'),
+ title: this.$t('OperationNode'),
dataIndex: 'name',
align: 'left'
},
From fcbd009619d35ea6646628decbe4ac0c29250dbe Mon Sep 17 00:00:00 2001
From: qq787203167 <787203167@qq.com>
Date: Thu, 11 Aug 2022 11:11:23 +0800
Subject: [PATCH 09/12] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E7=A6=85=E9=81=93?=
=?UTF-8?q?=E5=B7=B2=E7=9F=A5bug?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
.../components/initiatingProcess.vue | 4 +
.../documentComparison/index.vue | 86 +++++++++++++++++--
2 files changed, 85 insertions(+), 5 deletions(-)
diff --git a/jero-web/src/views/businessSupport/technologyAssessment/components/initiatingProcess.vue b/jero-web/src/views/businessSupport/technologyAssessment/components/initiatingProcess.vue
index 1ef583d29..b6ec3e600 100644
--- a/jero-web/src/views/businessSupport/technologyAssessment/components/initiatingProcess.vue
+++ b/jero-web/src/views/businessSupport/technologyAssessment/components/initiatingProcess.vue
@@ -64,6 +64,7 @@
{{$t('delete')}}
+
+ {{text}}
+
+
+ {{text}}
+
+
+ {{text}}
+
+
+ {{text}}
+