Browse Source

【pc优化】-张晓宁

master
FightingN 6 years ago
parent
commit
4ad3215874
  1. 6
      src/views/modules/custom/gridoperatorinfo.vue
  2. 33
      src/views/modules/master/master-user.vue
  3. 8
      src/views/modules/news/notice.vue
  4. 5
      src/views/modules/sys/role-add-or-update.vue
  5. 4
      src/views/modules/sys/role.vue

6
src/views/modules/custom/gridoperatorinfo.vue

@ -5,7 +5,7 @@
<el-form :inline="true"
:model="dataForm"
@keyup.enter.native="getDataListSearch()">
<el-form-item label="区域">
<el-form-item label="所属网格">
<el-cascader v-model="ids"
:options="options"
:props="{ checkStrictly: true }"
@ -14,11 +14,11 @@
</el-cascader>
</el-form-item>
<el-form-item>
<el-button type="primary" @click="getDataListSearch()">{{ $t('query') }}</el-button>
<el-button type="success" @click="getDataListSearch()">{{ $t('query') }}</el-button>
</el-form-item>
<el-form-item>
<el-button v-if="$hasPermission('custom:gridoperatorinfo:save')"
type="success"
type="primary"
@click="addOrUpdateHandle()">{{ $t('add') }}</el-button>
</el-form-item>
<el-form-item>

33
src/views/modules/master/master-user.vue

@ -7,7 +7,7 @@
height="90%">
<el-card shadow="never" class="aui-card--fill">
<div class="mod-sys__user">
<el-form :inline="true" :model="dataForm" @keyup.enter.native="getDataList()">
<el-form :inline="true" :model="dataForm" @keyup.enter.native="getDataListSearch()">
<el-form-item label="用户名">
<el-input v-model="dataForm.username" :placeholder="$t('user.username')" clearable maxlength="10" @keyup.native="btKeyUpUserName"></el-input>
</el-form-item>
@ -21,17 +21,24 @@
<el-input v-model="dataForm.mobile" placeholder="手机号" clearable maxlength="11" @keyup.native="btKeyUpMobile"></el-input>
</el-form-item>
<el-form-item>
<el-button @click="getDataListOverWrite()">{{ $t('query') }}</el-button>
<el-button @click="getDataListOverWrite()" type="success">{{ $t('query') }}</el-button>
</el-form-item>
</el-form>
<el-table v-loading="dataListLoading" :data="dataList" max-height="450" style="width: 100%;" @selection-change="handleSelectionChange">
<el-table-column type="selection" header-align="center" align="center" width="50"></el-table-column>
<el-table-column prop="username" :label="$t('user.username')" sortable="custom" header-align="center" align="center"></el-table-column>
<el-table-column
type="index"
header-align="center"
align="center"
width="50"
label='序号'
></el-table-column>
<el-table-column prop="username" :label="$t('user.username')" sortable="custom" header-align="center" align="center" width="100"></el-table-column>
<el-table-column prop="realName" :label="$t('user.realName')" header-align="center" align="center"></el-table-column>
<el-table-column prop="deptName" :label="$t('user.deptName')" header-align="center" align="center"></el-table-column>
<el-table-column prop="email" :label="$t('user.email')" header-align="center" align="center"></el-table-column>
<el-table-column prop="mobile" :label="$t('user.mobile')" sortable="custom" header-align="center" align="center"></el-table-column>
<el-table-column prop="status" :label="$t('user.status')" sortable="custom" header-align="center" align="center">
<el-table-column prop="deptName" :label="$t('user.deptName')" header-align="center" align="center" min-width="120"></el-table-column>
<el-table-column prop="email" :label="$t('user.email')" header-align="center" align="center" width="200"></el-table-column>
<el-table-column prop="mobile" :label="$t('user.mobile')" sortable="custom" header-align="center" align="center" width="120"></el-table-column>
<el-table-column prop="status" :label="$t('user.status')" sortable="custom" header-align="center" align="center" width="180">
<template slot-scope="scope">
<el-tag v-if="scope.row.status === 0" size="small" type="danger">{{ $t('user.status0') }}</el-tag>
<el-tag v-else size="small" type="success">{{ $t('user.status1') }}</el-tag>
@ -49,7 +56,7 @@
@current-change="pageCurrentChangeHandle">
</el-pagination>
<el-form>
<el-button type="primary" @click="getInfo()" style="margin-left:48%">{{"确定"}}</el-button>
<el-button type="primary" @click="getInfo()" style="margin-left:48%" class="end">{{"确定"}}</el-button>
</el-form>
</div>
</el-card>
@ -124,3 +131,13 @@ export default {
}
}
</script>
<style scoped lang='scss'>
.el-form{
.end{
margin-top: 10px;
}
}
.el-button--success{
margin-top: 0px!important;
}
</style>

8
src/views/modules/news/notice.vue

@ -13,18 +13,18 @@
</el-form-item>
</el-form-item>
<el-form-item>
<el-button type="primary" @click="getDataListSearch()">{{ $t('query') }}</el-button>
<el-button type="success" @click="getDataListSearch()">{{ $t('query') }}</el-button>
</el-form-item>
<el-form-item>
<el-button v-if="$hasPermission('news:notice:save')"
type="success"
type="primary"
@click="addOrUpdateHandle()">{{ $t('add') }}</el-button>
</el-form-item>
<el-form-item>
<!-- <el-form-item>
<el-button v-if="$hasPermission('news:notice:delete')"
type="danger"
@click="deleteHandle()">{{ $t('deleteBatch') }}</el-button>
</el-form-item>
</el-form-item> -->
</el-form>
<el-table v-loading="dataListLoading"
:data="dataList"

5
src/views/modules/sys/role-add-or-update.vue

@ -240,3 +240,8 @@ export default {
}
}
</script>
<style scoped>
.el-dialog__wrapper /deep/ .el-dialog__footer {
text-align: center!important;
}
</style>

4
src/views/modules/sys/role.vue

@ -18,11 +18,11 @@
@keyup.native="btKeyUpCompleteMatchName"></el-input>
</el-form-item>
<el-form-item>
<el-button @click="getDataListSearch()" type='primary'>{{ $t('query') }}</el-button>
<el-button @click="getDataListSearch()" type='success'>{{ $t('query') }}</el-button>
</el-form-item>
<el-form-item>
<el-button v-if="$hasPermission('sys:role:save')"
type="success"
type="primary"
@click="addOrUpdateHandle()">{{ $t('add') }}</el-button>
</el-form-item>
<el-form-item>

Loading…
Cancel
Save