Merge branch 'dev' of https://git.code.tencent.com/lian-cbtc/jl-client into dev

src/i18n/langs/en/permission.js

@@ -38,5 +38,6 @@ export default {
     transferTips:'You can receive multiple permissions at a time, and the permissions you receive can continue to be transferred.',
     distributeTips:'Only one permission can be obtained at a time. The permission received is a dedicated permission and cannot be redistributed.',
     distributeId: 'Distribute id',
-    sortType:'SortType'
+    sortType:'SortType',
+    nickName:'nickName'
 };

src/i18n/langs/zh/permission.js

@@ -45,5 +45,6 @@ export default {
     transferTips:'一次可以领取多个权限，领到的权限可以继续转赠',
     distributeTips:'一次只能领取一个权限，领到的权限是专用权限，不可再次分发',
     distributeId: '分发ID',
-    sortType:'排序方式'
+    sortType:'排序方式',
+    nickName:'昵称'
 };

src/views/newMap/newMapdraft/dataRelation/routeoperate/detail.vue

@@ -132,7 +132,8 @@ export default {
                         buttons: [
                             {
                                 name: this.$t('map.preview'),
-                                handleClick: this.flankProtectionSwitchDetail
+                                handleClick: this.flankProtectionSwitchDetail,
+                                showControl: (row) => { return row.routeFlankProtectionList.length > 0; }
                             }
                         ]
                     },
@@ -163,7 +164,8 @@ export default {
                         buttons: [
                             {
                                 name: this.$t('map.preview'),
-                                handleClick: this.routeSwitchDetail
+                                handleClick: this.routeSwitchDetail,
+                                showControl: (row) => { return row.routeSwitchList.length > 0; }
                             }
                         ]
                     },
@@ -173,7 +175,8 @@ export default {
                         buttons: [
                             {
                                 name: this.$t('map.relation'),
-                                handleClick: this.conflictingRouteSection
+                                handleClick: this.conflictingRouteSection,
+                                showControl: (row) => { return row.conflictingRouteList.length > 0; }
                             }
                         ]
                     },

src/views/orderauthor/permission/index.vue

@@ -167,7 +167,7 @@ export default {
                                 name: this.$t('orderAuthor.recovery'),
                                 handleClick: this.handleRestore,
                                 type: 'danger',
-                                showControl: (row) => { return row.status == '1' && row.canRestore }
+                                showControl: (row) => { return row.status == '1' && row.canRestore; }
                             }
                         ]
                     }

src/views/orderauthor/rules/index.vue

@@ -88,6 +88,11 @@ export default {
                         sortable:'custom',
                         sortBy:'sortOrder'
                     },
+                    {
+                        title: this.$t('permission.nickName'),
+                        width: '200',
+                        prop: 'userNickName'
+                    },
                     {
                         title: this.$t('permission.permissionName'),
                         width: '200',