fix: 修复bug、优化
1.add asset时,model添加没反应的问题 2.更改了alert rule里三个框的高度,增加长度限制 3.修复dc弹框电话校验问题
This commit is contained in:
@@ -43,7 +43,7 @@
|
|||||||
<template v-for="(item, index) in projectData">
|
<template v-for="(item, index) in projectData">
|
||||||
<el-menu-item :index="'2-' + index">
|
<el-menu-item :index="'2-' + index">
|
||||||
<div @click="jumpToProject(item)" :class="{'menu-item-active' :(activeIndex == 'project' && activeItemIndex == item.id)}">
|
<div @click="jumpToProject(item)" :class="{'menu-item-active' :(activeIndex == 'project' && activeItemIndex == item.id)}">
|
||||||
<span>{{item.name}}</span>
|
<span class="too-long-split" style="width: 135px;">{{item.name}}</span>
|
||||||
<div @click.stop="toEditProject(item)" class="menu-edit"><i style="color: inherit" class="nz-icon nz-icon-edit"></i></div>
|
<div @click.stop="toEditProject(item)" class="menu-edit"><i style="color: inherit" class="nz-icon nz-icon-edit"></i></div>
|
||||||
</div>
|
</div>
|
||||||
</el-menu-item>
|
</el-menu-item>
|
||||||
@@ -56,7 +56,7 @@
|
|||||||
<template v-for="(item, index) in assetData">
|
<template v-for="(item, index) in assetData">
|
||||||
<el-menu-item :index="'3-' + index">
|
<el-menu-item :index="'3-' + index">
|
||||||
<div @click="jumpToAsset(item.id)" :class="{'menu-item-active' : (activeIndex == 'asset' && indOf(activeItemIndexes, item.id) > -1) }">
|
<div @click="jumpToAsset(item.id)" :class="{'menu-item-active' : (activeIndex == 'asset' && indOf(activeItemIndexes, item.id) > -1) }">
|
||||||
<span>{{item.name}}</span>
|
<span class="too-long-split" style="width: 130px;">{{item.name}}</span>
|
||||||
<idc-config-box :post-idc="item" ref="idcConfigBox" placement="left" @after="getIDCOptionData" :button-class="'menu-edit'">
|
<idc-config-box :post-idc="item" ref="idcConfigBox" placement="left" @after="getIDCOptionData" :button-class="'menu-edit'">
|
||||||
<template v-slot:optionZone>
|
<template v-slot:optionZone>
|
||||||
<div @click="closeAllPop" class="menu-edit">
|
<div @click="closeAllPop" class="menu-edit">
|
||||||
|
|||||||
@@ -14,7 +14,9 @@ export function host(rule, value, callback) {
|
|||||||
export function phone(rule, value, callback) {
|
export function phone(rule, value, callback) {
|
||||||
const phoneReg = /^1[3|4|5|7|8][0-9]{9}$/
|
const phoneReg = /^1[3|4|5|7|8][0-9]{9}$/
|
||||||
setTimeout(() => {
|
setTimeout(() => {
|
||||||
if (!Number.isInteger(+value)) {
|
if (!value) {
|
||||||
|
callback()
|
||||||
|
} else if (!Number.isInteger(+value)) {
|
||||||
callback(new Error(vm.$t('validate.tel')))
|
callback(new Error(vm.$t('validate.tel')))
|
||||||
} else {
|
} else {
|
||||||
if (phoneReg.test(value)) {
|
if (phoneReg.test(value)) {
|
||||||
|
|||||||
@@ -11,10 +11,6 @@
|
|||||||
<span class="right-box-top-btn-icon"><i class="nz-icon nz-icon-edit"></i></span>
|
<span class="right-box-top-btn-icon"><i class="nz-icon nz-icon-edit"></i></span>
|
||||||
<span class="right-box-top-btn-txt">{{$t('overall.edit')}}</span>
|
<span class="right-box-top-btn-txt">{{$t('overall.edit')}}</span>
|
||||||
</button>
|
</button>
|
||||||
|
|
||||||
<!--<button type="button" @click="esc" class="nz-btn nz-btn-size-normal nz-btn-style-light nz-btn-style-square" id="alert-box-esc">
|
|
||||||
<span class="top-tool-btn-txt"><i class="el-icon-close"></i></span>
|
|
||||||
</button>-->
|
|
||||||
</div>
|
</div>
|
||||||
|
|
||||||
<!-- end--顶部按钮-->
|
<!-- end--顶部按钮-->
|
||||||
@@ -47,7 +43,7 @@
|
|||||||
</el-form-item>
|
</el-form-item>
|
||||||
<!--expr-->
|
<!--expr-->
|
||||||
<el-form-item :label="$t('alert.config.expr')" prop="expr">
|
<el-form-item :label="$t('alert.config.expr')" prop="expr">
|
||||||
<el-input v-if="rightBox.isEdit" type="textarea" placeholder="" v-model="alertRule.expr" size="small"></el-input>
|
<el-input maxlength="512" rows="4" show-word-limit v-if="rightBox.isEdit" type="textarea" placeholder="" v-model="alertRule.expr" size="small"></el-input>
|
||||||
<div v-if="!rightBox.isEdit" class="right-box-form-content-txt">{{alertRule.expr}}</div>
|
<div v-if="!rightBox.isEdit" class="right-box-form-content-txt">{{alertRule.expr}}</div>
|
||||||
</el-form-item>
|
</el-form-item>
|
||||||
<!--last-->
|
<!--last-->
|
||||||
@@ -71,12 +67,12 @@
|
|||||||
</el-form-item>
|
</el-form-item>
|
||||||
<!--summary-->
|
<!--summary-->
|
||||||
<el-form-item :label="$t('alert.summary')" prop="summary">
|
<el-form-item :label="$t('alert.summary')" prop="summary">
|
||||||
<el-input v-if="rightBox.isEdit" type="text" placeholder="" v-model="alertRule.summary" size="small"></el-input>
|
<el-input maxlength="512" rows="3" type="textarea" show-word-limit v-if="rightBox.isEdit" placeholder="" v-model="alertRule.summary" size="small"></el-input>
|
||||||
<div v-if="!rightBox.isEdit" class="right-box-form-content-txt">{{alertRule.summary}}</div>
|
<div v-if="!rightBox.isEdit" class="right-box-form-content-txt">{{alertRule.summary}}</div>
|
||||||
</el-form-item>
|
</el-form-item>
|
||||||
<!--description-->
|
<!--description-->
|
||||||
<el-form-item :label="$t('alert.description')" prop="description">
|
<el-form-item :label="$t('alert.description')" prop="description">
|
||||||
<el-input v-if="rightBox.isEdit" type="textarea" placeholder="" v-model="alertRule.description" size="small"></el-input>
|
<el-input maxlength="512" rows="4" show-word-limit v-if="rightBox.isEdit" type="textarea" placeholder="" v-model="alertRule.description" size="small"></el-input>
|
||||||
<div v-if="!rightBox.isEdit" class="right-box-form-content-txt">{{alertRule.description}}</div>
|
<div v-if="!rightBox.isEdit" class="right-box-form-content-txt">{{alertRule.description}}</div>
|
||||||
</el-form-item>
|
</el-form-item>
|
||||||
<!--receiver-->
|
<!--receiver-->
|
||||||
|
|||||||
@@ -61,8 +61,8 @@
|
|||||||
</button>
|
</button>
|
||||||
</div>
|
</div>
|
||||||
</template>
|
</template>
|
||||||
<div class="param-box param-box-module">
|
<div v-if="rightBox.isEdit" class="param-box param-box-module">
|
||||||
<div class="param-box-row" v-for="(item, index) in module.paramObj" v-if="rightBox.isEdit">
|
<div class="param-box-row" v-for="(item, index) in module.paramObj">
|
||||||
<el-form-item class="param-box-row-key" :rules="{required: true, message: $t('validate.required'), trigger: 'blur'}" :prop="'paramObj.' + index + '.key'">
|
<el-form-item class="param-box-row-key" :rules="{required: true, message: $t('validate.required'), trigger: 'blur'}" :prop="'paramObj.' + index + '.key'">
|
||||||
<el-input placeholder="key" size="mini" v-model="item.key"></el-input>
|
<el-input placeholder="key" size="mini" v-model="item.key"></el-input>
|
||||||
</el-form-item>
|
</el-form-item>
|
||||||
@@ -72,9 +72,9 @@
|
|||||||
</el-form-item>
|
</el-form-item>
|
||||||
<span class="param-box-row-symbol" :id="'moduel-remove-param-'+index" @click="removeParam(index)"><i class="nz-icon nz-icon-minus-square"></i></span>
|
<span class="param-box-row-symbol" :id="'moduel-remove-param-'+index" @click="removeParam(index)"><i class="nz-icon nz-icon-minus-square"></i></span>
|
||||||
</div>
|
</div>
|
||||||
<div class="param-box-row" v-for="(item, index) in module.paramObj" v-if="!rightBox.isEdit">
|
|
||||||
<div class="right-box-form-content-txt">{{item.key}}={{item.value}}</div>
|
|
||||||
</div>
|
</div>
|
||||||
|
<div v-for="(item, index) in module.paramObj" v-if="!rightBox.isEdit">
|
||||||
|
<div class="right-box-form-content-txt">{{item.key}}={{item.value}}</div>
|
||||||
</div>
|
</div>
|
||||||
|
|
||||||
</el-form-item>
|
</el-form-item>
|
||||||
|
|||||||
@@ -11,9 +11,10 @@
|
|||||||
<el-checkbox class="sidebar-info-item" :class="{'sidebar-info-item-active': indOf(checkList, item.id)}"
|
<el-checkbox class="sidebar-info-item" :class="{'sidebar-info-item-active': indOf(checkList, item.id)}"
|
||||||
v-for="(item,key) in checkListData" :key="key" :label=item.id>
|
v-for="(item,key) in checkListData" :key="key" :label=item.id>
|
||||||
<div class="sidebar-info-item-txt">
|
<div class="sidebar-info-item-txt">
|
||||||
<el-popover trigger="hover" placement="right-end" :content="item.name" >
|
<el-popover v-if="item.name.length > 12" trigger="hover" placement="top-start" :content="item.name" >
|
||||||
<span slot="reference">{{item.name}}</span>
|
<span slot="reference">{{item.name}}</span>
|
||||||
</el-popover>
|
</el-popover>
|
||||||
|
<span v-else>{{item.name}}</span>
|
||||||
</div>
|
</div>
|
||||||
|
|
||||||
<idc-config-box ref="idcConfigBox" :post-idc="item" placement="left" @after="getIDCOptionData" :button-class="'checkbox-edit'">
|
<idc-config-box ref="idcConfigBox" :post-idc="item" placement="left" @after="getIDCOptionData" :button-class="'checkbox-edit'">
|
||||||
|
|||||||
@@ -137,7 +137,6 @@
|
|||||||
trigger="click"
|
trigger="click"
|
||||||
width="370"
|
width="370"
|
||||||
v-model="popCompVisible"
|
v-model="popCompVisible"
|
||||||
:disabled=popState
|
|
||||||
v-clickoutside="clickOutSide"
|
v-clickoutside="clickOutSide"
|
||||||
@hide="resetVendor"
|
@hide="resetVendor"
|
||||||
popper-class="nz-pop2"
|
popper-class="nz-pop2"
|
||||||
@@ -243,7 +242,7 @@
|
|||||||
</el-popover>
|
</el-popover>
|
||||||
</div>
|
</div>
|
||||||
</el-form-item>
|
</el-form-item>
|
||||||
<el-form-item :label="this.$t('asset.createAssetTab.purchaseDate')" class="right-box-form-content">
|
<el-form-item :label="$t('asset.createAssetTab.purchaseDate')" class="right-box-form-content">
|
||||||
<el-date-picker
|
<el-date-picker
|
||||||
size="mini"
|
size="mini"
|
||||||
v-model="assetData.purchaseDate"
|
v-model="assetData.purchaseDate"
|
||||||
@@ -256,7 +255,7 @@
|
|||||||
<div class="asset-sub-title">{{$t('asset.createAssetTab.dc')}}</div>
|
<div class="asset-sub-title">{{$t('asset.createAssetTab.dc')}}</div>
|
||||||
<div class="line-100 asset-line"></div>
|
<div class="line-100 asset-line"></div>
|
||||||
<!------------------------------------------IDC---------------------------------------------->
|
<!------------------------------------------IDC---------------------------------------------->
|
||||||
<el-form-item :label="this.$t('asset.createAssetTab.dcName')" class="right-box-form-content" prop="idcId">
|
<el-form-item :label="$t('asset.createAssetTab.dcName')" class="right-box-form-content" prop="idcId">
|
||||||
<el-select popper-class="asset-dropdown" size="mini" v-model="assetData.idcId" clearable @change="getSingleIDCData" class="right-box-row-with-btn" placeholder="">
|
<el-select popper-class="asset-dropdown" size="mini" v-model="assetData.idcId" clearable @change="getSingleIDCData" class="right-box-row-with-btn" placeholder="">
|
||||||
<el-option
|
<el-option
|
||||||
:id="'asset-add-idc-op'+item.key"
|
:id="'asset-add-idc-op'+item.key"
|
||||||
|
|||||||
@@ -11,9 +11,10 @@
|
|||||||
:id="'project-module-'+item.id"
|
:id="'project-module-'+item.id"
|
||||||
>
|
>
|
||||||
<div class="sidebar-info-item-txt">
|
<div class="sidebar-info-item-txt">
|
||||||
<el-popover trigger="hover" placement="right-end" :content="item.name" >
|
<el-popover v-if="item.name.length > 12" trigger="hover" placement="top-start" :content="item.name" >
|
||||||
<span slot="reference">{{item.name}}</span>
|
<span slot="reference">{{item.name}}</span>
|
||||||
</el-popover>
|
</el-popover>
|
||||||
|
<span v-else>{{item.name}}</span>
|
||||||
</div>
|
</div>
|
||||||
<div class="side-bar-menu-edit" @click.stop="toEditModule(item)" :id="'project-module-edit-'+item.id"><i class="nz-icon nz-icon-edit"></i></div>
|
<div class="side-bar-menu-edit" @click.stop="toEditModule(item)" :id="'project-module-edit-'+item.id"><i class="nz-icon nz-icon-edit"></i></div>
|
||||||
</div>
|
</div>
|
||||||
|
|||||||
Reference in New Issue
Block a user