Commit 65664bb4 authored by 11528's avatar 11528

样式修改

parent 23236685
...@@ -732,7 +732,9 @@ export default { ...@@ -732,7 +732,9 @@ export default {
confirmButtonText: '确定', confirmButtonText: '确定',
cancelButtonText: '取消', cancelButtonText: '取消',
type: 'warning' type: 'warning'
}).then(() => {}) }).then(() => {
window.location.href = process.env.BASE_URL + 'exportFile.xls'
})
}, },
/** 查询登录日志 */ /** 查询登录日志 */
getList() { getList() {
......
...@@ -323,7 +323,9 @@ export default { ...@@ -323,7 +323,9 @@ export default {
confirmButtonText: '确定', confirmButtonText: '确定',
cancelButtonText: '取消', cancelButtonText: '取消',
type: 'warning' type: 'warning'
}).then(() => {}) }).then(() => {
window.location.href = process.env.BASE_URL + 'exportFile.xls'
})
} }
} }
} }
......
...@@ -88,7 +88,9 @@ export default { ...@@ -88,7 +88,9 @@ export default {
confirmButtonText: '确定', confirmButtonText: '确定',
cancelButtonText: '取消', cancelButtonText: '取消',
type: 'warning' type: 'warning'
}).then(() => {}) }).then(() => {
window.location.href = process.env.BASE_URL + 'exportFile.xls'
})
}, },
addEquipment() { addEquipment() {
this.$router.push({ this.$router.push({
......
...@@ -222,7 +222,9 @@ export default { ...@@ -222,7 +222,9 @@ export default {
confirmButtonText: '确定', confirmButtonText: '确定',
cancelButtonText: '取消', cancelButtonText: '取消',
type: 'warning' type: 'warning'
}).then(() => {}) }).then(() => {
window.location.href = process.env.BASE_URL + 'exportFile.xls'
})
} }
} }
} }
......
...@@ -104,7 +104,9 @@ export default { ...@@ -104,7 +104,9 @@ export default {
confirmButtonText: '确定', confirmButtonText: '确定',
cancelButtonText: '取消', cancelButtonText: '取消',
type: 'warning' type: 'warning'
}).then(() => {}) }).then(() => {
window.location.href = process.env.BASE_URL + 'exportFile.xls'
})
}, },
addEquipment() { addEquipment() {
this.$router.push({ this.$router.push({
......
...@@ -9,7 +9,6 @@ ...@@ -9,7 +9,6 @@
<el-form-item class="headSearch"> <el-form-item class="headSearch">
<el-select <el-select
v-model="searchBy.operationStatus" v-model="searchBy.operationStatus"
class="searchInput"
placeholder="请选择" placeholder="请选择"
clearable clearable
style="width: 150px" style="width: 150px"
...@@ -53,17 +52,23 @@ ...@@ -53,17 +52,23 @@
<el-table-column label="下次巡检时间" prop="NextTime" show-overflow-tooltip /> <el-table-column label="下次巡检时间" prop="NextTime" show-overflow-tooltip />
<el-table-column label="描述" prop="describe" show-overflow-tooltip /> <el-table-column label="描述" prop="describe" show-overflow-tooltip />
<el-table-column width="200px" label="操作"> <el-table-column width="200px" label="操作">
<el-link type="primary" @click="implement">执行</el-link> <template slot-scope="scope">
<el-link type="primary" @click="report">报告</el-link> <el-link type="primary" @click="implement">执行</el-link>
<el-link type="primary" @click="handleUpdate">编辑</el-link> <el-link type="primary" @click="report">报告</el-link>
<el-tooltip effect="light" placement="bottom" popper-class="moreTip"> <el-link type="primary" @click="handleUpdate">编辑</el-link>
<div slot="content" class="tooltipText" @click="deleteRow">删除</div> <el-popover
<div slot="content" class="tooltipText" @click="addWarn">复制</div> placement="bottom"
<div slot="content" class="tooltipText" @click="enable">启用</div> width="200"
<el-link>... trigger="click"
<div class="caretDown" /> >
</el-link> <div class="tooltipText" @click="deleteRow">删除</div>
</el-tooltip> <div class="tooltipText" @click="addWarn">复制</div>
<div class="tooltipText" @click="enable">启用</div>
<el-link type="primary" slot="reference">更多
<div class="caretDown" />
</el-link>
</el-popover>
</template>
</el-table-column> </el-table-column>
</el-table> </el-table>
</div> </div>
...@@ -671,6 +676,10 @@ export default { ...@@ -671,6 +676,10 @@ export default {
<style lang="scss" scoped> <style lang="scss" scoped>
.warnModule{ .warnModule{
.tooltipText{
cursor: pointer;
padding: 5px!important;
}
.strategyRow{ .strategyRow{
padding: 5px 0; padding: 5px 0;
} }
...@@ -756,11 +765,11 @@ export default { ...@@ -756,11 +765,11 @@ export default {
display: inline-block; display: inline-block;
width: 0; width: 0;
height: 0; height: 0;
margin-left: 8px; margin-left: 2px;
//vertical-align: middle; vertical-align: middle;
//border-top: 4px solid; border-top: 4px solid;
//border-right: 4px solid transparent; border-right: 4px solid transparent;
//border-left: 4px solid transparent; border-left: 4px solid transparent;
} }
} }
......
...@@ -109,13 +109,13 @@ ...@@ -109,13 +109,13 @@
<span>{{ scope.row.reportsNumber }}</span> <span>{{ scope.row.reportsNumber }}</span>
</template> </template>
</el-table-column> </el-table-column>
<el-table-column label="报告发送时间" prop="latestTime" show-overflow-tooltip /> <el-table-column label="报告发送时间" prop="latestTime" show-overflow-tooltip />
<el-table-column label="巡检计划名称" prop="NextTime" show-overflow-tooltip /> <el-table-column label="巡检计划名称" prop="NextTime" show-overflow-tooltip />
<el-table-column width="250px" label="操作"> <el-table-column width="250px" label="操作">
<template #default="{ row }"> <template #default="{ row }">
<el-link @click="report(row)">查看</el-link> <el-link type="primary" @click="report(row)">查看</el-link>
<el-link @click="implement">发送</el-link> <el-link type="primary" @click="implement">发送</el-link>
<el-link @click="deleteRow">下载</el-link> <el-link type="primary" @click="deleteRow">下载</el-link>
</template> </template>
</el-table-column> </el-table-column>
</el-table> </el-table>
...@@ -487,7 +487,9 @@ export default { ...@@ -487,7 +487,9 @@ export default {
confirmButtonText: '确定', confirmButtonText: '确定',
cancelButtonText: '取消', cancelButtonText: '取消',
type: 'warning' type: 'warning'
}).then(() => {}) }).then(() => {
window.location.href = process.env.BASE_URL + 'exportFile.xls'
})
}, },
enable() { enable() {
this.$confirm('此操作将启用此数据, 是否继续?', '提示', { this.$confirm('此操作将启用此数据, 是否继续?', '提示', {
......
...@@ -103,14 +103,13 @@ ...@@ -103,14 +103,13 @@
<el-form-item label="设备信息:"> <el-form-item label="设备信息:">
<div> <div>
<el-input v-model="addWarnForm.equipmentInformation" style="width: 50%" placeholder="请选择设备信息" :disabled="true" /> <el-input v-model="addWarnForm.equipmentInformation" style="width: 50%" placeholder="请选择设备信息" :disabled="true" />
<el-button @click="equipmentInformation"> 设备</el-button> <el-button @click="equipmentInformations"> 设备</el-button>
</div> </div>
<el-table <el-table
:data="equipmenData" :data="equipmenData1"
border border
style="width: 100%;padding-top: 20px;padding-left: 10px" style="width: 100%;padding-top: 20px;padding-left: 10px"
> >
<el-table-column type="selection" width="60" align="center" />
<el-table-column label="监测点名称" prop="number" show-overflow-tooltip /> <el-table-column label="监测点名称" prop="number" show-overflow-tooltip />
<el-table-column label="监测点类型" prop="theme" show-overflow-tooltip /> <el-table-column label="监测点类型" prop="theme" show-overflow-tooltip />
<el-table-column label="监测点状态" prop="source" show-overflow-tooltip /> <el-table-column label="监测点状态" prop="source" show-overflow-tooltip />
...@@ -327,6 +326,54 @@ ...@@ -327,6 +326,54 @@
<el-button @click="advancedQueryDialog = false">取消</el-button> <el-button @click="advancedQueryDialog = false">取消</el-button>
</span> </span>
</el-dialog> </el-dialog>
<el-dialog :visible.sync="equipmentInformation" title="设备信息" width="50%" class="addGroup" :model="information">
<el-row>
<el-col :span="12" class="equipmentDiv">
<span>选择告警设备</span>
<el-form ref="addWarnForm" label-width="auto" :model="addWarnForm">
<el-form-item label="">
<el-tree
:data="data"
node-key="id"
:default-expanded-keys="[2, 3]"
:default-checked-keys="[5]"
:props="defaultProps"
@node-click="handleNodeClick"
>
<template slot-scope="{ node, data }">
<span>
<img :src="data.icon" class="treeIcon">
<label>{{ node.label }}</label>
</span>
</template>
</el-tree>
</el-form-item>
</el-form>
</el-col>
<el-col :span="12" class="equipmentDiv">
<div>
<span>选择检测点</span>
<el-link type="primary" @click="checkName1">全选</el-link>
<el-link type="primary" @click="checkName2(equipmenData)">反选</el-link>
</div>
<el-table
ref="equipmenData"
:data="equipmenData"
border
:show-header="false"
height="100px"
@selection-change="handleSelectionChange"
>
<el-table-column type="selection" align="center" width="50px"/>
<el-table-column label="监测点名称" prop="number" show-overflow-tooltip />
</el-table>
</el-col>
</el-row>
<div slot="footer" class="dialog-footer">
<el-button @click="equipmentInformationSubmit">提交</el-button>
<el-button type="primary" @click="equipmentInformation = false">取消</el-button>
</div>
</el-dialog>
</div> </div>
</template> </template>
...@@ -338,43 +385,84 @@ export default { ...@@ -338,43 +385,84 @@ export default {
components: { Template }, components: { Template },
data() { data() {
return { return {
information: {
monitoringPointName: '',
monitoringPointType: '',
monitoringPointStatus: ''
},
data: [{ data: [{
id: 1, id: 1,
label: '本机容器', label: '本机容器',
icon: require('@/assets/image/shebei.png'),
children: [{ children: [{
id: 4, id: 4,
icon: require('@/assets/image/shebei9-guzhang.png'),
label: '虚拟化平台', label: '虚拟化平台',
children: [{ children: [{
id: 9, id: 9,
icon: require('@/assets/image/shebei2-zhengchang.png'),
label: '127.0.0.1' label: '127.0.0.1'
}, { }, {
id: 10, id: 10,
icon: require('@/assets/image/shebei2-zhengchang.png'),
label: '192.168.1.1' label: '192.168.1.1'
}] }]
}, { }, {
id: 5, id: 5,
icon: require('@/assets/image/shebei9-guzhang.png'),
label: '虚拟设备', label: '虚拟设备',
children: [{ children: [{
id: 9, id: 11,
icon: require('@/assets/image/shebei2-zhengchang.png'),
label: '192.168.5.4' label: '192.168.5.4'
}, { }, {
id: 10, id: 12,
icon: require('@/assets/image/shebei2-zhengchang.png'),
label: '192.168.44.2' label: '192.168.44.2'
}] }]
}, { }, {
id: 6, id: 6,
icon: require('@/assets/image/shebei9-guzhang.png'),
label: '服务器硬件', label: '服务器硬件',
children: [{ children: [{
id: 9, id: 13,
icon: require('@/assets/image/shebei2-zhengchang.png'),
label: '打印机' label: '打印机'
}, { }, {
id: 10, id: 14,
icon: require('@/assets/image/shebei2-zhengchang.png'),
label: '192.168.2.5' label: '192.168.2.5'
}] }]
}] }]
}], }],
stepActive: 1, stepActive: 1,
equipmenData: [], equipmenData: [],
equipmenData1: [],
dataD: [],
data1: [
{ number: '/dev/sda1 (/boot)', theme: 'UnixDisk', source: '正常' },
{ number: 'tmpfs (/dev/shm)', theme: 'UnixDisk', source: '正常' },
{ number: 'Ping', theme: 'Ping', source: '正常' },
{ number: 'CPU', theme: 'CPU', source: '正常' },
{ number: '连接', theme: 'UnixDisk', source: '正常' },
{ number: '交换分区', theme: 'UnixDisk', source: '正常' }
],
data2: [
{ number: 'Agent连接', theme: 'UnixDisk', source: '正常' },
{ number: 'Ping 127.0.0.1)', theme: 'UnixDisk', source: '正常' },
{ number: 'Linux CPU)', theme: 'CPU', source: '正常' },
{ number: 'Linux Swap', theme: 'Swap', source: '正常' },
{ number: 'Linux memory', theme: 'memory', source: '正常' },
{ number: 'sysfs', theme: 'sysfs', source: '正常' }
],
data3: [
{ number: 'Ping', theme: 'UnixDisk', source: '正常' },
{ number: 'CPU', theme: 'CPU', source: '正常' },
{ number: '内存', theme: 'UnixDependence', source: '正常' },
{ number: '连接', theme: 'UnixDependence', source: '正常' },
{ number: '10.61.36.156', theme: 'UnixDisk', source: '正常' },
{ number: '10.61.36.156', theme: 'UnixDisk', source: '正常' }
],
updateWarnForm: { updateWarnForm: {
founder: '', founder: '',
theme: '', theme: '',
...@@ -415,6 +503,7 @@ export default { ...@@ -415,6 +503,7 @@ export default {
addDialog: false, addDialog: false,
updateDialog: false, updateDialog: false,
advancedQueryDialog: false, advancedQueryDialog: false,
equipmentInformation: false,
isEdit: '', isEdit: '',
// 是否显示弹出层 // 是否显示弹出层
open: false, open: false,
...@@ -812,7 +901,9 @@ export default { ...@@ -812,7 +901,9 @@ export default {
confirmButtonText: '确定', confirmButtonText: '确定',
cancelButtonText: '取消', cancelButtonText: '取消',
type: 'warning' type: 'warning'
}).then(() => {}) }).then(() => {
window.location.href = process.env.BASE_URL + 'exportFile.xls'
})
}, },
userLove() { userLove() {
this.$confirm('此操作将撤回该数据, 是否继续?', '提示', { this.$confirm('此操作将撤回该数据, 是否继续?', '提示', {
...@@ -833,6 +924,12 @@ export default { ...@@ -833,6 +924,12 @@ export default {
closeDialog() { closeDialog() {
this.addDialog = false this.addDialog = false
}, },
/**
* 设备信息
*/
equipmentInformations() {
this.equipmentInformation = true
},
addWarn() { addWarn() {
this.isEdit = 3 this.isEdit = 3
this.addDialog = true this.addDialog = true
...@@ -857,6 +954,33 @@ export default { ...@@ -857,6 +954,33 @@ export default {
this.name2[i] = this.priorityOptions[i].label this.name2[i] = this.priorityOptions[i].label
} }
this.addWarnForm.priority = val ? this.name2 : [] this.addWarnForm.priority = val ? this.name2 : []
},
handleNodeClick(data) {
if (data.id === 9 || data.id === 10) {
this.equipmenData = this.data1
} else if (data.id === 11 || data.id === 12) {
this.equipmenData = this.data2
} else if (data.id === 13 || data.id === 14) {
this.equipmenData = this.data3
} else {
this.equipmenData = []
}
},
handleSelectionChange(data) {
this.dataD = data
},
checkName1() {
this.$refs.equipmenData.toggleAllSelection()
},
checkName2(rows) {
rows.forEach(row => {
this.$refs.equipmenData.toggleRowSelection(row)
})
},
equipmentInformationSubmit() {
this.equipmentInformation = false
this.equipmenData = []
this.equipmenData1 = this.dataD
} }
} }
} }
...@@ -1037,5 +1161,9 @@ export default { ...@@ -1037,5 +1161,9 @@ export default {
width: 0; width: 0;
} }
} }
.treeIcon{
width: 17px;
height: 17px;
}
} }
</style> </style>
...@@ -122,11 +122,10 @@ ...@@ -122,11 +122,10 @@
<el-button @click="equipmentInformations"> 设备</el-button> <el-button @click="equipmentInformations"> 设备</el-button>
</div> </div>
<el-table <el-table
:data="equipmenData" :data="equipmenData1"
border border
style="width: 100%;padding-top: 20px;padding-left: 10px" style="width: 100%;padding-top: 20px;padding-left: 10px"
> >
<el-table-column type="selection" width="60" align="center" />
<el-table-column label="监测点名称" prop="number" show-overflow-tooltip /> <el-table-column label="监测点名称" prop="number" show-overflow-tooltip />
<el-table-column label="监测点类型" prop="theme" show-overflow-tooltip /> <el-table-column label="监测点类型" prop="theme" show-overflow-tooltip />
<el-table-column label="监测点状态" prop="source" show-overflow-tooltip /> <el-table-column label="监测点状态" prop="source" show-overflow-tooltip />
...@@ -341,10 +340,18 @@ ...@@ -341,10 +340,18 @@
</el-form> </el-form>
</el-col> </el-col>
<el-col :span="12" class="equipmentDiv"> <el-col :span="12" class="equipmentDiv">
<span>选择检测点</span> <div>
<span>选择检测点</span>
<el-link type="primary" @click="checkName1">全选</el-link>
<el-link type="primary" @click="checkName2(equipmenData)">反选</el-link>
</div>
<el-table <el-table
ref="equipmenData"
:data="equipmenData" :data="equipmenData"
border border
:show-header="false"
height="100px"
@selection-change="handleSelectionChange"
> >
<el-table-column type="selection" align="center" width="50px"/> <el-table-column type="selection" align="center" width="50px"/>
<el-table-column label="监测点名称" prop="number" show-overflow-tooltip /> <el-table-column label="监测点名称" prop="number" show-overflow-tooltip />
...@@ -352,7 +359,7 @@ ...@@ -352,7 +359,7 @@
</el-col> </el-col>
</el-row> </el-row>
<div slot="footer" class="dialog-footer"> <div slot="footer" class="dialog-footer">
<el-button @click="equipmentInformation = false">提交</el-button> <el-button @click="equipmentInformationSubmit">提交</el-button>
<el-button type="primary" @click="equipmentInformation = false">取消</el-button> <el-button type="primary" @click="equipmentInformation = false">取消</el-button>
</div> </div>
</el-dialog> </el-dialog>
...@@ -471,41 +478,75 @@ export default { ...@@ -471,41 +478,75 @@ export default {
data: [{ data: [{
id: 1, id: 1,
label: '本机容器', label: '本机容器',
icon: require('@/assets/image/shebei.png'),
children: [{ children: [{
id: 4, id: 4,
icon: require('@/assets/image/shebei9-guzhang.png'),
label: '虚拟化平台', label: '虚拟化平台',
children: [{ children: [{
id: 9, id: 9,
icon: require('@/assets/image/shebei2-zhengchang.png'),
label: '127.0.0.1' label: '127.0.0.1'
}, { }, {
id: 10, id: 10,
icon: require('@/assets/image/shebei2-zhengchang.png'),
label: '192.168.1.1' label: '192.168.1.1'
}] }]
}, { }, {
id: 5, id: 5,
icon: require('@/assets/image/shebei9-guzhang.png'),
label: '虚拟设备', label: '虚拟设备',
children: [{ children: [{
id: 9, id: 11,
icon: require('@/assets/image/shebei2-zhengchang.png'),
label: '192.168.5.4' label: '192.168.5.4'
}, { }, {
id: 10, id: 12,
icon: require('@/assets/image/shebei2-zhengchang.png'),
label: '192.168.44.2' label: '192.168.44.2'
}] }]
}, { }, {
id: 6, id: 6,
icon: require('@/assets/image/shebei9-guzhang.png'),
label: '服务器硬件', label: '服务器硬件',
children: [{ children: [{
id: 9, id: 13,
icon: require('@/assets/image/shebei2-zhengchang.png'),
label: '打印机' label: '打印机'
}, { }, {
id: 10, id: 14,
icon: require('@/assets/image/shebei2-zhengchang.png'),
label: '192.168.2.5' label: '192.168.2.5'
}] }]
}] }]
}], }],
stepActive: 1, stepActive: 1,
equipmenData: [ equipmenData: [],
{ number: '/dev/sda1 (/boot)' } equipmenData1: [],
dataD: [],
data1: [
{ number: '/dev/sda1 (/boot)', theme: 'UnixDisk', source: '正常' },
{ number: 'tmpfs (/dev/shm)', theme: 'UnixDisk', source: '正常' },
{ number: 'Ping', theme: 'Ping', source: '正常' },
{ number: 'CPU', theme: 'CPU', source: '正常' },
{ number: '连接', theme: 'UnixDisk', source: '正常' },
{ number: '交换分区', theme: 'UnixDisk', source: '正常' }
],
data2: [
{ number: 'Agent连接', theme: 'UnixDisk', source: '正常' },
{ number: 'Ping 127.0.0.1)', theme: 'UnixDisk', source: '正常' },
{ number: 'Linux CPU)', theme: 'CPU', source: '正常' },
{ number: 'Linux Swap', theme: 'Swap', source: '正常' },
{ number: 'Linux memory', theme: 'memory', source: '正常' },
{ number: 'sysfs', theme: 'sysfs', source: '正常' }
],
data3: [
{ number: 'Ping', theme: 'UnixDisk', source: '正常' },
{ number: 'CPU', theme: 'CPU', source: '正常' },
{ number: '内存', theme: 'UnixDependence', source: '正常' },
{ number: '连接', theme: 'UnixDependence', source: '正常' },
{ number: '10.61.36.156', theme: 'UnixDisk', source: '正常' },
{ number: '10.61.36.156', theme: 'UnixDisk', source: '正常' }
], ],
updateWarnForm: { updateWarnForm: {
founder: '', founder: '',
...@@ -977,7 +1018,9 @@ export default { ...@@ -977,7 +1018,9 @@ export default {
confirmButtonText: '确定', confirmButtonText: '确定',
cancelButtonText: '取消', cancelButtonText: '取消',
type: 'warning' type: 'warning'
}).then(() => {}) }).then(() => {
window.location.href = process.env.BASE_URL + 'exportFile.xls'
})
}, },
enable() { enable() {
this.$confirm('此操作将启用此数据, 是否继续?', '提示', { this.$confirm('此操作将启用此数据, 是否继续?', '提示', {
...@@ -1081,6 +1124,33 @@ export default { ...@@ -1081,6 +1124,33 @@ export default {
this.name2[i] = this.priorityOptions[i].label this.name2[i] = this.priorityOptions[i].label
} }
this.addWarnForm.priority = val ? this.name2 : [] this.addWarnForm.priority = val ? this.name2 : []
},
handleNodeClick(data) {
if (data.id === 9 || data.id === 10) {
this.equipmenData = this.data1
} else if (data.id === 11 || data.id === 12) {
this.equipmenData = this.data2
} else if (data.id === 13 || data.id === 14) {
this.equipmenData = this.data3
} else {
this.equipmenData = []
}
},
handleSelectionChange(data) {
this.dataD = data
},
checkName1() {
this.$refs.equipmenData.toggleAllSelection()
},
checkName2(rows) {
rows.forEach(row => {
this.$refs.equipmenData.toggleRowSelection(row)
})
},
equipmentInformationSubmit() {
this.equipmentInformation = false
this.equipmenData = []
this.equipmenData1 = this.dataD
} }
} }
} }
......
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