diff --git a/server/repository/asset.go b/server/repository/asset.go index 4d06094..d5b1801 100644 --- a/server/repository/asset.go +++ b/server/repository/asset.go @@ -287,7 +287,7 @@ func (r assetRepository) ExistById(c context.Context, id string) (bool, error) { } func (r assetRepository) FindMyAssets(c context.Context, pageIndex, pageSize int, name, protocol, tags string, assetIds []string, order, field string) (o []model.AssetForPage, total int64, err error) { - db := r.GetDB(c).Table("assets").Select("assets.id,assets.name,assets.protocol,assets.active,assets.active_message,assets.tags,assets.description,assets.last_access_time,"). + db := r.GetDB(c).Table("assets").Select("assets.id,assets.name,assets.protocol,assets.active,assets.active_message,assets.tags,assets.description,assets.last_access_time"). Where("id in ?", assetIds) dbCounter := r.GetDB(c).Table("assets").Where("id in ?", assetIds) diff --git a/server/service/menu_default_data.go b/server/service/menu_default_data.go index 7ed7953..d67e44f 100644 --- a/server/service/menu_default_data.go +++ b/server/service/menu_default_data.go @@ -34,11 +34,13 @@ var DefaultMenu = []*model.Menu{ model.NewMenu("asset-add", "新建", "asset", model.NewPermission("POST", "/assets"), model.NewPermission("GET", "/access-gateways"), + model.NewPermission("GET", "/credentials"), ), model.NewMenu("asset-edit", "编辑", "asset", model.NewPermission("GET", "/assets/:id"), model.NewPermission("PUT", "/assets/:id"), model.NewPermission("GET", "/access-gateways"), + model.NewPermission("GET", "/credentials"), ), model.NewMenu("asset-del", "删除", "asset", model.NewPermission("DELETE", "/assets/:id"), diff --git a/web/src/components/NoMatch.js b/web/src/components/NoMatch.js index 3bfbae3..5de8d85 100644 --- a/web/src/components/NoMatch.js +++ b/web/src/components/NoMatch.js @@ -1,5 +1,5 @@ import React from 'react'; -import {Button, Layout, Result} from "antd"; +import {Button, Layout, Result, Space} from "antd"; import {Link} from "react-router-dom"; const {Content} = Layout; @@ -12,7 +12,13 @@ const NoMatch = () => { status="404" title="404" subTitle="抱歉,您似乎到达了预期之外的页面。" - extra={} + extra={ + + + + + + } /> diff --git a/web/src/components/NoPermission.js b/web/src/components/NoPermission.js index 2cbbde6..1300c7a 100644 --- a/web/src/components/NoPermission.js +++ b/web/src/components/NoPermission.js @@ -17,11 +17,9 @@ const NoPermission = () => { subTitle="抱歉,您似乎没有此页面的权限。" extra={ - - + + + } /> diff --git a/web/src/components/worker/MyAsset.js b/web/src/components/worker/MyAsset.js index 3422129..6586586 100644 --- a/web/src/components/worker/MyAsset.js +++ b/web/src/components/worker/MyAsset.js @@ -153,8 +153,8 @@ const MyAsset = () => { 接入 ,