wangshuai
/
youshi
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

框架前端样式微调

This commit is contained in:
wangshuai 2024-07-02 18:55:30 +08:00
parent 3a8f95b4a3
commit 66fc4ea469
3 changed files with 157 additions and 180 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
ruoyi-ui/src/layout/components/Navbar.vue
View File

@ -6,7 +6,7 @@
<top-nav id="topmenu-container" class="topmenu-container" v-if="topNav"/> <top-nav id="topmenu-container" class="topmenu-container" v-if="topNav"/>
<div class="right-menu"> <div class="right-menu">
<template v-if="device!=='mobile'"> <!-- <template v-if="device!=='mobile'">
<search id="header-search" class="right-menu-item" /> <search id="header-search" class="right-menu-item" />
<el-tooltip content="源码地址" effect="dark" placement="bottom"> <el-tooltip content="源码地址" effect="dark" placement="bottom">
@ -23,7 +23,7 @@
<size-select id="size-select" class="right-menu-item hover-effect" /> <size-select id="size-select" class="right-menu-item hover-effect" />
</el-tooltip> </el-tooltip>
</template> </template> -->
<el-dropdown class="avatar-container right-menu-item hover-effect" trigger="click"> <el-dropdown class="avatar-container right-menu-item hover-effect" trigger="click">
<div class="avatar-wrapper"> <div class="avatar-wrapper">

331
ruoyi-ui/src/views/market/whole/index.vue
View File

@ -1,72 +1,136 @@
<template> <template>
<div class="app-container"> <div class="app-container">
<el-form :model="queryParams" ref="queryForm" size="small" :inline="true" v-show="showSearch"> <el-form :model="queryParams" ref="queryForm" size="small" :inline="true" v-show="showSearch">
<el-form-item label="平台" prop="platform"> <el-row>
<el-select <el-col :span="5">
v-model="queryParams.platform" <el-form-item label="对接平台" prop="platform" >
placeholder="选择平台" <el-select
clearable v-model="queryParams.platform"
style="width: 240px" placeholder="选择平台"
> clearable
<el-option style="width: 240px"
v-for="dict in dict.type.sys_platform_type" >
:key="dict.value" <el-option
:label="dict.label" v-for="dict in dict.type.sys_platform_type"
:value="dict.value" :key="dict.value"
/> :label="dict.label"
</el-select> :value="dict.value"
</el-form-item> />
<el-form-item label="店铺名称" prop="roleName"> </el-select>
<el-input </el-form-item>
v-model="queryParams.roleName" </el-col>
placeholder="请输入店铺名称" <el-col :span="5">
clearable <el-form-item label="店铺名称" prop="roleName">
style="width: 240px" <el-input
@keyup.enter.native="handleQuery" v-model="queryParams.roleName"
/> placeholder="请输入店铺名称"
</el-form-item> clearable
<el-form-item label="店铺编号" prop="roleKey"> style="width: 240px"
<el-input @keyup.enter.native="handleQuery"
v-model="queryParams.roleKey" />
placeholder="请输入店铺编号" </el-form-item>
clearable </el-col>
style="width: 240px" <el-col :span="5">
@keyup.enter.native="handleQuery" <el-form-item label="店铺编号" prop="roleKey">
/> <el-input
</el-form-item> v-model="queryParams.roleKey"
<el-form-item label="店铺归属" prop="status"> placeholder="请输入店铺编号"
<el-select clearable
v-model="queryParams.status" style="width: 240px"
placeholder="店铺归属" @keyup.enter.native="handleQuery"
filterable="true" />
clearable </el-form-item>
style="width: 240px" </el-col>
> <el-col :span="5">
<el-option <el-form-item label="店铺归属" prop="status">
v-for="dict in dict.type.sys_normal_disable" <el-select
:key="dict.value" v-model="queryParams.status"
:label="dict.label" placeholder="店铺归属"
:value="dict.value" filterable
/> clearable
</el-select> style="width: 240px"
</el-form-item> >
<el-form-item> <el-option
<el-button type="primary" icon="el-icon-search" size="mini" @click="handleQuery">搜索</el-button> v-for="dict in dict.type.sys_normal_disable"
<el-button icon="el-icon-refresh" size="mini" @click="resetQuery">重置</el-button> :key="dict.value"
</el-form-item> :label="dict.label"
:value="dict.value"
/>
</el-select>
</el-form-item>
</el-col>
<el-col :span="2">门店数量</el-col>
<el-col :span="2">掉线数量</el-col>
</el-row>
<el-row>
<el-col :span="5">
<el-form-item label="登录状态" prop="platform">
<el-select
v-model="queryParams.platform"
placeholder="选择登录状态"
clearable
style="width: 240px"
>
<el-option
v-for="dict in dict.type.sys_grant_status"
:key="dict.value"
:label="dict.label"
:value="dict.value"
/>
</el-select>
</el-form-item>
</el-col>
<el-col :span="5">
<el-form-item label="回访状态" prop="platform">
<el-select
v-model="queryParams.platform"
placeholder="选择回访状态"
clearable
style="width: 240px"
>
<el-option
v-for="dict in dict.type.sys_return_visit_status"
:key="dict.value"
:label="dict.label"
:value="dict.value"
/>
</el-select>
</el-form-item>
</el-col>
<el-col :span="5">
<el-col :span="2">开启数量</el-col></el-col>
<el-col :span="4">
<el-form-item>
<el-button type="primary" icon="el-icon-search" size="mini" @click="handleQuery">搜索</el-button>
<el-button icon="el-icon-refresh" size="mini" @click="resetQuery">重置</el-button>
</el-form-item>
</el-col>
</el-row>
</el-form> </el-form>
<el-row :gutter="10" class="mb8"> <el-row :gutter="10" class="mb8">
<!-- <el-col :span="1.5">--> <el-col :span="1.5">
<!-- <el-button--> <el-button
<!-- type="primary"--> type="primary"
<!-- plain--> plain
<!-- icon="el-icon-plus"--> icon="el-icon-plus"
<!-- size="mini"--> size="mini"
<!-- @click="handleAdd"--> @click="handleAdd"
<!-- v-hasPermi="['system:role:add']"--> v-hasPermi="['system:role:add']"
<!-- >新增</el-button>--> >授权前置指引</el-button>
<!-- </el-col>--> </el-col>
<el-col :span="1.5">
<a href="https://e.waimai.meituan.com?ABC=OK777:1" style="color: rgb(230, 167, 0);">授权M</a>
<el-tooltip content="请使用鼠标右键点击授权M后选择在隐身窗口中打开链接（新增或更新失效，操作一致）" effect="dark" placement="bottom">
<i class="el-tooltip el-icon-question" tabindex="0" ></i>
</el-tooltip>
<!-- <template>
<el-tooltip content="源码地址" effect="dark" placement="bottom">
<ruo-yi-git id="ruoyi-git" class="right-menu-item hover-effect" />
</el-tooltip>
</template> -->
</el-col>
<!-- <el-col :span="1.5">--> <!-- <el-col :span="1.5">-->
<!-- <el-button--> <!-- <el-button-->
<!-- type="success"--> <!-- type="success"-->
@ -104,20 +168,23 @@
<el-table v-loading="loading" :data="roleList" @selection-change="handleSelectionChange"> <el-table v-loading="loading" :data="roleList" @selection-change="handleSelectionChange">
<el-table-column type="selection" width="55" align="center" /> <el-table-column type="selection" width="55" align="center" />
<el-table-column label="序号" prop="roleId" width="120" /> <el-table-column label="序号" prop="roleId" />
<el-table-column label="名称" prop="roleName" :show-overflow-tooltip="true" width="150" /> <el-table-column label="平台" prop="roleName" :show-overflow-tooltip="true" />
<el-table-column label="标识" prop="roleKey" :show-overflow-tooltip="true" width="150" /> <el-table-column label="编码" prop="roleKey" :show-overflow-tooltip="true" />
<el-table-column label="状态" align="center" width="100"/> <el-table-column label="名称" prop="roleKey" :show-overflow-tooltip="true" />
<el-table-column label="源" align="center" width="100"/> <el-table-column label="状态" align="center" />
<el-table-column label="昨日单量" align="center" width="100"/> <el-table-column label="昨日单量" align="center" />
<el-table-column label="昨日好评量" align="center" width="100"/> <el-table-column label="昨日好评量" align="center" />
<el-table-column label="昨日五星量" align="center" width="100"/> <el-table-column label="昨日五星量" align="center" />
<el-table-column label="昨日好评比(%)" align="center" width="100"/> <el-table-column label="昨日回访量" align="center" />
<el-table-column label="昨日营销比(%)" align="center" width="100"/> <el-table-column label="昨日营销比(%)" align="center" />
<el-table-column label="影响量(今)" align="center" width="100"/> <el-table-column label="今日影响量" align="center" />
<el-table-column label="影响量(昨)" align="center" width="100"/> <el-table-column label="评分" align="center" />
<el-table-column label="评分" align="center" width="100"/> <el-table-column label="归属" align="center" />
<el-table-column label="营销用户下单" align="center" width="100"/> <el-table-column label="创建时间" align="center" />
<el-table-column label="营销用户下单" align="center" />
<el-table-column label="是否开启" align="center" />
<el-table-column label="操作" align="center" />
<!-- <template slot-scope="scope">--> <!-- <template slot-scope="scope">-->
<!-- <el-switch--> <!-- <el-switch-->
@ -134,7 +201,7 @@
</template> </template>
</el-table-column> </el-table-column>
<el-table-column label="操作" align="center" class-name="small-padding fixed-width"> <el-table-column label="操作" align="center" class-name="small-padding fixed-width">
<template slot-scope="scope" v-if="scope.row.roleId !== 1"> <!-- <template slot-scope="scope" v-if="scope.row.roleId !== 1"> -->
<el-button <el-button
size="mini" size="mini"
type="text" type="text"
@ -158,7 +225,7 @@
v-hasPermi="['system:role:edit']">分配用户</el-dropdown-item> v-hasPermi="['system:role:edit']">分配用户</el-dropdown-item>
</el-dropdown-menu> </el-dropdown-menu>
</el-dropdown> </el-dropdown>
</template> <!-- </template> -->
</el-table-column> </el-table-column>
</el-table> </el-table>
@ -170,99 +237,6 @@
@pagination="getList" @pagination="getList"
/> />
<!-- 添加或修改角色配置对话框 -->
<el-dialog :title="title" :visible.sync="open" width="500px" append-to-body>
<el-form ref="form" :model="form" :rules="rules" label-width="100px">
<el-form-item label="角色名称" prop="roleName">
<el-input v-model="form.roleName" placeholder="请输入角色名称" />
</el-form-item>
<el-form-item prop="roleKey">
<span slot="label">
<el-tooltip content="控制器中定义的权限字符，如：@PreAuthorize(`@ss.hasRole('admin')`)" placement="top">
<i class="el-icon-question"></i>
</el-tooltip>
权限字符
</span>
<el-input v-model="form.roleKey" placeholder="请输入权限字符" />
</el-form-item>
<el-form-item label="角色顺序" prop="roleSort">
<el-input-number v-model="form.roleSort" controls-position="right" :min="0" />
</el-form-item>
<el-form-item label="状态">
<el-radio-group v-model="form.status">
<el-radio
v-for="dict in dict.type.sys_normal_disable"
:key="dict.value"
:label="dict.value"
>{{dict.label}}</el-radio>
</el-radio-group>
</el-form-item>
<el-form-item label="菜单权限">
<el-checkbox v-model="menuExpand" @change="handleCheckedTreeExpand($event, 'menu')">展开/折叠</el-checkbox>
<el-checkbox v-model="menuNodeAll" @change="handleCheckedTreeNodeAll($event, 'menu')">全选/全不选</el-checkbox>
<el-checkbox v-model="form.menuCheckStrictly" @change="handleCheckedTreeConnect($event, 'menu')">父子联动</el-checkbox>
<el-tree
class="tree-border"
:data="menuOptions"
show-checkbox
ref="menu"
node-key="id"
:check-strictly="!form.menuCheckStrictly"
empty-text="加载中，请稍候"
:props="defaultProps"
></el-tree>
</el-form-item>
<el-form-item label="备注">
<el-input v-model="form.remark" type="textarea" placeholder="请输入内容"></el-input>
</el-form-item>
</el-form>
<div slot="footer" class="dialog-footer">
<el-button type="primary" @click="submitForm">确 定</el-button>
<el-button @click="cancel">取 消</el-button>
</div>
</el-dialog>
<!-- 分配角色数据权限对话框 -->
<el-dialog :title="title" :visible.sync="openDataScope" width="500px" append-to-body>
<el-form :model="form" label-width="80px">
<el-form-item label="角色名称">
<el-input v-model="form.roleName" :disabled="true" />
</el-form-item>
<el-form-item label="权限字符">
<el-input v-model="form.roleKey" :disabled="true" />
</el-form-item>
<el-form-item label="权限范围">
<el-select v-model="form.dataScope" @change="dataScopeSelectChange">
<el-option
v-for="item in dataScopeOptions"
:key="item.value"
:label="item.label"
:value="item.value"
></el-option>
</el-select>
</el-form-item>
<el-form-item label="数据权限" v-show="form.dataScope == 2">
<el-checkbox v-model="deptExpand" @change="handleCheckedTreeExpand($event, 'dept')">展开/折叠</el-checkbox>
<el-checkbox v-model="deptNodeAll" @change="handleCheckedTreeNodeAll($event, 'dept')">全选/全不选</el-checkbox>
<el-checkbox v-model="form.deptCheckStrictly" @change="handleCheckedTreeConnect($event, 'dept')">父子联动</el-checkbox>
<el-tree
class="tree-border"
:data="deptOptions"
show-checkbox
default-expand-all
ref="dept"
node-key="id"
:check-strictly="!form.deptCheckStrictly"
empty-text="加载中，请稍候"
:props="defaultProps"
></el-tree>
</el-form-item>
</el-form>
<div slot="footer" class="dialog-footer">
<el-button type="primary" @click="submitDataScope">确 定</el-button>
<el-button @click="cancelDataScope">取 消</el-button>
</div>
</el-dialog>
</div> </div>
</template> </template>
@ -272,7 +246,7 @@ import { treeselect as menuTreeselect, roleMenuTreeselect } from "@/api/system/m
export default { export default {
name: "Role", name: "Role",
dicts: ['sys_normal_disable','sys_platform_type','sys_return_visit_status'], dicts: ['sys_normal_disable','sys_grant_status','sys_platform_type','sys_return_visit_status'],
data() { data() {
return { return {
// 遮罩层 // 遮罩层
@ -514,10 +488,13 @@ export default {
}, },
/** 新增按钮操作 */ /** 新增按钮操作 */
handleAdd() { handleAdd() {
this.reset(); var url = 'https://p.kdocs.cn/s/VEQ34BIAIQ';
this.getMenuTreeselect(); window.open(url,'_blank');
this.open = true; //
this.title = "添加角色"; // this.reset();
// this.getMenuTreeselect();
// this.open = true;
// this.title = "添加角色";
}, },
/** 修改按钮操作 */ /** 修改按钮操作 */
handleUpdate(row) { handleUpdate(row) {

2
ruoyi-ui/src/views/system/user/index.vue
View File

@ -141,7 +141,7 @@
<el-table-column label="用户编号" align="center" key="userId" prop="userId" v-if="columns[0].visible" /> <el-table-column label="用户编号" align="center" key="userId" prop="userId" v-if="columns[0].visible" />
<el-table-column label="用户名称" align="center" key="userName" prop="userName" v-if="columns[1].visible" :show-overflow-tooltip="true" /> <el-table-column label="用户名称" align="center" key="userName" prop="userName" v-if="columns[1].visible" :show-overflow-tooltip="true" />
<el-table-column label="用户昵称" align="center" key="nickName" prop="nickName" v-if="columns[2].visible" :show-overflow-tooltip="true" /> <el-table-column label="用户昵称" align="center" key="nickName" prop="nickName" v-if="columns[2].visible" :show-overflow-tooltip="true" />
<el-table-column label="部门" align="center" key="deptName" prop="dept.deptName" v-if="columns[3].visible" :show-overflow-tooltip="true" /> <el-table-column label="代理级别" align="center" key="deptName" prop="dept.deptName" v-if="columns[3].visible" :show-overflow-tooltip="true" />
<el-table-column label="手机号码" align="center" key="phonenumber" prop="phonenumber" v-if="columns[4].visible" width="120" /> <el-table-column label="手机号码" align="center" key="phonenumber" prop="phonenumber" v-if="columns[4].visible" width="120" />
<el-table-column label="状态" align="center" key="status" v-if="columns[5].visible"> <el-table-column label="状态" align="center" key="status" v-if="columns[5].visible">
<template slot-scope="scope"> <template slot-scope="scope">