Big-Data-Lab
/
RMS-VUE
6
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

代码重提交

This commit is contained in:
Xubx 2024-10-11 20:46:12 +08:00
parent cfaa6acf1f
commit fed3b04152
12 changed files with 878 additions and 910 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
src/components/layouts/UserLayout.vue
View File

@ -18,7 +18,7 @@
<route-view></route-view> <route-view></route-view>
</div> </div>
<div class="footer"> <!-- <div class="footer">
<div class="links"> <div class="links">
<a href="https://www.baidu.com" target="_blank">帮助</a> <a href="https://www.baidu.com" target="_blank">帮助</a>
<a href="https://www.bing.com" target="_blank">隐私</a> <a href="https://www.bing.com" target="_blank">隐私</a>
@ -28,7 +28,7 @@
Copyright &copy; <a href="https://www.baidu.com" target="_blank">哈尔滨师范大学人工智能大数据实验室</a> All Copyright &copy; <a href="https://www.baidu.com" target="_blank">哈尔滨师范大学人工智能大数据实验室</a> All
right reserved right reserved
</div> </div>
</div> </div> -->
</div> </div>
</div> </div>
</template> </template>

8
src/components/tools/UserMenu.vue
View File

@ -38,7 +38,7 @@
<span v-if="isDesktop()">欢迎您，{{ nickname() }}</span> <span v-if="isDesktop()">欢迎您，{{ nickname() }}</span>
</span> </span>
<a-menu slot="overlay" class="user-dropdown-menu-wrapper"> <a-menu slot="overlay" class="user-dropdown-menu-wrapper">
<a-menu-item key="0"> <!-- <a-menu-item key="0">
<router-link :to="{ name: 'account-center' }"> <router-link :to="{ name: 'account-center' }">
<a-icon type="user"/> <a-icon type="user"/>
<span>个人中心</span> <span>个人中心</span>
@ -53,15 +53,15 @@
<a-menu-item key="3" @click="systemSetting"> <a-menu-item key="3" @click="systemSetting">
<a-icon type="tool"/> <a-icon type="tool"/>
<span>系统设置</span> <span>系统设置</span>
</a-menu-item> </a-menu-item> -->
<a-menu-item key="4" @click="updatePassword"> <a-menu-item key="4" @click="updatePassword">
<a-icon type="setting"/> <a-icon type="setting"/>
<span>密码修改</span> <span>密码修改</span>
</a-menu-item> </a-menu-item>
<a-menu-item key="5" @click="updateCurrentDepart"> <!-- <a-menu-item key="5" @click="updateCurrentDepart">
<a-icon type="cluster"/> <a-icon type="cluster"/>
<span>切换部门</span> <span>切换部门</span>
</a-menu-item> </a-menu-item> -->
<a-menu-item key="6" @click="clearCache"> <a-menu-item key="6" @click="clearCache">
<a-icon type="sync"/> <a-icon type="sync"/>
<span>清理缓存</span> <span>清理缓存</span>

3
src/views/dashboard/IndexChart.vue
View File

@ -151,9 +151,6 @@ export default {
}, },
drawPie() { drawPie() {
let myChart = this.$echarts.init(document.getElementById("pie")); let myChart = this.$echarts.init(document.getElementById("pie"));
let option = { let option = {
title: { title: {
text: "领用单位资产数统计", text: "领用单位资产数统计",

13
src/views/rms/FurnitureCollegeList/RmsFurnitureCollegeList.vue
View File

@ -39,15 +39,16 @@
<!-- 操作按钮区域 --> <!-- 操作按钮区域 -->
<div class="table-operator"> <div class="table-operator">
<a-button @click="handleAdd" type="primary" icon="plus">新增</a-button> <a-button @click="handleAdd" v-has="'furnitureCollege:add'" type="primary" icon="plus">新增</a-button>
<a-button type="primary" icon="download" @click="handleExportXls('家具信息表（学院）')">导出</a-button> <a-button type="primary" v-has="'furnitureCollege:export'" icon="download"
@click="handleExportXls('家具信息表（学院）')">导出</a-button>
<!-- <a-upload name="file" :showUploadList="false" :multiple="false" :headers="tokenHeader" :action="importExcelUrl" <!-- <a-upload name="file" :showUploadList="false" :multiple="false" :headers="tokenHeader" :action="importExcelUrl"
@change="handleImportExcel"> @change="handleImportExcel">
<a-button type="primary" icon="import">导入</a-button> <a-button type="primary" icon="import">导入</a-button>
</a-upload> --> </a-upload> -->
<a-upload name="file" :showUploadList="false" :multiple="false" :headers="tokenHeader" :action="importExcelUrl" <a-upload name="file" :showUploadList="false" :multiple="false" :headers="tokenHeader" :action="importExcelUrl"
@change="ImportData"> @change="ImportData">
<a-button type="primary" icon="import">导入</a-button> <a-button type="primary" v-has="'furnitureCollege:import'" icon="import">导入</a-button>
<a-modal v-model="showDifference" title="数据对比" :width="1300" okText="导入" @ok="DifferenceOk"> <a-modal v-model="showDifference" title="数据对比" :width="1300" okText="导入" @ok="DifferenceOk">
<!-- 居中显示表格标题 --> <!-- 居中显示表格标题 -->
<div style="text-align: center; padding: 10px; background-color: #f0f0f0; <div style="text-align: center; padding: 10px; background-color: #f0f0f0;
@ -78,7 +79,8 @@
</div> </div>
</a-modal> </a-modal>
</a-upload> </a-upload>
<a-button type="primary" icon="zoom-in" @click="showHistoryModal">历史数据</a-button> <a-button type="primary" v-has="'furnitureCollege:history'" icon="zoom-in"
@click="showHistoryModal">历史数据</a-button>
<a-modal v-model="historyModalVisible" title="历史数据" @ok="closeHistoryModal"> <a-modal v-model="historyModalVisible" title="历史数据" @ok="closeHistoryModal">
<div class="modal-content"> <div class="modal-content">
<!-- 在这里显示历史数据 --> <!-- 在这里显示历史数据 -->
@ -124,13 +126,14 @@
</template> </template>
<span slot="action" slot-scope="text, record"> <span slot="action" slot-scope="text, record">
<div v-has="'furnitureCollege:operate'" style="display: inline-block;">
<a @click="handleEdit(record)">编辑</a> <a @click="handleEdit(record)">编辑</a>
<a-divider type="vertical" /> <a-divider type="vertical" />
<a-popconfirm title="确定删除吗?" @confirm="() => handleDelete(record.id)"> <a-popconfirm title="确定删除吗?" @confirm="() => handleDelete(record.id)">
<a>删除</a> <a>删除</a>
</a-popconfirm> </a-popconfirm>
<a-divider type="vertical" /> <a-divider type="vertical" />
</div>
<a @click="handleDetail(record)">详情</a> <a @click="handleDetail(record)">详情</a>
</span> </span>

8
src/views/rms/FurnitureList/RmsFurnitureList.vue
View File

@ -39,15 +39,15 @@
<!-- 操作按钮区域 --> <!-- 操作按钮区域 -->
<div class="table-operator"> <div class="table-operator">
<a-button @click="handleAdd" type="primary" icon="plus">新增</a-button> <a-button @click="handleAdd" v-has="'furniture:add'" type="primary" icon="plus">新增</a-button>
<a-button type="primary" icon="download" @click="handleExportXls('家具信息表')">导出</a-button> <a-button type="primary" v-has="'furniture:export'" icon="download" @click="handleExportXls('家具信息表')">导出</a-button>
<!-- <a-upload name="file" :showUploadList="false" :multiple="false" :headers="tokenHeader" :action="importExcelUrl" <!-- <a-upload name="file" :showUploadList="false" :multiple="false" :headers="tokenHeader" :action="importExcelUrl"
@change="handleImportExcel"> @change="handleImportExcel">
<a-button type="primary" icon="import">导入</a-button> <a-button type="primary" icon="import">导入</a-button>
</a-upload> --> </a-upload> -->
<a-upload name="file" :showUploadList="false" :multiple="false" :headers="tokenHeader" :action="importExcelUrl" <a-upload name="file" :showUploadList="false" :multiple="false" :headers="tokenHeader" :action="importExcelUrl"
@change="ImportData"> @change="ImportData">
<a-button type="primary" icon="import">导入</a-button> <a-button type="primary" v-has="'furniture:import'" icon="import">导入</a-button>
<a-modal v-model="showDifference" title="数据对比" :width="1300" okText="导入" @ok="DifferenceOk"> <a-modal v-model="showDifference" title="数据对比" :width="1300" okText="导入" @ok="DifferenceOk">
<!-- 居中显示表格标题 --> <!-- 居中显示表格标题 -->
<div style="text-align: center; padding: 10px; background-color: #f0f0f0; <div style="text-align: center; padding: 10px; background-color: #f0f0f0;
@ -78,7 +78,7 @@
</div> </div>
</a-modal> </a-modal>
</a-upload> </a-upload>
<a-button type="primary" icon="zoom-in" @click="showHistoryModal">历史数据</a-button> <a-button type="primary" v-has="'furniture:history'" icon="zoom-in" @click="showHistoryModal">历史数据</a-button>
<a-modal v-model="historyModalVisible" title="历史数据" @ok="closeHistoryModal"> <a-modal v-model="historyModalVisible" title="历史数据" @ok="closeHistoryModal">
<div class="modal-content"> <div class="modal-content">
<!-- 在这里显示历史数据 --> <!-- 在这里显示历史数据 -->

13
src/views/rms/InstrumentCollegeList/RmsInstrumentCollegeList.vue
View File

@ -39,15 +39,16 @@
<!-- 操作按钮区域 --> <!-- 操作按钮区域 -->
<div class="table-operator"> <div class="table-operator">
<a-button @click="handleAdd" type="primary" icon="plus">新增</a-button> <a-button @click="handleAdd" v-has="'instrumentCollege:add'" type="primary" icon="plus">新增</a-button>
<a-button type="primary" icon="download" @click="handleExportXls('仪器信息表（学院）')">导出</a-button> <a-button type="primary" v-has="'instrumentCollege:export'" icon="download"
@click="handleExportXls('仪器信息表（学院）')">导出</a-button>
<!-- <a-upload name="file" :showUploadList="false" :multiple="false" :headers="tokenHeader" :action="importExcelUrl" <!-- <a-upload name="file" :showUploadList="false" :multiple="false" :headers="tokenHeader" :action="importExcelUrl"
@change="handleImportExcel"> @change="handleImportExcel">
<a-button type="primary" icon="import">导入</a-button> <a-button type="primary" icon="import">导入</a-button>
</a-upload> --> </a-upload> -->
<a-upload name="file" :showUploadList="false" :multiple="false" :headers="tokenHeader" :action="importExcelUrl" <a-upload name="file" :showUploadList="false" :multiple="false" :headers="tokenHeader" :action="importExcelUrl"
@change="ImportData"> @change="ImportData">
<a-button type="primary" icon="import">导入</a-button> <a-button type="primary" v-has="'instrumentCollege:import'" icon="import">导入</a-button>
<a-modal v-model="showDifference" title="数据对比" :width="1300" okText="导入" @ok="DifferenceOk"> <a-modal v-model="showDifference" title="数据对比" :width="1300" okText="导入" @ok="DifferenceOk">
<!-- 居中显示表格标题 --> <!-- 居中显示表格标题 -->
<div style="text-align: center; padding: 10px; background-color: #f0f0f0; <div style="text-align: center; padding: 10px; background-color: #f0f0f0;
@ -78,7 +79,8 @@
</div> </div>
</a-modal> </a-modal>
</a-upload> </a-upload>
<a-button type="primary" icon="zoom-in" @click="showHistoryModal">历史数据</a-button> <a-button type="primary" v-has="'instrumentCollege:history'" icon="zoom-in"
@click="showHistoryModal">历史数据</a-button>
<a-modal v-model="historyModalVisible" title="历史数据" @ok="closeHistoryModal"> <a-modal v-model="historyModalVisible" title="历史数据" @ok="closeHistoryModal">
<div class="modal-content"> <div class="modal-content">
<!-- 在这里显示历史数据 --> <!-- 在这里显示历史数据 -->
@ -118,13 +120,14 @@
@change="handleTableChange"> @change="handleTableChange">
<span slot="action" slot-scope="text, record"> <span slot="action" slot-scope="text, record">
<div v-has="'instrumentCollege:operate'" style="display: inline-block;">
<a @click="handleEdit(record)">编辑</a> <a @click="handleEdit(record)">编辑</a>
<a-divider type="vertical" /> <a-divider type="vertical" />
<a-popconfirm title="确定删除吗?" @confirm="() => handleDelete(record.id)"> <a-popconfirm title="确定删除吗?" @confirm="() => handleDelete(record.id)">
<a>删除</a> <a>删除</a>
</a-popconfirm> </a-popconfirm>
<a-divider type="vertical" /> <a-divider type="vertical" />
</div>
<a @click="handleDetail(record)">详情</a> <a @click="handleDetail(record)">详情</a>
</span> </span>
</a-table> </a-table>

8
src/views/rms/InstrumentList/RmsInstrumentList.vue
View File

@ -39,15 +39,15 @@
</div> </div>
<!-- 操作按钮区域 --> <!-- 操作按钮区域 -->
<div class="table-operator"> <div class="table-operator">
<a-button @click="handleAdd" type="primary" icon="plus">新增</a-button> <a-button @click="handleAdd" v-has="'instrument:add'" type="primary" icon="plus">新增</a-button>
<a-button type="primary" icon="download" @click="handleExportXls('仪器信息表（学院）')">导出</a-button> <a-button type="primary" v-has="'instrument:export'" icon="download" @click="handleExportXls('仪器信息表（学院）')">导出</a-button>
<!-- <a-upload name="file" :showUploadList="false" :multiple="false" :headers="tokenHeader" :action="importExcelUrl" <!-- <a-upload name="file" :showUploadList="false" :multiple="false" :headers="tokenHeader" :action="importExcelUrl"
@change="handleImportExcel"> @change="handleImportExcel">
<a-button type="primary" icon="import">导入</a-button> <a-button type="primary" icon="import">导入</a-button>
</a-upload> --> </a-upload> -->
<a-upload name="file" :showUploadList="false" :multiple="false" :headers="tokenHeader" :action="importExcelUrl" <a-upload name="file" :showUploadList="false" :multiple="false" :headers="tokenHeader" :action="importExcelUrl"
@change="ImportData"> @change="ImportData">
<a-button type="primary" icon="import">导入</a-button> <a-button type="primary" v-has="'instrument:import'" icon="import">导入</a-button>
<a-modal v-model="showDifference" title="数据对比" :width="1300" okText="导入" @ok="DifferenceOk"> <a-modal v-model="showDifference" title="数据对比" :width="1300" okText="导入" @ok="DifferenceOk">
<!-- 居中显示表格标题 --> <!-- 居中显示表格标题 -->
<div style="text-align: center; padding: 10px; background-color: #f0f0f0; <div style="text-align: center; padding: 10px; background-color: #f0f0f0;
@ -78,7 +78,7 @@
</div> </div>
</a-modal> </a-modal>
</a-upload> </a-upload>
<a-button type="primary" icon="zoom-in" @click="showHistoryModal">历史数据</a-button> <a-button type="primary" v-has="'instrument:history'" icon="zoom-in" @click="showHistoryModal">历史数据</a-button>
<a-modal v-model="historyModalVisible" title="历史数据" @ok="closeHistoryModal"> <a-modal v-model="historyModalVisible" title="历史数据" @ok="closeHistoryModal">
<div class="modal-content"> <div class="modal-content">
<!-- 在这里显示历史数据 --> <!-- 在这里显示历史数据 -->

13
src/views/rms/IntangibleCollegeList/RmsIntangibleCollegeList.vue
View File

@ -39,13 +39,14 @@
<!-- 操作按钮区域 --> <!-- 操作按钮区域 -->
<div class="table-operator"> <div class="table-operator">
<a-button @click="handleAdd" type="primary" icon="plus">新增</a-button> <a-button @click="handleAdd" v-has="'intangibleCollege:add'" type="primary" icon="plus">新增</a-button>
<!-- <a-button @click="AddData()" type="primary" icon="plus">导数据</a-button> --> <!-- <a-button @click="AddData()" type="primary" icon="plus">导数据</a-button> -->
<a-button type="primary" icon="download" @click="handleExportXls('无形资产（学院）')">导出</a-button> <a-button type="primary" v-has="'intangibleCollege:export'" icon="download"
@click="handleExportXls('无形资产（学院）')">导出</a-button>
<a-upload name="file" :showUploadList="false" :multiple="false" :headers="tokenHeader" :action="importExcelUrl" <a-upload name="file" :showUploadList="false" :multiple="false" :headers="tokenHeader" :action="importExcelUrl"
@change="ImportData"> @change="ImportData">
<a-button type="primary" icon="import">导入</a-button> <a-button type="primary" v-has="'intangibleCollege:import'" icon="import">导入</a-button>
<a-modal v-model="showDifference" title="数据对比" :width="1300" okText="导入" @ok="DifferenceOk"> <a-modal v-model="showDifference" title="数据对比" :width="1300" okText="导入" @ok="DifferenceOk">
<!-- 居中显示表格标题 --> <!-- 居中显示表格标题 -->
<div style="text-align: center; padding: 10px; background-color: #f0f0f0; <div style="text-align: center; padding: 10px; background-color: #f0f0f0;
@ -76,7 +77,8 @@
</div> </div>
</a-modal> </a-modal>
</a-upload> </a-upload>
<a-button type="primary" icon="zoom-in" @click="showHistoryModal">历史数据</a-button> <a-button type="primary" v-has="'intangibleCollege:history'" icon="zoom-in"
@click="showHistoryModal">历史数据</a-button>
<a-modal v-model="historyModalVisible" title="历史数据" @ok="closeHistoryModal"> <a-modal v-model="historyModalVisible" title="历史数据" @ok="closeHistoryModal">
<div class="modal-content"> <div class="modal-content">
<!-- 在这里显示历史数据 --> <!-- 在这里显示历史数据 -->
@ -130,13 +132,14 @@
</template> </template>
<span slot="action" slot-scope="text, record"> <span slot="action" slot-scope="text, record">
<div v-has="'intangibleCollege:operate'" style="display: inline-block;">
<a @click="handleEdit(record)">编辑</a> <a @click="handleEdit(record)">编辑</a>
<a-divider type="vertical" /> <a-divider type="vertical" />
<a-popconfirm title="确定删除吗?" @confirm="() => handleDelete(record.id)"> <a-popconfirm title="确定删除吗?" @confirm="() => handleDelete(record.id)">
<a>删除</a> <a>删除</a>
</a-popconfirm> </a-popconfirm>
<a-divider type="vertical" /> <a-divider type="vertical" />
</div>
<a @click="handleDetail(record)">详情</a> <a @click="handleDetail(record)">详情</a>
</span> </span>

8
src/views/rms/IntangibleList/RmsIntangibleList.vue
View File

@ -39,17 +39,17 @@
<!-- 操作按钮区域 --> <!-- 操作按钮区域 -->
<div class="table-operator"> <div class="table-operator">
<a-button @click="handleAdd" type="primary" icon="plus">新增</a-button> <a-button @click="handleAdd" v-has="'intangible:add'" type="primary" icon="plus">新增</a-button>
<!-- <a-button @click="AddData()" type="primary" icon="plus">导数据</a-button> --> <!-- <a-button @click="AddData()" type="primary" icon="plus">导数据</a-button> -->
<a-button type="primary" icon="download" @click="handleExportXls('无形资产')">导出</a-button> <a-button type="primary" v-has="'intangible:export'" icon="download" @click="handleExportXls('无形资产')">导出</a-button>
<!-- <a-upload name="file" :showUploadList="false" :multiple="false" :headers="tokenHeader" :action="importExcelUrl" <!-- <a-upload name="file" :showUploadList="false" :multiple="false" :headers="tokenHeader" :action="importExcelUrl"
@change="handleImportExcel"> @change="handleImportExcel">
<a-button type="primary" icon="import">导入</a-button> <a-button type="primary" icon="import">导入</a-button>
</a-upload> --> </a-upload> -->
<a-upload name="file" :showUploadList="false" :multiple="false" :headers="tokenHeader" :action="importExcelUrl" <a-upload name="file" :showUploadList="false" :multiple="false" :headers="tokenHeader" :action="importExcelUrl"
@change="ImportData"> @change="ImportData">
<a-button type="primary" icon="import">导入</a-button> <a-button type="primary" v-has="'intangible:import'" icon="import">导入</a-button>
<a-modal v-model="showDifference" title="数据对比" :width="1300" okText="导入" @ok="DifferenceOk"> <a-modal v-model="showDifference" title="数据对比" :width="1300" okText="导入" @ok="DifferenceOk">
<!-- 居中显示表格标题 --> <!-- 居中显示表格标题 -->
<div style="text-align: center; padding: 10px; background-color: #f0f0f0; <div style="text-align: center; padding: 10px; background-color: #f0f0f0;
@ -80,7 +80,7 @@
</div> </div>
</a-modal> </a-modal>
</a-upload> </a-upload>
<a-button type="primary" icon="zoom-in" @click="showHistoryModal">历史数据</a-button> <a-button type="primary" v-has="'intangible:history'" icon="zoom-in" @click="showHistoryModal">历史数据</a-button>
<a-modal v-model="historyModalVisible" title="历史数据" @ok="closeHistoryModal"> <a-modal v-model="historyModalVisible" title="历史数据" @ok="closeHistoryModal">
<div class="modal-content"> <div class="modal-content">
<!-- 在这里显示历史数据 --> <!-- 在这里显示历史数据 -->

47
src/views/system/RoleUserList.vue
View File

@ -34,7 +34,8 @@
<div class="table-operator" style="margin: 5px 0 10px 2px"> <div class="table-operator" style="margin: 5px 0 10px 2px">
<a-button @click="handleAdd" type="primary" icon="plus">新建角色</a-button> <a-button @click="handleAdd" type="primary" icon="plus">新建角色</a-button>
<!--<a-button @click="handleEdit(model1)" type="primary" icon="plus">角色编辑</a-button>--> <!--<a-button @click="handleEdit(model1)" type="primary" icon="plus">角色编辑</a-button>-->
<a-upload name="file" :showUploadList="false" :multiple="false" :headers="tokenHeader" :action="importExcelUrl" @change="handleImportExcel"> <a-upload name="file" :showUploadList="false" :multiple="false" :headers="tokenHeader" :action="importExcelUrl"
@change="handleImportExcel">
<a-button type="primary" icon="import">导入</a-button> <a-button type="primary" icon="import">导入</a-button>
</a-upload> </a-upload>
<a-button type="primary" icon="download" @click="handleExportXls('角色管理')">导出</a-button> <a-button type="primary" icon="download" @click="handleExportXls('角色管理')">导出</a-button>
@ -47,40 +48,20 @@
</div> </div>
<div style="margin-top: 15px"> <div style="margin-top: 15px">
<a-table <a-table style="height:500px" ref="table" size="middle" bordered rowKey="id" :columns="columns"
style="height:500px" :dataSource="dataSource" :pagination="ipagination" :loading="loading"
ref="table"
size="middle"
bordered
rowKey="id"
:columns="columns"
:dataSource="dataSource"
:pagination="ipagination"
:loading="loading"
:rowSelection="{ selectedRowKeys: selectedRowKeys1, onChange: onSelectChange1, type: 'radio' }" :rowSelection="{ selectedRowKeys: selectedRowKeys1, onChange: onSelectChange1, type: 'radio' }"
@change="handleTableChange"> @change="handleTableChange">
<span slot="action" slot-scope="text, record"> <span slot="action" slot-scope="text, record">
<a @click="handleOpen(record)">用户</a> <a @click="handleOpen(record)">用户</a>
<a-divider type="vertical" /> <a-divider type="vertical" />
<a-dropdown>
<a class="ant-dropdown-link">
更多 <a-icon type="down"/>
</a>
<a-menu slot="overlay">
<a-menu-item>
<a @click="handlePerssion(record.id)">授权</a> <a @click="handlePerssion(record.id)">授权</a>
</a-menu-item> <a-divider type="vertical" />
<a-menu-item>
<a @click="handleEdit(record)">编辑</a> <a @click="handleEdit(record)">编辑</a>
</a-menu-item> <a-divider type="vertical" />
<a-menu-item>
<a-popconfirm title="确定删除吗?" @confirm="() => handleDelete1(record.id)"> <a-popconfirm title="确定删除吗?" @confirm="() => handleDelete1(record.id)">
<a>删除</a> <a>删除</a>
</a-popconfirm> </a-popconfirm>
</a-menu-item>
</a-menu>
</a-dropdown>
</span> </span>
</a-table> </a-table>
</div> </div>
@ -139,18 +120,9 @@
selectedRowKeys2.length }}</a>项 selectedRowKeys2.length }}</a>项
<a style="margin-left: 24px" @click="onClearSelected2">清空</a> <a style="margin-left: 24px" @click="onClearSelected2">清空</a>
</div> </div>
<a-table <a-table style="height:500px" ref="table2" bordered size="middle" rowKey="id" :columns="columns2"
style="height:500px" :dataSource="dataSource2" :pagination="ipagination2" :loading="loading2"
ref="table2" :rowSelection="{ selectedRowKeys: selectedRowKeys2, onChange: onSelectChange2 }" @change="handleTableChange2">
bordered
size="middle"
rowKey="id"
:columns="columns2"
:dataSource="dataSource2"
:pagination="ipagination2"
:loading="loading2"
:rowSelection="{selectedRowKeys: selectedRowKeys2, onChange: onSelectChange2}"
@change="handleTableChange2">
<span slot="action" slot-scope="text, record"> <span slot="action" slot-scope="text, record">
<a @click="handleEdit2(record)">编辑</a> <a @click="handleEdit2(record)">编辑</a>
<a-divider type="vertical" /> <a-divider type="vertical" />
@ -538,6 +510,7 @@
</script> </script>
<style scoped> <style scoped>
@import '~@assets/less/common.less'; @import '~@assets/less/common.less';
/** Button按钮间距 */ /** Button按钮间距 */
.ant-btn { .ant-btn {
margin-left: 8px margin-left: 8px

58
src/views/system/UserList.vue
View File

@ -13,7 +13,7 @@
</a-form-item> </a-form-item>
</a-col> </a-col>
<a-col :md="6" :sm="8"> <!-- <a-col :md="6" :sm="8">
<a-form-item label="性别"> <a-form-item label="性别">
<a-select v-model="queryParam.sex" placeholder="请选择性别"> <a-select v-model="queryParam.sex" placeholder="请选择性别">
<a-select-option value="">请选择</a-select-option> <a-select-option value="">请选择</a-select-option>
@ -21,15 +21,15 @@
<a-select-option value="2">女</a-select-option> <a-select-option value="2">女</a-select-option>
</a-select> </a-select>
</a-form-item> </a-form-item>
</a-col> </a-col> -->
<template v-if="toggleSearchStatus"> <!-- <template v-if="toggleSearchStatus"> -->
<a-col :md="6" :sm="8"> <!-- <a-col :md="6" :sm="8">
<a-form-item label="真实名字"> <a-form-item label="真实名字">
<a-input placeholder="请输入真实名字" v-model="queryParam.realname"></a-input> <a-input placeholder="请输入真实名字" v-model="queryParam.realname"></a-input>
</a-form-item> </a-form-item>
</a-col> </a-col> -->
<a-col :md="6" :sm="8"> <a-col :md="6" :sm="8">
<a-form-item label="手机号码"> <a-form-item label="手机号码">
@ -37,7 +37,7 @@
</a-form-item> </a-form-item>
</a-col> </a-col>
<a-col :md="6" :sm="8"> <!-- <a-col :md="6" :sm="8">
<a-form-item label="用户状态"> <a-form-item label="用户状态">
<a-select v-model="queryParam.status" placeholder="请选择"> <a-select v-model="queryParam.status" placeholder="请选择">
<a-select-option value="">请选择</a-select-option> <a-select-option value="">请选择</a-select-option>
@ -45,17 +45,17 @@
<a-select-option value="2">冻结</a-select-option> <a-select-option value="2">冻结</a-select-option>
</a-select> </a-select>
</a-form-item> </a-form-item>
</a-col> </a-col> -->
</template> <!-- </template> -->
<a-col :md="6" :sm="8"> <a-col :md="6" :sm="8">
<span style="float: left;overflow: hidden;" class="table-page-search-submitButtons"> <span style="float: left;overflow: hidden;" class="table-page-search-submitButtons">
<a-button type="primary" @click="searchQuery" icon="search">查询</a-button> <a-button type="primary" @click="searchQuery" icon="search">查询</a-button>
<a-button type="primary" @click="searchReset" icon="reload" style="margin-left: 8px">重置</a-button> <a-button type="primary" @click="searchReset" icon="reload" style="margin-left: 8px">重置</a-button>
<a @click="handleToggleSearch" style="margin-left: 8px"> <!-- <a @click="handleToggleSearch" style="margin-left: 8px">
{{ toggleSearchStatus ? '收起' : '展开' }} {{ toggleSearchStatus ? '收起' : '展开' }}
<a-icon :type="toggleSearchStatus ? 'up' : 'down'"/> <a-icon :type="toggleSearchStatus ? 'up' : 'down'"/>
</a> </a> -->
</span> </span>
</a-col> </a-col>
@ -238,19 +238,19 @@
scopedSlots: {customRender: "avatarslot"} scopedSlots: {customRender: "avatarslot"}
}, },
{ // {
title: '性别', // title: '性别',
align: "center", // align: "center",
width: 80, // width: 80,
dataIndex: 'sex_dictText', // dataIndex: 'sex_dictText',
sorter: true // sorter: true
}, // },
{ // {
title: '生日', // title: '生日',
align: "center", // align: "center",
width: 100, // width: 100,
dataIndex: 'birthday' // dataIndex: 'birthday'
}, // },
{ {
title: '手机号码', title: '手机号码',
align: "center", align: "center",
@ -263,12 +263,12 @@
width: 180, width: 180,
dataIndex: 'orgCodeTxt' dataIndex: 'orgCodeTxt'
}, },
{ // {
title: '负责部门', // title: '负责部门',
align: "center", // align: "center",
width: 180, // width: 180,
dataIndex: 'departIds_dictText' // dataIndex: 'departIds_dictText'
}, // },
{ {
title: '状态', title: '状态',
align: "center", align: "center",

61
src/views/system/modules/UserModal.vue
View File

@ -1,13 +1,6 @@
<template> <template>
<a-drawer <a-drawer :title="title" :maskClosable="true" :width="drawerWidth" placement="right" :closable="true"
:title="title" @close="handleCancel" :visible="visible" style="height: 100%;">
:maskClosable="true"
:width="drawerWidth"
placement="right"
:closable="true"
@close="handleCancel"
:visible="visible"
style="height: 100%;">
<template slot="title"> <template slot="title">
<div style="width: 100%;"> <div style="width: 100%;">
@ -40,88 +33,84 @@
<a-input placeholder="请输入用户姓名" v-model="model.realname" /> <a-input placeholder="请输入用户姓名" v-model="model.realname" />
</a-form-model-item> </a-form-model-item>
<a-form-model-item label="工号" :labelCol="labelCol" :wrapperCol="wrapperCol" prop="workNo"> <!-- <a-form-model-item label="工号" :labelCol="labelCol" :wrapperCol="wrapperCol" prop="workNo">
<a-input placeholder="请输入工号" v-model="model.workNo" /> <a-input placeholder="请输入工号" v-model="model.workNo" />
</a-form-model-item> </a-form-model-item> -->
<a-form-model-item label="手机号码" :labelCol="labelCol" :wrapperCol="wrapperCol" prop="phone"> <a-form-model-item label="手机号码" :labelCol="labelCol" :wrapperCol="wrapperCol" prop="phone">
<a-input placeholder="请输入手机号码" v-model="model.phone" /> <a-input placeholder="请输入手机号码" v-model="model.phone" />
</a-form-model-item> </a-form-model-item>
<a-form-model-item label="职务" :labelCol="labelCol" :wrapperCol="wrapperCol"> <!-- <a-form-model-item label="职务" :labelCol="labelCol" :wrapperCol="wrapperCol">
<j-select-position placeholder="请选择职务" :multiple="false" v-model="model.post"/> <j-select-position placeholder="请选择职务" :multiple="false" v-model="model.post"/>
</a-form-model-item> </a-form-model-item> -->
<a-form-model-item label="角色分配" :labelCol="labelCol" :wrapperCol="wrapperCol" v-show="!roleDisabled"> <a-form-model-item label="角色分配" :labelCol="labelCol" :wrapperCol="wrapperCol" v-show="!roleDisabled">
<j-multi-select-tag <j-multi-select-tag :disabled="disableSubmit" v-model="model.selectedroles" :options="rolesOptions"
:disabled="disableSubmit"
v-model="model.selectedroles"
:options="rolesOptions"
placeholder="请选择角色"> placeholder="请选择角色">
</j-multi-select-tag> </j-multi-select-tag>
</a-form-model-item> </a-form-model-item>
<!--部门分配--> <!--部门分配-->
<a-form-model-item label="部门分配" :labelCol="labelCol" :wrapperCol="wrapperCol" v-show="!departDisabled"> <a-form-model-item label="部门分配" :labelCol="labelCol" :wrapperCol="wrapperCol" v-show="!departDisabled">
<j-select-depart v-model="model.selecteddeparts" :multi="true" @back="backDepartInfo" :backDepart="true" :treeOpera="true">></j-select-depart> <j-select-depart v-model="model.selecteddeparts" :multi="true" @back="backDepartInfo" :backDepart="true"
:treeOpera="true">></j-select-depart>
</a-form-model-item> </a-form-model-item>
<!--租户分配--> <!--租户分配-->
<a-form-model-item label="租户分配" :labelCol="labelCol" :wrapperCol="wrapperCol" v-show="!departDisabled"> <!-- <a-form-model-item label="租户分配" :labelCol="labelCol" :wrapperCol="wrapperCol" v-show="!departDisabled">
<j-multi-select-tag <j-multi-select-tag
:disabled="disableSubmit" :disabled="disableSubmit"
v-model="model.relTenantIds" v-model="model.relTenantIds"
:options="tenantsOptions" :options="tenantsOptions"
placeholder="请选择租户"> placeholder="请选择租户">
</j-multi-select-tag> </j-multi-select-tag>
</a-form-model-item> </a-form-model-item> -->
<a-form-model-item label="身份" :labelCol="labelCol" :wrapperCol="wrapperCol"> <!-- <a-form-model-item label="身份" :labelCol="labelCol" :wrapperCol="wrapperCol">
<a-radio-group v-model="model.userIdentity" @change="identityChange"> <a-radio-group v-model="model.userIdentity" @change="identityChange">
<a-radio :value="1">普通用户</a-radio> <a-radio :value="1">普通用户</a-radio>
<a-radio :value="2">上级</a-radio> <a-radio :value="2">上级</a-radio>
</a-radio-group> </a-radio-group>
</a-form-model-item> </a-form-model-item> -->
<a-form-model-item label="负责部门" :labelCol="labelCol" :wrapperCol="wrapperCol" v-show="departIdShow == true"> <a-form-model-item label="负责部门" :labelCol="labelCol" :wrapperCol="wrapperCol" v-show="departIdShow == true">
<j-multi-select-tag <j-multi-select-tag :disabled="disableSubmit" v-model="model.departIds" :options="nextDepartOptions"
:disabled="disableSubmit"
v-model="model.departIds"
:options="nextDepartOptions"
placeholder="请选择负责部门"> placeholder="请选择负责部门">
</j-multi-select-tag> </j-multi-select-tag>
</a-form-model-item> </a-form-model-item>
<a-form-model-item label="头像" :labelCol="labelCol" :wrapperCol="wrapperCol">
<j-image-upload class="avatar-uploader" text="上传" v-model="model.avatar" ></j-image-upload>
</a-form-model-item>
<a-form-model-item label="生日" :labelCol="labelCol" :wrapperCol="wrapperCol">
<!-- <a-form-model-item label="生日" :labelCol="labelCol" :wrapperCol="wrapperCol">
<a-date-picker <a-date-picker
style="width: 100%" style="width: 100%"
placeholder="请选择生日" placeholder="请选择生日"
v-model="model.birthday" v-model="model.birthday"
:format="dateFormat" :format="dateFormat"
:getCalendarContainer="node => node.parentNode"/> :getCalendarContainer="node => node.parentNode"/>
</a-form-model-item> </a-form-model-item> -->
<a-form-model-item label="性别" :labelCol="labelCol" :wrapperCol="wrapperCol"> <!-- <a-form-model-item label="性别" :labelCol="labelCol" :wrapperCol="wrapperCol">
<a-select v-model="model.sex" placeholder="请选择性别" :getPopupContainer= "(target) => target.parentNode"> <a-select v-model="model.sex" placeholder="请选择性别" :getPopupContainer= "(target) => target.parentNode">
<a-select-option :value="1">男</a-select-option> <a-select-option :value="1">男</a-select-option>
<a-select-option :value="2">女</a-select-option> <a-select-option :value="2">女</a-select-option>
</a-select> </a-select>
</a-form-model-item> </a-form-model-item> --->
<a-form-model-item label="邮箱" :labelCol="labelCol" :wrapperCol="wrapperCol" prop="email"> <a-form-model-item label="邮箱" :labelCol="labelCol" :wrapperCol="wrapperCol" prop="email">
<a-input placeholder="请输入邮箱" v-model="model.email" /> <a-input placeholder="请输入邮箱" v-model="model.email" />
</a-form-model-item> </a-form-model-item>
<a-form-model-item label="座机" :labelCol="labelCol" :wrapperCol="wrapperCol" prop="telephone"> <a-form-model-item label="头像" :labelCol="labelCol" :wrapperCol="wrapperCol">
<j-image-upload class="avatar-uploader" text="上传" v-model="model.avatar"></j-image-upload>
</a-form-model-item>
<!-- <a-form-model-item label="座机" :labelCol="labelCol" :wrapperCol="wrapperCol" prop="telephone">
<a-input placeholder="请输入座机" v-model="model.telephone" /> <a-input placeholder="请输入座机" v-model="model.telephone" />
</a-form-model-item> </a-form-model-item>
<a-form-model-item label="工作流引擎" :labelCol="labelCol" :wrapperCol="wrapperCol"> <a-form-model-item label="工作流引擎" :labelCol="labelCol" :wrapperCol="wrapperCol">
<j-dict-select-tag v-model="model.activitiSync" placeholder="请选择是否同步工作流引擎" :type="'radio'" dictCode="activiti_sync"/> <j-dict-select-tag v-model="model.activitiSync" placeholder="请选择是否同步工作流引擎" :type="'radio'" dictCode="activiti_sync"/>
</a-form-model-item> </a-form-model-item> -->
</a-form-model> </a-form-model>
</a-spin> </a-spin>
@ -490,6 +479,7 @@
width: 104px; width: 104px;
height: 104px; height: 104px;
} }
.ant-upload-select-picture-card i { .ant-upload-select-picture-card i {
font-size: 49px; font-size: 49px;
color: #999; color: #999;
@ -521,5 +511,4 @@
/deep/ .ant-drawer-body { /deep/ .ant-drawer-body {
padding-bottom: 53px; padding-bottom: 53px;
} }
</style> </style>