Skip to content

C
confucius
Commit c7481cb2 authored by 罗超's avatar 罗超
Browse files
Options

优化部分功能

parent 094ba88a
Expand all Hide whitespace changes
Inline Side-by-side
Showing with 467 additions and 352 deletions
quasar.conf.js
View file @ c7481cb2
......@@ -130,7 +130,6 @@ module.exports = function(ctx) {
'QDate',
'QPopupProxy',
'QBanner',
'QScrollArea',
'QSeparator',
'QChip',
'QTab',
......
src/App.vue
View file @ c7481cb2
......@@ -12,7 +12,7 @@ export default {
<style>
@import url('~assets/css/font.css');
@import url('//at.alicdn.com/t/font_2077629_pdphpdntjxl.css');
@import url('//at.alicdn.com/t/font_2077629_om4uj5994af.css');
html,
body,
......@@ -116,5 +116,27 @@ button.bg-accent:active{
background: linear-gradient(270deg, #37ADF7, #2961FE) !important;
}
.q-avatar__content{
font-family: perfectFont !important;
font-size: 14px !important;
}
.left-menu-box .q-item.q-router-link--active,.left-menu-box .q-item--active{
background:var(--q-color-secondary) !important;
color:#f5f5f5 !important;
border-radius: 0px 4px 4px 0px !important;
margin:0 4px;
position: relative;
}
.left-menu-box .q-item.q-router-link--active::before{
position: absolute;
width: 7px;
height: 7px;
background: #FAFAFA;
border-radius: 50%;
top: calc(50% - 3.5px);
right: 20px;
display: block;
content: ' ';
}
/***************************************************** End 重写ElementUI 抽屉效果 ***************************************************************/
</style>
src/layouts/MainLayout.vue
View file @ c7481cb2
This diff is collapsed.
src/pages/school/manager.vue
View file @ c7481cb2
......@@ -11,32 +11,18 @@
option-value="value" option-label="label" label="校区状态" />
</div>
</div>
<div class="page-option">
<!-- 原则上不能操作过三个按钮，建议不要使用查询按钮，增加用户操作次数 -->
<!-- <q-btn color="primary" outline label="立即查询" /> -->
<q-btn color="accent" class="q-mr-md" icon="add" label="新增校区" @click="EditSchool(null)" />
<q-btn-dropdown outline color="dark" label="更多">
<q-list>
<q-item clickable v-close-popup @click="onItemClick">
<!-- <q-item-section side>
<q-icon name="style" />
</q-item-section> -->
<q-item-section>
<q-item-label>导出</q-item-label>
</q-item-section>
</q-item>
<q-item clickable v-close-popup @click="onItemClick">
<q-item-section>
<q-item-label>导入</q-item-label>
</q-item-section>
</q-item>
</q-list>
</q-btn-dropdown>
</div>
</div>
<div class="page-content">
<q-table :pagination="msg" :loading="loading" no-data-label="暂无相关数据" flat class="sticky-column-table"
separator="none" title="校区信息" :data="data" :columns="columns" row-key="name">
separator="none" :data="data" :columns="columns" row-key="name">
<template v-slot:top="props">
<div class="col-2 q-table__title">校区信息</div>
<q-space />
<div class="page-option">
<q-btn color="accent" size="sm" icon="add" label="新增校区" @click="EditSchool(null)" />
</div>
</template>
<template v-slot:body-cell-Status="props">
<q-td :props="props">
<q-badge :color="props.value==1?'negative':'primary'" :label="props.value==1?'关闭':'正常'" />
......@@ -89,20 +75,20 @@
format: val => `${val}`,
sortable: true
},
{
name: 'GroupName',
label: '所属机构',
field: 'GroupName',
align: 'left',
sortable: true
},
{
name: 'DeptName',
label: '所属部门',
field: 'DeptName',
align: 'left',
sortable: true
},
// {
// name: 'GroupName',
// label: '所属机构',
// field: 'GroupName',
// align: 'left',
// sortable: true
// },
// {
// name: 'DeptName',
// label: '所属部门',
// field: 'DeptName',
// align: 'left',
// sortable: true
// },
{
name: 'ManagerName',
label: '负责人',
......
src/pages/school/sysuser.vue
View file @ c7481cb2
......@@ -69,40 +69,38 @@
</q-field>
</div>
</div>
<div class="page-option">
<q-btn color="accent" class="q-mr-md" icon="add" label="新增员工" @click="EditManager(null)" />
<q-btn-dropdown outline color="dark" label="更多">
<q-list>
<q-item clickable v-close-popup @click="getType(1)">
<q-item-section>
<q-item-label>离职</q-item-label>
</q-item-section>
</q-item>
<q-item clickable v-close-popup @click="resetPassWord()">
<q-item-section>
<q-item-label>重置密码</q-item-label>
</q-item-section>
</q-item>
</q-list>
</q-btn-dropdown>
</div>
</div>
<div class="page-content">
<q-table :pagination="msg" :loading="loading" no-data-label="暂无相关数据" flat selection="multiple"
:selected.sync="selected" class="sticky-right-column-table sticky-tow-column-table" separator="none"
title="员工管理" :data="data" :columns="columns" row-key="Id">
<template v-slot:body-cell-UserIcon="props">
<q-td auto-width :props="props">
<q-avatar size="md" v-if="props.value">
<img :src="props.value" />
</q-avatar>
<q-avatar size="md" color="teal-10" text-color="white" v-if="!props.value">
{{GetFirst(props.row.EmployeeName)}}</q-avatar>
</q-td>
:selected.sync="selected" class="sticky-right-column-table sticky-column-table" separator="none"
:data="data" :columns="columns" row-key="Id">
<template v-slot:top="props">
<div class="col-2 q-table__title">员工管理</div>
<q-space />
<q-btn color="accent" class="q-mr-md" size="sm" icon="add" label="新增员工" @click="EditManager(null)" />
<q-btn-dropdown outline color="dark" size="sm" label="更多">
<q-list>
<q-item clickable v-close-popup @click="getType(1)">
<q-item-section>
<q-item-label>离职</q-item-label>
</q-item-section>
</q-item>
<q-item clickable v-close-popup @click="resetPassWord()">
<q-item-section>
<q-item-label>重置密码</q-item-label>
</q-item-section>
</q-item>
</q-list>
</q-btn-dropdown>
</template>
<template v-slot:body-cell-EmployeeName="props">
<q-td :props="props">
<div class="text-blue cursor-pointer">{{props.value}}</div>
<q-avatar rounded size="sm" v-if="props.row.UserIcon">
<img :src="props.row.UserIcon" />
</q-avatar>
<q-avatar rounded size="sm" color="teal-10" text-color="white" v-if="!props.row.UserIcon">
{{GetFirst(props.row.EmployeeName)}}</q-avatar>
<span class="text-blue cursor-pointer q-ml-sm">{{props.value}}</span>
</q-td>
</template>
<template v-slot:body-cell-StuSex="props">
......@@ -137,12 +135,12 @@
</template>
<template v-slot:body-cell-optioned="props">
<q-td :props="props">
<div style="min-width:190px;width:100%" class="syster_qDropdown">
<div class="syster_qDropdown">
<q-btn v-if="props.row.ManagerAccount==''" flat size="xs" icon="iconfont icon-ziyuan" color="warning"
style="font-weight:400" class="q-mr-xs" label="创建账号" @click="createAccount(props.row.MId)" />
<q-btn flat size="xs" icon="edit" color="accent" style="font-weight:400" label="编辑"
@click="EditManager(props.row)" />
<q-btn-dropdown outline color="dark" label="更多" style="margin-left:10px;">
<q-btn-dropdown flat size="sm" color="dark" label="更多" style="margin-left:10px;">
<q-list>
<q-item clickable v-close-popup @click="transFerJob(props.row,3)">
<q-item-section>
......@@ -206,12 +204,7 @@
required: true,
label: '',
align: 'left',
}, {
name: 'UserIcon',
label: '',
field: 'UserIcon',
align: 'left',
},
},
{
name: 'EmployeeName',
required: true,
......
src/pages/system/dept.vue
View file @ c7481cb2
<template>
<div class="page-body">
<div class="page-search row items-center">
<div class="col row wrap q-mr-lg q-col-gutter-md">
<div class="col-3">
<selectSearch classStr="col-12 q-pr-lg q-pb-lg" :Data='schoolList' optionValue="SId" optionLabel="SName"
<div class="col row wrap q-col-gutter-md">
<div class="col">
<selectSearch :Data='schoolList' optionValue="SId" optionLabel="SName"
:densetype="false" :vModel="msg.School_Id" label="校区" @returnData="returnData" :useInput="true"
:reactiveRules="false">
</selectSearch>
</div>
<div class="col-3">
<div class="col">
<q-input @change="resetSearch" clearable standout="bg-primary text-white" v-model="msg.DeptName"
label="部门名称" />
</div>
<div class="col-3">
<div class="col">
<q-select @input="resetSearch" filled stack-label option-value="value" option-label="label"
v-model="msg.DeptTier" ref="DeptTier" :options="DeptTierList" label="部门层级" :dense="false"
class="col-6 q-pr-lg q-pb-lg" emit-value map-options clearable @clear="resetSearch" />
emit-value map-options clearable @clear="resetSearch" />
</div>
<div class="col-3">
<div class="col">
<selectTree v-if="DeptTreeList&&DeptTreeList.length>0" :treeData='DeptTreeList' :defaultArray="returnString"
nodeKey="DeptId" :multiple="false" labelKey="DeptName" childrenKey="ChildList" tipText="选择上级部门"
@getChild="getChild" classStr="col-6 q-pr-lg q-pb-lg"></selectTree>
@getChild="getChild"></selectTree>
</div>
<div class="col-3">
<div class="col">
<q-select @input="resetSearch" standout="bg-primary text-white" v-model="msg.Status" :options="ShowOpts"
emit-value map-options label="状态" />
</div>
</div>
<div class="page-option">
<q-btn color="accent" class="q-mr-md" icon="add" label="新增部门" @click="EditDept(null)" />
<q-btn color="accent" class="q-mr-md" icon="add" label="组织机构图" @click="gotoRelation()" />
</div>
</div>
<div class="page-content">
<q-table :pagination="msg" :loading="loading" no-data-label="暂无相关数据" flat class="sticky-tow-column-table"
separator="none" title="部门信息" :data="data" :columns="columns" row-key="name">
separator="none" :data="data" :columns="columns" row-key="name">
<template v-slot:top="props">
<div class="col-2 q-table__title">部门信息</div>
<q-space />
<div class="page-option">
<q-btn color="accent" size="sm" class="q-mr-md" icon="add" label="新增部门" @click="EditDept(null)" />
<q-btn color="secondary" flat size="sm" icon="iconfont icon-zuzhijiagou" label="组织机构图" @click="gotoRelation()" />
</div>
</template>
<template v-slot:body-cell-Status="props">
<q-td :props="props">
<q-toggle size="md" color="primary" :false-value="1" :true-value="0" v-model="props.row.Status"
<q-toggle size="sm" color="secondary" :false-value="1" :true-value="0" v-model="props.row.Status"
title="注意：关闭后，分类将无法正常使用." @input="SetDeptStatus(props.row)" />
</q-td>
</template>
......@@ -97,7 +101,7 @@
},
{
name: 'School_Id',
label: '是否为公司',
label: '所属校区',
field: 'School_Id',
align: 'left'
},
......
src/pages/system/post.vue
View file @ c7481cb2
......@@ -11,16 +11,21 @@
emit-value map-options label="状态" />
</div>
</div>
<div class="page-option">
<q-btn color="accent" class="q-mr-md" icon="add" label="新增岗位" @click="EditPost(null)" />
</div>
</div>
<div class="page-content">
<q-table :pagination="msg" :loading="loading" no-data-label="暂无相关数据" flat class="sticky-tow-column-table"
separator="none" title="岗位信息" :data="data" :columns="columns" row-key="name">
<template v-slot:top="props">
<div class="col-2 q-table__title">部门信息</div>
<q-space />
<div class="page-option">
<q-btn color="accent" size="sm" icon="add" label="新增岗位" @click="EditPost(null)" />
</div>
</template>
<template v-slot:body-cell-Status="props">
<q-td :props="props">
<q-toggle size="md" color="primary" :false-value="1" :true-value="0" v-model="props.row.Status"
<q-toggle size="sm" color="secondary" :false-value="1" :true-value="0" v-model="props.row.Status"
title="注意：关闭后，分类将无法正常使用." @input="SetPostStatus(props.row)" />
</q-td>
</template>
......
src/pages/system/role.vue
View file @ c7481cb2
......@@ -11,18 +11,24 @@
emit-value map-options label="状态" />
</div>
</div>
<div class="page-option">
<q-btn color="accent" class="q-mr-md" icon="add" label="新增角色" @click="EditRole(null)" />
</div>
</div>
<div class="page-content">
<q-table :pagination="msg" :loading="loading" no-data-label="暂无相关数据" flat class="sticky-tow-column-table"
separator="none" title="角色信息" :data="data" :columns="columns" row-key="name">
<template v-slot:top="props">
<div class="col-2 q-table__title">角色信息</div>
<q-space />
<div class="page-option">
<q-btn color="accent" size="sm" icon="add" label="新增角色" @click="EditRole(null)" />
</div>
</template>
<template v-slot:body-cell-Status="props">
<q-td :props="props">
<q-toggle size="md" color="primary" :false-value="1" :true-value="0" v-model="props.row.Status"
title="注意：关闭后，分类将无法正常使用." @input="DeleteRole(props.row)" />
</q-td>
</template>
<template v-slot:bottom>
<q-pagination class="full-width justify-end" v-model="msg.pageIndex" color="primary" :max="pageCount"
......
src/pages/user/login.vue
View file @ c7481cb2
......@@ -115,6 +115,7 @@ export default {
},
methods: {
gologin() {
console.log('aaaaa')
this.isLogining = true
this.$refs.account.validate()
this.$refs.pwd.validate()
......@@ -139,7 +140,7 @@ export default {
this.isLogining = false
})
} else {
console.log('dosomething')
}
setTimeout(() => {
this.isLogining = false
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment