From 493c4db1c911168c480d868d58dda8c65f668733 Mon Sep 17 00:00:00 2001 From: wanghaoyu <825151728@qq.com> Date: Mon, 9 Dec 2019 18:51:56 +0800 Subject: [PATCH] =?UTF-8?q?feature:=20asset=E7=95=8C=E9=9D=A2=E5=BC=80?= =?UTF-8?q?=E5=8F=91=20=E9=87=8D=E6=96=B0=E7=BB=98=E5=88=B6=E4=BE=A7?= =?UTF-8?q?=E6=BB=91=E7=AA=97=E5=8F=A3,=E6=B7=BB=E5=8A=A0=E7=9B=B8?= =?UTF-8?q?=E5=BA=94=E7=9A=84=E5=BC=B9=E5=87=BA=E6=A1=86=E8=AE=BE=E7=BD=AE?= =?UTF-8?q?=E5=B1=9E=E6=80=A7?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../src/components/page/asset/asset.vue | 748 +++++++++++++----- 1 file changed, 537 insertions(+), 211 deletions(-) diff --git a/nezha-fronted/src/components/page/asset/asset.vue b/nezha-fronted/src/components/page/asset/asset.vue index c40ad5ba9..b090816fd 100644 --- a/nezha-fronted/src/components/page/asset/asset.vue +++ b/nezha-fronted/src/components/page/asset/asset.vue @@ -7,7 +7,8 @@
ALL
- {{item.name}} + {{item.name}}
编辑
 @@ -47,9 +48,12 @@

- - - + + +
@@ -58,27 +62,28 @@
+
+
+
+ +
+ {{$t('overall.esc')}} +
+
+
+ +
+ {{$t('overall.save')}} +
+
+
+ +
+ {{$t('overall.delete')}} +
+
+
111
-
-
-
- -
- Esc -
-
-
- -
- Save -
-
-
- -
- Delete -
-
@@ -90,152 +95,336 @@ - +
342
 - +
342
 - - - - - - - - - - - 取消 - -
- -
-
- -
-
-
- -
- Esc -
-
-
- -
- Save -
-
-
- -
- Delete -
-
-
- - 192.168.100.255 - - - AAQWEROIUOWENKOIZLNWEROFPIAN - - - 服务器 - - - No1 - - - 国内地区/北京市/1号 - - - 13排223机柜 - - - 192.158.22.22 - - - 在库 - - -
111
- -
-
- endPoint: -
-
- - - - - - - - - - +
资产信息
- 默认CLI账户 -
- - 111111111111111111111 - 111111111111111111111 - 111111111111111111111 - 111111111111111111111 - -
-
-
+ +
+ + + {{ item.name }} + + + + + + + + + + +
+ +
+ 资产类型 + 新增资产类型 +
111
+ 已有资产类型 +
+
    +
  • +
    + 1111 + +
    +
    + 1111 + +
    +
    + 1111 + +
    +
    + 1111 + +
    +
    + 1111 + +
    +
    + 1111 + +
    +
    • +
+
+
+ + +
+
+ + + +
+ + + {{ item.name }} + + + + + + + + + + +
+ +
+ 商场/型号 + 新厂商名称 +
111
+ 已有厂商 +
+
    +
  • +
    + 1111 + +
    +
    + 1111 + +
    +
    + 1111 + +
    +
    + 1111 + +
    +
    + 1111 + +
    +
    + 1111 + +
    +
    • +
+
+ 已有型号 +
111
+
+
    +
  • +
    + 1111 + +
    +
    + 1111 + +
    +
    + 1111 + +
    +
    + 1111 + +
    +
    + 1111 + +
    +
    + 1111 + +
    +
    • +
+
+
+ + +
+
+ + +
+ + + {{ item.name }} + + + + + + + + + + +
+ +
IDC
+ + +
+ + + {{ item.name }} + + + + + + + + + + +
+ +
+ 标题 + + + + + + + + + +
+ + +
+
+ - 192.168.100.255 + + + + + + + + + + +
+ + + {{ item.name }} + + + + + + + + + + +
+ +
+ 标题 + + + + +
{{value1}}
+ + + + + + + +
+ + +
+
+ + + + + + + +
IDC
+ + + + + + + + + - AAQWEROIUOWENKOIZLNWEROFPIAN + - - 服务器 - - - No1 - - - 国内地区/北京市/1号 + +
@@ -252,9 +441,9 @@ export default { name: "asset", data() { return { + value1:100, checkList: [], - checkListData: [], - sidebarState:'', + sidebarState: '', tableTitle: [ { label: this.$t("asset.tableTitle.id"), @@ -360,38 +549,63 @@ export default { endPoint: '上海市普陀区金沙江路 1518 弄' } ], + checkListData: [], + assetOptionData: [ + { + id: '1', + name: 'group1', + }, { + id: '2', + name: 'group2', + }, { + id: '3', + name: '小组3', + }, { + id: '4', + name: '小组4', + }, { + id: '5', + name: '小组啊小组5', + }, { + id: '6', + name: '小组6', + }], input: '', pageObj: { pageNo: 1, pageSize: 20, total: 0, + idcId: this.$store.state.assetData.selectedData }, - tableHeight:document.documentElement.clientHeight-200, + tableHeight: document.documentElement.clientHeight - 200, tabShow: false, tagType: 'add', form: { name: '' }, - searchObj: { - idcId: 7 - } + rightBox: { //弹出框相关 + show: false, + isEdit: false, //false查看，true编辑 + title: '' + }, + assetType: {}, } }, - computed:{ - getData(){ + computed: { + getData() { return this.$store.state.assetData } }, - watch:{ - getData:{ - handler(newVal,oldVal){ - this.checkList.splice(1,1,newVal.selectedData) - if(newVal.moduleData=='asset'){ - this.sidebarState=true - }else{ - this.sidebarState=false + watch: { + getData: { + handler(newVal, oldVal) { + this.checkList.splice(0, 0, newVal.selectedData) + if (newVal.moduleData == 'asset') { + this.sidebarState = true + } else { + this.sidebarState = false this.getAssetData(); - this.checkListData=[0] + this.checkListData = [0] } }, deep: true, @@ -412,6 +626,26 @@ export default { this.pageObj.total = response.data.total } }) + }, + markOptionData() { + for (let i in this.assetOptionData) { + this.$set(this.assetOptionData[i], 'isEdit', false); + this.$set(this.assetOptionData[i], 'oldName', this.assetOptionData[i].name); + } + }, + editOptionData(item) { + if (!item.isEdit) { + item.isEdit = true; + } else { + if (item.name != item.oldName) { + item.isEdit = false; + } else { + item.isEdit = false; + } + } + }, + delOptionData(data) { + }, tagShow(t) { this.tabShow = false; @@ -423,6 +657,9 @@ export default { this.tabShow = true; this.tagType = 'edit' } + }, + editing() { + }, pageNo(val) { this.pageObj.pageNo = val; @@ -433,12 +670,12 @@ export default { this.getListData() } }, - mounted() { + this.markOptionData(); this.getListData(); this.getAssetData(); window.onresize = () => { - this.tableHeight = document.documentElement.clientHeight-200; + this.tableHeight = document.documentElement.clientHeight - 200; } } } @@ -462,6 +699,10 @@ export default { margin-top: 20px; } +.el-divider--horizontal { + margin: 12px; +} + .el-checkbox-group { padding-top: 10px; } @@ -469,15 +710,25 @@ export default { .el-checkbox { width: 270px; } + +.select-style .el-select .el-input .el-input__inner { + width: 400px +} + +.el-scrollbar .el-input { + width: 200px +}