diff --git a/nezha-fronted/src/components/common/login.vue b/nezha-fronted/src/components/common/login.vue index 0d2eafa5f..f92796203 100644 --- a/nezha-fronted/src/components/common/login.vue +++ b/nezha-fronted/src/components/common/login.vue @@ -11,7 +11,7 @@
- +
diff --git a/nezha-fronted/src/components/page/asset/asset.vue b/nezha-fronted/src/components/page/asset/asset.vue index b090816fd..480d3794c 100644 --- a/nezha-fronted/src/components/page/asset/asset.vue +++ b/nezha-fronted/src/components/page/asset/asset.vue @@ -7,8 +7,8 @@ -
+
-
111
+
Create Asset +
@@ -102,14 +103,16 @@
资产信息
+
+ :value="item.name" + > {{ item.name }} @@ -129,41 +132,45 @@ -
- 资产类型 - 新增资产类型 -
111
- 已有资产类型 -
-
    -
  • -
    - 1111 - +
    +
    +
    +
    +
    +
    -
    - 1111 - -
    -
    - 1111 - -
    -
    - 1111 - -
    -
    - 1111 - -
    -
    - 1111 - -
    -
  • -
+ {{$t('overall.esc')}} +
+
+ 资产类型 + 新增资产类型 + + 已有资产类型 +
+
    +
  • +
    + {{item.name}} + +
    +
  • +
+
+
+
+
+
+ {{$t('overall.cancel')}} +
+
+ {{$t('overall.save')}}
@@ -171,101 +178,109 @@
- +
- - - {{ item.name }} - - - - - - - - - - + +
-
- 商场/型号 - 新厂商名称 -
111
- 已有厂商 -
-
    -
  • -
    - 1111 - +
    +
    +
    +
    +
    +
    -
    - 1111 - -
    -
    - 1111 - -
    -
    - 1111 - -
    -
    - 1111 - -
    -
    - 1111 - -
    -
  • -
+ {{$t('overall.esc')}} +
+
+
+ 商场/型号 + + 已有厂商 +
+
    +
  • +
    + 1111 + +
    +
    + 1111 + +
    +
    + 1111 + +
    +
    + 1111 + +
    +
    + 1111 + +
    +
    + 1111 + +
    +
  • +
+
+ 已有型号 + +
+
    +
  • +
    + 1111 + +
    +
    + 1111 + +
    +
    + 1111 + +
    +
    + 1111 + +
    +
    + 1111 + +
    +
    + 1111 + +
    +
  • +
+
+
- 已有型号 -
111
-
-
    -
  • -
    - 1111 - -
    -
    - 1111 - -
    -
    - 1111 - -
    -
    - 1111 - -
    -
    - 1111 - -
    -
    - 1111 - -
    -
  • -
+
+ +
+
+ {{$t('overall.cancel')}} +
+
+ {{$t('overall.save')}}
@@ -275,39 +290,25 @@
- - - {{ item.name }} - - - - - - - - - - + +
IDC
+
- + + :value="item.name" + > {{ item.name }} @@ -327,42 +328,69 @@ -
- 标题 - - - - - - - - - +
+
+
+
+ +
+ {{$t('overall.esc')}} +
+
+
+ 标题 + + + + + + + + + + + + +
+
+
+
+ {{$t('overall.cancel')}} +
+
+ {{$t('overall.save')}} +
- - + + {{idcSelectedData.location}} - - + + {{idcSelectedData.principal}} - - + + {{idcSelectedData.tel}} +
- + + :value="item.name" + > {{ item.name }} @@ -382,48 +410,71 @@ -
- 标题 - - - - -
{{value1}}
-
- - - - - - +
+
+
+
+ +
+ {{$t('overall.esc')}} +
+
+
+ 标题 + + + + +
{{value1}}
+ +
+ + + + + + +
+
+
+
+ {{$t('overall.cancel')}} +
+
+ {{$t('overall.save')}} +
- - + + {{cabinetSelectedData.uSize}} - - + + {{cabinetSelectedData.desc}} -
IDC
+
CLI Account
- + - + - + - +
@@ -441,7 +492,9 @@ export default { name: "asset", data() { return { - value1:100, + cabinetModelData: '', + cabinetIDCData: '', + value1: 100, checkList: [], sidebarState: '', tableTitle: [ @@ -470,8 +523,8 @@ export default { prop: 'Module', show: true, }, { - label: this.$t("asset.tableTitle.alarm"), - prop: 'Alarm', + label: this.$t("asset.tableTitle.alert"), + prop: 'alert', show: true, }, { label: this.$t("asset.tableTitle.dataCenter"), @@ -550,26 +603,61 @@ export default { } ], checkListData: [], - assetOptionData: [ + assetTypeData: '', + assetTypeOptionData: [ { id: '1', - name: 'group1', + name: '座机', }, { id: '2', - name: 'group2', + name: '路由器', }, { id: '3', - name: '小组3', - }, { - id: '4', - name: '小组4', - }, { - id: '5', - name: '小组啊小组5', - }, { - id: '6', - name: '小组6', + name: '台式机', }], + companyTypeData: '', + companyTypeOptionData: [ + { + value: 'zhinan', + label: '指南', + children: [ + { + value: 'shejiyuanze', + label: '设计原则', + }, { + value: 'daohang', + label: '导航', + } + ] + }, { + value: 'zujian', + label: '组件', + children: [ + { + value: '11', + label: '设计原22则', + }, { + value: '33', + label: '导44航', + } + ] + }, { + value: 'ziyuan', + label: '资源', + children: [ + { + value: 'shejiyuanze', + label: '设计原则', + }, { + value: 'daohang', + label: '导航', + } + ] + }], + IDCData: '', + IDCOptionData: [], + cabinetData: '', + cabinetOptionData: [], input: '', pageObj: { pageNo: 1, @@ -589,6 +677,24 @@ export default { title: '' }, assetType: {}, + accountType: '', + idcSelectedData: { + id: '', + name: '', + location: '', + principal: '', + tel: '' + }, + cabinetSelectedData: { + name: '', + uSize: '', + desc: '', + idc: '' + }, + popTypeVisible: false, + popCompVisible: false, + popIDCVisible: false, + popCabinetVisible: false } }, computed: { @@ -613,13 +719,6 @@ export default { }, methods: { getAssetData() { - this.$get('idc', this.pageObj).then(response => { - if (response.code == 200) { - this.checkListData = response.data.list - } - }) - }, - getListData() { this.$get('asset', this.pageObj).then(response => { if (response.code === 200) { this.tableData = response.data.list; @@ -627,17 +726,31 @@ export default { } }) }, + getIDCOptionData() { + this.$get('idc', this.pageObj).then(response => { + if (response.code === 200) { + this.checkListData = this.IDCOptionData = response.data.list; + } + }) + }, + getCabinetOptionData() { + this.$get('cabinet', this.pageObj).then(response => { + if (response.code === 200) { + this.cabinetOptionData = response.data.list; + } + }) + }, markOptionData() { - for (let i in this.assetOptionData) { - this.$set(this.assetOptionData[i], 'isEdit', false); - this.$set(this.assetOptionData[i], 'oldName', this.assetOptionData[i].name); - } + this.assetTypeOptionData.forEach(item => { + this.$set(item, 'isEdit', false); + this.$set(item, 'oldName', item.name); + }) }, editOptionData(item) { if (!item.isEdit) { item.isEdit = true; } else { - if (item.name != item.oldName) { + if (item.name !== item.oldName) { item.isEdit = false; } else { item.isEdit = false; @@ -660,20 +773,52 @@ export default { }, editing() { + }, + getSingleIDCData(data) { + console.log(data) + this.idcSelectedData = '' + this.IDCOptionData.forEach(item => { + if (item.name == data) { + this.idcSelectedData = item + console.log(this.idcSelectedData) + } + }) + }, + getSingleCabinetData(data) { + this.cabinetOptionData.forEach(item => { + if (item.name === data) { + this.cabinetSelectedData = item + } + }) }, pageNo(val) { this.pageObj.pageNo = val; - this.getListData() + this.getAssetData() }, pageSize(val) { this.pageObj.pageSize = val; - this.getListData() - } + this.getAssetData() + }, + popoverClose(data) { + if (data === 'type') { + this.popTypeVisible = false + } + if (data === 'comp') { + this.popCompVisible = false + } + if (data === 'IDC') { + this.popIDCVisible = false + } + if (data === 'equip') { + this.popCabinetVisible = false + } + }, }, mounted() { this.markOptionData(); - this.getListData(); this.getAssetData(); + this.getIDCOptionData(); + this.getCabinetOptionData(); window.onresize = () => { this.tableHeight = document.documentElement.clientHeight - 200; } @@ -685,6 +830,11 @@ export default { font-size: 10px; } +.el-popover { + padding: 0px; + border-radius: 10px; +} + .el-form-style .el-form-item { margin-bottom: 0px; } @@ -700,7 +850,7 @@ export default { } .el-divider--horizontal { - margin: 12px; + margin: 15px; } .el-checkbox-group { @@ -800,6 +950,12 @@ export default { margin: 15px 0; } +.account-list-option { + cursor: pointer; + display: inline-block; + margin-right: 6px; +} + .right-box-top-btns { text-align: center; } @@ -853,32 +1009,59 @@ export default { height: 300px; width: 400px; } -.pop-window-company{ - height: 600px; + +.pop-window-assetType { + height: 500px; width: 400px; } -.pop-window-type{ - height: 600px; - width: 400px; +.pop-window-assetType-content { + padding: 1px 15px 15px 20px; } -.companyList{ +.companyList { width: 300px; height: 150px; border: 1px solid #000000; } -.rm-c-list li{ - width: 300px; - height: 400px; +.rm-c-list li { border: 1px solid #000000; } -.rm-c-list span:hover{ - background-color:#888;color:#fff; +.rm-c-list span:hover { + background-color: #888; + color: #fff; } +.right-box-bottom-btn { + display: inline-block; + background-color: #656565; + color: white; + line-height: 35px; + cursor: pointer; + text-align: center; +} + +.right-box-bottom-btns { + position: absolute; + bottom: 0px; + width: 100%; + text-align: center; +} + +.right-box-bottom-btn-cancel { + background-color: #DADADA; + color: #656565; + width: 50%; + border-bottom-left-radius: 8px; +} + +.right-box-bottom-btn-50 { + width: 50%; + float: right; + border-bottom-right-radius: 8px; +} @keyframes slide-in-from-right { from {