From 7771994ef1f7326b4f512b1ed53eb03de6ef8eab Mon Sep 17 00:00:00 2001 From: wanghaoyu <825151728@qq.com> Date: Thu, 12 Dec 2019 17:07:33 +0800 Subject: [PATCH] =?UTF-8?q?feature:=20asset=E5=A2=9E=E5=8A=A0=E6=B7=BB?= =?UTF-8?q?=E5=8A=A0=E8=B5=84=E4=BA=A7=E5=8A=9F=E8=83=BD=20=E8=B7=AF?= =?UTF-8?q?=E7=94=B1=E5=8F=8A=E8=AF=B7=E6=B1=82=E6=A3=80=E6=B5=8Btoken=20?= =?UTF-8?q?=E8=B0=83=E6=95=B4=E9=A1=B5=E9=9D=A2?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../src/components/common/language/en.js | 24 +- .../src/components/page/asset/asset.vue | 906 +++++++++++++++--- nezha-fronted/src/http.js | 27 +- nezha-fronted/src/main.js | 14 + 4 files changed, 812 insertions(+), 159 deletions(-) diff --git a/nezha-fronted/src/components/common/language/en.js b/nezha-fronted/src/components/common/language/en.js index 575f2beeb..5169d2a98 100644 --- a/nezha-fronted/src/components/common/language/en.js +++ b/nezha-fronted/src/components/common/language/en.js @@ -1,11 +1,11 @@ import enLocale from 'element-ui/lib/locale/lang/en' //引入element语言包 const en = { overall:{ - dashboard:'dashboard', - project:'project', - alert: "alert", - asset:'asset', - config:'config', + dashboard:'Dashboard', + project:'Projects', + alert: "Alert", + asset:'Assets', + config:'Config', create: 'Create', edit: 'Edit', delete: 'Delete', @@ -20,18 +20,18 @@ const en = { tableTitle: { id: 'ID', assetType: '资产类型', - device: 'Device SN', - ip: 'IP', - assetState: '资产状态', + device: 'SN', + host: 'Host', + assetState: 'State', module: 'Module', - alert: 'alert', + alert: 'Alert', dataCenter: '数据中心', cabinet: '机柜', model: '型号', manufacturer: '厂商', - procurementDate: '采购日期', - warrantyDate: '保修截止期', - deviceDuty: '设备责任人', + procurementDate: '购买日期', + principal: '责任人', + principalTel: '责任人电话', option: "Option" }, tagTableTitle: { diff --git a/nezha-fronted/src/components/page/asset/asset.vue b/nezha-fronted/src/components/page/asset/asset.vue index 5d9c2c509..634b92a58 100644 --- a/nezha-fronted/src/components/page/asset/asset.vue +++ b/nezha-fronted/src/components/page/asset/asset.vue @@ -6,7 +6,7 @@
ALL
- + {{item.name}}
编辑
@@ -38,7 +38,7 @@ @@ -46,29 +46,94 @@ -
-
+ +
+
@@ -76,7 +141,7 @@
{{$t('overall.esc')}}
-
+
@@ -90,15 +155,15 @@
Create Asset
- +
- + - + - +
- -
342
- - -
342
-
资产信息
- +
- + {{ item.value }} - + @@ -199,7 +258,11 @@
@@ -222,7 +285,7 @@
商场/型号 新厂商名称 - + 已有厂商 @@ -241,9 +304,9 @@
新型号名称 - + + @click="addNewData('model')"> 已有型号
    @@ -274,7 +337,7 @@
- +
IDC
- +
- 标题 - + -
{{value1}}
- +
{{addCabinetData.uSize}}
+ - - +
@@ -433,7 +496,8 @@ @click="popoverClose('equip')"> {{$t('overall.cancel')}}
-
+
{{$t('overall.save')}}
@@ -467,15 +531,432 @@
-
-
-
- {{$t('overall.cancel')}} +
+
+ {{$t('overall.cancel')}} +
+
+ {{$t('overall.save')}} +
-
- {{$t('overall.save')}} +
+ + + +
+
+
+
+ +
+ {{$t('overall.esc')}} +
+
+
+ +
+ {{$t('overall.save')}} +
+
+
+ +
+ {{$t('overall.delete')}} +
+
+
Edit Asset
+ +
+ + + + + + + +
+ + + + +
+ + + + + + + +
资产信息
+ + + +
+ + + {{ item.value }} + + + + + + + + + + + +
+ +
+
+
+
+
+ +
+ {{$t('overall.esc')}} +
+
+ 资产类型 + 新增资产类型 + + + 已有资产类型 +
+
    +
  • +
    + {{item.value}} + +
    +
    • +
+
+
+
+
+
+ {{$t('overall.cancel')}} +
+
+ {{$t('overall.save')}} +
+
+ + +
+
+ + + +
+ + +
+ +
+
+
+
+
+ +
+ {{$t('overall.esc')}} +
+
+
+ 商场/型号 + 新厂商名称 + + + 已有厂商 +
+
    +
  • +
    + {{item.value}} + +
    +
    • +
+
+ 新型号名称 + + + 已有型号 +
+
    +
  • +
    + {{item.name}} + +
    +
    • +
+
+
+
+
+
+
+ {{$t('overall.cancel')}} +
+
+ {{$t('overall.save')}} +
+
+ + +
+
+ + +
+ + +
+ +
IDC
+ + + +
+ + + {{ item.name }} + + + + + + + + + + +
+ +
+
+
+
+ +
+ {{$t('overall.esc')}} +
+
+
+ 标题 + + + + + + + + + + + + +
+
+
+
+ {{$t('overall.cancel')}} +
+
+ {{$t('overall.save')}} +
+
+ + +
+
+ + + {{idcSelectedData.location}} + + + {{idcSelectedData.principal}} + + + {{idcSelectedData.tel}} + + + + +
+ + + {{ item.name }} + + + + + + + + + + +
+ +
+
+
+
+ +
+ {{$t('overall.esc')}} +
+
+
+ 标题 + + + + +
{{addCabinetData.uSize}}
+ + + + + + + + +
+
+
+
+ {{$t('overall.cancel')}} +
+
+ {{$t('overall.save')}} +
+
+ + +
+
+ + + {{cabinetSelectedData.uSize}} + + + {{cabinetSelectedData.desc}} + +
CLI Account
+ + + + + + + + + + + + + + + + +
+ +
+
+ {{$t('overall.cancel')}} +
+
+ {{$t('overall.save')}} +
@@ -490,14 +971,15 @@ export default { name: "asset", data() { return { - assetData:{ - sn:'', - host:'', - state:'', - purchaseDate:'', - idcId:'', - cabinetId:'', - modelId:1 + vendorModelData: '', + assetData: { + sn: '', + host: '', + state: '', + purchaseDate: '', + idcId: '', + cabinetId: '', + modelId: '' }, assetStateOption: [{ value: 1, @@ -514,18 +996,18 @@ export default { { label: this.$t("asset.tableTitle.id"), prop: 'ID', - show: true, + show: false, }, { label: this.$t("asset.tableTitle.assetType"), prop: '资产类型', show: true, }, { label: this.$t("asset.tableTitle.device"), - prop: 'Device SN', + prop: 'SN', show: true, }, { - label: this.$t("asset.tableTitle.ip"), - prop: 'IP', + label: this.$t("asset.tableTitle.host"), + prop: 'HOST', show: true, }, { label: this.$t("asset.tableTitle.assetState"), @@ -537,7 +1019,7 @@ export default { show: true, }, { label: this.$t("asset.tableTitle.alert"), - prop: 'alert', + prop: 'Alert', show: true, }, { label: this.$t("asset.tableTitle.dataCenter"), @@ -557,15 +1039,15 @@ export default { show: true, }, { label: this.$t("asset.tableTitle.procurementDate"), - prop: '采购日期', + prop: '购买日期', show: true, }, { - label: this.$t("asset.tableTitle.warrantyDate"), - prop: '保修截止期', + label: this.$t("asset.tableTitle.principal"), + prop: '责任人', show: true, }, { - label: this.$t("asset.tableTitle.deviceDuty"), - prop: '设备责任人', + label: this.$t("asset.tableTitle.principalTel"), + prop: '责任人电话', show: true, }, { label: this.$t('config.account.option'), @@ -576,58 +1058,29 @@ export default { checkListData: [], assetTypeData11111: '', assetTypeOptionData: [], - companyTypeData: '', - companyTypeOptionData: [ + vendorTypeData: '', + vendorTypeOptionData: [ { - 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: '导航', - } - ] + value: '', + label: '', + children: [] }], - vendorUlData:'', - modelUlData:'', - vendorCode:'', + vendorUlData: '', + modelUlData: '', + vendorCode: '', IDCData: '', IDCOptionData: [], cabinetData: '', cabinetOptionData: [], input: '', pageObj: { + id:'', pageNo: 1, pageSize: 20, total: 0, - idcId: this.$store.state.assetData.selectedData + idcId: '', + idcIds:'' + }, tableHeight: document.documentElement.clientHeight - 200, tabShow: false, @@ -645,6 +1098,15 @@ export default { type: 'assetType', value: '', }, + addVendorData: { + type: 'vendor', + value: '', + }, + addNewModelData: { + name: '', + vendorCode: '', + typeCode: '' + }, accountType: '', idcSelectedData: { id: '', @@ -661,16 +1123,27 @@ export default { tel: '' }, cabinetSelectedData: { - name: '', uSize: '', desc: '', - idc: '' + }, + addCabinetData: { + name: '', + uSize: 0, + remark: '', + idcId: '', }, popTypeVisible: false, + editPopTypeVisible: false, popCompVisible: false, popIDCVisible: false, popCabinetVisible: false, - vendorCount:'' + vendorCount: '', + allModelUlData: '', + addForm:{ + sn:'', + host:'', + state:'', + } } }, computed: { @@ -682,37 +1155,56 @@ export default { 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] - } + console.log(newVal.selectedData) }, deep: true, }, }, methods: { - getAssetData() { - this.$get('asset', this.pageObj).then(response => { - if (response.code === 200) { - this.tableData = response.data.list; - this.pageObj.total = response.data.total - } - }) + getAssetData(data) { + if(data !== undefined){ + this.pageObj.id=data + this.$get('asset', this.pageObj).then(response => { + if (response.code === 200) { + console.log(response.data.list[0]) + this.getCabinetOptionData(response.data.list[0].idc.id) + this.assetType = response.data.list[0].model.type.code + this.assetData.sn = response.data.list[0].sn + this.assetData.host = response.data.list[0].host + this.assetData.state = response.data.list[0].state + this.assetData.idcId = response.data.list[0].idc.id + this.assetData.cabinetId = response.data.list[0].cabinet == null ? '':response.data.list[0].cabinet.id + this.assetData.purchaseDate = response.data.list[0].purchaseDate + this.idcSelectedData.location = response.data.list[0].idc.location + this.idcSelectedData.principal = response.data.list[0].idc.principal + this.idcSelectedData.tel = response.data.list[0].idc.tel + this.cabinetSelectedData.uSize = response.data.list[0].cabinet == null ? '':response.data.list[0].cabinet.uSize + this.cabinetSelectedData.desc =response.data.list[0].cabinet == null ? '':response.data.list[0].cabinet.remark + this.getConnectData() + } + }) + }else{ + this.$get('asset', this.pageObj).then(response => { + if (response.code === 200) { + this.tableData = response.data.list; + this.pageObj.total = response.data.total + } + }) + } }, getIDCOptionData() { this.$get('idc').then(response => { if (response.code === 200) { this.checkListData = this.IDCOptionData = response.data.list; + this.markOptionData(this.IDCOptionData) } }) }, getCabinetOptionData(data) { - this.$get('cabinet?idcId='+data).then(response => { + this.$get('cabinet?idcId=' + data).then(response => { if (response.code === 200) { this.cabinetOptionData = response.data.list; + this.markOptionData(this.cabinetOptionData) } }) }, @@ -732,35 +1224,122 @@ export default { } }) }, - getModelOptionData(assetType,vendorCode) { - this.$get('model?typeCode='+assetType+'&vendorCode='+vendorCode).then(response => { + getModelOptionData(assetType, vendorCode) { + this.$get('model?typeCode=' + assetType + '&vendorCode=' + vendorCode).then(response => { if (response.code === 200) { this.modelUlData = response.data.list - console.log(this.modelUlData.i) + } + }) + }, + getAllModelOptionData() { + this.$get('model?typeCode=' + this.assetType).then(response => { + if (response.code === 200) { + this.allModelUlData = response.data.list } }) }, addNewData(type) { if (type === 'IDC') { this.$post('idc', this.addIdcData).then(res => { + if (res.code === 200) { + const h = this.$createElement; + this.$notify({ + message: h('i', {style: 'color: teal'}, '添加成功'), + duration: 2000 + }); + this.popoverClose('IDC') + } }) } if (type === 'assetType') { this.$post('sys/dict/save', this.assetTypeData).then(res => { + if (res.code === 200) { + this.getAssetTypeOptionData() + const h = this.$createElement; + this.$notify({ + message: h('i', {style: 'color: teal'}, '添加成功'), + duration: 2000 + }); + } }) } if (type === 'asset') { + this.assetData.modelId = this.assetData.modelId.join(',').split(',')[1] this.$post('asset', this.assetData).then(res => { + if (res.code === 200) { + const h = this.$createElement; + this.$notify({ + message: h('i', {style: 'color: teal'}, '添加成功'), + duration: 2000 + }); + this.getAssetData(); + } + }) + } + if (type === 'model') { + this.addNewModelData.typeCode = this.assetType + this.addNewModelData.vendorCode = this.vendorCode + this.$post('model', this.addNewModelData).then(res => { + if (res.code === 200) { + this.getModelOptionData(this.assetType, this.vendorCode) + const h = this.$createElement; + this.$notify({ + message: h('i', {style: 'color: teal'}, '添加成功'), + duration: 2000 + }); + this.getConnectData() + }else{ + const h = this.$createElement; + this.$notify({ + message: h('i', {style: 'color: teal'}, '请先选择资产类型'), + duration: 2000 + }); + } + }) + } + if (type === 'cabinet') { + this.addCabinetData.idcId = this.assetData.idcId + this.$post('cabinet', this.addCabinetData).then(res => { + if (res.code === 200) { + const h = this.$createElement; + this.$notify({ + message: h('i', {style: 'color: teal'}, '添加成功'), + duration: 2000 + }); + this.getCabinetOptionData(this.addCabinetData.idcId) + this.popoverClose('cabinet') + } }) } }, markOptionData(data) { data.forEach(item => { - console.log(item) this.$set(item, 'isEdit', false); this.$set(item, 'oldName', item.value); }) }, + getConnectData() { + this.getAllModelOptionData() + var resultData = [] + let venData = this.vendorUlData + let modelData = this.allModelUlData + for (var i = 0; i < venData.length; i++) { + var obj = {} + obj.value = venData[i].value + obj.label = venData[i].value + obj.children = [] + for (var j = 0; j < modelData.length; j++) { + if (venData[i].code === modelData[j].vendor.code) { + var obj1 = {} + obj1.value = modelData[j].id + obj1.label = modelData[j].name + obj.children.push(obj1) + } + } + resultData.push(obj) + } + this.vendorTypeOptionData = resultData + }, editOptionData(item) { if (!item.isEdit) { item.isEdit = true; @@ -772,16 +1351,22 @@ export default { } } }, - delOptionData(data) {}, - tagShow(t) { + delOptionData(data) { + }, + tagShow(t,data) { this.tabShow = false; if (t === 'showAdd') { this.tabShow = true; this.tagType = 'add' + this.$refs['addForm'].resetFields() + this.assetType = '' + this.assetData.idcId='' + this.assetData.cabinetId= '' } if (t === 'showEdit') { this.tabShow = true; this.tagType = 'edit' + this.getAssetData(data) } }, editing() { @@ -795,28 +1380,37 @@ export default { } }); this.getCabinetOptionData(this.assetData.idcId); - this.assetData.cabinetId='' - }, + this.assetData.cabinetId = '' + } + , getSingleCabinetData(data) { + this.cabinetSelectedData = ''; this.cabinetOptionData.forEach(item => { if (item.id === data) { this.cabinetSelectedData = item } }) }, - getLidata(index,item){ - this.vendorCount=index; - this.vendorCode = item.code; - this.getModelOptionData(this.assetType,this.vendorCode) + getSingleAsset(data){ + this.pageObj.idcIds=data.join(',') + this.getAssetData() }, + getLidata(index, item) { + this.vendorCount = index; + this.vendorCode = item.code; + this.getModelOptionData(this.assetType, this.vendorCode) + } + , pageNo(val) { this.pageObj.pageNo = val; this.getAssetData() - }, + } + , pageSize(val) { this.pageObj.pageSize = val; this.getAssetData() - }, + } + , popoverClose(data) { if (data === 'type') { this.popTypeVisible = false @@ -829,12 +1423,34 @@ export default { if (data === 'IDC') { this.popIDCVisible = false } - if (data === 'equip') { + if (data === 'cabinet') { this.popCabinetVisible = false } }, - show1(){ - console.log(this.assetData.idcId) + editPopoverClose(data) { + if (data === 'type') { + this.editPopTypeVisible = false + } + if (data === 'comp') { + this.editPopTypeVisible = false; + this.modelUlData = ''; + this.vendorCount = '' + } + if (data === 'IDC') { + this.editPopTypeVisible = false + } + if (data === 'cabinet') { + this.editPopTypeVisible = false + } + }, + returnData(data){ + if (data && data !== '--') { + return data.name; + } else if (data === '--') { + return '-'; + } else { + return "-"; + } } }, mounted() { @@ -959,7 +1575,7 @@ export default { .tab-input-square { border: 1px solid #aaaaaa; height: 25px; - width: 70px; + width: 65px; border-radius: 3px; text-align: center; margin-top: 6px; @@ -1023,7 +1639,7 @@ export default { } .pop-window { - height: 300px; + height: 370px; width: 400px; } @@ -1040,12 +1656,14 @@ export default { width: 97%; height: 300px; border: 1px solid #cfcfcf; + overflow-y: auto; } .li-list-part { width: 90%; height: 130px; border: 1px solid #cfcfcf; + overflow-y: auto; } .rm-c-list span:hover { @@ -1081,9 +1699,11 @@ export default { float: right; border-bottom-right-radius: 8px; } -.activeColor{ - background-color:#409EFF; + +.activeColor { + background-color: #409EFF; } + @keyframes slide-in-from-right { from { right: -800px diff --git a/nezha-fronted/src/http.js b/nezha-fronted/src/http.js index 67b3174cd..58dcef15e 100644 --- a/nezha-fronted/src/http.js +++ b/nezha-fronted/src/http.js @@ -1,7 +1,11 @@ import axios from 'axios' +import router from './router' + import qs from 'qs' //引入数据格式化 //axios.defaults.baseURL = 'http://localhost:8088/nz-admin'; -axios.defaults.baseURL = 'http://192.168.40.247:8080/nz-admin'; +axios.defaults.baseURL = 'http://192.168.41.69:8080/nz-admin'; +// axios.defaults.baseURL = 'http://192.168.40.247:8080/nz-admin'; + axios.interceptors.request.use(config => { // config.headers = { // "Content-Type": 'application/x-www-form-urlencoded', @@ -13,8 +17,23 @@ axios.interceptors.request.use(config => { } return config; }, - err => Promise.reject(err)); - + err => Promise.reject(err) +); +axios.interceptors.response.use( + response => { + if(response.status === 200){ + if(response.data.code == 101007){ + router.push({ + path: "/login" + }) + } + } + return response + }, + error => { + return Promise.reject(error) + } +) export function get(url, params) { return new Promise((resolve, reject) => { axios.get(url, { @@ -33,7 +52,7 @@ export function post(url, params) { resolve(response.data) }).catch(err => { console.info(err) - resolve(err.response.data) + resolve('失败') }) }) } diff --git a/nezha-fronted/src/main.js b/nezha-fronted/src/main.js index 9c78dd12c..5bb4de70e 100644 --- a/nezha-fronted/src/main.js +++ b/nezha-fronted/src/main.js @@ -72,3 +72,17 @@ new Vue({ components: {App}, template: '' }) + + +router.beforeEach((to, from, next) => { + if (to.path === '/login') { + next() + } else { + let token = sessionStorage.getItem('token'); + if (token) { + next() + } else { + next({ path: '/dashboard' }) + } + } +})