diff --git a/nezha-fronted/src/assets/stylus/main.scss b/nezha-fronted/src/assets/stylus/main.scss index 4d2bc65a0..0d34a99ea 100644 --- a/nezha-fronted/src/assets/stylus/main.scss +++ b/nezha-fronted/src/assets/stylus/main.scss @@ -672,6 +672,10 @@ li{ /*.top-tool-main-right>.nz-btn, .top-tool-main-right-to-left>.nz-btn, .top-tool-main-right>.nz-btn-group, .top-tool-main-right>.panel-calendar { margin-top: -2px; }*/ +.asset .top-tool-main-right-to-left { + right: calc(100% - 440px) !important; + /*transform: translateX(100%);*/ +} .top-tool-main-right-to-left { right: calc(100% - 390px) !important; /*transform: translateX(100%);*/ diff --git a/nezha-fronted/src/components/common/language/cn.js b/nezha-fronted/src/components/common/language/cn.js index faf0c8bb9..fa2040278 100644 --- a/nezha-fronted/src/components/common/language/cn.js +++ b/nezha-fronted/src/components/common/language/cn.js @@ -18,6 +18,8 @@ const cn = { upload: "上传", search: "搜索", add: "新增", + addAssetList: "新增", + batchEdit:'批量修改', option: "操作", remark: "描述", clearAll: "清空", @@ -396,6 +398,8 @@ const cn = { asset: { asset: "资产", assetType:'资产类型',//'资产类型' + batchEditAsset:'批量修改资产', + selectAsset:'已选择的资产', editAssetTab: { title: "新增资产", sn: "SN", diff --git a/nezha-fronted/src/components/common/language/en.js b/nezha-fronted/src/components/common/language/en.js index 562c2f50c..d1c6f3cff 100644 --- a/nezha-fronted/src/components/common/language/en.js +++ b/nezha-fronted/src/components/common/language/en.js @@ -24,6 +24,8 @@ const en = { preview:'Preview',//预览 search: 'Search', //'搜索' add: 'Create', //"新增" + addAssetList: "Add", + batchEdit:'Batch Edit', option: 'Operation', //"操作" remark: "Description", clear: 'Clear', //"清除" @@ -401,6 +403,8 @@ const en = { assets: 'Assets',//'资产' editAsset: 'Edit asset',//'编辑资产' createAsset: 'New asset',//'编辑资产' + batchEditAsset:'Batch edit asset', + selectAsset:'Selected assets', host: "Host", state: 'State',//'状态' pingActive: 'active',//可ping通 diff --git a/nezha-fronted/src/components/common/rightBox/batchEditAsset.vue b/nezha-fronted/src/components/common/rightBox/batchEditAsset.vue new file mode 100644 index 000000000..2c8fbc19d --- /dev/null +++ b/nezha-fronted/src/components/common/rightBox/batchEditAsset.vue @@ -0,0 +1,1148 @@ + + + + + diff --git a/nezha-fronted/src/components/page/asset/asset.vue b/nezha-fronted/src/components/page/asset/asset.vue index fa51a8404..9b5f0ccae 100644 --- a/nezha-fronted/src/components/page/asset/asset.vue +++ b/nezha-fronted/src/components/page/asset/asset.vue @@ -17,6 +17,9 @@ + @@ -191,6 +194,9 @@ + + + @@ -211,6 +217,7 @@ //侧滑 rightBox: { show: false, + batchShow:false, }, /*二级页面相关*/ bottomBox: { @@ -548,11 +555,15 @@ this.asset = this.newAsset(); this.rightBox.show = true; }, + batchEdit(){ + this.rightBox.batchShow = true; + }, newAsset() { return JSON.parse(JSON.stringify(this.blankAsset)); }, closeRightBox(refresh) { this.rightBox.show = false; + this.rightBox.batchShow = false; if (refresh) { this.afterTableListChange() this.loadKeys(); diff --git a/nezha-fronted/src/main.js b/nezha-fronted/src/main.js index c601177b1..a7d9fa7ce 100644 --- a/nezha-fronted/src/main.js +++ b/nezha-fronted/src/main.js @@ -33,6 +33,7 @@ import moduleBox from './components/common/rightBox/moduleBox'; //module弹框 import editEndpointBox from './components/common/rightBox/editEndpointBox'; //endpoint弹框组件 import addEndpointBox from './components/common/rightBox/addEndpointBox'; //endpoint弹框组件 import assetBox from "./components/common/rightBox/assetBox"; //资产添加组件 +import batchEditAsset from "./components/common/rightBox/batchEditAsset"; //资产批量修改组件 import alertConfigBox from "./components/common/rightBox/alertConfigBox"; //告警规则弹框组件 import panelBox from "./components/common/rightBox/panelBox"; //面板弹框组件 import moduleListPop from "./components/page/asset/moduleListPop"; //面板弹框组件 @@ -54,6 +55,7 @@ Vue.component("module-box", moduleBox); Vue.component("edit-endpoint-box", editEndpointBox); Vue.component("add-endpoint-box", addEndpointBox); Vue.component("asset-box", assetBox); +Vue.component("batch-edit-asset", batchEditAsset); Vue.component("alert-config-box", alertConfigBox); Vue.component("panel-box", panelBox); Vue.component("module-list-pop", moduleListPop);