Authored by 王涛

修改乙方运维用户属性按钮;对比分析功能

<div :style="{'height':'380px','padding':'6px'}">
<slot name="title">
<div style="text-align: left;margin-bottom: 10px;padding-left: 10px;">对比分析场景</div>
</slot>
<div style="text-align: left;margin-bottom: 10px;padding-left: 10px;font-weight: bold">
<slot name="title">
对比分析场景
</slot>
</div>
<el-row :gutter="5">
<el-col :span="4">
<div style="display: flex;flex-wrap: wrap;width: 100%">
<div style="display: flex;flex-wrap: wrap;width: 100%;padding-left: 10px;">
<slot name="lineName">
分析名称
</slot>
... ...
... ... @@ -139,12 +139,12 @@
<div class="title">
<i class="iconfont icon-liebiaomoshi"/> 资产信息
<el-dropdown size="mini" split-button @click="assetsAdd('bastion',`新建${icon['bastion'].name}资产`)" style="margin-left: 20px">
<el-dropdown v-if="Object.keys(icon).length > 0" size="mini" split-button @click="assetsAdd('bastion',`新建${icon['bastion'].name}资产`)" style="margin-left: 20px">
<i class="icon el-icon-plus"/>添加{{icon['bastion'].name}}
<template #dropdown>
<div style="max-height: 300px;overflow-y: auto">
<el-dropdown-menu>
<el-dropdown-item v-for="(v,k) in icon" @click="assetsAdd(k,`新建${icon[k].name}资产`)">
<el-dropdown-item v-for="(v,k) in icon" @click="assetsAdd(k,`新建${v.name}资产`)">
添加{{v.name}}
</el-dropdown-item>
</el-dropdown-menu>
... ...
... ... @@ -371,6 +371,7 @@ export default {
}
}
let saveAnalysis = () => {
let formVal = form.value;
let parentName = formVal.parentName;
let parentId = formVal.parentId;
... ... @@ -426,9 +427,29 @@ export default {
proxy.$http.post(url, addParam, function (res) {
if (res && res.success) {
proxy.$global.showMsg("添加成功!");
setTimeout(function () {
window.top.location.href = window.top.location.origin + "/#/analysis/index"
}, 1500)
onReset();
// 清空数据
form.value = {
parentId: '',
parentName: '',
desc: '',
scene: {
name: '',
desc: '',
sort: 1,
timeScope: '',
frequency: '',
},
resourceList: []
}
// 已选择列表
tabFirstList.value = [];
// 关闭谈画框
showDialogForm(false);
// window.top.location.href = window.top.location.origin + "/#/analysis/view/id=105"
window.top.location.href = window.top.location.origin + '/#/' + res.str;
}
});
}
... ...
... ... @@ -3,7 +3,7 @@
<div v-for="(item,index) in childArr">
<analysis-line :legend="lineChart[item.node.id].legend" :xAxis="lineChart[item.node.id].xAxis" :series="lineChart[item.node.id].series">
<template #title="scope" >
{{ index == 0 ? item.node.configName : '' }}
{{ index == 0 ? parentInfo.configName : '' }}
</template>
<template #lineName="scope">
{{ item.node.configName }}
... ... @@ -23,10 +23,6 @@
</template>
</analysis-line>
<el-divider content-position="left">
<!--<div>
<i class="iconfont icon-liebiaomoshi"></i>
<span style="margin-left: 5px">查询条件</span>
</div>-->
</el-divider>
</div>
</div>
... ...