This commit is contained in:
du.meimei
2025-04-24 09:20:17 +08:00
parent d72dadab0c
commit 6eeb90f590
5 changed files with 65 additions and 38 deletions

View File

@@ -26,7 +26,7 @@ const actions = {
setGroupList({ commit }, data) {
commit('SET_GROUPLIST', data)
},
setToken({ commit },data){
setToken({ commit }, data) {
commit('SET_TOKEN', data)
},
// user login

View File

@@ -34,20 +34,17 @@ export default {
isRedraw: true,
render: (h, params) => {
return h('div', [
h(
'el-button',
{
props: { type: 'text', size: 'mini', icon: 'el-icon-tickets', title: '查看详情' },
on: { click: () => this.handleInfoVisible(params.row) }
}
),
h('el-button', {
props: { type: 'text', size: 'mini', icon: 'el-icon-tickets', title: '查看详情' },
on: { click: () => this.handleInfoVisible(params.row) }
}),
h(
'el-button',
{
props: { type: 'text', size: 'mini', icon: 'el-icon-edit-outline', title: '修改' },
on: { click: () => this.handleEdit(params.row) }
},
"修改"
'修改'
),
h(
'el-button',
@@ -55,7 +52,7 @@ export default {
props: { type: 'danger', size: 'mini', icon: 'el-icon-delete', title: '删除' },
on: { click: () => this.handleDelete(params.row, params.index) }
},
"删除"
'删除'
)
])
}
@@ -107,7 +104,7 @@ export default {
},
watch: {
form: {
handler() { },
handler() {},
deep: true
}
},
@@ -243,8 +240,7 @@ export default {
<el-form-item label="规则类型">
<el-select v-model="form.ruleType" placeholder="请选择规则类型">
<el-option label="全部规则" value="">全部规则</el-option>
<el-option v-for="item in tableConfig.ruleType" :key="item" :label="item"
:value="reverseRuleType(item)" />
<el-option v-for="item in tableConfig.ruleType" :key="item" :label="item" :value="reverseRuleType(item)" />
</el-select>
</el-form-item>
</el-col>
@@ -257,8 +253,15 @@ export default {
<!-- 创建时间 -->
<el-col :span="6">
<el-form-item label="创建时间">
<el-date-picker v-model="form.createdDate" type="daterange" unlink-panels range-separator="-"
start-placeholder="开始日期" end-placeholder="结束日期" :picker-options="form.pickerOptions">
<el-date-picker
v-model="form.createdDate"
type="daterange"
unlink-panels
range-separator="-"
start-placeholder="开始日期"
end-placeholder="结束日期"
:picker-options="form.pickerOptions"
>
</el-date-picker>
</el-form-item>
</el-col>
@@ -277,14 +280,19 @@ export default {
<!-- 下方规则列表 -->
<div class="p20">
<r-table :columns="tableConfig.columns" :data="tableData" :deletion="false" :total="tableConfig.total"
@currentChange="handleCurrentChange" @sizeChange="handleSizeChange" :currentPage="tableConfig.currentPage"
:pageSize="tableConfig.pageSize" />
<r-table
:columns="tableConfig.columns"
:data="tableData"
:deletion="false"
:total="tableConfig.total"
@currentChange="handleCurrentChange"
@sizeChange="handleSizeChange"
:currentPage="tableConfig.currentPage"
:pageSize="tableConfig.pageSize"
/>
</div>
</el-card>
<edit-prompt-rule ref="editPromptRule" v-if="dialogOptions.currentComponent === 'EditPromptRule'"
@getDataList="handleQuery" />
<edit-split-rule ref="editSplitRule" v-else-if="dialogOptions.currentComponent === 'EditSplitRule'"
@getDataList="handleQuery" />
<edit-prompt-rule ref="editPromptRule" v-if="dialogOptions.currentComponent === 'EditPromptRule'" @getDataList="handleQuery" />
<edit-split-rule ref="editSplitRule" v-else-if="dialogOptions.currentComponent === 'EditSplitRule'" @getDataList="handleQuery" />
</div>
</template>

View File

@@ -36,14 +36,20 @@
</el-form>
</div>
<r-table :columns="tableConfig.columns" :data="tableData" :deletion="false" :total="tableConfig.total"
@currentChange="handleCurrentChange" @sizeChange="handleSizeChange" :currentPage="tableConfig.currentPage"
:pageSize="tableConfig.pageSize" />
<r-table
:columns="tableConfig.columns"
:data="tableData"
:deletion="false"
:total="tableConfig.total"
@currentChange="handleCurrentChange"
@sizeChange="handleSizeChange"
:currentPage="tableConfig.currentPage"
:pageSize="tableConfig.pageSize"
/>
</el-card>
<!-- 菜单新增 编辑 弹窗 -->
<menu-dialog :visible.sync="dialogVisible" :title="dialogTitle" :is-edit="isEdit" :is-view="isView"
:menu-data="currentMenuData" @submit="handleSubmit" />
<menu-dialog :visible.sync="dialogVisible" :title="dialogTitle" :is-edit="isEdit" :is-view="isView" :menu-data="currentMenuData" @submit="handleSubmit" />
</div>
</template>

View File

@@ -173,7 +173,7 @@ export default {
},
// 处理角色选择变化
handleRolesChange(roleIds) {
this.form.sysUserRoleDTOs = roleIds.map(id => ({ roleId: id }));
this.form.sysUserRoleDTOs = roleIds.map(id => ({ roleId: id }))
}
}
}

View File

@@ -24,9 +24,16 @@
</el-col>
<el-col :span="6">
<el-form-item label="创建时间">
<el-date-picker v-model="queryParams.dateRange" type="daterange" range-separator="-"
start-placeholder="开始日期" end-placeholder="结束日期" value-format="yyyy-MM-dd" size="small"
style="width: 100%" />
<el-date-picker
v-model="queryParams.dateRange"
type="daterange"
range-separator="-"
start-placeholder="开始日期"
end-placeholder="结束日期"
value-format="yyyy-MM-dd"
size="small"
style="width: 100%"
/>
</el-form-item>
</el-col>
</el-row>
@@ -41,14 +48,20 @@
</el-row>
</el-form>
</div>
<r-table :columns="tableConfig.columns" :data="tableData" :deletion="false" :total="tableConfig.total"
@currentChange="handleCurrentChange" @sizeChange="handleSizeChange" :currentPage="tableConfig.currentPage"
:pageSize="tableConfig.pageSize" />
<r-table
:columns="tableConfig.columns"
:data="tableData"
:deletion="false"
:total="tableConfig.total"
@currentChange="handleCurrentChange"
@sizeChange="handleSizeChange"
:currentPage="tableConfig.currentPage"
:pageSize="tableConfig.pageSize"
/>
</el-card>
<!-- 用户新增弹窗 -->
<user-dialog :visible.sync="dialogVisible" :title="dialogTitle" :is-edit="isEdit" :is-view="isView"
:user-data="currentUserData" @submit="handleSubmit" />
<user-dialog :visible.sync="dialogVisible" :title="dialogTitle" :is-edit="isEdit" :is-view="isView" :user-data="currentUserData" @submit="handleSubmit" />
<!-- 重置密码弹窗 -->
<reset-password-dialog :visible.sync="resetPasswordVisible" :user-id="currentUserId" @success="getUserList" />
@@ -122,7 +135,7 @@ export default {
'el-button',
{
props: { type: 'text', size: 'mini' },
class: "normal-button",
class: 'normal-button',
on: { click: () => this.handleEdit(params.row) }
},
'编辑'
@@ -151,7 +164,7 @@ export default {
'el-button',
{
props: { type: 'text', size: 'mini', style: 'color: #409EFF' },
class: "normal-button",
class: 'normal-button',
on: { click: () => this.handleResetPassword(params.row) }
},
'重置密码'