Merge branch 'master-v32-lushangqing' into 'master'
elementui升级影响到页面样式更改-对比分析、故障管理、乙方运维 #2 See merge request !668
Showing
16 changed files
with
118 additions
and
101 deletions
| @@ -361,7 +361,15 @@ global.getAlarmLevel = (level) => { | @@ -361,7 +361,15 @@ global.getAlarmLevel = (level) => { | ||
| 361 | } | 361 | } |
| 362 | 362 | ||
| 363 | // 组件默认大小 medium / small / mini | 363 | // 组件默认大小 medium / small / mini |
| 364 | -global.elementSize = ''; | 364 | +// global.elementSize = 'default'; |
| 365 | +global.elementConfig = { | ||
| 366 | + size:{ | ||
| 367 | + // large / default / small | ||
| 368 | + button:'default', | ||
| 369 | + // large / default / small | ||
| 370 | + input:'large' | ||
| 371 | + } | ||
| 372 | +} | ||
| 365 | global.height = window.innerHeight - 20; | 373 | global.height = window.innerHeight - 20; |
| 366 | 374 | ||
| 367 | export default global | 375 | export default global |
| @@ -2,14 +2,14 @@ | @@ -2,14 +2,14 @@ | ||
| 2 | <div class="cm-card" :style="{'min-height':height+'px','height':'100%'}"> | 2 | <div class="cm-card" :style="{'min-height':height+'px','height':'100%'}"> |
| 3 | <analysis-line :legend="lineChart.legend" :xAxis="lineChart.xAxis" :series="lineChart.series"> | 3 | <analysis-line :legend="lineChart.legend" :xAxis="lineChart.xAxis" :series="lineChart.series"> |
| 4 | <template #lineName="scope"> | 4 | <template #lineName="scope"> |
| 5 | - <el-input v-model="form.scene.name" placeholder="请输入场景名称"/> | 5 | + <el-input :size="$global.elementConfig.size.input" v-model="form.scene.name" placeholder="请输入场景名称"/> |
| 6 | </template> | 6 | </template> |
| 7 | <template #tools="scope"> | 7 | <template #tools="scope"> |
| 8 | - <el-button type="primary" style="margin-left: 10px" @click="showDialogForm(true)">保存</el-button> | 8 | + <el-button :size="$global.elementConfig.size.button" type="primary" style="margin-left: 10px" @click="showDialogForm(true)">保存</el-button> |
| 9 | </template> | 9 | </template> |
| 10 | <template #timeRange="scope"> | 10 | <template #timeRange="scope"> |
| 11 | <el-dropdown style="margin-left: 100px"> | 11 | <el-dropdown style="margin-left: 100px"> |
| 12 | - <el-button> | 12 | + <el-button :size="$global.elementConfig.size.button"> |
| 13 | 时间范围 <i class="el-icon el-icon-arrow-down"></i> | 13 | 时间范围 <i class="el-icon el-icon-arrow-down"></i> |
| 14 | </el-button> | 14 | </el-button> |
| 15 | <template #dropdown> | 15 | <template #dropdown> |
| @@ -26,7 +26,7 @@ | @@ -26,7 +26,7 @@ | ||
| 26 | </template> | 26 | </template> |
| 27 | <template #frequency="scope"> | 27 | <template #frequency="scope"> |
| 28 | <el-dropdown style="margin-left: 10px"> | 28 | <el-dropdown style="margin-left: 10px"> |
| 29 | - <el-button style="display: none !important;"> | 29 | + <el-button :size="$global.elementConfig.size.button" style="display: none !important;"> |
| 30 | 聚合频率 <i class="el-icon el-icon-arrow-down"></i> | 30 | 聚合频率 <i class="el-icon el-icon-arrow-down"></i> |
| 31 | </el-button> | 31 | </el-button> |
| 32 | <template #dropdown> | 32 | <template #dropdown> |
| @@ -51,7 +51,7 @@ | @@ -51,7 +51,7 @@ | ||
| 51 | <div style="width: calc(100% - 12px);padding: 0px 6px"> | 51 | <div style="width: calc(100% - 12px);padding: 0px 6px"> |
| 52 | <el-row :gutter="5"> | 52 | <el-row :gutter="5"> |
| 53 | <el-col :span="4"> | 53 | <el-col :span="4"> |
| 54 | - <div style="display: flex;flex-wrap: wrap;width: 100%;padding-left: 15px;"> | 54 | + <div style="display: flex;flex-wrap: wrap;width: 100%;padding-left: 15px;padding-right:15px;box-sizing: border-box;"> |
| 55 | <!--<el-dropdown> | 55 | <!--<el-dropdown> |
| 56 | <el-icon class="el-icon--right"> | 56 | <el-icon class="el-icon--right"> |
| 57 | <arrow-down/> | 57 | <arrow-down/> |
| @@ -59,13 +59,13 @@ | @@ -59,13 +59,13 @@ | ||
| 59 | <cm-biz-type-tree-input multiple clearable collapseTags @callback="getBizType"/> | 59 | <cm-biz-type-tree-input multiple clearable collapseTags @callback="getBizType"/> |
| 60 | </el-dropdown>--> | 60 | </el-dropdown>--> |
| 61 | 61 | ||
| 62 | - <el-select v-model="busTypeArr" multiple filterable clearable collapse-tags placeholder="请选择业务" style="margin-top: 10px"> | 62 | + <el-select :size="$global.elementConfig.size.input" v-model="busTypeArr" multiple filterable clearable collapse-tags placeholder="请选择业务" style="margin-top: 10px"> |
| 63 | <el-option | 63 | <el-option |
| 64 | v-for="item in busTypeList" | 64 | v-for="item in busTypeList" |
| 65 | :label="item.busTypeName" :value="item.busId"></el-option> | 65 | :label="item.busTypeName" :value="item.busId"></el-option> |
| 66 | </el-select> | 66 | </el-select> |
| 67 | 67 | ||
| 68 | - <el-dropdown> | 68 | + <el-dropdown :size="$global.elementConfig.size.input"> |
| 69 | <el-icon class="el-icon--right"> | 69 | <el-icon class="el-icon--right"> |
| 70 | <arrow-down/> | 70 | <arrow-down/> |
| 71 | </el-icon> | 71 | </el-icon> |
| @@ -79,17 +79,17 @@ | @@ -79,17 +79,17 @@ | ||
| 79 | <cm-kpi-type-tree-input multiple clearable collapseTags @callback="getKpiType"/> | 79 | <cm-kpi-type-tree-input multiple clearable collapseTags @callback="getKpiType"/> |
| 80 | </el-dropdown>--> | 80 | </el-dropdown>--> |
| 81 | 81 | ||
| 82 | - <el-select v-model="kpiTypeArr" multiple filterable clearable collapse-tags placeholder="请选择指标" style="margin-top: 10px"> | 82 | + <el-select :size="$global.elementConfig.size.input" v-model="kpiTypeArr" multiple filterable clearable collapse-tags placeholder="请选择指标" style="margin-top: 10px"> |
| 83 | <el-option | 83 | <el-option |
| 84 | v-for="item in kpiList" | 84 | v-for="item in kpiList" |
| 85 | :label="item.kpiName" :value="item.kpiId"></el-option> | 85 | :label="item.kpiName" :value="item.kpiId"></el-option> |
| 86 | </el-select> | 86 | </el-select> |
| 87 | 87 | ||
| 88 | - <el-input v-model="keyWords" placeholder="输入关键字" style="margin-top: 15px;width: 225px;"/> | 88 | + <el-input :size="$global.elementConfig.size.input" v-model="keyWords" placeholder="输入关键字" style="margin-top: 15px;width: 225px;"/> |
| 89 | 89 | ||
| 90 | <div style="margin-top: 10px;text-align: center"> | 90 | <div style="margin-top: 10px;text-align: center"> |
| 91 | - <el-button type="primary" @click="onReset()">重置</el-button> | ||
| 92 | - <el-button type="primary" @click="onBtnSearch()" style="margin-left: 10px">查询</el-button> | 91 | + <el-button :size="$global.elementConfig.size.button" type="primary" @click="onReset()">重置</el-button> |
| 92 | + <el-button :size="$global.elementConfig.size.button" type="primary" @click="onBtnSearch()" style="margin-left: 10px">查询</el-button> | ||
| 93 | </div> | 93 | </div> |
| 94 | </div> | 94 | </div> |
| 95 | </el-col> | 95 | </el-col> |
| @@ -102,7 +102,7 @@ | @@ -102,7 +102,7 @@ | ||
| 102 | :showBorder="true" :loading="false" | 102 | :showBorder="true" :loading="false" |
| 103 | :showPage="true" :showTools="true" :height="(height - 500)"> | 103 | :showPage="true" :showTools="true" :height="(height - 500)"> |
| 104 | <template #tools="{scope}"> | 104 | <template #tools="{scope}"> |
| 105 | - <el-button type="text" size="small" | 105 | + <el-button :size="$global.elementConfig.size.button" type="text" size="small" |
| 106 | @click.prevent="deleteRes(scope.row,scope.$index)"> | 106 | @click.prevent="deleteRes(scope.row,scope.$index)"> |
| 107 | <i class="el-icon-delete"/> 移除 | 107 | <i class="el-icon-delete"/> 移除 |
| 108 | </el-button> | 108 | </el-button> |
| @@ -143,10 +143,10 @@ | @@ -143,10 +143,10 @@ | ||
| 143 | </el-radio-group> | 143 | </el-radio-group> |
| 144 | </div> | 144 | </div> |
| 145 | <div v-if="!isAdd " style="padding: 3px 10px;"> | 145 | <div v-if="!isAdd " style="padding: 3px 10px;"> |
| 146 | - <el-input v-model="form.parentName" placeholder="请输入场景分类"/> | 146 | + <el-input :size="$global.elementConfig.size.input" v-model="form.parentName" placeholder="请输入场景分类"/> |
| 147 | </div> | 147 | </div> |
| 148 | <div v-if="!isAdd " style="padding: 3px 10px;"> | 148 | <div v-if="!isAdd " style="padding: 3px 10px;"> |
| 149 | - <el-input v-model="form.desc" placeholder="请输入场景分类描述"/> | 149 | + <el-input :size="$global.elementConfig.size.input" v-model="form.desc" placeholder="请输入场景分类描述"/> |
| 150 | </div> | 150 | </div> |
| 151 | 151 | ||
| 152 | <div v-else style="padding: 3px 10px;"> | 152 | <div v-else style="padding: 3px 10px;"> |
| @@ -164,13 +164,13 @@ | @@ -164,13 +164,13 @@ | ||
| 164 | <!-- <span>比对分析场景</span>--> | 164 | <!-- <span>比对分析场景</span>--> |
| 165 | <!-- </div>--> | 165 | <!-- </div>--> |
| 166 | <div style="padding: 3px 10px;"> | 166 | <div style="padding: 3px 10px;"> |
| 167 | - <el-input v-model="form.scene.name" placeholder="请输入场景名称"/> | 167 | + <el-input :size="$global.elementConfig.size.input" v-model="form.scene.name" placeholder="请输入场景名称"/> |
| 168 | </div> | 168 | </div> |
| 169 | <div style="padding: 3px 10px;"> | 169 | <div style="padding: 3px 10px;"> |
| 170 | - <el-input v-model="form.scene.desc" placeholder="请输入场景描述"/> | 170 | + <el-input :size="$global.elementConfig.size.input" v-model="form.scene.desc" placeholder="请输入场景描述"/> |
| 171 | </div> | 171 | </div> |
| 172 | <div style="padding: 3px 10px;"> | 172 | <div style="padding: 3px 10px;"> |
| 173 | - <el-input v-model="form.scene.sort" type="number" placeholder="请输入排序"/> | 173 | + <el-input :size="$global.elementConfig.size.input" v-model="form.scene.sort" type="number" placeholder="请输入排序"/> |
| 174 | </div> | 174 | </div> |
| 175 | </template> | 175 | </template> |
| 176 | </cm-dialog> | 176 | </cm-dialog> |
| @@ -15,9 +15,9 @@ | @@ -15,9 +15,9 @@ | ||
| 15 | <el-row class="list-search"> | 15 | <el-row class="list-search"> |
| 16 | <el-col :span="6"> | 16 | <el-col :span="6"> |
| 17 | <div class="search-input flex-div-start"> | 17 | <div class="search-input flex-div-start"> |
| 18 | - <el-input v-model="inputSearch" placeholder="请输入查询内容" /> | 18 | + <el-input :size="$global.elementConfig.size.input" v-model="inputSearch" placeholder="请输入查询内容" /> |
| 19 | <!-- <span class="search-text" >搜索</span>--> | 19 | <!-- <span class="search-text" >搜索</span>--> |
| 20 | - <el-button type="primary" @click="searchData" class="search-text button-flex-div-center">搜索</el-button> | 20 | + <el-button :size="$global.elementConfig.size.button" type="primary" @click="searchData" class="search-text button-flex-div-center">搜索</el-button> |
| 21 | 21 | ||
| 22 | </div> | 22 | </div> |
| 23 | 23 | ||
| @@ -26,7 +26,7 @@ | @@ -26,7 +26,7 @@ | ||
| 26 | <el-row class="list-title"> | 26 | <el-row class="list-title"> |
| 27 | <el-col :span="24" class="text-left"> | 27 | <el-col :span="24" class="text-left"> |
| 28 | <router-link :to="'/analysis/add'" class="analysis link-type"> | 28 | <router-link :to="'/analysis/add'" class="analysis link-type"> |
| 29 | - <el-button type="primary" class="button-flex-div-center"><i class="el-icon-plus"></i>新增</el-button> | 29 | + <el-button :size="$global.elementConfig.size.button" type="primary" class="button-flex-div-center"><i class="el-icon-plus"></i>新增</el-button> |
| 30 | </router-link> | 30 | </router-link> |
| 31 | 31 | ||
| 32 | <!-- <el-button type="primary" class="button-flex-div-center"><i class="icon-list icon-list-delete"></i>删除</el-button>--> | 32 | <!-- <el-button type="primary" class="button-flex-div-center"><i class="icon-list icon-list-delete"></i>删除</el-button>--> |
| @@ -81,11 +81,11 @@ | @@ -81,11 +81,11 @@ | ||
| 81 | <el-dialog v-model="addVisible" :title="添加配置" width="50%" @close="closeDialog" top="15vh"> | 81 | <el-dialog v-model="addVisible" :title="添加配置" width="50%" @close="closeDialog" top="15vh"> |
| 82 | <el-form ref="addHandleForm" :model="addHandleForm" label-width="120px"> | 82 | <el-form ref="addHandleForm" :model="addHandleForm" label-width="120px"> |
| 83 | <el-form-item label="名称"> | 83 | <el-form-item label="名称"> |
| 84 | - <el-input v-model="addHandleForm.parentName"></el-input> | 84 | + <el-input :size="$global.elementConfig.size.input" v-model="addHandleForm.parentName"></el-input> |
| 85 | </el-form-item> | 85 | </el-form-item> |
| 86 | 86 | ||
| 87 | <el-form-item label="描述"> | 87 | <el-form-item label="描述"> |
| 88 | - <el-input v-model="addHandleForm.desc"></el-input> | 88 | + <el-input :size="$global.elementConfig.size.input" v-model="addHandleForm.desc"></el-input> |
| 89 | </el-form-item> | 89 | </el-form-item> |
| 90 | </el-form> | 90 | </el-form> |
| 91 | </el-dialog> | 91 | </el-dialog> |
| @@ -8,7 +8,7 @@ | @@ -8,7 +8,7 @@ | ||
| 8 | <el-col :span="24"> | 8 | <el-col :span="24"> |
| 9 | <div class="flex-div-start margin-top-bottom-10"> | 9 | <div class="flex-div-start margin-top-bottom-10"> |
| 10 | 10 | ||
| 11 | - <el-select class="margin-right-10" v-model="resTypeArr" @change="changeRes" filterable clearable collapse-tags placeholder="请选择资源"> | 11 | + <el-select :size="$global.elementConfig.size.input" class="margin-right-10" v-model="resTypeArr" @change="changeRes" filterable clearable collapse-tags placeholder="请选择资源"> |
| 12 | <el-option | 12 | <el-option |
| 13 | v-for="item in resTypeList" | 13 | v-for="item in resTypeList" |
| 14 | :label="item.resName" :value="item.resId"></el-option> | 14 | :label="item.resName" :value="item.resId"></el-option> |
| @@ -19,19 +19,19 @@ | @@ -19,19 +19,19 @@ | ||
| 19 | </el-dropdown>--> | 19 | </el-dropdown>--> |
| 20 | 20 | ||
| 21 | 21 | ||
| 22 | - <el-select class="margin-right-10" v-model="kpiTypeArr" filterable clearable collapse-tags placeholder="请选择指标"> | 22 | + <el-select :size="$global.elementConfig.size.input" class="margin-right-10" v-model="kpiTypeArr" filterable clearable collapse-tags placeholder="请选择指标"> |
| 23 | <el-option | 23 | <el-option |
| 24 | v-for="item in kpiList" | 24 | v-for="item in kpiList" |
| 25 | :label="item.kpiName" :value="item.kpiId"></el-option> | 25 | :label="item.kpiName" :value="item.kpiId"></el-option> |
| 26 | </el-select> | 26 | </el-select> |
| 27 | 27 | ||
| 28 | - <el-input style="width:160px;" class="margin-right-10" v-model="keyWords" placeholder="输入关键字" /> | 28 | + <el-input :size="$global.elementConfig.size.input" style="width:160px;" class="margin-right-10" v-model="keyWords" placeholder="输入关键字" /> |
| 29 | 29 | ||
| 30 | <div class="flex-div-start"> | 30 | <div class="flex-div-start"> |
| 31 | - <el-button type="primary" @click="onReset()">重置</el-button> | ||
| 32 | - <el-button type="primary" @click="onBtnSearch()" style="margin-left: 10px">查询</el-button> | ||
| 33 | - <el-button type="primary" @click="saveAll()" style="margin-left: 10px">批量添加</el-button> | ||
| 34 | - <el-button type="primary" @click="saveAllData()" style="margin-left: 10px">全部添加</el-button> | 31 | + <el-button :size="$global.elementConfig.size.button" type="primary" @click="onReset()">重置</el-button> |
| 32 | + <el-button :size="$global.elementConfig.size.button" type="primary" @click="onBtnSearch()" style="margin-left: 10px">查询</el-button> | ||
| 33 | + <el-button :size="$global.elementConfig.size.button" type="primary" @click="saveAll()" style="margin-left: 10px">批量添加</el-button> | ||
| 34 | + <el-button :size="$global.elementConfig.size.button" type="primary" @click="saveAllData()" style="margin-left: 10px">全部添加</el-button> | ||
| 35 | </div> | 35 | </div> |
| 36 | 36 | ||
| 37 | </div> | 37 | </div> |
| @@ -42,7 +42,7 @@ | @@ -42,7 +42,7 @@ | ||
| 42 | <cm-table-page v-show="tableDataList" :columns="columns" :dataList="tableDataList" @loaddata="loadTableDataList" :multipleSelection="apmMonitorListChecked" | 42 | <cm-table-page v-show="tableDataList" :columns="columns" :dataList="tableDataList" @loaddata="loadTableDataList" :multipleSelection="apmMonitorListChecked" |
| 43 | :showIndex="true" :total="count" :showSelection="true" @selectionChange="selectionChange" | 43 | :showIndex="true" :total="count" :showSelection="true" @selectionChange="selectionChange" |
| 44 | :showBorder="true" :loading="false" :pageSize="pageSize" | 44 | :showBorder="true" :loading="false" :pageSize="pageSize" |
| 45 | - :showPage="true" :showTools="true" :height="(height - 500)"> | 45 | + :showPage="true" :showTools="true" :height="(height - 300)"> |
| 46 | <template #tools="{scope}"> | 46 | <template #tools="{scope}"> |
| 47 | <el-button type="text" size="small" @click.prevent="addRes(scope.row,scope.$index)"> | 47 | <el-button type="text" size="small" @click.prevent="addRes(scope.row,scope.$index)"> |
| 48 | <i class="el-icon-plus"/> 添加 | 48 | <i class="el-icon-plus"/> 添加 |
| @@ -47,6 +47,7 @@ export default { | @@ -47,6 +47,7 @@ export default { | ||
| 47 | setup(props){ | 47 | setup(props){ |
| 48 | const {proxy} = Vue.getCurrentInstance(); | 48 | const {proxy} = Vue.getCurrentInstance(); |
| 49 | let id = proxy.$global.getQueryVariable('configId') ; | 49 | let id = proxy.$global.getQueryVariable('configId') ; |
| 50 | + let height=Vue.ref(window.innerHeight); | ||
| 50 | let config = Vue.ref(id == false ? null : id); | 51 | let config = Vue.ref(id == false ? null : id); |
| 51 | let count=Vue.ref(0); | 52 | let count=Vue.ref(0); |
| 52 | let tableDataList = Vue.ref([]); | 53 | let tableDataList = Vue.ref([]); |
| @@ -301,7 +302,8 @@ export default { | @@ -301,7 +302,8 @@ export default { | ||
| 301 | resTypeList, | 302 | resTypeList, |
| 302 | init, | 303 | init, |
| 303 | onReset, | 304 | onReset, |
| 304 | - onBtnSearch | 305 | + onBtnSearch, |
| 306 | + height | ||
| 305 | } | 307 | } |
| 306 | 308 | ||
| 307 | }, | 309 | }, |
| @@ -25,13 +25,13 @@ | @@ -25,13 +25,13 @@ | ||
| 25 | :label="item.kpiName" :value="item.kpiId"></el-option> | 25 | :label="item.kpiName" :value="item.kpiId"></el-option> |
| 26 | </el-select>--> | 26 | </el-select>--> |
| 27 | 27 | ||
| 28 | - <el-input style="width:160px;" class="margin-right-10" v-model="keyWords" placeholder="输入关键字" /> | 28 | + <el-input :size="$global.elementConfig.size.input" style="width:160px;" class="margin-right-10" v-model="keyWords" placeholder="输入关键字" /> |
| 29 | 29 | ||
| 30 | <div class="flex-div-start"> | 30 | <div class="flex-div-start"> |
| 31 | - <el-button type="primary" @click="onReset()">重置</el-button> | ||
| 32 | - <el-button type="primary" @click="onBtnSearch()" style="margin-left: 10px">查询</el-button> | ||
| 33 | - <el-button type="primary" :disabled="isLoading" @click="saveAll()" style="margin-left: 10px">批量添加</el-button> | ||
| 34 | - <el-button type="primary" :disabled="isLoading" @click="saveAlldata()" style="margin-left: 10px">全部添加</el-button> | 31 | + <el-button :size="$global.elementConfig.size.button" type="primary" @click="onReset()">重置</el-button> |
| 32 | + <el-button :size="$global.elementConfig.size.button" type="primary" @click="onBtnSearch()" style="margin-left: 10px">查询</el-button> | ||
| 33 | + <el-button :size="$global.elementConfig.size.button" type="primary" :disabled="isLoading" @click="saveAll()" style="margin-left: 10px">批量添加</el-button> | ||
| 34 | + <el-button :size="$global.elementConfig.size.button" type="primary" :disabled="isLoading" @click="saveAlldata()" style="margin-left: 10px">全部添加</el-button> | ||
| 35 | </div> | 35 | </div> |
| 36 | </div> | 36 | </div> |
| 37 | </el-col> | 37 | </el-col> |
| @@ -41,7 +41,7 @@ | @@ -41,7 +41,7 @@ | ||
| 41 | <cm-table-page v-show="tableDataList" :columns="columns" :dataList="tableDataList" @loaddata="loadTableDataList" :multipleSelection="applicationMonitorListChecked" | 41 | <cm-table-page v-show="tableDataList" :columns="columns" :dataList="tableDataList" @loaddata="loadTableDataList" :multipleSelection="applicationMonitorListChecked" |
| 42 | :showIndex="true" :total="count" :showSelection="true" @selectionChange="selectionChange" | 42 | :showIndex="true" :total="count" :showSelection="true" @selectionChange="selectionChange" |
| 43 | :showBorder="true" :loading="false" :pageSize="pageSize" | 43 | :showBorder="true" :loading="false" :pageSize="pageSize" |
| 44 | - :showPage="true" :showTools="true" :height="(height - 500)"> | 44 | + :showPage="true" :showTools="true" :height="(height - 300)"> |
| 45 | <template #default="{row,prop,column}"> | 45 | <template #default="{row,prop,column}"> |
| 46 | <div v-if="prop == 'url'" class="text-overflow" :title="row.url"> | 46 | <div v-if="prop == 'url'" class="text-overflow" :title="row.url"> |
| 47 | <span class="">{{row.url }}</span> | 47 | <span class="">{{row.url }}</span> |
| @@ -28,6 +28,7 @@ export default { | @@ -28,6 +28,7 @@ export default { | ||
| 28 | setup(props){ | 28 | setup(props){ |
| 29 | const {proxy} = Vue.getCurrentInstance(); | 29 | const {proxy} = Vue.getCurrentInstance(); |
| 30 | let id = proxy.$global.getQueryVariable('configId') ; | 30 | let id = proxy.$global.getQueryVariable('configId') ; |
| 31 | + let height=Vue.ref(window.innerHeight); | ||
| 31 | let config = Vue.ref(id == false ? null : id); | 32 | let config = Vue.ref(id == false ? null : id); |
| 32 | let count=Vue.ref(0); | 33 | let count=Vue.ref(0); |
| 33 | let tableDataList = Vue.ref([]); | 34 | let tableDataList = Vue.ref([]); |
| @@ -305,7 +306,8 @@ export default { | @@ -305,7 +306,8 @@ export default { | ||
| 305 | targetId, | 306 | targetId, |
| 306 | init, | 307 | init, |
| 307 | onReset, | 308 | onReset, |
| 308 | - onBtnSearch | 309 | + onBtnSearch, |
| 310 | + height | ||
| 309 | } | 311 | } |
| 310 | 312 | ||
| 311 | }, | 313 | }, |
| @@ -30,8 +30,8 @@ | @@ -30,8 +30,8 @@ | ||
| 30 | <div class="flex-div-start"> | 30 | <div class="flex-div-start"> |
| 31 | <!-- <el-button type="primary" @click="onReset()">重置</el-button> | 31 | <!-- <el-button type="primary" @click="onReset()">重置</el-button> |
| 32 | <el-button type="primary" @click="onBtnSearch()" style="margin-left: 10px">查询</el-button>--> | 32 | <el-button type="primary" @click="onBtnSearch()" style="margin-left: 10px">查询</el-button>--> |
| 33 | - <el-button type="primary" :disabled="isLoading" @click="saveAll()">批量添加</el-button> | ||
| 34 | - <el-button type="primary" :disabled="isLoading" @click="saveAlldata()" style="margin-left: 10px">全部添加</el-button> | 33 | + <el-button :size="$global.elementConfig.size.button" type="primary" :disabled="isLoading" @click="saveAll()">批量添加</el-button> |
| 34 | + <el-button :size="$global.elementConfig.size.button" type="primary" :disabled="isLoading" @click="saveAlldata()" style="margin-left: 10px">全部添加</el-button> | ||
| 35 | </div> | 35 | </div> |
| 36 | </div> | 36 | </div> |
| 37 | </el-col> | 37 | </el-col> |
| @@ -6,7 +6,7 @@ | @@ -6,7 +6,7 @@ | ||
| 6 | <div class="grid-content bg-purple"> | 6 | <div class="grid-content bg-purple"> |
| 7 | <span class="fault-book-input-text">所属业务</span> | 7 | <span class="fault-book-input-text">所属业务</span> |
| 8 | <!-- <el-input v-model="input" placeholder="Please input 1" class="fault-book-input"/>--> | 8 | <!-- <el-input v-model="input" placeholder="Please input 1" class="fault-book-input"/>--> |
| 9 | - <el-select class="margin-right-10" v-model="busTypeArr" @change="changeBUsType" filterable clearable collapse-tags placeholder="请选择业务"> | 9 | + <el-select :size="$global.elementConfig.size.input" class="margin-right-10" v-model="busTypeArr" @change="changeBUsType" filterable clearable collapse-tags placeholder="请选择业务"> |
| 10 | <el-option | 10 | <el-option |
| 11 | v-for="item in busTypeList" | 11 | v-for="item in busTypeList" |
| 12 | :label="item.busTypeName" :value="item.busId" :key="item.busId"></el-option> | 12 | :label="item.busTypeName" :value="item.busId" :key="item.busId"></el-option> |
| @@ -16,7 +16,7 @@ | @@ -16,7 +16,7 @@ | ||
| 16 | <el-col :span="6"> | 16 | <el-col :span="6"> |
| 17 | <div class="grid-content bg-purple"> | 17 | <div class="grid-content bg-purple"> |
| 18 | <span class="fault-book-input-text">名称</span> | 18 | <span class="fault-book-input-text">名称</span> |
| 19 | - <el-input v-model="name" placeholder="请输入名称" maxlength="50" class="fault-book-input"/> | 19 | + <el-input :size="$global.elementConfig.size.input" v-model="name" placeholder="请输入名称" maxlength="50" class="fault-book-input"/> |
| 20 | </div> | 20 | </div> |
| 21 | </el-col> | 21 | </el-col> |
| 22 | </el-row> | 22 | </el-row> |
| @@ -79,7 +79,7 @@ | @@ -79,7 +79,7 @@ | ||
| 79 | <el-col :span="24" > | 79 | <el-col :span="24" > |
| 80 | <div class="fault-definition-select-up"> | 80 | <div class="fault-definition-select-up"> |
| 81 | 当 | 81 | 当 |
| 82 | - <el-select v-model="kpiId" placeholder="请选择告警"> | 82 | + <el-select :size="$global.elementConfig.size.input" v-model="kpiId" placeholder="请选择告警"> |
| 83 | <el-option | 83 | <el-option |
| 84 | v-for="item in alarmList" | 84 | v-for="item in alarmList" |
| 85 | :key="item.kpiId" | 85 | :key="item.kpiId" |
| @@ -89,7 +89,7 @@ | @@ -89,7 +89,7 @@ | ||
| 89 | </el-option> | 89 | </el-option> |
| 90 | </el-select> | 90 | </el-select> |
| 91 | 的警告级别为 | 91 | 的警告级别为 |
| 92 | - <el-select v-model="triggerValue" placeholder="请选择级别"> | 92 | + <el-select :size="$global.elementConfig.size.input" v-model="triggerValue" placeholder="请选择级别"> |
| 93 | <el-option | 93 | <el-option |
| 94 | v-for="item in alarmLevel" | 94 | v-for="item in alarmLevel" |
| 95 | :key="item.value" | 95 | :key="item.value" |
| @@ -168,13 +168,13 @@ | @@ -168,13 +168,13 @@ | ||
| 168 | <div class="context-multiple-choice flex-div-start margin-30 flex-div-wrap overflow-scroll-y"> | 168 | <div class="context-multiple-choice flex-div-start margin-30 flex-div-wrap overflow-scroll-y"> |
| 169 | <div class="btn-el-btn margin-bottom-10" v-for="(item, index) in networkMonitorList" :key="index"> | 169 | <div class="btn-el-btn margin-bottom-10" v-for="(item, index) in networkMonitorList" :key="index"> |
| 170 | <div> | 170 | <div> |
| 171 | - <el-button :disabled="faultStateRadio==0" class="multiple-choice-button" type="primary">{{item.linkName}}</el-button> | 171 | + <el-button :size="$global.elementConfig.size.button" :disabled="faultStateRadio==0" class="multiple-choice-button" type="primary">{{item.linkName}}</el-button> |
| 172 | <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"> | 172 | <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"> |
| 173 | <img src="" v-else style="width:12px;height:12px;" class="multiple-choice-icon" alt=""> | 173 | <img src="" v-else style="width:12px;height:12px;" class="multiple-choice-icon" alt=""> |
| 174 | </div> | 174 | </div> |
| 175 | </div> | 175 | </div> |
| 176 | <div class="flex-div btn-el-btn margin-bottom-10" v-if="faultStateRadio==1"> | 176 | <div class="flex-div btn-el-btn margin-bottom-10" v-if="faultStateRadio==1"> |
| 177 | - <el-button class="multiple-choice-button color-999" @click="addNetNode">添加网络检测</el-button> | 177 | + <el-button :size="$global.elementConfig.size.button" class="multiple-choice-button color-999" @click="addNetNode">添加网络检测</el-button> |
| 178 | <img src="./src/assets/images/faultDiagnosis/icon-item-add.png" class="multiple-choice-add-icon"> | 178 | <img src="./src/assets/images/faultDiagnosis/icon-item-add.png" class="multiple-choice-add-icon"> |
| 179 | </div> | 179 | </div> |
| 180 | </div> | 180 | </div> |
| @@ -206,7 +206,7 @@ | @@ -206,7 +206,7 @@ | ||
| 206 | <div class="context-multiple-choice flex-div-start margin-30 flex-div-wrap overflow-scroll-y"> | 206 | <div class="context-multiple-choice flex-div-start margin-30 flex-div-wrap overflow-scroll-y"> |
| 207 | <div class="btn-el-btn margin-bottom-10" v-for="(item, index) in applicationMonitorList" :key="index"> | 207 | <div class="btn-el-btn margin-bottom-10" v-for="(item, index) in applicationMonitorList" :key="index"> |
| 208 | <div> | 208 | <div> |
| 209 | - <el-button :disabled="faultApplicationRadio==0" class="multiple-choice-button" type="primary">{{item.streamName}}</el-button> | 209 | + <el-button :size="$global.elementConfig.size.button" :disabled="faultApplicationRadio==0" class="multiple-choice-button" type="primary">{{item.streamName}}</el-button> |
| 210 | <!-- <img :id="item.id" @click="deleteItem(item.id, applicationMonitorList)" src="./src/assets/images/faultDiagnosis/icon-item-delete.png" class="multiple-choice-icon cursorClass">--> | 210 | <!-- <img :id="item.id" @click="deleteItem(item.id, applicationMonitorList)" src="./src/assets/images/faultDiagnosis/icon-item-delete.png" class="multiple-choice-icon cursorClass">--> |
| 211 | <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"> | 211 | <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"> |
| 212 | <img src="" v-else style="width:12px;height:12px;" class="multiple-choice-icon" alt=""> | 212 | <img src="" v-else style="width:12px;height:12px;" class="multiple-choice-icon" alt=""> |
| @@ -214,7 +214,7 @@ | @@ -214,7 +214,7 @@ | ||
| 214 | 214 | ||
| 215 | </div> | 215 | </div> |
| 216 | <div class="flex-div btn-el-btn margin-bottom-10" v-if="faultApplicationRadio==1"> | 216 | <div class="flex-div btn-el-btn margin-bottom-10" v-if="faultApplicationRadio==1"> |
| 217 | - <el-button class="multiple-choice-button color-999" @click="addApplicationMonitor()">添加应用检测</el-button> | 217 | + <el-button :size="$global.elementConfig.size.button" class="multiple-choice-button color-999" @click="addApplicationMonitor()">添加应用检测</el-button> |
| 218 | <img src="./src/assets/images/faultDiagnosis/icon-item-add.png" class="multiple-choice-add-icon"> | 218 | <img src="./src/assets/images/faultDiagnosis/icon-item-add.png" class="multiple-choice-add-icon"> |
| 219 | </div> | 219 | </div> |
| 220 | </div> | 220 | </div> |
| @@ -240,7 +240,7 @@ | @@ -240,7 +240,7 @@ | ||
| 240 | <el-radio v-model="faultEnvironmentRadio" label="0">不启用</el-radio> | 240 | <el-radio v-model="faultEnvironmentRadio" label="0">不启用</el-radio> |
| 241 | </div> | 241 | </div> |
| 242 | <div class="flex-div margin-30 btn-el-btn margin-bottom-10" v-if="faultEnvironmentRadio==1"> | 242 | <div class="flex-div margin-30 btn-el-btn margin-bottom-10" v-if="faultEnvironmentRadio==1"> |
| 243 | - <el-button class="multiple-choice-button color-999" @click="addBaseMonitor()">添加基础环境</el-button> | 243 | + <el-button :size="$global.elementConfig.size.button" class="multiple-choice-button color-999" @click="addBaseMonitor()">添加基础环境</el-button> |
| 244 | <img style="top:0;" src="./src/assets/images/faultDiagnosis/icon-item-add.png" class="multiple-choice-add-icon"> | 244 | <img style="top:0;" src="./src/assets/images/faultDiagnosis/icon-item-add.png" class="multiple-choice-add-icon"> |
| 245 | </div> | 245 | </div> |
| 246 | </el-col> | 246 | </el-col> |
| @@ -328,13 +328,13 @@ | @@ -328,13 +328,13 @@ | ||
| 328 | <el-col :span="24"> | 328 | <el-col :span="24"> |
| 329 | <div class="context-multiple-choice flex-div-start margin-30 flex-div-wrap overflow-scroll-y"> | 329 | <div class="context-multiple-choice flex-div-start margin-30 flex-div-wrap overflow-scroll-y"> |
| 330 | <div class="btn-el-btn margin-bottom-10" v-for="(item, index) in apmMonitorList" :key="index" > | 330 | <div class="btn-el-btn margin-bottom-10" v-for="(item, index) in apmMonitorList" :key="index" > |
| 331 | - <el-button :disabled="faultAPMRadio==0" class="multiple-choice-button" type="primary">{{item.resName}}</el-button> | 331 | + <el-button :size="$global.elementConfig.size.button" :disabled="faultAPMRadio==0" class="multiple-choice-button" type="primary">{{item.resName}}</el-button> |
| 332 | <img :id="item.id" @click="deleteApm(item)" src="./src/assets/images/faultDiagnosis/icon-item-delete.png" class="multiple-choice-icon position-absolute cursorClass"> | 332 | <img :id="item.id" @click="deleteApm(item)" src="./src/assets/images/faultDiagnosis/icon-item-delete.png" class="multiple-choice-icon position-absolute cursorClass"> |
| 333 | 333 | ||
| 334 | </div> | 334 | </div> |
| 335 | 335 | ||
| 336 | <div class="btn-el-btn margin-bottom-10" v-if="faultAPMRadio==1"> | 336 | <div class="btn-el-btn margin-bottom-10" v-if="faultAPMRadio==1"> |
| 337 | - <el-button class="multiple-choice-button" @click="addAPM()">添加 APM</el-button> | 337 | + <el-button :size="$global.elementConfig.size.button" class="multiple-choice-button" @click="addAPM()">添加 APM</el-button> |
| 338 | <img src="./src/assets/images/faultDiagnosis/icon-item-add.png" class="multiple-choice-add-icon"> | 338 | <img src="./src/assets/images/faultDiagnosis/icon-item-add.png" class="multiple-choice-add-icon"> |
| 339 | </div> | 339 | </div> |
| 340 | 340 | ||
| @@ -369,7 +369,7 @@ | @@ -369,7 +369,7 @@ | ||
| 369 | <div class="context-multiple-choice flex-div-start margin-30 flex-div-wrap overflow-scroll-y"> | 369 | <div class="context-multiple-choice flex-div-start margin-30 flex-div-wrap overflow-scroll-y"> |
| 370 | <div class="btn-el-btn margin-bottom-10" v-for="(item, index) in dialtestMonitorList" :key="index"> | 370 | <div class="btn-el-btn margin-bottom-10" v-for="(item, index) in dialtestMonitorList" :key="index"> |
| 371 | <div> | 371 | <div> |
| 372 | - <el-button :disabled="faultDialtestRadio==0" class="multiple-choice-button" type="primary">{{item.taskName}}</el-button> | 372 | + <el-button :size="$global.elementConfig.size.button" :disabled="faultDialtestRadio==0" class="multiple-choice-button" type="primary">{{item.taskName}}</el-button> |
| 373 | <!-- <img :id="item.id" @click="deleteItem(item.id, applicationMonitorList)" src="./src/assets/images/faultDiagnosis/icon-item-delete.png" class="multiple-choice-icon cursorClass">--> | 373 | <!-- <img :id="item.id" @click="deleteItem(item.id, applicationMonitorList)" src="./src/assets/images/faultDiagnosis/icon-item-delete.png" class="multiple-choice-icon cursorClass">--> |
| 374 | <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"> | 374 | <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"> |
| 375 | <img src="" v-else style="width:12px;height:12px;" class="multiple-choice-icon" alt=""> | 375 | <img src="" v-else style="width:12px;height:12px;" class="multiple-choice-icon" alt=""> |
| @@ -377,7 +377,7 @@ | @@ -377,7 +377,7 @@ | ||
| 377 | 377 | ||
| 378 | </div> | 378 | </div> |
| 379 | <div class="flex-div btn-el-btn margin-bottom-10" v-if="faultDialtestRadio==1"> | 379 | <div class="flex-div btn-el-btn margin-bottom-10" v-if="faultDialtestRadio==1"> |
| 380 | - <el-button class="multiple-choice-button color-999" @click="addDialtestMonitor()">添加拨测分析</el-button> | 380 | + <el-button :size="$global.elementConfig.size.button" class="multiple-choice-button color-999" @click="addDialtestMonitor()">添加拨测分析</el-button> |
| 381 | <img src="./src/assets/images/faultDiagnosis/icon-item-add.png" class="multiple-choice-add-icon"> | 381 | <img src="./src/assets/images/faultDiagnosis/icon-item-add.png" class="multiple-choice-add-icon"> |
| 382 | </div> | 382 | </div> |
| 383 | </div> | 383 | </div> |
| @@ -409,12 +409,12 @@ | @@ -409,12 +409,12 @@ | ||
| 409 | <div class="context-multiple-choice flex-div-start margin-30 flex-div-wrap overflow-scroll-y"> | 409 | <div class="context-multiple-choice flex-div-start margin-30 flex-div-wrap overflow-scroll-y"> |
| 410 | <div class="btn-el-btn margin-bottom-10" v-for="(item, index) in logDetectionList" :key="index"> | 410 | <div class="btn-el-btn margin-bottom-10" v-for="(item, index) in logDetectionList" :key="index"> |
| 411 | <div> | 411 | <div> |
| 412 | - <el-button :disabled="faultLogRadio==0" class="multiple-choice-button" type="primary">{{item.title}}</el-button> | 412 | + <el-button :size="$global.elementConfig.size.button" :disabled="faultLogRadio==0" class="multiple-choice-button" type="primary">{{item.title}}</el-button> |
| 413 | <img :id="item.id" @click="deleteItem(item.id, logDetectionList)" src="./src/assets/images/faultDiagnosis/icon-item-delete.png" class="multiple-choice-icon"> | 413 | <img :id="item.id" @click="deleteItem(item.id, logDetectionList)" src="./src/assets/images/faultDiagnosis/icon-item-delete.png" class="multiple-choice-icon"> |
| 414 | </div> | 414 | </div> |
| 415 | </div> | 415 | </div> |
| 416 | <div class="btn-el-btn margin-bottom-10" v-if="faultLogRadio==1"> | 416 | <div class="btn-el-btn margin-bottom-10" v-if="faultLogRadio==1"> |
| 417 | - <el-button class="multiple-choice-button" @click="addLogMonitor()">添加日志检测</el-button> | 417 | + <el-button :size="$global.elementConfig.size.button" class="multiple-choice-button" @click="addLogMonitor()">添加日志检测</el-button> |
| 418 | <img src="./src/assets/images/faultDiagnosis/icon-item-add.png" class="multiple-choice-add-icon"> | 418 | <img src="./src/assets/images/faultDiagnosis/icon-item-add.png" class="multiple-choice-add-icon"> |
| 419 | </div> | 419 | </div> |
| 420 | </div> | 420 | </div> |
| @@ -437,12 +437,12 @@ | @@ -437,12 +437,12 @@ | ||
| 437 | <div class="context-multiple-choice flex-div-start margin-30 flex-div-wrap overflow-scroll-y"> | 437 | <div class="context-multiple-choice flex-div-start margin-30 flex-div-wrap overflow-scroll-y"> |
| 438 | <div class="btn-el-btn margin-bottom-10" v-for="(item, index) in subscriptionReportList" :key="index"> | 438 | <div class="btn-el-btn margin-bottom-10" v-for="(item, index) in subscriptionReportList" :key="index"> |
| 439 | <div> | 439 | <div> |
| 440 | - <el-button class="multiple-choice-button" type="primary">{{item.title}}</el-button> | 440 | + <el-button :size="$global.elementConfig.size.button" class="multiple-choice-button" type="primary">{{item.title}}</el-button> |
| 441 | <img :id="item.id" @click="deleteItem(item.id, subscriptionReportList)" src="./src/assets/images/faultDiagnosis/icon-item-delete.png" class="multiple-choice-icon"> | 441 | <img :id="item.id" @click="deleteItem(item.id, subscriptionReportList)" src="./src/assets/images/faultDiagnosis/icon-item-delete.png" class="multiple-choice-icon"> |
| 442 | </div> | 442 | </div> |
| 443 | </div> | 443 | </div> |
| 444 | <div class="btn-el-btn margin-bottom-10"> | 444 | <div class="btn-el-btn margin-bottom-10"> |
| 445 | - <el-button class="multiple-choice-button" @click="addSubscriptionReport()">添加订阅人员</el-button> | 445 | + <el-button :size="$global.elementConfig.size.button" class="multiple-choice-button" @click="addSubscriptionReport()">添加订阅人员</el-button> |
| 446 | <img src="./src/assets/images/faultDiagnosis/icon-item-add.png" class="multiple-choice-add-icon"> | 446 | <img src="./src/assets/images/faultDiagnosis/icon-item-add.png" class="multiple-choice-add-icon"> |
| 447 | </div> | 447 | </div> |
| 448 | </div> | 448 | </div> |
| @@ -452,8 +452,8 @@ | @@ -452,8 +452,8 @@ | ||
| 452 | 452 | ||
| 453 | <!--取消和保存--> | 453 | <!--取消和保存--> |
| 454 | <div class="btn-faultDiagnosis flex-center"> | 454 | <div class="btn-faultDiagnosis flex-center"> |
| 455 | - <el-button @click="goBackIndex">取消</el-button> | ||
| 456 | - <el-button @click="saveConfigDetail" type="primary" :loading="isLoading">保存</el-button> | 455 | + <el-button :size="$global.elementConfig.size.button" @click="goBackIndex">取消</el-button> |
| 456 | + <el-button :size="$global.elementConfig.size.button" @click="saveConfigDetail" type="primary" :loading="isLoading">保存</el-button> | ||
| 457 | 457 | ||
| 458 | </div> | 458 | </div> |
| 459 | 459 |
| @@ -2,7 +2,7 @@ | @@ -2,7 +2,7 @@ | ||
| 2 | <el-row> | 2 | <el-row> |
| 3 | <el-col :span="6"> | 3 | <el-col :span="6"> |
| 4 | <div class="search-input margin-30 flex-div-start"> | 4 | <div class="search-input margin-30 flex-div-start"> |
| 5 | - <el-input v-model="name" placeholder="故障诊断" class="fault-book-input-text" /> | 5 | + <el-input :size="$global.elementConfig.size.input" v-model="name" placeholder="故障诊断" class="fault-book-input-text" /> |
| 6 | <span class="search-text" style="border-radius: 4px" @click="searchList">搜索</span> | 6 | <span class="search-text" style="border-radius: 4px" @click="searchList">搜索</span> |
| 7 | </div> | 7 | </div> |
| 8 | 8 |
| @@ -33,7 +33,7 @@ | @@ -33,7 +33,7 @@ | ||
| 33 | </div> | 33 | </div> |
| 34 | <el-row v-if="!addSetLIstVisible" class="flex-div-start" style="margin: 20px 0 10px 4%;" > | 34 | <el-row v-if="!addSetLIstVisible" class="flex-div-start" style="margin: 20px 0 10px 4%;" > |
| 35 | <span>配置链路名称</span> | 35 | <span>配置链路名称</span> |
| 36 | - <el-input style="flex:1;margin-left:10px;" maxlength="50" class="margin-right-10" v-model="linkName" placeholder="输入链路名称" /> | 36 | + <el-input :size="$global.elementConfig.size.input" style="flex:1;margin-left:10px;" maxlength="50" class="margin-right-10" v-model="linkName" placeholder="输入链路名称" /> |
| 37 | 37 | ||
| 38 | </el-row> | 38 | </el-row> |
| 39 | <div class="context-body"> | 39 | <div class="context-body"> |
| @@ -102,7 +102,7 @@ | @@ -102,7 +102,7 @@ | ||
| 102 | </el-row> | 102 | </el-row> |
| 103 | 103 | ||
| 104 | <div v-if="!addSetLIstVisible" class="margin-top flex-center position-bottom"> | 104 | <div v-if="!addSetLIstVisible" class="margin-top flex-center position-bottom"> |
| 105 | - <el-button @click="saveLinkAndNodeInfo" type="primary">保存</el-button> | 105 | + <el-button :size="$global.elementConfig.size.button" @click="saveLinkAndNodeInfo" type="primary">保存</el-button> |
| 106 | </div> | 106 | </div> |
| 107 | 107 | ||
| 108 | </div> | 108 | </div> |
| @@ -124,7 +124,7 @@ | @@ -124,7 +124,7 @@ | ||
| 124 | v-for="item in busTypeList" | 124 | v-for="item in busTypeList" |
| 125 | :label="item.busTypeName" :value="item.busId"></el-option> | 125 | :label="item.busTypeName" :value="item.busId"></el-option> |
| 126 | </el-select>--> | 126 | </el-select>--> |
| 127 | - <el-select class="margin-right-10" v-model="resTypeArr" @change="changeRes" filterable clearable collapse-tags placeholder="请选择资源"> | 127 | + <el-select :size="$global.elementConfig.size.input" class="margin-right-10" v-model="resTypeArr" @change="changeRes" filterable clearable collapse-tags placeholder="请选择资源"> |
| 128 | <el-option | 128 | <el-option |
| 129 | v-for="item in resTypeList" | 129 | v-for="item in resTypeList" |
| 130 | :label="item.resName" :value="item.resId"></el-option> | 130 | :label="item.resName" :value="item.resId"></el-option> |
| @@ -135,7 +135,7 @@ | @@ -135,7 +135,7 @@ | ||
| 135 | </el-dropdown>--> | 135 | </el-dropdown>--> |
| 136 | 136 | ||
| 137 | 137 | ||
| 138 | - <el-select class="margin-right-10" v-model="kpiTypeArr" filterable clearable collapse-tags placeholder="请选择指标"> | 138 | + <el-select :size="$global.elementConfig.size.input" class="margin-right-10" v-model="kpiTypeArr" filterable clearable collapse-tags placeholder="请选择指标"> |
| 139 | <el-option | 139 | <el-option |
| 140 | v-for="item in kpiList" | 140 | v-for="item in kpiList" |
| 141 | :label="item.kpiName" :value="item.kpiId"></el-option> | 141 | :label="item.kpiName" :value="item.kpiId"></el-option> |
| @@ -144,15 +144,15 @@ | @@ -144,15 +144,15 @@ | ||
| 144 | <!-- <el-input style="width:160px;" class="margin-right-10" v-model="keyWords" placeholder="输入关键字" />--> | 144 | <!-- <el-input style="width:160px;" class="margin-right-10" v-model="keyWords" placeholder="输入关键字" />--> |
| 145 | 145 | ||
| 146 | <div class="flex-div-start"> | 146 | <div class="flex-div-start"> |
| 147 | - <el-button type="primary" @click="onReset()">重置</el-button> | ||
| 148 | - <el-button type="primary" @click="onBtnSearch()" style="margin-left: 10px">查询</el-button> | 147 | + <el-button :size="$global.elementConfig.size.button" type="primary" @click="onReset()">重置</el-button> |
| 148 | + <el-button :size="$global.elementConfig.size.button" type="primary" @click="onBtnSearch()" style="margin-left: 10px">查询</el-button> | ||
| 149 | </div> | 149 | </div> |
| 150 | </div> | 150 | </div> |
| 151 | </el-col> | 151 | </el-col> |
| 152 | </el-row> | 152 | </el-row> |
| 153 | <el-row v-if="flag" class="flex-div-start" style="margin-bottom: 10px;margin-top: 10px;padding-top:10px;border-top:1px solid #ebeef5" > | 153 | <el-row v-if="flag" class="flex-div-start" style="margin-bottom: 10px;margin-top: 10px;padding-top:10px;border-top:1px solid #ebeef5" > |
| 154 | <span>节点名称</span> | 154 | <span>节点名称</span> |
| 155 | - <el-input style="flex:1;margin-left:10px;" class="margin-right-10" maxlength="50" v-model.trim="nodeName" placeholder="输入节点名称" /> | 155 | + <el-input :size="$global.elementConfig.size.input" style="flex:1;margin-left:10px;" class="margin-right-10" maxlength="50" v-model.trim="nodeName" placeholder="输入节点名称" /> |
| 156 | </el-row> | 156 | </el-row> |
| 157 | <el-row class="margin-bottom-50"> | 157 | <el-row class="margin-bottom-50"> |
| 158 | <el-col :span="24" :class="[{'table-height':!flag},{'table-height-45':flag}]"> | 158 | <el-col :span="24" :class="[{'table-height':!flag},{'table-height-45':flag}]"> |
| @@ -179,7 +179,7 @@ | @@ -179,7 +179,7 @@ | ||
| 179 | 179 | ||
| 180 | </el-row> | 180 | </el-row> |
| 181 | <div v-if="tableVisible" class="margin-top btn-faultDiagnosis flex-center position-bottom"> | 181 | <div v-if="tableVisible" class="margin-top btn-faultDiagnosis flex-center position-bottom"> |
| 182 | - <el-button @click="cancleList">取消</el-button> | 182 | + <el-button :size="$global.elementConfig.size.button" @click="cancleList">取消</el-button> |
| 183 | <!-- <el-button @click="saveList" type="primary">保存</el-button>--> | 183 | <!-- <el-button @click="saveList" type="primary">保存</el-button>--> |
| 184 | </div> | 184 | </div> |
| 185 | </template> | 185 | </template> |
| @@ -74,6 +74,7 @@ export default { | @@ -74,6 +74,7 @@ export default { | ||
| 74 | setup(props){ | 74 | setup(props){ |
| 75 | const {proxy} = Vue.getCurrentInstance(); | 75 | const {proxy} = Vue.getCurrentInstance(); |
| 76 | let id = proxy.$global.getQueryVariable('configId') ; | 76 | let id = proxy.$global.getQueryVariable('configId') ; |
| 77 | + let height=Vue.ref(window.innerHeight); | ||
| 77 | let config = Vue.ref(id == false ? null : id); | 78 | let config = Vue.ref(id == false ? null : id); |
| 78 | let count=Vue.ref(0); | 79 | let count=Vue.ref(0); |
| 79 | let tableDataList = Vue.ref([]); | 80 | let tableDataList = Vue.ref([]); |
| @@ -353,7 +354,8 @@ export default { | @@ -353,7 +354,8 @@ export default { | ||
| 353 | linkName, | 354 | linkName, |
| 354 | linkId, | 355 | linkId, |
| 355 | backLink, | 356 | backLink, |
| 356 | - iconArr | 357 | + iconArr, |
| 358 | + height | ||
| 357 | } | 359 | } |
| 358 | 360 | ||
| 359 | }, | 361 | }, |
| @@ -7,13 +7,13 @@ | @@ -7,13 +7,13 @@ | ||
| 7 | <el-row> | 7 | <el-row> |
| 8 | <el-col :span="24"> | 8 | <el-col :span="24"> |
| 9 | <div class="flex-div-start margin-top-bottom-10"> | 9 | <div class="flex-div-start margin-top-bottom-10"> |
| 10 | - <el-input style="width:160px;" class="margin-right-10" v-model="keyWords" placeholder="输入关键字" /> | 10 | + <el-input :size="$global.elementConfig.size.input" style="width:160px;" class="margin-right-10" v-model="keyWords" placeholder="输入关键字" /> |
| 11 | 11 | ||
| 12 | <div class="flex-div-start"> | 12 | <div class="flex-div-start"> |
| 13 | - <el-button type="primary" @click="onReset()">重置</el-button> | ||
| 14 | - <el-button type="primary" @click="onBtnSearch()" style="margin-left: 10px">查询</el-button> | ||
| 15 | - <el-button type="primary" :disabled="isLoading" @click="saveAll()" style="margin-left: 10px">批量添加</el-button> | ||
| 16 | - <el-button type="primary" :disabled="isLoading" @click="saveAlldata()" style="margin-left: 10px">全部添加</el-button> | 13 | + <el-button :size="$global.elementConfig.size.button" type="primary" @click="onReset()">重置</el-button> |
| 14 | + <el-button :size="$global.elementConfig.size.button" type="primary" @click="onBtnSearch()" style="margin-left: 10px">查询</el-button> | ||
| 15 | + <el-button :size="$global.elementConfig.size.button" type="primary" :disabled="isLoading" @click="saveAll()" style="margin-left: 10px">批量添加</el-button> | ||
| 16 | + <el-button :size="$global.elementConfig.size.button" type="primary" :disabled="isLoading" @click="saveAlldata()" style="margin-left: 10px">全部添加</el-button> | ||
| 17 | </div> | 17 | </div> |
| 18 | </div> | 18 | </div> |
| 19 | </el-col> | 19 | </el-col> |
| @@ -23,7 +23,7 @@ | @@ -23,7 +23,7 @@ | ||
| 23 | <cm-table-page v-show="tableDataList" :columns="columns" :dataList="tableDataList" @loaddata="loadTableDataList" :multipleSelection="dialtestMonitorListChecked" | 23 | <cm-table-page v-show="tableDataList" :columns="columns" :dataList="tableDataList" @loaddata="loadTableDataList" :multipleSelection="dialtestMonitorListChecked" |
| 24 | :showIndex="true" :total="count" :showSelection="true" @selectionChange="selectionChange" | 24 | :showIndex="true" :total="count" :showSelection="true" @selectionChange="selectionChange" |
| 25 | :showBorder="true" :loading="false" :pageSize="pageSize" | 25 | :showBorder="true" :loading="false" :pageSize="pageSize" |
| 26 | - :showPage="true" :showTools="true" :height="(height - 500)"> | 26 | + :showPage="true" :showTools="true" :height="(height - 300)"> |
| 27 | <template #default="{row,prop,column}"> | 27 | <template #default="{row,prop,column}"> |
| 28 | <div v-if="prop == 'url'" class="text-overflow" :title="row.url"> | 28 | <div v-if="prop == 'url'" class="text-overflow" :title="row.url"> |
| 29 | <span class="">{{row.url }}</span> | 29 | <span class="">{{row.url }}</span> |
| @@ -43,7 +43,7 @@ | @@ -43,7 +43,7 @@ | ||
| 43 | </el-col> | 43 | </el-col> |
| 44 | </el-row> | 44 | </el-row> |
| 45 | <div class="margin-top btn-faultDiagnosis flex-center position-bottom"> | 45 | <div class="margin-top btn-faultDiagnosis flex-center position-bottom"> |
| 46 | - <el-button @click="cancleList">取消</el-button> | 46 | + <el-button :size="$global.elementConfig.size.button" @click="cancleList">取消</el-button> |
| 47 | <!-- <el-button @click="saveList" type="primary">保存</el-button>--> | 47 | <!-- <el-button @click="saveList" type="primary">保存</el-button>--> |
| 48 | </div> | 48 | </div> |
| 49 | </template> | 49 | </template> |
| @@ -28,6 +28,7 @@ export default { | @@ -28,6 +28,7 @@ export default { | ||
| 28 | setup(props){ | 28 | setup(props){ |
| 29 | const {proxy} = Vue.getCurrentInstance(); | 29 | const {proxy} = Vue.getCurrentInstance(); |
| 30 | let id = proxy.$global.getQueryVariable('configId') ; | 30 | let id = proxy.$global.getQueryVariable('configId') ; |
| 31 | + let height=Vue.ref(window.innerHeight); | ||
| 31 | let config = Vue.ref(id == false ? null : id); | 32 | let config = Vue.ref(id == false ? null : id); |
| 32 | let count=Vue.ref(0); | 33 | let count=Vue.ref(0); |
| 33 | let tableDataList = Vue.ref([]); | 34 | let tableDataList = Vue.ref([]); |
| @@ -302,7 +303,8 @@ export default { | @@ -302,7 +303,8 @@ export default { | ||
| 302 | targetId, | 303 | targetId, |
| 303 | init, | 304 | init, |
| 304 | onReset, | 305 | onReset, |
| 305 | - onBtnSearch | 306 | + onBtnSearch, |
| 307 | + height | ||
| 306 | } | 308 | } |
| 307 | 309 | ||
| 308 | }, | 310 | }, |
| 1 | <div class="container" :style="{'height':height+'px','max-height':height+'px'}"> | 1 | <div class="container" :style="{'height':height+'px','max-height':height+'px'}"> |
| 2 | <div class="cm-card" :style="{'min-height':height+'px','max-height':height+'px','height':'100%'}"> | 2 | <div class="cm-card" :style="{'min-height':height+'px','max-height':height+'px','height':'100%'}"> |
| 3 | <div class="search"> | 3 | <div class="search"> |
| 4 | - <div class="condition fault-book-input-text" style="width: 250px"> | 4 | + <div class="condition fault-book-input-text" > |
| 5 | <el-form-item> | 5 | <el-form-item> |
| 6 | - <el-input v-model="searchForm.keyword" placeholder="输入关键字" | ||
| 7 | - @keydown.enter.native="getPage" class="fault-book-input-text"></el-input> | 6 | + <el-input :size="$global.elementConfig.size.input" v-model="searchForm.keyword" placeholder="输入关键字" |
| 7 | + @keydown.enter.native="getPage" style="margin-top:5px;" class="fault-book-input-text"></el-input> | ||
| 8 | </el-form-item> | 8 | </el-form-item> |
| 9 | <!--<el-form-item> | 9 | <!--<el-form-item> |
| 10 | <el-select v-model="searchForm.category" placeholder="故障分类"> | 10 | <el-select v-model="searchForm.category" placeholder="故障分类"> |
| @@ -12,14 +12,15 @@ | @@ -12,14 +12,15 @@ | ||
| 12 | <el-option label="Zone two" value="beijing"></el-option> | 12 | <el-option label="Zone two" value="beijing"></el-option> |
| 13 | </el-select> | 13 | </el-select> |
| 14 | </el-form-item>--> | 14 | </el-form-item>--> |
| 15 | - </div> | ||
| 16 | - <div class="btns" style="justify-content: left;padding-left: 0px"> | ||
| 17 | <el-form-item> | 15 | <el-form-item> |
| 18 | - <el-button type="primary" @click="getPage"> | 16 | + <el-button :size="$global.elementConfig.size.button" type="primary" @click="getPage"> |
| 19 | 搜索 | 17 | 搜索 |
| 20 | </el-button> | 18 | </el-button> |
| 21 | </el-form-item> | 19 | </el-form-item> |
| 22 | </div> | 20 | </div> |
| 21 | + <div class="btns" style="justify-content: left;padding-left: 0px"> | ||
| 22 | + | ||
| 23 | + </div> | ||
| 23 | </div> | 24 | </div> |
| 24 | 25 | ||
| 25 | <div class="search-table"> | 26 | <div class="search-table"> |
| @@ -83,12 +84,12 @@ | @@ -83,12 +84,12 @@ | ||
| 83 | <el-row :gutter="5"> | 84 | <el-row :gutter="5"> |
| 84 | <el-col :span="12"> | 85 | <el-col :span="12"> |
| 85 | <el-form-item label="故障分类" prop="faulttype"> | 86 | <el-form-item label="故障分类" prop="faulttype"> |
| 86 | - <el-input v-model="handleInfoForm.faulttype" :disabled="true"></el-input> | 87 | + <el-input :size="$global.elementConfig.size.input" v-model="handleInfoForm.faulttype" :disabled="true"></el-input> |
| 87 | </el-form-item> | 88 | </el-form-item> |
| 88 | </el-col> | 89 | </el-col> |
| 89 | <el-col :span="12"> | 90 | <el-col :span="12"> |
| 90 | <el-form-item label="发生时间" prop="createTime"> | 91 | <el-form-item label="发生时间" prop="createTime"> |
| 91 | - <el-input v-model="handleInfoForm.createTime" :disabled="true"></el-input> | 92 | + <el-input :size="$global.elementConfig.size.input" v-model="handleInfoForm.createTime" :disabled="true"></el-input> |
| 92 | </el-form-item> | 93 | </el-form-item> |
| 93 | </el-col> | 94 | </el-col> |
| 94 | </el-row> | 95 | </el-row> |
| @@ -96,12 +97,12 @@ | @@ -96,12 +97,12 @@ | ||
| 96 | <el-row :gutter="5"> | 97 | <el-row :gutter="5"> |
| 97 | <el-col :span="12"> | 98 | <el-col :span="12"> |
| 98 | <el-form-item label="当前状态" prop="faultState"> | 99 | <el-form-item label="当前状态" prop="faultState"> |
| 99 | - <el-input v-model="handleInfoForm.faultState" :disabled="true"></el-input> | 100 | + <el-input :size="$global.elementConfig.size.input" v-model="handleInfoForm.faultState" :disabled="true"></el-input> |
| 100 | </el-form-item> | 101 | </el-form-item> |
| 101 | </el-col> | 102 | </el-col> |
| 102 | <el-col :span="12"> | 103 | <el-col :span="12"> |
| 103 | <el-form-item label="持续时长" prop="duration"> | 104 | <el-form-item label="持续时长" prop="duration"> |
| 104 | - <el-input v-model="handleInfoForm.duration" :disabled="true"></el-input> | 105 | + <el-input :size="$global.elementConfig.size.input" v-model="handleInfoForm.duration" :disabled="true"></el-input> |
| 105 | </el-form-item> | 106 | </el-form-item> |
| 106 | </el-col> | 107 | </el-col> |
| 107 | </el-row> | 108 | </el-row> |
| @@ -109,12 +110,12 @@ | @@ -109,12 +110,12 @@ | ||
| 109 | <el-row :gutter="5"> | 110 | <el-row :gutter="5"> |
| 110 | <el-col :span="12"> | 111 | <el-col :span="12"> |
| 111 | <el-form-item label="故障主体" prop="faultBody"> | 112 | <el-form-item label="故障主体" prop="faultBody"> |
| 112 | - <el-input v-model="handleInfoForm.faultBody" :disabled="true"></el-input> | 113 | + <el-input :size="$global.elementConfig.size.input" v-model="handleInfoForm.faultBody" :disabled="true"></el-input> |
| 113 | </el-form-item> | 114 | </el-form-item> |
| 114 | </el-col> | 115 | </el-col> |
| 115 | <el-col :span="12"> | 116 | <el-col :span="12"> |
| 116 | <el-form-item label="影响范围" prop="influenceScope"> | 117 | <el-form-item label="影响范围" prop="influenceScope"> |
| 117 | - <el-input v-model="handleInfoForm.influenceScope" :disabled="true"></el-input> | 118 | + <el-input :size="$global.elementConfig.size.input" v-model="handleInfoForm.influenceScope" :disabled="true"></el-input> |
| 118 | </el-form-item> | 119 | </el-form-item> |
| 119 | </el-col> | 120 | </el-col> |
| 120 | </el-row> | 121 | </el-row> |
| @@ -122,7 +123,7 @@ | @@ -122,7 +123,7 @@ | ||
| 122 | <el-row :gutter="5"> | 123 | <el-row :gutter="5"> |
| 123 | <el-col :span="24"> | 124 | <el-col :span="24"> |
| 124 | <el-form-item label="标签" prop="label"> | 125 | <el-form-item label="标签" prop="label"> |
| 125 | - <el-input v-model="handleInfoForm.label" placeholder="多个标签#分割"></el-input> | 126 | + <el-input :size="$global.elementConfig.size.input" v-model="handleInfoForm.label" placeholder="多个标签#分割"></el-input> |
| 126 | </el-form-item> | 127 | </el-form-item> |
| 127 | </el-col> | 128 | </el-col> |
| 128 | </el-row> | 129 | </el-row> |
| @@ -131,7 +132,7 @@ | @@ -131,7 +132,7 @@ | ||
| 131 | <el-row :gutter="5"> | 132 | <el-row :gutter="5"> |
| 132 | <el-col :span="24"> | 133 | <el-col :span="24"> |
| 133 | <el-form-item label="处理方案" prop="solution"> | 134 | <el-form-item label="处理方案" prop="solution"> |
| 134 | - <el-input v-model="handleInfoForm.solution" type="textarea"></el-input> | 135 | + <el-input :size="$global.elementConfig.size.input" v-model="handleInfoForm.solution" type="textarea"></el-input> |
| 135 | </el-form-item> | 136 | </el-form-item> |
| 136 | </el-col> | 137 | </el-col> |
| 137 | </el-row> | 138 | </el-row> |
| @@ -145,8 +146,8 @@ | @@ -145,8 +146,8 @@ | ||
| 145 | </el-row> | 146 | </el-row> |
| 146 | 147 | ||
| 147 | <el-form-item> | 148 | <el-form-item> |
| 148 | - <el-button @click="showHandleInfoDialog(false)">取消</el-button> | ||
| 149 | - <el-button v-if="handleInfoForm.solveTime == null || handleInfoForm.solveTime == ''" type="primary" @click="saveHandleInfo('handleForm',getPage)">保存</el-button> | 149 | + <el-button :size="$global.elementConfig.size.button" @click="showHandleInfoDialog(false)">取消</el-button> |
| 150 | + <el-button :size="$global.elementConfig.size.button" v-if="handleInfoForm.solveTime == null || handleInfoForm.solveTime == ''" type="primary" @click="saveHandleInfo('handleForm',getPage)">保存</el-button> | ||
| 150 | </el-form-item> | 151 | </el-form-item> |
| 151 | </el-form> | 152 | </el-form> |
| 152 | </template> | 153 | </template> |
| @@ -14,26 +14,26 @@ | @@ -14,26 +14,26 @@ | ||
| 14 | ></el-switch> | 14 | ></el-switch> |
| 15 | </el-form-item> | 15 | </el-form-item> |
| 16 | <el-form-item label="项目名称" prop="alias"> | 16 | <el-form-item label="项目名称" prop="alias"> |
| 17 | - <el-input v-model="form.alias" :disabled="form.isOps == 0" clearable></el-input> | 17 | + <el-input :size="$global.elementConfig.size.input" v-model="form.alias" :disabled="form.isOps == 0" clearable></el-input> |
| 18 | </el-form-item> | 18 | </el-form-item> |
| 19 | <el-form-item label="项目编号" prop="code" > | 19 | <el-form-item label="项目编号" prop="code" > |
| 20 | - <el-input v-model="form.code" :disabled="form.isOps == 0" clearable></el-input> | 20 | + <el-input :size="$global.elementConfig.size.input" v-model="form.code" :disabled="form.isOps == 0" clearable></el-input> |
| 21 | </el-form-item> | 21 | </el-form-item> |
| 22 | <el-form-item label="项目负责人" prop="principalName"> | 22 | <el-form-item label="项目负责人" prop="principalName"> |
| 23 | <div style="display: flex"> | 23 | <div style="display: flex"> |
| 24 | - <el-input v-model="form.principalName" :disabled="form.isOps == 0" readonly="true" clearable></el-input> | ||
| 25 | - <el-button style="margin-left: 5px" @click="showUserDialog(true)" :disabled="form.isOps == 0" >选择</el-button> | 24 | + <el-input :size="$global.elementConfig.size.input" v-model="form.principalName" :disabled="form.isOps == 0" readonly="true" clearable></el-input> |
| 25 | + <el-button :size="$global.elementConfig.size.button" style="margin-left: 5px" @click="showUserDialog(true)" :disabled="form.isOps == 0" >选择</el-button> | ||
| 26 | </div> | 26 | </div> |
| 27 | </el-form-item> | 27 | </el-form-item> |
| 28 | <el-form-item label="排序" prop="sort"> | 28 | <el-form-item label="排序" prop="sort"> |
| 29 | - <el-input type="number" v-model="form.sort" :disabled="form.isOps == 0" clearable></el-input> | 29 | + <el-input :size="$global.elementConfig.size.input" type="number" v-model="form.sort" :disabled="form.isOps == 0" clearable></el-input> |
| 30 | </el-form-item> | 30 | </el-form-item> |
| 31 | 31 | ||
| 32 | <el-form-item label="描述" prop="remark"> | 32 | <el-form-item label="描述" prop="remark"> |
| 33 | - <el-input v-model="form.remark" type="textarea" :disabled="form.isOps == 0" clearable></el-input> | 33 | + <el-input :size="$global.elementConfig.size.input" v-model="form.remark" type="textarea" :disabled="form.isOps == 0" clearable></el-input> |
| 34 | </el-form-item> | 34 | </el-form-item> |
| 35 | <el-form-item> | 35 | <el-form-item> |
| 36 | - <el-button type="primary" size="small" @click="onSubmit('ruleForm')">保存配置</el-button> | 36 | + <el-button :size="$global.elementConfig.size.button" type="primary" @click="onSubmit('ruleForm')">保存配置</el-button> |
| 37 | </el-form-item> | 37 | </el-form-item> |
| 38 | </el-form> | 38 | </el-form> |
| 39 | 39 |
-
Please register or login to post a comment