Merge branch 'codeCheck' of https://git.mesalab.cn/nezha/nezha-fronted into codeCheck

This commit is contained in:
zhangyu
2020-09-24 14:14:33 +08:00
6 changed files with 9 additions and 5 deletions

View File

@@ -53,6 +53,7 @@
:cell-class-name="messageStyle"
style="width: 100%;"
@sort-change="tableDataSort"
@row-dblclick="detail"
>
<el-table-column
:resizable="false"

View File

@@ -43,6 +43,7 @@
ref="assetTable"
:cell-class-name="messageStyle"
@sort-change="tableDataSort"
@row-dblclick="detail"
>
<el-table-column
:resizable="false"

View File

@@ -55,8 +55,8 @@
>
<template slot-scope="scope" :column="item">
<div v-if="item.prop == 'option'" class="content-right-options">
<span :title="$t('overall.view')" @click="detail(scope.row)" class="content-right-option" :id="'account-detail-'+scope.row.id"><i class="nz-icon nz-icon-view"></i></span>
&nbsp;
<!--<span :title="$t('overall.view')" @click="detail(scope.row)" class="content-right-option" :id="'account-detail-'+scope.row.id"><i class="nz-icon nz-icon-view"></i></span>
&nbsp;-->
<span :title="$t('overall.edit')" @click="edit(scope.row)" class="content-right-option" :id="'account-edit-'+scope.row.id"><i class="nz-icon nz-icon-edit"></i></span>
&nbsp;
<span :title="$t('overall.delete')" @click="del(scope.row)" class="content-right-option" :id="'account-del-'+scope.row.id"><i class="nz-icon nz-icon-delete"></i></span>

View File

@@ -39,6 +39,7 @@
v-show="bottomBox.mainResizeShow"
:height="mainTableHeight"
@sort-change="tableDataSort"
@row-dblclick="panel"
>
<el-table-column :resizable="false"
v-for="(item, index) in tools.customTableTitle"
@@ -128,7 +129,7 @@
tableId: 'modelTable', //需要分页的table的id用于记录每页数量
rightBox: {show: false},
model: {},
blankModel: {
id: '',

View File

@@ -56,8 +56,8 @@
</el-popover>
</span>
<div v-else-if="item.prop == 'option'" class="content-right-options">
<span :title="$t('overall.view')" @click="detail(scope.row)" class="content-right-option" :id="'prom-detail-'+scope.row.id"><i class="nz-icon nz-icon-view"></i></span>
&nbsp;
<!--<span :title="$t('overall.view')" @click="detail(scope.row)" class="content-right-option" :id="'prom-detail-'+scope.row.id"><i class="nz-icon nz-icon-view"></i></span>
&nbsp;-->
<span :title="$t('overall.edit')" @click="edit(scope.row)" class="content-right-option" :id="'prom-edit-'+scope.row.id"><i class="nz-icon nz-icon-edit"></i></span>
&nbsp;
<span :title="$t('overall.delete')" @click="del(scope.row)" class="content-right-option" :id="'prom-del-'+scope.row.id"><i class="nz-icon nz-icon-delete"></i></span>

View File

@@ -64,6 +64,7 @@
v-loading="tools.loading"
style="width: 100%;"
@sort-change="tableDataSort"
@row-dblclick="detailEndpoint"
>
<el-table-column
:resizable="false"