diff --git a/.eslintrc.js b/.eslintrc.js index de7f19773..ad4b39c24 100644 --- a/.eslintrc.js +++ b/.eslintrc.js @@ -9,16 +9,11 @@ module.exports = { node: true, es6: true }, - extends: ['plugin:vue/recommended', 'eslint:recommended', 'plugin:vue-i18n/recommended'], + extends: ['plugin:vue/recommended', 'eslint:recommended'], globals: { window: true, _: true }, - settings: { - 'vue-i18n': { - localeDir: './src/i18n/langs/*.json' // extention is glob formatting! - } - }, // add your custom rules here // it is base on https://github.com/vuejs/eslint-config-vue rules: { diff --git a/src/components/AssetSelect/index.vue b/src/components/AssetSelect/index.vue index 89a09dca7..e5fa20c5d 100644 --- a/src/components/AssetSelect/index.vue +++ b/src/components/AssetSelect/index.vue @@ -1,6 +1,6 @@ <template> <div> - <el-select ref="select" v-model="internalValue" @focus="handleFocus" multiple placeholder="请选择资产" /> + <el-select ref="select" v-model="internalValue" multiple placeholder="请选择资产" @focus="handleFocus" /> <el-dialog :title="this.$t('Assets')" :visible.sync="dialogVisible" @@ -15,7 +15,7 @@ /> <span slot="footer" class="dialog-footer"> <el-button @click="dialogVisible = false">取 消</el-button> - <el-button @click="handleConfirm" type="primary">确 定</el-button> + <el-button type="primary" @click="handleConfirm">确 定</el-button> </span> </el-dialog> </div> diff --git a/src/views/tickets/TicketDetail/TicketDetail.vue b/src/views/tickets/TicketDetail/TicketDetail.vue index d942892b3..e8dfeea75 100644 --- a/src/views/tickets/TicketDetail/TicketDetail.vue +++ b/src/views/tickets/TicketDetail/TicketDetail.vue @@ -38,11 +38,11 @@ </el-form-item> <el-form-item style="float: right"> <template v-if="hasActionPerm"> - <el-button :disabled="object.status === 'closed'" @click="handleApprove" type="primary" size="small"><i class="fa fa-check" />{{ $t('tickets.Accept') }}</el-button> - <el-button :disabled="object.status === 'closed'" @click="handleReject" type="warning" size="small"><i class="fa fa-ban" />{{ $t('tickets.Reject') }}</el-button> + <el-button :disabled="object.status === 'closed'" type="primary" size="small" @click="handleApprove"><i class="fa fa-check" />{{ $t('tickets.Accept') }}</el-button> + <el-button :disabled="object.status === 'closed'" type="warning" size="small" @click="handleReject"><i class="fa fa-ban" />{{ $t('tickets.Reject') }}</el-button> </template> - <el-button :disabled="object.status === 'closed'" @click="handleClosed" type="danger" size="small"><i class="fa fa-times" />{{ $t('tickets.Close') }}</el-button> - <el-button :disabled="object.status === 'closed'" @click="handleComment" type="info" size="small"><i class="fa fa-pencil" />{{ $t('tickets.Comment') }}</el-button> + <el-button :disabled="object.status === 'closed'" type="danger" size="small" @click="handleClosed"><i class="fa fa-times" />{{ $t('tickets.Close') }}</el-button> + <el-button :disabled="object.status === 'closed'" type="info" size="small" @click="handleComment"><i class="fa fa-pencil" />{{ $t('tickets.Comment') }}</el-button> </el-form-item> </el-form> </div> diff --git a/src/views/tickets/TicketDetail/index.vue b/src/views/tickets/TicketDetail/index.vue index 080d09725..94b8724e7 100644 --- a/src/views/tickets/TicketDetail/index.vue +++ b/src/views/tickets/TicketDetail/index.vue @@ -1,6 +1,6 @@ <template> <GenericDetailPage :object.sync="ticket" :active-menu.sync="config.activeMenu" v-bind="config" v-on="$listeners"> - <component v-bind:is="config.activeMenu" :object="ticket" /> + <component :is="config.activeMenu" :object="ticket" /> </GenericDetailPage> </template> diff --git a/src/views/users/groups/UserGroupDetail/index.vue b/src/views/users/groups/UserGroupDetail/index.vue index 4e6d638d5..bd2664787 100644 --- a/src/views/users/groups/UserGroupDetail/index.vue +++ b/src/views/users/groups/UserGroupDetail/index.vue @@ -1,7 +1,7 @@ <template> <GenericDetailPage :object.sync="group" :active-menu.sync="config.activeMenu" v-bind="config" v-on="$listeners"> <keep-alive> - <component v-bind:is="config.activeMenu" :object="group" /> + <component :is="config.activeMenu" :object="group" /> </keep-alive> </GenericDetailPage> </template> diff --git a/src/views/users/users/UserDetail/index.vue b/src/views/users/users/UserDetail/index.vue index 2aa233bfa..14185f081 100644 --- a/src/views/users/users/UserDetail/index.vue +++ b/src/views/users/users/UserDetail/index.vue @@ -1,7 +1,7 @@ <template> <GenericDetailPage :object.sync="user" :active-menu.sync="config.activeMenu" v-bind="config" v-on="$listeners"> <keep-alive> - <component v-bind:is="config.activeMenu" :object="user" /> + <component :is="config.activeMenu" :object="user" /> </keep-alive> </GenericDetailPage> </template>