From 3bc936191cf6a6994f4be4610f90a95e7a4abcee Mon Sep 17 00:00:00 2001 From: zhouwx <1175765986@qq.com> Date: 星期四, 16 一月 2025 09:46:32 +0800 Subject: [PATCH] 修改字样 --- .env.development | 6 +++--- src/views/system/user/index.vue | 6 +++--- src/layout/components/Sidebar/Logo.vue | 10 +++++----- src/views/system/dept/index.vue | 30 +++++++++++++++--------------- .env.production | 2 +- src/views/monitor/online/index.vue | 2 +- 6 files changed, 28 insertions(+), 28 deletions(-) diff --git a/.env.development b/.env.development index 53843f1..f6cfc0f 100644 --- a/.env.development +++ b/.env.development @@ -1,5 +1,5 @@ # 页面标题 -VUE_APP_TITLE = 安全生产考试管理 +VUE_APP_TITLE = 管理面板 # 开发环境配置 ENV = 'development' @@ -9,14 +9,14 @@ #VUE_APP_BASE_API = 'http://192.168.0.47:8085/api' #董 -VUE_APP_BASE_API = 'http://192.168.2.24:8085/api' +#VUE_APP_BASE_API = 'http://192.168.2.24:8085/api' #孔 #VUE_APP_BASE_API = 'http://192.168.2.15:8085/api' #线上 -#VUE_APP_BASE_API = 'http://106.15.95.149:8086/api' +VUE_APP_BASE_API = 'http://106.15.95.149:8086/api' # 路由懒加载 VUE_CLI_BABEL_TRANSPILE_MODULES = true diff --git a/.env.production b/.env.production index 3b94372..273a63a 100644 --- a/.env.production +++ b/.env.production @@ -1,5 +1,5 @@ # 页面标题 -VUE_APP_TITLE = 安全生产考试管理 +VUE_APP_TITLE = 管理面板 # 生产环境配置 ENV = 'production' diff --git a/src/layout/components/Sidebar/Logo.vue b/src/layout/components/Sidebar/Logo.vue index e42beb5..97c52b7 100644 --- a/src/layout/components/Sidebar/Logo.vue +++ b/src/layout/components/Sidebar/Logo.vue @@ -14,7 +14,7 @@ </template> <script> -import logoImg from '@/assets/logo/logo.png' +import logoImg from '@/assets/logo/logo1.png' import {mapState} from "vuex"; import variables from '@/assets/styles/variables.scss' @@ -39,7 +39,7 @@ }, data() { return { - title: process.env.VUE_APP_TITLE, + title: '管理面板', logo: logoImg } } @@ -70,8 +70,8 @@ width: 100%; & .sidebar-logo { - width: 32px; - height: 32px; + width: 38px; + height: 38px; vertical-align: middle; margin-right: 12px; } @@ -82,7 +82,7 @@ color: #fff; font-weight: 600; line-height: 50px; - font-size: 14px; + font-size: 24px; font-family: Avenir, Helvetica Neue, Arial, Helvetica, sans-serif; vertical-align: middle; } diff --git a/src/views/monitor/online/index.vue b/src/views/monitor/online/index.vue index b0159ab..a4f9b25 100644 --- a/src/views/monitor/online/index.vue +++ b/src/views/monitor/online/index.vue @@ -35,7 +35,7 @@ </el-table-column> <el-table-column label="会话编号" align="center" prop="tokenId" :show-overflow-tooltip="true" /> <el-table-column label="登录名称" align="center" prop="userName" :show-overflow-tooltip="true" /> - <el-table-column label="部门名称" align="center" prop="deptName" /> + <el-table-column label="组织架构" align="center" prop="deptName" /> <el-table-column label="主机" align="center" prop="ipaddr" :show-overflow-tooltip="true" /> <el-table-column label="登录地点" align="center" prop="loginLocation" :show-overflow-tooltip="true" /> <el-table-column label="浏览器" align="center" prop="browser" /> diff --git a/src/views/system/dept/index.vue b/src/views/system/dept/index.vue index 2587a4e..dd8f325 100644 --- a/src/views/system/dept/index.vue +++ b/src/views/system/dept/index.vue @@ -1,16 +1,16 @@ <template> <div class="app-container"> <el-form :model="queryParams" ref="queryForm" size="small" :inline="true" v-show="showSearch"> - <el-form-item label="部门名称" prop="deptName"> + <el-form-item label="组织架构名称" prop="deptName"> <el-input v-model="queryParams.deptName" - placeholder="请输入部门名称" + placeholder="请输入组织架构名称" clearable @keyup.enter.native="handleQuery" /> </el-form-item> <el-form-item label="状态" prop="status"> - <el-select v-model="queryParams.status" placeholder="部门状态" clearable> + <el-select v-model="queryParams.status" placeholder="组织架构状态" clearable> <el-option v-for="dict in dict.type.sys_normal_disable" :key="dict.value" @@ -56,7 +56,7 @@ :default-expand-all="isExpandAll" :tree-props="{children: 'children', hasChildren: 'hasChildren'}" > - <el-table-column prop="deptName" label="部门名称" width="260"></el-table-column> + <el-table-column prop="deptName" label="组织架构名称" width="260"></el-table-column> <el-table-column prop="orderNum" label="排序" width="200"></el-table-column> <el-table-column prop="status" label="状态" width="100"> <template slot-scope="scope"> @@ -98,19 +98,19 @@ </el-table> <!-- 添加或修改部门对话框 --> - <el-dialog :title="title" :visible.sync="open" width="600px" append-to-body> - <el-form ref="form" :model="form" :rules="rules" label-width="80px"> + <el-dialog :title="title" :visible.sync="open" width="650px" append-to-body> + <el-form ref="form" :model="form" :rules="rules" label-width="120px"> <el-row> <el-col :span="24" v-if="form.parentId !== 0"> - <el-form-item label="上级部门" prop="parentId"> - <treeselect v-model="form.parentId" :options="deptOptions" :normalizer="normalizer" placeholder="选择上级部门" /> + <el-form-item label="上级组织架构" prop="parentId"> + <treeselect v-model="form.parentId" :options="deptOptions" :normalizer="normalizer" placeholder="选择上级组织架构" /> </el-form-item> </el-col> </el-row> <el-row> <el-col :span="12"> - <el-form-item label="部门名称" prop="deptName"> - <el-input v-model="form.deptName" placeholder="请输入部门名称" /> + <el-form-item label="组织架构名称" prop="deptName"> + <el-input v-model="form.deptName" placeholder="请输入组织架构名称" /> </el-form-item> </el-col> <el-col :span="12"> @@ -138,7 +138,7 @@ </el-form-item> </el-col> <el-col :span="12"> - <el-form-item label="部门状态"> + <el-form-item label="组织架构状态"> <el-radio-group v-model="form.status"> <el-radio v-for="dict in dict.type.sys_normal_disable" @@ -195,10 +195,10 @@ // 表单校验 rules: { parentId: [ - { required: true, message: "上级部门不能为空", trigger: "blur" } + { required: true, message: "上级组织架构不能为空", trigger: "blur" } ], deptName: [ - { required: true, message: "部门名称不能为空", trigger: "blur" } + { required: true, message: "组织架构名称不能为空", trigger: "blur" } ], orderNum: [ { required: true, message: "显示排序不能为空", trigger: "blur" } @@ -278,7 +278,7 @@ this.form.parentId = row.deptId; } this.open = true; - this.title = "添加部门"; + this.title = "添加组织架构"; listDept().then(response => { this.deptOptions = this.handleTree(response.data, "deptId"); }); @@ -297,7 +297,7 @@ getDept(row.deptId).then(response => { this.form = response.data; this.open = true; - this.title = "修改部门"; + this.title = "修改组织架构"; listDeptExcludeChild(row.deptId).then(response => { this.deptOptions = this.handleTree(response.data, "deptId"); if (this.deptOptions.length == 0) { diff --git a/src/views/system/user/index.vue b/src/views/system/user/index.vue index 9f61dcd..02611be 100644 --- a/src/views/system/user/index.vue +++ b/src/views/system/user/index.vue @@ -6,7 +6,7 @@ <div class="head-container"> <el-input v-model="deptName" - placeholder="请输入部门名称" + placeholder="请输入组织架构名称" clearable size="small" prefix-icon="el-icon-search" @@ -142,7 +142,7 @@ <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="userName" prop="userName" v-if="columns[1].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="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="status" v-if="columns[5].visible"> <template slot-scope="scope"> <el-switch @@ -454,7 +454,7 @@ { key: 0, label: `用户编号`, visible: true }, { key: 1, label: `用户名`, visible: true }, { key: 2, label: `真实姓名`, visible: true }, - { key: 3, label: `部门`, visible: true }, + { key: 3, label: `组织架构`, visible: true }, { key: 4, label: `手机号码`, visible: true }, { key: 5, label: `状态`, visible: true }, { key: 6, label: `创建时间`, visible: true } -- Gitblit v1.9.2