修改已知问题
This commit is contained in:
qq787203167
@@ -125,7 +125,7 @@
|
||||
},
|
||||
{
|
||||
title: this.$t('DictionaryName'),
|
||||
align: 'left',
|
||||
align: 'center',
|
||||
dataIndex: 'dictName'
|
||||
},
|
||||
// {
|
||||
@@ -136,12 +136,12 @@
|
||||
// },
|
||||
{
|
||||
title: this.$t('DictionaryNumber'),
|
||||
align: 'left',
|
||||
align: 'center',
|
||||
dataIndex: 'dictCode'
|
||||
},
|
||||
{
|
||||
title: this.$t('describe'),
|
||||
align: 'left',
|
||||
align: 'center',
|
||||
dataIndex: 'description'
|
||||
},
|
||||
{
|
||||
|
||||
@@ -107,39 +107,39 @@
|
||||
{
|
||||
title: this.$t('MenuName'),
|
||||
dataIndex: 'name',
|
||||
align: 'center',
|
||||
key: 'name'
|
||||
},
|
||||
{
|
||||
title: this.$t('MenuEnName'),
|
||||
dataIndex: 'menuEn',
|
||||
align: 'center',
|
||||
key: 'menuEn'
|
||||
},
|
||||
{
|
||||
title: this.$t('MenuType'),
|
||||
dataIndex: 'menuType',
|
||||
key: 'menuType',
|
||||
customRender: this.text
|
||||
},
|
||||
{
|
||||
title: 'icon',
|
||||
dataIndex: 'icon',
|
||||
align: 'center',
|
||||
key: 'icon'
|
||||
},
|
||||
{
|
||||
title: this.$t('assembly'),
|
||||
dataIndex: 'component',
|
||||
align: 'center',
|
||||
key: 'component',
|
||||
scopedSlots: { customRender: 'component' }
|
||||
},
|
||||
{
|
||||
title: this.$t('route'),
|
||||
dataIndex: 'url',
|
||||
align: 'center',
|
||||
key: 'url',
|
||||
scopedSlots: { customRender: 'url' }
|
||||
},
|
||||
{
|
||||
title: this.$t('sort'),
|
||||
dataIndex: 'sortNo',
|
||||
align: 'center',
|
||||
key: 'sortNo'
|
||||
},
|
||||
{
|
||||
|
||||
@@ -30,7 +30,7 @@
|
||||
<!-- <a-upload name="file" :showUploadList="false" :multiple="false" :headers="tokenHeader" :action="importExcelUrl" @change="handleImportExcel">-->
|
||||
<!-- <a-button type="primary" icon="import">{{$t('import')}}</a-button>-->
|
||||
<!-- </a-upload>-->
|
||||
<div @click="handleExportXls($t('RoleManagement'))" class="operator-text">
|
||||
<div @click="handleExportXls($t('RoleManagement'))" class="operator-text">
|
||||
<a-icon type="export" :rotate="-90"/>
|
||||
{{$t('export')}}
|
||||
</div>
|
||||
@@ -52,27 +52,13 @@
|
||||
:loading="loading"
|
||||
@change="handleTableChange">
|
||||
<span slot="action" slot-scope="text, record">
|
||||
<a @click="handleOpen(record)">{{$t('user')}}</a>
|
||||
<a-divider type="vertical"/>
|
||||
|
||||
<a-dropdown>
|
||||
<a class="ant-dropdown-link">
|
||||
{{$t('more')}} <a-icon type="down"/>
|
||||
</a>
|
||||
<a-menu slot="overlay">
|
||||
<a-menu-item>
|
||||
<a @click="handlePerssion(record.id)">{{$t('toGrantAuthorization')}}</a>
|
||||
</a-menu-item>
|
||||
<a-menu-item>
|
||||
<a @click="handleEdit(record)">{{$t('edit')}}</a>
|
||||
</a-menu-item>
|
||||
<a-menu-item>
|
||||
<a-popconfirm :title="$t('areYouSure')" @confirm="() => handleDelete1(record.id)">
|
||||
<a>{{$t('delete')}}</a>
|
||||
<a @click="handlePerssion(record.id)" class="text">{{$t('toGrantAuthorization')}}</a>
|
||||
<a @click="handleEdit(record)" class="text">{{$t('edit')}}</a>
|
||||
<a-popconfirm :title="$t('areYouSure')" @confirm="() => handleDelete1(record.id)">
|
||||
<a class="text">{{$t('delete')}}</a>
|
||||
</a-popconfirm>
|
||||
</a-menu-item>
|
||||
</a-menu>
|
||||
</a-dropdown>
|
||||
<!-- <a @click="handleOpen(record)">{{$t('user')}}</a>-->
|
||||
<!-- <a-divider type="vertical"/>-->
|
||||
</span>
|
||||
</a-table>
|
||||
</div>
|
||||
@@ -275,7 +261,15 @@
|
||||
|
||||
},
|
||||
handleDelete1: function(id) {
|
||||
this.handleDelete(id)
|
||||
let that = this
|
||||
getAction(this.url.delete, { id: id }).then((res) => {
|
||||
if (res.success) {
|
||||
that.$message.success(res.message)
|
||||
that.loadData()
|
||||
} else {
|
||||
that.$message.warning(res.message)
|
||||
}
|
||||
})
|
||||
this.dataSource2 = []
|
||||
this.currentRoleId = ''
|
||||
},
|
||||
@@ -393,6 +387,7 @@
|
||||
.ant-btn {
|
||||
margin-left: 8px
|
||||
}
|
||||
|
||||
.box-title-text {
|
||||
line-height: 1.4;
|
||||
display: flex;
|
||||
@@ -426,4 +421,8 @@
|
||||
height: 38px;
|
||||
/*margin-top: 2px;*/
|
||||
}
|
||||
|
||||
.text {
|
||||
margin-right: 8px;
|
||||
}
|
||||
</style>
|
||||
@@ -61,12 +61,13 @@
|
||||
:row-selection="{ selectedRowKeys: selectedRowKeys, onChange: onSelectChange }"
|
||||
:columns="columns"
|
||||
:dataSource="dataSource"
|
||||
:scroll="{x: 1600}"
|
||||
:pagination="ipagination"
|
||||
:loading="loading"
|
||||
@change="handleTableChange">
|
||||
<span slot="msgContent" slot-scope="text,scope">
|
||||
<a :style="{'color':scope.readFlag == 0 ? 'red':'#00A0E9'}" :title="text" @click="msgContentClick(scope)">
|
||||
{{text && text.length > 25?text.slice(0,24)+'...':text}}
|
||||
{{text}}
|
||||
</a>
|
||||
</span>
|
||||
<span slot="msgCategory" slot-scope="text,scope">
|
||||
@@ -82,7 +83,7 @@
|
||||
|
||||
<script>
|
||||
import { filterObj } from '@/utils/util'
|
||||
import { getAction, putAction , deleteAction } from '@/api/manage'
|
||||
import { getAction, putAction, deleteAction } from '@/api/manage'
|
||||
import ShowAnnouncement from '@/components/tools/ShowAnnouncement'
|
||||
import { JeroListMixin } from '@/mixins/JeroListMixin'
|
||||
import DynamicNotice from '../../components/tools/DynamicNotice'
|
||||
@@ -109,17 +110,21 @@
|
||||
title: this.$t('MessageContent'),
|
||||
align: 'center',
|
||||
dataIndex: 'msgContent',
|
||||
width: 600,
|
||||
ellipsis: true,
|
||||
scopedSlots: { customRender: 'msgContent' }
|
||||
},
|
||||
{
|
||||
title: this.$t('MessageType'),
|
||||
align: 'center',
|
||||
dataIndex: 'msgCategory',
|
||||
width: 200,
|
||||
scopedSlots: { customRender: 'msgCategory' }
|
||||
},
|
||||
{
|
||||
title: this.$t('NotificationTime'),
|
||||
align: 'center',
|
||||
width: 200,
|
||||
dataIndex: 'sendTime'
|
||||
}
|
||||
],
|
||||
@@ -160,10 +165,10 @@
|
||||
getAction(that.url.readAllMsg, { ids: selectedRowKeys.join(',') }).then((res) => {
|
||||
if (res.success) {
|
||||
that.selectedRowKeys = []
|
||||
that.$message.success(this.$t('OperationSuccessful'))
|
||||
that.$message.success(that.$t('OperationSuccessful'))
|
||||
that.loadData()
|
||||
}else{
|
||||
that.$message.success(this.$t('operationFailed'))
|
||||
} else {
|
||||
that.$message.success(that.$t('operationFailed'))
|
||||
}
|
||||
})
|
||||
}
|
||||
@@ -193,10 +198,10 @@
|
||||
deleteAction(that.url.deleteUrl, { ids: selectedRowKeys.join(',') }).then((res) => {
|
||||
if (res.success) {
|
||||
that.selectedRowKeys = []
|
||||
that.$message.success(this.$t('OperationSuccessful'))
|
||||
that.$message.success(that.$t('OperationSuccessful'))
|
||||
that.loadData()
|
||||
}else{
|
||||
that.$message.success(this.$t('operationFailed'))
|
||||
} else {
|
||||
that.$message.success(that.$t('operationFailed'))
|
||||
}
|
||||
})
|
||||
}
|
||||
|
||||
@@ -107,6 +107,10 @@
|
||||
<a-avatar shape="square" :src="getAvatarView(record.avatar)" icon="user"/>
|
||||
</div>
|
||||
</template>
|
||||
<span slot="action" slot-scope="text, record">
|
||||
<a @click="handleEdit(record)" >{{$t('RoleAssignment')}}</a>
|
||||
</span>
|
||||
|
||||
</a-table>
|
||||
</div>
|
||||
<!-- table区域-end -->
|
||||
@@ -206,14 +210,14 @@
|
||||
align: 'center',
|
||||
width: 80,
|
||||
dataIndex: 'status_dictText'
|
||||
},
|
||||
{
|
||||
title: this.$t('operation'),
|
||||
dataIndex: 'action',
|
||||
scopedSlots: {customRender: 'action'},
|
||||
align: "center",
|
||||
width: 80
|
||||
}
|
||||
// {
|
||||
// title: this.$t('operation'),
|
||||
// dataIndex: 'action',
|
||||
// scopedSlots: {customRender: 'action'},
|
||||
// align: "center",
|
||||
// width: 170
|
||||
// }
|
||||
],
|
||||
superQueryFieldList: [
|
||||
{ type: 'input', value: 'username', text: this.$t('userAccount') },
|
||||
|
||||
File diff suppressed because it is too large
Load Diff
Reference in New Issue
Block a user