monitor_v3 / hg-monitor-web · Commits

Go to a project

Authored by 王涛
Commit db61624299aaf656ead59b62f004140938ff0b67 2 parents 530ee500 03abb8aa

Merge branch 'master-v32-lushangqing' into 'master' 

elementui升级影响到页面样式更改-对比分析、故障管理、乙方运维 #2



See merge request !668
Inline Side-by-side
Showing 16 changed files with 118 additions and 101 deletions
... ... @@ -361,7 +361,15 @@ global.getAlarmLevel = (level) => {
}
// 组件默认大小 medium / small / mini
global.elementSize = '';
// global.elementSize = 'default';
global.elementConfig = {
size:{
// large / default / small
button:'default',
// large / default / small
input:'large'
}
}
global.height = window.innerHeight - 20;
export default global
... ...
... ... @@ -2,14 +2,14 @@
<div class="cm-card" :style="{'min-height':height+'px','height':'100%'}">
<analysis-line :legend="lineChart.legend" :xAxis="lineChart.xAxis" :series="lineChart.series">
<template #lineName="scope">
<el-input v-model="form.scene.name" placeholder="请输入场景名称"/>
<el-input :size="$global.elementConfig.size.input" v-model="form.scene.name" placeholder="请输入场景名称"/>
</template>
<template #tools="scope">
<el-button type="primary" style="margin-left: 10px" @click="showDialogForm(true)">保存</el-button>
<el-button :size="$global.elementConfig.size.button" type="primary" style="margin-left: 10px" @click="showDialogForm(true)">保存</el-button>
</template>
<template #timeRange="scope">
<el-dropdown style="margin-left: 100px">
<el-button>
<el-button :size="$global.elementConfig.size.button">
时间范围 <i class="el-icon el-icon-arrow-down"></i>
</el-button>
<template #dropdown>
... ... @@ -26,7 +26,7 @@
</template>
<template #frequency="scope">
<el-dropdown style="margin-left: 10px">
<el-button style="display: none !important;">
<el-button :size="$global.elementConfig.size.button" style="display: none !important;">
聚合频率 <i class="el-icon el-icon-arrow-down"></i>
</el-button>
<template #dropdown>
... ... @@ -51,7 +51,7 @@
<div style="width: calc(100% - 12px);padding: 0px 6px">
<el-row :gutter="5">
<el-col :span="4">
<div style="display: flex;flex-wrap: wrap;width: 100%;padding-left: 15px;">
<div style="display: flex;flex-wrap: wrap;width: 100%;padding-left: 15px;padding-right:15px;box-sizing: border-box;">
<!--<el-dropdown>
<el-icon class="el-icon&#45;&#45;right">
<arrow-down/>
... ... @@ -59,13 +59,13 @@
<cm-biz-type-tree-input multiple clearable collapseTags @callback="getBizType"/>
</el-dropdown>-->
<el-select v-model="busTypeArr" multiple filterable clearable collapse-tags placeholder="请选择业务" style="margin-top: 10px">
<el-select :size="$global.elementConfig.size.input" v-model="busTypeArr" multiple filterable clearable collapse-tags placeholder="请选择业务" style="margin-top: 10px">
<el-option
v-for="item in busTypeList"
:label="item.busTypeName" :value="item.busId"></el-option>
</el-select>
<el-dropdown>
<el-dropdown :size="$global.elementConfig.size.input">
<el-icon class="el-icon--right">
<arrow-down/>
</el-icon>
... ... @@ -79,17 +79,17 @@
<cm-kpi-type-tree-input multiple clearable collapseTags @callback="getKpiType"/>
</el-dropdown>-->
<el-select v-model="kpiTypeArr" multiple filterable clearable collapse-tags placeholder="请选择指标" style="margin-top: 10px">
<el-select :size="$global.elementConfig.size.input" v-model="kpiTypeArr" multiple filterable clearable collapse-tags placeholder="请选择指标" style="margin-top: 10px">
<el-option
v-for="item in kpiList"
:label="item.kpiName" :value="item.kpiId"></el-option>
</el-select>
<el-input v-model="keyWords" placeholder="输入关键字" style="margin-top: 15px;width: 225px;"/>
<el-input :size="$global.elementConfig.size.input" v-model="keyWords" placeholder="输入关键字" style="margin-top: 15px;width: 225px;"/>
<div style="margin-top: 10px;text-align: center">
<el-button type="primary" @click="onReset()">重置</el-button>
<el-button type="primary" @click="onBtnSearch()" style="margin-left: 10px">查询</el-button>
<el-button :size="$global.elementConfig.size.button" type="primary" @click="onReset()">重置</el-button>
<el-button :size="$global.elementConfig.size.button" type="primary" @click="onBtnSearch()" style="margin-left: 10px">查询</el-button>
</div>
</div>
</el-col>
... ... @@ -102,7 +102,7 @@
:showBorder="true" :loading="false"
:showPage="true" :showTools="true" :height="(height - 500)">
<template #tools="{scope}">
<el-button type="text" size="small"
<el-button :size="$global.elementConfig.size.button" type="text" size="small"
@click.prevent="deleteRes(scope.row,scope.$index)">
<i class="el-icon-delete"/> 移除
</el-button>
... ... @@ -143,10 +143,10 @@
</el-radio-group>
</div>
<div v-if="!isAdd " style="padding: 3px 10px;">
<el-input v-model="form.parentName" placeholder="请输入场景分类"/>
<el-input :size="$global.elementConfig.size.input" v-model="form.parentName" placeholder="请输入场景分类"/>
</div>
<div v-if="!isAdd " style="padding: 3px 10px;">
<el-input v-model="form.desc" placeholder="请输入场景分类描述"/>
<el-input :size="$global.elementConfig.size.input" v-model="form.desc" placeholder="请输入场景分类描述"/>
</div>
<div v-else style="padding: 3px 10px;">
... ... @@ -164,13 +164,13 @@
<!-- <span>比对分析场景</span>-->
<!-- </div>-->
<div style="padding: 3px 10px;">
<el-input v-model="form.scene.name" placeholder="请输入场景名称"/>
<el-input :size="$global.elementConfig.size.input" v-model="form.scene.name" placeholder="请输入场景名称"/>
</div>
<div style="padding: 3px 10px;">
<el-input v-model="form.scene.desc" placeholder="请输入场景描述"/>
<el-input :size="$global.elementConfig.size.input" v-model="form.scene.desc" placeholder="请输入场景描述"/>
</div>
<div style="padding: 3px 10px;">
<el-input v-model="form.scene.sort" type="number" placeholder="请输入排序"/>
<el-input :size="$global.elementConfig.size.input" v-model="form.scene.sort" type="number" placeholder="请输入排序"/>
</div>
</template>
</cm-dialog>
... ...
... ... @@ -15,9 +15,9 @@
<el-row class="list-search">
<el-col :span="6">
<div class="search-input flex-div-start">
<el-input v-model="inputSearch" placeholder="请输入查询内容" />
<el-input :size="$global.elementConfig.size.input" v-model="inputSearch" placeholder="请输入查询内容" />
<!-- <span class="search-text" >搜索</span>-->
<el-button type="primary" @click="searchData" class="search-text button-flex-div-center">搜索</el-button>
<el-button :size="$global.elementConfig.size.button" type="primary" @click="searchData" class="search-text button-flex-div-center">搜索</el-button>
</div>
... ... @@ -26,7 +26,7 @@
<el-row class="list-title">
<el-col :span="24" class="text-left">
<router-link :to="'/analysis/add'" class="analysis link-type">
<el-button type="primary" class="button-flex-div-center"><i class="el-icon-plus"></i>新增</el-button>
<el-button :size="$global.elementConfig.size.button" type="primary" class="button-flex-div-center"><i class="el-icon-plus"></i>新增</el-button>
</router-link>
<!-- <el-button type="primary" class="button-flex-div-center"><i class="icon-list icon-list-delete"></i>删除</el-button>-->
... ... @@ -81,11 +81,11 @@
<el-dialog v-model="addVisible" :title="添加配置" width="50%" @close="closeDialog" top="15vh">
<el-form ref="addHandleForm" :model="addHandleForm" label-width="120px">
<el-form-item label="名称">
<el-input v-model="addHandleForm.parentName"></el-input>
<el-input :size="$global.elementConfig.size.input" v-model="addHandleForm.parentName"></el-input>
</el-form-item>
<el-form-item label="描述">
<el-input v-model="addHandleForm.desc"></el-input>
<el-input :size="$global.elementConfig.size.input" v-model="addHandleForm.desc"></el-input>
</el-form-item>
</el-form>
</el-dialog>
... ...
... ... @@ -8,7 +8,7 @@
<el-col :span="24">
<div class="flex-div-start margin-top-bottom-10">
<el-select class="margin-right-10" v-model="resTypeArr" @change="changeRes" filterable clearable collapse-tags placeholder="请选择资源">
<el-select :size="$global.elementConfig.size.input" class="margin-right-10" v-model="resTypeArr" @change="changeRes" filterable clearable collapse-tags placeholder="请选择资源">
<el-option
v-for="item in resTypeList"
:label="item.resName" :value="item.resId"></el-option>
... ... @@ -19,19 +19,19 @@
</el-dropdown>-->
<el-select class="margin-right-10" v-model="kpiTypeArr" filterable clearable collapse-tags placeholder="请选择指标">
<el-select :size="$global.elementConfig.size.input" class="margin-right-10" v-model="kpiTypeArr" filterable clearable collapse-tags placeholder="请选择指标">
<el-option
v-for="item in kpiList"
:label="item.kpiName" :value="item.kpiId"></el-option>
</el-select>
<el-input style="width:160px;" class="margin-right-10" v-model="keyWords" placeholder="输入关键字" />
<el-input :size="$global.elementConfig.size.input" style="width:160px;" class="margin-right-10" v-model="keyWords" placeholder="输入关键字" />
<div class="flex-div-start">
<el-button type="primary" @click="onReset()">重置</el-button>
<el-button type="primary" @click="onBtnSearch()" style="margin-left: 10px">查询</el-button>
<el-button type="primary" @click="saveAll()" style="margin-left: 10px">批量添加</el-button>
<el-button type="primary" @click="saveAllData()" style="margin-left: 10px">全部添加</el-button>
<el-button :size="$global.elementConfig.size.button" type="primary" @click="onReset()">重置</el-button>
<el-button :size="$global.elementConfig.size.button" type="primary" @click="onBtnSearch()" style="margin-left: 10px">查询</el-button>
<el-button :size="$global.elementConfig.size.button" type="primary" @click="saveAll()" style="margin-left: 10px">批量添加</el-button>
<el-button :size="$global.elementConfig.size.button" type="primary" @click="saveAllData()" style="margin-left: 10px">全部添加</el-button>
</div>
</div>
... ... @@ -42,7 +42,7 @@
<cm-table-page v-show="tableDataList" :columns="columns" :dataList="tableDataList" @loaddata="loadTableDataList" :multipleSelection="apmMonitorListChecked"
:showIndex="true" :total="count" :showSelection="true" @selectionChange="selectionChange"
:showBorder="true" :loading="false" :pageSize="pageSize"
:showPage="true" :showTools="true" :height="(height - 500)">
:showPage="true" :showTools="true" :height="(height - 300)">
<template #tools="{scope}">
<el-button type="text" size="small" @click.prevent="addRes(scope.row,scope.$index)">
<i class="el-icon-plus"/> 添加
... ...
... ... @@ -47,6 +47,7 @@ export default {
setup(props){
const {proxy} = Vue.getCurrentInstance();
let id = proxy.$global.getQueryVariable('configId') ;
let height=Vue.ref(window.innerHeight);
let config = Vue.ref(id == false ? null : id);
let count=Vue.ref(0);
let tableDataList = Vue.ref([]);
... ... @@ -301,7 +302,8 @@ export default {
resTypeList,
init,
onReset,
onBtnSearch
onBtnSearch,
height
}
},
... ...
... ... @@ -25,13 +25,13 @@
:label="item.kpiName" :value="item.kpiId"></el-option>
</el-select>-->
<el-input style="width:160px;" class="margin-right-10" v-model="keyWords" placeholder="输入关键字" />
<el-input :size="$global.elementConfig.size.input" style="width:160px;" class="margin-right-10" v-model="keyWords" placeholder="输入关键字" />
<div class="flex-div-start">
<el-button type="primary" @click="onReset()">重置</el-button>
<el-button type="primary" @click="onBtnSearch()" style="margin-left: 10px">查询</el-button>
<el-button type="primary" :disabled="isLoading" @click="saveAll()" style="margin-left: 10px">批量添加</el-button>
<el-button type="primary" :disabled="isLoading" @click="saveAlldata()" style="margin-left: 10px">全部添加</el-button>
<el-button :size="$global.elementConfig.size.button" type="primary" @click="onReset()">重置</el-button>
<el-button :size="$global.elementConfig.size.button" type="primary" @click="onBtnSearch()" style="margin-left: 10px">查询</el-button>
<el-button :size="$global.elementConfig.size.button" type="primary" :disabled="isLoading" @click="saveAll()" style="margin-left: 10px">批量添加</el-button>
<el-button :size="$global.elementConfig.size.button" type="primary" :disabled="isLoading" @click="saveAlldata()" style="margin-left: 10px">全部添加</el-button>
</div>
</div>
</el-col>
... ... @@ -41,7 +41,7 @@
<cm-table-page v-show="tableDataList" :columns="columns" :dataList="tableDataList" @loaddata="loadTableDataList" :multipleSelection="applicationMonitorListChecked"
:showIndex="true" :total="count" :showSelection="true" @selectionChange="selectionChange"
:showBorder="true" :loading="false" :pageSize="pageSize"
:showPage="true" :showTools="true" :height="(height - 500)">
:showPage="true" :showTools="true" :height="(height - 300)">
<template #default="{row,prop,column}">
<div v-if="prop == 'url'" class="text-overflow" :title="row.url">
<span class="">{{row.url }}</span>
... ...
... ... @@ -28,6 +28,7 @@ export default {
setup(props){
const {proxy} = Vue.getCurrentInstance();
let id = proxy.$global.getQueryVariable('configId') ;
let height=Vue.ref(window.innerHeight);
let config = Vue.ref(id == false ? null : id);
let count=Vue.ref(0);
let tableDataList = Vue.ref([]);
... ... @@ -305,7 +306,8 @@ export default {
targetId,
init,
onReset,
onBtnSearch
onBtnSearch,
height
}
},
... ...
... ... @@ -30,8 +30,8 @@
<div class="flex-div-start">
<!-- <el-button type="primary" @click="onReset()">重置</el-button>
<el-button type="primary" @click="onBtnSearch()" style="margin-left: 10px">查询</el-button>-->
<el-button type="primary" :disabled="isLoading" @click="saveAll()">批量添加</el-button>
<el-button type="primary" :disabled="isLoading" @click="saveAlldata()" style="margin-left: 10px">全部添加</el-button>
<el-button :size="$global.elementConfig.size.button" type="primary" :disabled="isLoading" @click="saveAll()">批量添加</el-button>
<el-button :size="$global.elementConfig.size.button" type="primary" :disabled="isLoading" @click="saveAlldata()" style="margin-left: 10px">全部添加</el-button>
</div>
</div>
</el-col>
... ...
... ... @@ -6,7 +6,7 @@
<div class="grid-content bg-purple">
<span class="fault-book-input-text">所属业务</span>
<!-- <el-input v-model="input" placeholder="Please input 1" class="fault-book-input"/>-->
<el-select class="margin-right-10" v-model="busTypeArr" @change="changeBUsType" filterable clearable collapse-tags placeholder="请选择业务">
<el-select :size="$global.elementConfig.size.input" class="margin-right-10" v-model="busTypeArr" @change="changeBUsType" filterable clearable collapse-tags placeholder="请选择业务">
<el-option
v-for="item in busTypeList"
:label="item.busTypeName" :value="item.busId" :key="item.busId"></el-option>
... ... @@ -16,7 +16,7 @@
<el-col :span="6">
<div class="grid-content bg-purple">
<span class="fault-book-input-text">名称</span>
<el-input v-model="name" placeholder="请输入名称" maxlength="50" class="fault-book-input"/>
<el-input :size="$global.elementConfig.size.input" v-model="name" placeholder="请输入名称" maxlength="50" class="fault-book-input"/>
</div>
</el-col>
</el-row>
... ... @@ -79,7 +79,7 @@
<el-col :span="24" >
<div class="fault-definition-select-up">
当
<el-select v-model="kpiId" placeholder="请选择告警">
<el-select :size="$global.elementConfig.size.input" v-model="kpiId" placeholder="请选择告警">
<el-option
v-for="item in alarmList"
:key="item.kpiId"
... ... @@ -89,7 +89,7 @@
</el-option>
</el-select>
的警告级别为
<el-select v-model="triggerValue" placeholder="请选择级别">
<el-select :size="$global.elementConfig.size.input" v-model="triggerValue" placeholder="请选择级别">
<el-option
v-for="item in alarmLevel"
:key="item.value"
... ... @@ -168,13 +168,13 @@
<div class="context-multiple-choice flex-div-start margin-30 flex-div-wrap overflow-scroll-y">
<div class="btn-el-btn margin-bottom-10" v-for="(item, index) in networkMonitorList" :key="index">
<div>
<el-button :disabled="faultStateRadio==0" class="multiple-choice-button" type="primary">{{item.linkName}}</el-button>
<el-button :size="$global.elementConfig.size.button" :disabled="faultStateRadio==0" class="multiple-choice-button" type="primary">{{item.linkName}}</el-button>
<img :id="item.id" v-if="faultStateRadio==1" @click="deleteNetLink(item)" src="./src/assets/images/faultDiagnosis/icon-item-delete.png" class="multiple-choice-icon cursorClass">
<img src="" v-else style="width:12px;height:12px;" class="multiple-choice-icon" alt="">
</div>
</div>
<div class="flex-div btn-el-btn margin-bottom-10" v-if="faultStateRadio==1">
<el-button class="multiple-choice-button color-999" @click="addNetNode">添加网络检测</el-button>
<el-button :size="$global.elementConfig.size.button" class="multiple-choice-button color-999" @click="addNetNode">添加网络检测</el-button>
<img src="./src/assets/images/faultDiagnosis/icon-item-add.png" class="multiple-choice-add-icon">
</div>
</div>
... ... @@ -206,7 +206,7 @@
<div class="context-multiple-choice flex-div-start margin-30 flex-div-wrap overflow-scroll-y">
<div class="btn-el-btn margin-bottom-10" v-for="(item, index) in applicationMonitorList" :key="index">
<div>
<el-button :disabled="faultApplicationRadio==0" class="multiple-choice-button" type="primary">{{item.streamName}}</el-button>
<el-button :size="$global.elementConfig.size.button" :disabled="faultApplicationRadio==0" class="multiple-choice-button" type="primary">{{item.streamName}}</el-button>
<!-- <img :id="item.id" @click="deleteItem(item.id, applicationMonitorList)" src="./src/assets/images/faultDiagnosis/icon-item-delete.png" class="multiple-choice-icon cursorClass">-->
<img :id="item.id" v-if="faultApplicationRadio==1" @click="deleteApp(item)" src="./src/assets/images/faultDiagnosis/icon-item-delete.png" class="multiple-choice-icon cursorClass">
<img src="" v-else style="width:12px;height:12px;" class="multiple-choice-icon" alt="">
... ... @@ -214,7 +214,7 @@
</div>
<div class="flex-div btn-el-btn margin-bottom-10" v-if="faultApplicationRadio==1">
<el-button class="multiple-choice-button color-999" @click="addApplicationMonitor()">添加应用检测</el-button>
<el-button :size="$global.elementConfig.size.button" class="multiple-choice-button color-999" @click="addApplicationMonitor()">添加应用检测</el-button>
<img src="./src/assets/images/faultDiagnosis/icon-item-add.png" class="multiple-choice-add-icon">
</div>
</div>
... ... @@ -240,7 +240,7 @@
<el-radio v-model="faultEnvironmentRadio" label="0">不启用</el-radio>
</div>
<div class="flex-div margin-30 btn-el-btn margin-bottom-10" v-if="faultEnvironmentRadio==1">
<el-button class="multiple-choice-button color-999" @click="addBaseMonitor()">添加基础环境</el-button>
<el-button :size="$global.elementConfig.size.button" class="multiple-choice-button color-999" @click="addBaseMonitor()">添加基础环境</el-button>
<img style="top:0;" src="./src/assets/images/faultDiagnosis/icon-item-add.png" class="multiple-choice-add-icon">
</div>
</el-col>
... ... @@ -328,13 +328,13 @@
<el-col :span="24">
<div class="context-multiple-choice flex-div-start margin-30 flex-div-wrap overflow-scroll-y">
<div class="btn-el-btn margin-bottom-10" v-for="(item, index) in apmMonitorList" :key="index" >
<el-button :disabled="faultAPMRadio==0" class="multiple-choice-button" type="primary">{{item.resName}}</el-button>
<el-button :size="$global.elementConfig.size.button" :disabled="faultAPMRadio==0" class="multiple-choice-button" type="primary">{{item.resName}}</el-button>
<img :id="item.id" @click="deleteApm(item)" src="./src/assets/images/faultDiagnosis/icon-item-delete.png" class="multiple-choice-icon position-absolute cursorClass">
</div>
<div class="btn-el-btn margin-bottom-10" v-if="faultAPMRadio==1">
<el-button class="multiple-choice-button" @click="addAPM()">添加 APM</el-button>
<el-button :size="$global.elementConfig.size.button" class="multiple-choice-button" @click="addAPM()">添加 APM</el-button>
<img src="./src/assets/images/faultDiagnosis/icon-item-add.png" class="multiple-choice-add-icon">
</div>
... ... @@ -369,7 +369,7 @@
<div class="context-multiple-choice flex-div-start margin-30 flex-div-wrap overflow-scroll-y">
<div class="btn-el-btn margin-bottom-10" v-for="(item, index) in dialtestMonitorList" :key="index">
<div>
<el-button :disabled="faultDialtestRadio==0" class="multiple-choice-button" type="primary">{{item.taskName}}</el-button>
<el-button :size="$global.elementConfig.size.button" :disabled="faultDialtestRadio==0" class="multiple-choice-button" type="primary">{{item.taskName}}</el-button>
<!-- <img :id="item.id" @click="deleteItem(item.id, applicationMonitorList)" src="./src/assets/images/faultDiagnosis/icon-item-delete.png" class="multiple-choice-icon cursorClass">-->
<img :id="item.id" v-if="faultDialtestRadio==1" @click="deleteDialtest(item)" src="./src/assets/images/faultDiagnosis/icon-item-delete.png" class="multiple-choice-icon cursorClass">
<img src="" v-else style="width:12px;height:12px;" class="multiple-choice-icon" alt="">
... ... @@ -377,7 +377,7 @@
</div>
<div class="flex-div btn-el-btn margin-bottom-10" v-if="faultDialtestRadio==1">
<el-button class="multiple-choice-button color-999" @click="addDialtestMonitor()">添加拨测分析</el-button>
<el-button :size="$global.elementConfig.size.button" class="multiple-choice-button color-999" @click="addDialtestMonitor()">添加拨测分析</el-button>
<img src="./src/assets/images/faultDiagnosis/icon-item-add.png" class="multiple-choice-add-icon">
</div>
</div>
... ... @@ -409,12 +409,12 @@
<div class="context-multiple-choice flex-div-start margin-30 flex-div-wrap overflow-scroll-y">
<div class="btn-el-btn margin-bottom-10" v-for="(item, index) in logDetectionList" :key="index">
<div>
<el-button :disabled="faultLogRadio==0" class="multiple-choice-button" type="primary">{{item.title}}</el-button>
<el-button :size="$global.elementConfig.size.button" :disabled="faultLogRadio==0" class="multiple-choice-button" type="primary">{{item.title}}</el-button>
<img :id="item.id" @click="deleteItem(item.id, logDetectionList)" src="./src/assets/images/faultDiagnosis/icon-item-delete.png" class="multiple-choice-icon">
</div>
</div>
<div class="btn-el-btn margin-bottom-10" v-if="faultLogRadio==1">
<el-button class="multiple-choice-button" @click="addLogMonitor()">添加日志检测</el-button>
<el-button :size="$global.elementConfig.size.button" class="multiple-choice-button" @click="addLogMonitor()">添加日志检测</el-button>
<img src="./src/assets/images/faultDiagnosis/icon-item-add.png" class="multiple-choice-add-icon">
</div>
</div>
... ... @@ -437,12 +437,12 @@
<div class="context-multiple-choice flex-div-start margin-30 flex-div-wrap overflow-scroll-y">
<div class="btn-el-btn margin-bottom-10" v-for="(item, index) in subscriptionReportList" :key="index">
<div>
<el-button class="multiple-choice-button" type="primary">{{item.title}}</el-button>
<el-button :size="$global.elementConfig.size.button" class="multiple-choice-button" type="primary">{{item.title}}</el-button>
<img :id="item.id" @click="deleteItem(item.id, subscriptionReportList)" src="./src/assets/images/faultDiagnosis/icon-item-delete.png" class="multiple-choice-icon">
</div>
</div>
<div class="btn-el-btn margin-bottom-10">
<el-button class="multiple-choice-button" @click="addSubscriptionReport()">添加订阅人员</el-button>
<el-button :size="$global.elementConfig.size.button" class="multiple-choice-button" @click="addSubscriptionReport()">添加订阅人员</el-button>
<img src="./src/assets/images/faultDiagnosis/icon-item-add.png" class="multiple-choice-add-icon">
</div>
</div>
... ... @@ -452,8 +452,8 @@
<!--取消和保存-->
<div class="btn-faultDiagnosis flex-center">
<el-button @click="goBackIndex">取消</el-button>
<el-button @click="saveConfigDetail" type="primary" :loading="isLoading">保存</el-button>
<el-button :size="$global.elementConfig.size.button" @click="goBackIndex">取消</el-button>
<el-button :size="$global.elementConfig.size.button" @click="saveConfigDetail" type="primary" :loading="isLoading">保存</el-button>
</div>
... ...
... ... @@ -2,7 +2,7 @@
<el-row>
<el-col :span="6">
<div class="search-input margin-30 flex-div-start">
<el-input v-model="name" placeholder="故障诊断" class="fault-book-input-text" />
<el-input :size="$global.elementConfig.size.input" v-model="name" placeholder="故障诊断" class="fault-book-input-text" />
<span class="search-text" style="border-radius: 4px" @click="searchList">搜索</span>
</div>
... ...
... ... @@ -33,7 +33,7 @@
</div>
<el-row v-if="!addSetLIstVisible" class="flex-div-start" style="margin: 20px 0 10px 4%;" >
<span>配置链路名称</span>
<el-input style="flex:1;margin-left:10px;" maxlength="50" class="margin-right-10" v-model="linkName" placeholder="输入链路名称" />
<el-input :size="$global.elementConfig.size.input" style="flex:1;margin-left:10px;" maxlength="50" class="margin-right-10" v-model="linkName" placeholder="输入链路名称" />
</el-row>
<div class="context-body">
... ... @@ -102,7 +102,7 @@
</el-row>
<div v-if="!addSetLIstVisible" class="margin-top flex-center position-bottom">
<el-button @click="saveLinkAndNodeInfo" type="primary">保存</el-button>
<el-button :size="$global.elementConfig.size.button" @click="saveLinkAndNodeInfo" type="primary">保存</el-button>
</div>
</div>
... ... @@ -124,7 +124,7 @@
v-for="item in busTypeList"
:label="item.busTypeName" :value="item.busId"></el-option>
</el-select>-->
<el-select class="margin-right-10" v-model="resTypeArr" @change="changeRes" filterable clearable collapse-tags placeholder="请选择资源">
<el-select :size="$global.elementConfig.size.input" class="margin-right-10" v-model="resTypeArr" @change="changeRes" filterable clearable collapse-tags placeholder="请选择资源">
<el-option
v-for="item in resTypeList"
:label="item.resName" :value="item.resId"></el-option>
... ... @@ -135,7 +135,7 @@
</el-dropdown>-->
<el-select class="margin-right-10" v-model="kpiTypeArr" filterable clearable collapse-tags placeholder="请选择指标">
<el-select :size="$global.elementConfig.size.input" class="margin-right-10" v-model="kpiTypeArr" filterable clearable collapse-tags placeholder="请选择指标">
<el-option
v-for="item in kpiList"
:label="item.kpiName" :value="item.kpiId"></el-option>
... ... @@ -144,15 +144,15 @@
<!-- <el-input style="width:160px;" class="margin-right-10" v-model="keyWords" placeholder="输入关键字" />-->
<div class="flex-div-start">
<el-button type="primary" @click="onReset()">重置</el-button>
<el-button type="primary" @click="onBtnSearch()" style="margin-left: 10px">查询</el-button>
<el-button :size="$global.elementConfig.size.button" type="primary" @click="onReset()">重置</el-button>
<el-button :size="$global.elementConfig.size.button" type="primary" @click="onBtnSearch()" style="margin-left: 10px">查询</el-button>
</div>
</div>
</el-col>
</el-row>
<el-row v-if="flag" class="flex-div-start" style="margin-bottom: 10px;margin-top: 10px;padding-top:10px;border-top:1px solid #ebeef5" >
<span>节点名称</span>
<el-input style="flex:1;margin-left:10px;" class="margin-right-10" maxlength="50" v-model.trim="nodeName" placeholder="输入节点名称" />
<el-input :size="$global.elementConfig.size.input" style="flex:1;margin-left:10px;" class="margin-right-10" maxlength="50" v-model.trim="nodeName" placeholder="输入节点名称" />
</el-row>
<el-row class="margin-bottom-50">
<el-col :span="24" :class="[{'table-height':!flag},{'table-height-45':flag}]">
... ... @@ -179,7 +179,7 @@
</el-row>
<div v-if="tableVisible" class="margin-top btn-faultDiagnosis flex-center position-bottom">
<el-button @click="cancleList">取消</el-button>
<el-button :size="$global.elementConfig.size.button" @click="cancleList">取消</el-button>
<!-- <el-button @click="saveList" type="primary">保存</el-button>-->
</div>
</template>
... ...
... ... @@ -74,6 +74,7 @@ export default {
setup(props){
const {proxy} = Vue.getCurrentInstance();
let id = proxy.$global.getQueryVariable('configId') ;
let height=Vue.ref(window.innerHeight);
let config = Vue.ref(id == false ? null : id);
let count=Vue.ref(0);
let tableDataList = Vue.ref([]);
... ... @@ -353,7 +354,8 @@ export default {
linkName,
linkId,
backLink,
iconArr
iconArr,
height
}
},
... ...
... ... @@ -7,13 +7,13 @@
<el-row>
<el-col :span="24">
<div class="flex-div-start margin-top-bottom-10">
<el-input style="width:160px;" class="margin-right-10" v-model="keyWords" placeholder="输入关键字" />
<el-input :size="$global.elementConfig.size.input" style="width:160px;" class="margin-right-10" v-model="keyWords" placeholder="输入关键字" />
<div class="flex-div-start">
<el-button type="primary" @click="onReset()">重置</el-button>
<el-button type="primary" @click="onBtnSearch()" style="margin-left: 10px">查询</el-button>
<el-button type="primary" :disabled="isLoading" @click="saveAll()" style="margin-left: 10px">批量添加</el-button>
<el-button type="primary" :disabled="isLoading" @click="saveAlldata()" style="margin-left: 10px">全部添加</el-button>
<el-button :size="$global.elementConfig.size.button" type="primary" @click="onReset()">重置</el-button>
<el-button :size="$global.elementConfig.size.button" type="primary" @click="onBtnSearch()" style="margin-left: 10px">查询</el-button>
<el-button :size="$global.elementConfig.size.button" type="primary" :disabled="isLoading" @click="saveAll()" style="margin-left: 10px">批量添加</el-button>
<el-button :size="$global.elementConfig.size.button" type="primary" :disabled="isLoading" @click="saveAlldata()" style="margin-left: 10px">全部添加</el-button>
</div>
</div>
</el-col>
... ... @@ -23,7 +23,7 @@
<cm-table-page v-show="tableDataList" :columns="columns" :dataList="tableDataList" @loaddata="loadTableDataList" :multipleSelection="dialtestMonitorListChecked"
:showIndex="true" :total="count" :showSelection="true" @selectionChange="selectionChange"
:showBorder="true" :loading="false" :pageSize="pageSize"
:showPage="true" :showTools="true" :height="(height - 500)">
:showPage="true" :showTools="true" :height="(height - 300)">
<template #default="{row,prop,column}">
<div v-if="prop == 'url'" class="text-overflow" :title="row.url">
<span class="">{{row.url }}</span>
... ... @@ -43,7 +43,7 @@
</el-col>
</el-row>
<div class="margin-top btn-faultDiagnosis flex-center position-bottom">
<el-button @click="cancleList">取消</el-button>
<el-button :size="$global.elementConfig.size.button" @click="cancleList">取消</el-button>
<!-- <el-button @click="saveList" type="primary">保存</el-button>-->
</div>
</template>
... ...
... ... @@ -28,6 +28,7 @@ export default {
setup(props){
const {proxy} = Vue.getCurrentInstance();
let id = proxy.$global.getQueryVariable('configId') ;
let height=Vue.ref(window.innerHeight);
let config = Vue.ref(id == false ? null : id);
let count=Vue.ref(0);
let tableDataList = Vue.ref([]);
... ... @@ -302,7 +303,8 @@ export default {
targetId,
init,
onReset,
onBtnSearch
onBtnSearch,
height
}
},
... ...
<div class="container" :style="{'height':height+'px','max-height':height+'px'}">
<div class="cm-card" :style="{'min-height':height+'px','max-height':height+'px','height':'100%'}">
<div class="search">
<div class="condition fault-book-input-text" style="width: 250px">
<div class="condition fault-book-input-text" >
<el-form-item>
<el-input v-model="searchForm.keyword" placeholder="输入关键字"
@keydown.enter.native="getPage" class="fault-book-input-text"></el-input>
<el-input :size="$global.elementConfig.size.input" v-model="searchForm.keyword" placeholder="输入关键字"
@keydown.enter.native="getPage" style="margin-top:5px;" class="fault-book-input-text"></el-input>
</el-form-item>
<!--<el-form-item>
<el-select v-model="searchForm.category" placeholder="故障分类">
... ... @@ -12,14 +12,15 @@
<el-option label="Zone two" value="beijing"></el-option>
</el-select>
</el-form-item>-->
</div>
<div class="btns" style="justify-content: left;padding-left: 0px">
<el-form-item>
<el-button type="primary" @click="getPage">
<el-button :size="$global.elementConfig.size.button" type="primary" @click="getPage">
搜索
</el-button>
</el-form-item>
</div>
<div class="btns" style="justify-content: left;padding-left: 0px">
</div>
</div>
<div class="search-table">
... ... @@ -83,12 +84,12 @@
<el-row :gutter="5">
<el-col :span="12">
<el-form-item label="故障分类" prop="faulttype">
<el-input v-model="handleInfoForm.faulttype" :disabled="true"></el-input>
<el-input :size="$global.elementConfig.size.input" v-model="handleInfoForm.faulttype" :disabled="true"></el-input>
</el-form-item>
</el-col>
<el-col :span="12">
<el-form-item label="发生时间" prop="createTime">
<el-input v-model="handleInfoForm.createTime" :disabled="true"></el-input>
<el-input :size="$global.elementConfig.size.input" v-model="handleInfoForm.createTime" :disabled="true"></el-input>
</el-form-item>
</el-col>
</el-row>
... ... @@ -96,12 +97,12 @@
<el-row :gutter="5">
<el-col :span="12">
<el-form-item label="当前状态" prop="faultState">
<el-input v-model="handleInfoForm.faultState" :disabled="true"></el-input>
<el-input :size="$global.elementConfig.size.input" v-model="handleInfoForm.faultState" :disabled="true"></el-input>
</el-form-item>
</el-col>
<el-col :span="12">
<el-form-item label="持续时长" prop="duration">
<el-input v-model="handleInfoForm.duration" :disabled="true"></el-input>
<el-input :size="$global.elementConfig.size.input" v-model="handleInfoForm.duration" :disabled="true"></el-input>
</el-form-item>
</el-col>
</el-row>
... ... @@ -109,12 +110,12 @@
<el-row :gutter="5">
<el-col :span="12">
<el-form-item label="故障主体" prop="faultBody">
<el-input v-model="handleInfoForm.faultBody" :disabled="true"></el-input>
<el-input :size="$global.elementConfig.size.input" v-model="handleInfoForm.faultBody" :disabled="true"></el-input>
</el-form-item>
</el-col>
<el-col :span="12">
<el-form-item label="影响范围" prop="influenceScope">
<el-input v-model="handleInfoForm.influenceScope" :disabled="true"></el-input>
<el-input :size="$global.elementConfig.size.input" v-model="handleInfoForm.influenceScope" :disabled="true"></el-input>
</el-form-item>
</el-col>
</el-row>
... ... @@ -122,7 +123,7 @@
<el-row :gutter="5">
<el-col :span="24">
<el-form-item label="标签" prop="label">
<el-input v-model="handleInfoForm.label" placeholder="多个标签#分割"></el-input>
<el-input :size="$global.elementConfig.size.input" v-model="handleInfoForm.label" placeholder="多个标签#分割"></el-input>
</el-form-item>
</el-col>
</el-row>
... ... @@ -131,7 +132,7 @@
<el-row :gutter="5">
<el-col :span="24">
<el-form-item label="处理方案" prop="solution">
<el-input v-model="handleInfoForm.solution" type="textarea"></el-input>
<el-input :size="$global.elementConfig.size.input" v-model="handleInfoForm.solution" type="textarea"></el-input>
</el-form-item>
</el-col>
</el-row>
... ... @@ -145,8 +146,8 @@
</el-row>
<el-form-item>
<el-button @click="showHandleInfoDialog(false)">取消</el-button>
<el-button v-if="handleInfoForm.solveTime == null || handleInfoForm.solveTime == ''" type="primary" @click="saveHandleInfo('handleForm',getPage)">保存</el-button>
<el-button :size="$global.elementConfig.size.button" @click="showHandleInfoDialog(false)">取消</el-button>
<el-button :size="$global.elementConfig.size.button" v-if="handleInfoForm.solveTime == null || handleInfoForm.solveTime == ''" type="primary" @click="saveHandleInfo('handleForm',getPage)">保存</el-button>
</el-form-item>
</el-form>
</template>
... ...
... ... @@ -14,26 +14,26 @@
></el-switch>
</el-form-item>
<el-form-item label="项目名称" prop="alias">
<el-input v-model="form.alias" :disabled="form.isOps == 0" clearable></el-input>
<el-input :size="$global.elementConfig.size.input" v-model="form.alias" :disabled="form.isOps == 0" clearable></el-input>
</el-form-item>
<el-form-item label="项目编号" prop="code" >
<el-input v-model="form.code" :disabled="form.isOps == 0" clearable></el-input>
<el-input :size="$global.elementConfig.size.input" v-model="form.code" :disabled="form.isOps == 0" clearable></el-input>
</el-form-item>
<el-form-item label="项目负责人" prop="principalName">
<div style="display: flex">
<el-input v-model="form.principalName" :disabled="form.isOps == 0" readonly="true" clearable></el-input>
<el-button style="margin-left: 5px" @click="showUserDialog(true)" :disabled="form.isOps == 0" >选择</el-button>
<el-input :size="$global.elementConfig.size.input" v-model="form.principalName" :disabled="form.isOps == 0" readonly="true" clearable></el-input>
<el-button :size="$global.elementConfig.size.button" style="margin-left: 5px" @click="showUserDialog(true)" :disabled="form.isOps == 0" >选择</el-button>
</div>
</el-form-item>
<el-form-item label="排序" prop="sort">
<el-input type="number" v-model="form.sort" :disabled="form.isOps == 0" clearable></el-input>
<el-input :size="$global.elementConfig.size.input" type="number" v-model="form.sort" :disabled="form.isOps == 0" clearable></el-input>
</el-form-item>
<el-form-item label="描述" prop="remark">
<el-input v-model="form.remark" type="textarea" :disabled="form.isOps == 0" clearable></el-input>
<el-input :size="$global.elementConfig.size.input" v-model="form.remark" type="textarea" :disabled="form.isOps == 0" clearable></el-input>
</el-form-item>
<el-form-item>
<el-button type="primary" size="small" @click="onSubmit('ruleForm')">保存配置</el-button>
<el-button :size="$global.elementConfig.size.button" type="primary" @click="onSubmit('ruleForm')">保存配置</el-button>
</el-form-item>
</el-form>
... ...