Commit 4d275c0c authored by Asjoker's avatar Asjoker

feat: 所剩修改

parent dcd8109d
...@@ -628,7 +628,7 @@ export default { ...@@ -628,7 +628,7 @@ export default {
/** 查询按钮操作 */ /** 查询按钮操作 */
changeTime() { changeTime() {
this.$router.push({ this.$router.push({
path: '/IntegratedMonitor/reportStatistics/addStatisticReport', path: '/IntegratedMonitor/reportStatistics/addErrorReport',
type: 'add' type: 'add'
}) })
}, },
......
...@@ -257,7 +257,7 @@ ...@@ -257,7 +257,7 @@
<el-input type="textarea" /> <el-input type="textarea" />
</el-form-item> </el-form-item>
<el-form-item label="设备信息"> <el-form-item label="设备信息">
<el-button @click="transferOpen = true">请选择设备信息</el-button> <el-button style="margin-bottom: 10px" @click="transferOpen = true;treeOptionFlag = false">请选择设备信息</el-button>
<el-table :data="dialogTable"> <el-table :data="dialogTable">
<el-table-column label="监测点名称" show-overflow-tooltip prop="name" /> <el-table-column label="监测点名称" show-overflow-tooltip prop="name" />
<el-table-column label="监测点类型" show-overflow-tooltip prop="type" /> <el-table-column label="监测点类型" show-overflow-tooltip prop="type" />
...@@ -297,14 +297,56 @@ ...@@ -297,14 +297,56 @@
</div> </div>
</el-dialog> </el-dialog>
<el-dialog :visible.sync="transferOpen" title="设备信息" width="600px"> <el-dialog :visible.sync="transferOpen" title="设备信息" width="800px">
<tree-transfer <!-- <tree-transfer-->
:title="['选择告警设备', '选择监测点']" <!-- :title="['选择告警设备', '选择监测点']"-->
:from_data="fromData" <!-- :from_data="fromData"-->
:to_data="toData" <!-- :to_data="toData"-->
:default-props="{ label: 'label', children: 'children' }" <!-- :default-props="{ label: 'label', children: 'children' }"-->
/> <!-- />-->
<el-row :gutter="20">
<el-col :span="14">
<div
style="background-color: #f2f2f2;
line-height: 20px;
font-size: 12px;
padding: 0 5px;
border-radius: 4px 4px 0 0;
border: 1px solid #d2d6de;"
>选择告警设备</div>
<div class="equipmentDiv">
<el-tree
:data="treeData"
node-key="id"
:default-expanded-keys="[2, 3]"
:default-checked-keys="[5]"
@node-click="handleClickNode"
/>
</div>
</el-col>
<el-col :span="10">
<div
style="background-color: #f2f2f2;
line-height: 20px;
font-size: 12px;
padding: 0 5px;
border-radius: 4px 4px 0 0;
border: 1px solid #d2d6de;"
>选择监测点</div>
<div class="equipmentDiv">
<el-tree
ref="optionsTree"
v-show="treeOptionFlag"
:data="treeOption"
show-checkbox
node-key="id"
:default-expanded-keys="[2, 3]"
:default-checked-keys="[5]"
/>
</div>
</el-col>
</el-row>
<div slot="footer" class="dialog-footer"> <div slot="footer" class="dialog-footer">
<el-button @click="transferOpen = false">取消</el-button> <el-button @click="transferOpen = false">取消</el-button>
...@@ -322,11 +364,9 @@ import add from '@/assets/icons/workOverviewIcons/add.png' ...@@ -322,11 +364,9 @@ import add from '@/assets/icons/workOverviewIcons/add.png'
import created from '@/assets/icons/workOverviewIcons/created.png' import created from '@/assets/icons/workOverviewIcons/created.png'
import handled from '@/assets/icons/workOverviewIcons/handled.png' import handled from '@/assets/icons/workOverviewIcons/handled.png'
import notAssigned from '@/assets/icons/workOverviewIcons/notAssigned.png' import notAssigned from '@/assets/icons/workOverviewIcons/notAssigned.png'
import treeTransfer from 'el-tree-transfer'
export default { export default {
name: 'Sylog', name: 'Sylog',
components: { treeTransfer },
data() { data() {
return { return {
myTask, myTask,
...@@ -539,18 +579,58 @@ export default { ...@@ -539,18 +579,58 @@ export default {
}] }]
}] }]
}], }],
treeOption: [{
id: '1',
pid: 0,
label: 'Ping 192.168.1.55',
children: []
}, {
id: '2',
pid: 0,
label: 'Temperature -01-Inlet Ambient-0002',
children: []
}, {
id: '3',
pid: 0,
label: 'Temperature -02-CPU 1-0003',
children: []
}, {
id: '4',
pid: 0,
label: 'Temperature -03-CPU 2-0004',
children: []
}, {
id: '5',
pid: 0,
label: 'Temperature -04-P1 DIMM 1-6-0005',
children: []
}, {
id: '6',
pid: 0,
label: 'Temperature -05-P1 DIMM 7-12-0006',
children: []
}],
// "选择监测点"显隐标记
treeOptionFlag: false,
fromData: [ fromData: [
{ {
id: '1', id: '1',
pid: 0, pid: 0,
label: '一级 1', label: '本机容器',
children: [ children: [
{ {
id: '1-1', id: '1-1',
pid: '1', pid: '1',
label: '二级 1-1', label: '虚拟化平台',
disabled: true, children: [{
children: [] id: '1-1-1',
pid: '1-1',
label: '虚拟设备'
}, {
id: '1-1-2',
pid: '1-1',
label: '虚拟路由'
}]
}, },
{ {
id: '1-2', id: '1-2',
...@@ -598,6 +678,22 @@ export default { ...@@ -598,6 +678,22 @@ export default {
} }
}, },
methods: { methods: {
handleClickNode(data) {
console.log('this is handleClickNode', data)
if (!data.children) {
this.treeOptionFlag = true
}
},
handleClickAll(data) {
this.$nextTick(() => {
this.$refs.optionsTree.setCheckedNodes(this.treeOption)
})
},
handleClickAll(data) {
this.$nextTick(() => {
this.$refs.optionsTree.setCheckedNodes(this.treeOption)
})
},
handleMyMission() { handleMyMission() {
this.$router.push({ this.$router.push({
path: '/workManagement/myMission' path: '/workManagement/myMission'
...@@ -700,6 +796,14 @@ export default { ...@@ -700,6 +796,14 @@ export default {
} }
} }
} }
.equipmentDiv{
max-height: 150px;
height: 150px;
overflow: auto;
border: 1px solid #d2d6de;
padding: 10px 0;
border-radius: 0 0 4px 4px;
}
.colClass { .colClass {
width: 20%; width: 20%;
} }
......
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