Skip to content

I
IT-monitor
Commit 1025eb90 authored by 11528's avatar 11528
Browse files
Options

Merge remote-tracking branch 'origin/master' into master

parents 30d414e7 1f068a35
Expand all Hide whitespace changes
Inline Side-by-side
Showing with 1199 additions and 31 deletions
src/layout/components/TagsView/index.vue
View file @ 1025eb90
......@@ -13,7 +13,7 @@
@click.middle.native="!isAffix(tag)?closeSelectedTag(tag):''"
@contextmenu.prevent.native="openMenu(tag,$event)"
>
<span style="color: #168DE8">{{ tag.title }}</span>
<span>{{ tag.title }}</span>
<span v-if="!isAffix(tag)" class="el-icon-close" @click.prevent.stop="closeSelectedTag(tag)" />
</router-link>
</scroll-pane>
......@@ -242,7 +242,8 @@ export default {
}
&.active {
background-color: #fff;
color: $color-theme;
//color: $color-theme;
color: #168DE8;
border-color: transparent;
//&::before {
// content: '';
......
src/layout/components/header.vue
View file @ 1025eb90
......@@ -6,25 +6,25 @@
class="hamburger-container"
@toggleClick="toggleSideBar"
/>
<el-dropdown
class="change-sys"
@command="handleCommand"
>
<!-- <el-dropdown-->
<!-- class="change-sys"-->
<!-- @command="handleCommand"-->
<!-- >-->
<!-- <span class="el-dropdown-link">-->
<!-- 业务中台<i class="el-icon-arrow-down el-icon&#45;&#45;right" />-->
<!-- </span>-->
<el-dropdown-menu
slot="dropdown"
>
<el-dropdown-item
v-for="(item) in appList"
:key="item.businessId"
:command="specialTag !== '1' ? item.pcUrl : ''"
>
{{ item.system }}
</el-dropdown-item>
</el-dropdown-menu>
</el-dropdown>
<!-- <el-dropdown-menu-->
<!-- slot="dropdown"-->
<!-- >-->
<!-- <el-dropdown-item-->
<!-- v-for="(item) in appList"-->
<!-- :key="item.businessId"-->
<!-- :command="specialTag !== '1' ? item.pcUrl : ''"-->
<!-- >-->
<!-- {{ item.system }}-->
<!-- </el-dropdown-item>-->
<!-- </el-dropdown-menu>-->
<!-- </el-dropdown>-->
</div>
<div class="right-menu">
<!-- <i class="el-icon-info" />-->
......
src/views/IntegratedMonitor/warning/warningSetup.vue
View file @ 1025eb90
......@@ -186,7 +186,7 @@ export default {
{
id: 12,
icon: require('@/assets/image/shebei9-weixian.png'),
label: '虚拟化平台',
label: '虚拟设备（默认每个设备支持5个监测点）',
children: [{
id: 121,
icon: require('@/assets/image/shebei2-guzhang.png'),
......@@ -285,6 +285,7 @@ export default {
this.addDialog = false
},
addWarn() {
this.stepActive = 1
this.addWarnDialog = true
},
deleteRow() {
......
src/views/assetManagement/addAsset.vue 0 → 100644
View file @ 1025eb90
<template>
<div class="addAssetClass">
<div class="addAssetTitle">新增资产</div>
<el-collapse v-model="activeNames" @change="handleChange">
<el-collapse-item class="collapseTitle" title="基本信息" name="1">
<el-form ref="form" label-width="auto" :model="form">
<el-row :gutter="12">
<el-col :span="12">
<el-form-item label="资产名称:">
<el-input v-model="form.value" />
</el-form-item>
</el-col>
<el-col :span="12">
<el-form-item label="资产编码:">
<el-input v-model="form.value1" />
</el-form-item>
</el-col>
</el-row>
<el-row :gutter="12">
<el-col :span="12">
<el-form-item label="状态:">
<el-select
v-model="form.value2"
style="width: 100%"
>
<el-option value="未入库" label="未入库" />
</el-select>
</el-form-item>
</el-col>
<el-col :span="12">
<el-form-item label="所属公司:">
<el-select
v-model="form.value3"
style="width: 100%"
>
<el-option value="默认公司" label="默认公司" />
</el-select>
</el-form-item>
</el-col>
</el-row>
<el-row :gutter="12">
<el-col :span="12">
<el-form-item label="所属部门:">
<el-select
v-model="form.value4"
style="width: 100%"
>
<el-option value="默认部门" label="默认部门" />
</el-select>
</el-form-item>
</el-col>
<el-col :span="12">
<el-form-item label="拥有者:">
<el-input v-model="form.value5" />
</el-form-item>
</el-col>
</el-row>
<el-row :gutter="12">
<el-col :span="12">
<el-form-item label="使用者:">
<el-input v-model="form.value6" />
</el-form-item>
</el-col>
<el-col :span="12">
<el-form-item label="保修开始时间:">
<el-date-picker
style="width: 100%"
v-model="form.value7"
type="date"
placeholder="选择日期">
</el-date-picker>
</el-form-item>
</el-col>
</el-row>
<el-row :gutter="12">
<el-col :span="12">
<el-form-item label="保修结束时间:">
<el-date-picker
style="width: 100%"
v-model="form.value8"
type="date"
placeholder="选择日期">
</el-date-picker>
</el-form-item>
</el-col>
<el-col :span="12">
<el-form-item label="采购时间:">
<el-date-picker
style="width: 100%"
v-model="form.value8"
type="date"
placeholder="选择日期">
</el-date-picker>
</el-form-item>
</el-col>
</el-row>
<el-row :gutter="12">
<el-col :span="12">
<el-form-item label="配置:">
<el-input v-model="form.value9" />
</el-form-item>
</el-col>
<el-col :span="12">
<el-form-item label="序列号:">
<el-input v-model="form.value10" />
</el-form-item>
</el-col>
</el-row>
</el-form>
</el-collapse-item>
<el-collapse-item title="资产属性" name="2">
<el-form ref="form" label-width="auto" :model="form">
<el-row :gutter="12">
<el-col :span="12">
<el-form-item label="品牌:">
<el-input v-model="form.value11" />
</el-form-item>
</el-col>
<el-col :span="12">
<el-form-item label="型号:">
<el-input v-model="form.value12" />
</el-form-item>
</el-col>
</el-row>
<el-row :gutter="12">
<el-col :span="12">
<el-form-item label="设备名称:">
<el-input v-model="form.value13" />
</el-form-item>
</el-col>
<el-col :span="12">
<el-form-item label="设备用途:">
<el-input v-model="form.value14" />
</el-form-item>
</el-col>
</el-row>
<el-row :gutter="12">
<el-col :span="12">
<el-form-item label="出厂日期:">
<el-input v-model="form.value15" />
</el-form-item>
</el-col>
<el-col :span="12">
<el-form-item label="机房:">
<el-input v-model="form.value16" />
</el-form-item>
</el-col>
</el-row>
<el-row :gutter="12">
<el-col :span="12">
<el-form-item label="设备U位:">
<el-input v-model="form.value17" />
</el-form-item>
</el-col>
<el-col :span="12">
<el-form-item label="业务IP地址:">
<el-input v-model="form.value18" />
</el-form-item>
</el-col>
</el-row>
<el-row :gutter="12">
<el-col :span="12">
<el-form-item label="管理IP地址:">
<el-input v-model="form.value19" />
</el-form-item>
</el-col>
<el-col :span="12">
<el-form-item label="操作系统及版本:">
<el-input v-model="form.value20" />
</el-form-item>
</el-col>
</el-row>
</el-form>
</el-collapse-item>
<el-collapse-item title="配置属性" name="3">
<el-row :gutter="12">
<el-col :span="12">
<el-form-item label="操作系统及版本:">
<el-input v-model="form.value21" />
</el-form-item>
</el-col>
</el-row>
</el-collapse-item>
</el-collapse>
</div>
</template>
<script>
export default {
name: 'AddAsset',
data() {
return {
form: {
value: '',
value1: '',
value2: '',
value3: '',
value4: '',
value5: '',
value6: '',
value7: '',
value8: '',
value9: '',
value10: '',
value11: '',
value12: '',
value13: '',
value14: '',
value15: '',
value16: '',
value17: '',
value18: '',
value19: '',
value20: '',
value21: ''
},
activeNames: ['1', '2', '3']
}
},
mounted() {
},
created() {
},
methods: {
}
}
</script>
<style lang="scss">
.addAssetClass{
padding: 15px;
.addAssetTitle{
padding:0 0 20px 0 ;
font-size: 16px;
font-weight: bold;
}
.el-collapse .el-collapse-item__header{
font-weight: bold;
font-size: 15px;
color: #43C2D5;
}
}
</style>
src/views/assetManagement/assetList.vue 0 → 100644
View file @ 1025eb90
This diff is collapsed.
src/views/assetManagement/assetListDetails.vue 0 → 100644
View file @ 1025eb90
<template>
<div class="assetListDetails">
<el-tabs v-model="activeName" @tab-click="handleClick">
<el-tab-pane label="基本信息" name="first">
<el-form ref="firstForm" label-width="auto" :model="firstForm">
<el-row>
<el-col :span="6">
<el-form-item label="分类名称:">
<span>{{ '计量调度平台4#应用服务器' }}</span>
</el-form-item>
</el-col>
<el-col :span="6">
<el-form-item label="资产编号:">
<span>{{ 'test1-0406104022-0100' }}</span>
</el-form-item>
</el-col>
</el-row>
<el-row>
<el-col :span="6">
<el-form-item label="状态:">
<span>{{ '在用' }}</span>
</el-form-item>
</el-col>
<el-col :span="6">
<el-form-item label="所属公司:">
<span>{{ '' }}</span>
</el-form-item>
</el-col>
</el-row>
<el-row>
<el-col :span="6">
<el-form-item label="所属部门:">
<span>{{ '' }}</span>
</el-form-item>
</el-col>
<el-col :span="6">
<el-form-item label="拥有者:">
<span>{{ '中国' }}</span>
</el-form-item>
</el-col>
</el-row>
<el-row>
<el-col :span="6">
<el-form-item label="使用者:">
<span>{{ '北京' }}</span>
</el-form-item>
</el-col>
<el-col :span="6">
<el-form-item label="保修开始时间:">
<span>{{ '2022-01-01' }}</span>
</el-form-item>
</el-col>
</el-row>
<el-row>
<el-col :span="6">
<el-form-item label="保修结束时间:">
<span>{{ '2027-01-02' }}</span>
</el-form-item>
</el-col>
<el-col :span="6">
<el-form-item label="采购时间:">
<span>{{ '2022-01-01' }}</span>
</el-form-item>
</el-col>
</el-row>
<el-row>
<el-col :span="6">
<el-form-item label="序列号:">
<span>{{ '214239134' }}</span>
</el-form-item>
</el-col>
<el-col :span="6">
<el-form-item label="二维码:">
<span>{{ '' }}</span>
</el-form-item>
</el-col>
</el-row>
</el-form>
</el-tab-pane>
<el-tab-pane label="资产属性" name="second">
<el-form ref="secondForm" label-width="auto" :model="secondForm">
<el-row>
<el-col :span="6">
<el-form-item label="品牌:">
<span>{{ '浪潮' }}</span>
</el-form-item>
</el-col>
<el-col :span="6">
<el-form-item label="型号:">
<span>{{ 'NF5270M3' }}</span>
</el-form-item>
</el-col>
</el-row>
<el-row>
<el-col :span="6">
<el-form-item label="设备名称:">
<span>{{ '浪潮服务器' }}</span>
</el-form-item>
</el-col>
<el-col :span="6">
<el-form-item label="设备用途:">
<span>{{ '计量调度平台4#应用服务器' }}</span>
</el-form-item>
</el-col>
</el-row>
<el-row>
<el-col :span="6">
<el-form-item label="出厂日期:">
<span>{{ '2021-12-25' }}</span>
</el-form-item>
</el-col>
<el-col :span="6">
<el-form-item label="机房:">
<span>{{ '北京XX' }}</span>
</el-form-item>
</el-col>
</el-row>
<el-row>
<el-col :span="6">
<el-form-item label="设备U位:">
<span>{{ '23' }}</span>
</el-form-item>
</el-col>
<el-col :span="6">
<el-form-item label="业务IP地址:">
<span>{{ '10.124.44.142' }}</span>
</el-form-item>
</el-col>
</el-row>
<el-row>
<el-col :span="6">
<el-form-item label="管理IP地址:">
<span>{{ ' ' }}</span>
</el-form-item>
</el-col>
<el-col :span="6">
<el-form-item label="采购时间:">
<span>{{ '2022-01-01' }}</span>
</el-form-item>
</el-col>
</el-row>
<el-row>
<el-col :span="6">
<el-form-item label="操作系统及版:">
<span>{{ 'Red Hat 6.4' }}</span>
</el-form-item>
</el-col>
<el-col :span="6">
<el-form-item label="操作系统及版本:">
<span>{{ 'Red Hat 6.4' }}</span>
</el-form-item>
</el-col>
</el-row>
<el-row>
<el-col :span="6">
<el-form-item label="MAC地址:">
<span>{{ '' }}</span>
</el-form-item>
</el-col>
</el-row>
</el-form>
</el-tab-pane>
<el-tab-pane label="配置属性" name="third">
配置属性
</el-tab-pane>
<el-tab-pane label="变更记录" name="fourth">
<el-table
:data="tableData"
border
style="width: 100%;padding-top: 20px"
>
<el-table-column label="处理日期" prop="date" show-overflow-tooltip />
<el-table-column label="处理人" prop="name" show-overflow-tooltip />
<el-table-column label="处理内容" prop="content" show-overflow-tooltip />
</el-table>
</el-tab-pane>
<el-tab-pane label="维保记录" name="fifth">
维保记录
</el-tab-pane>
</el-tabs>
</div>
</template>
<script>
export default {
name: 'AssetListDetails',
data() {
return {
tableData: [
{ date: '2022-5-22', name: 'test', content: '测试测试' },
{ date: '2022-5-22', name: 'test', content: '测试测试' },
{ date: '2022-5-22', name: 'test', content: '测试测试' }
],
firstForm: {
},
activeName: 'first'
}
},
created() {
},
mounted() {
},
methods: {
}
}
</script>
<style lang="scss">
.assetListDetails{
padding: 10px;
}
</style>
src/views/system/user/index.vue
View file @ 1025eb90
......@@ -615,9 +615,9 @@ export default {
}
this.getList()
this.getTreeSelect()
this.getConfigKey('sys.user.initPassword').then(response => {
this.initPassword = response.msg
})
// this.getConfigKey('sys.user.initPassword').then(response => {
// this.initPassword = response.msg
// })
},
methods: {
changeValue() {
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment