hanzhengzheng/CASM_web
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

update

Browse Source
This commit is contained in:
hzz 2024-04-16 14:50:55 +08:00
parent 640ad55aa2
commit 2a91699fab
11 changed files with 95 additions and 42 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
src/components/SizeSelect/index.vue
View File

@ -24,9 +24,9 @@ const route = useRoute();
const router = useRouter();
const { proxy } = getCurrentInstance();
const sizeOptions = ref([
{ label: "较大", value: "large" },
{ label: "默认", value: "default" },
{ label: "稍小", value: "small" },
{ label: proxy.tLang('common','较大'), value: "large" },
{ label: proxy.tLang('common','默认'), value: "default" },
{ label: proxy.tLang('common','较小'), value: "small" },
]);
function handleSetSize(size) {

26
src/lang/i18n-en-US.js
View File

@ -56,6 +56,7 @@ export default {
"更新时间": "Update Time",
"请输入": "Please input ",
"请选择": "Please select",
"请确认": "Please confirm",
"确 定": "OK",
"取 消": "Cancel",
"添加成功": "Add Success",
@ -66,6 +67,15 @@ export default {
"未完成": "Unfinished",
"下载": "Download",
"分钟": "Minute",
"选择语言":"Select Language",
"布局大小":"Layout Size",
"较大":"Large",
"默认":"Default",
"较小":"Small",
"个人中心":"Profile",
"退出登录":"Logout",
"保存":"Save",
"关闭":"Close",
},
"validate": {
"不能为空": "Can not be empty ",
@ -143,6 +153,21 @@ export default {
'人员ID': 'Staff ID',
'员工姓名': 'Staff Name',
'员工编号': 'Staff Code',
'用户名称': 'Username',
"手机号码": "Mobile",
"用户邮箱": "Email",
"所属部门": "Dept",
"所属角色": "Role",
"创建日期": "Create Date",
"基本资料": "Basic Info",
"修改密码": "Change Password",
"用户昵称": "Nickname",
"男": "male",
"女": "famale",
"旧密码": "Old Password",
"新密码": "New Password",
"确认密码": "Confirm Password",
},
"device": {
"设备信息": "Device Info",
@ -188,6 +213,7 @@ export default {
"第几次": "Needle No.",
"步骤": "Step",
"二维码": "QRCode",
"编码": "Code",
},
"produce": {
"产品编码": "ProductCode",

29
src/lang/i18n-zh-CN.js
View File

@ -35,6 +35,7 @@ export default {
"面线管理": "面线管理",
"底线管理": "底线管理",
"梭芯信息": "梭芯管理",
},
"common": {
"新增": "新增",
@ -57,6 +58,7 @@ export default {
"更新时间": "更新时间",
"请输入": "请输入",
"请选择": "请选择",
"请确认": "请确认",
"确 定": "确 定",
"取 消": "取 消",
"添加成功": "添加成功",
@ -67,6 +69,15 @@ export default {
"未完成": "未完成",
"下载": "下载",
"分钟": " 分钟",
"选择语言":"选择语言",
"布局大小":"布局大小",
"较大":"较大",
"默认":"默认",
"较小":"较小",
"个人中心":"个人中心",
"退出登录":"退出登录",
"保存":"保存",
"关闭":"关闭",
},
"validate": {
"不能为空": "不能为空",
@ -143,6 +154,22 @@ export default {
'人员ID': '人员ID',
'员工姓名': '员工姓名',
'员工编号': '员工编号',
"个人信息": "个人信息",
"用户名称": "用户名称",
"手机号码": "手机号码",
"用户邮箱": "用户邮箱",
"所属部门": "所属部门",
"所属角色": "所属角色",
"创建日期": "创建日期",
"基本资料": "基本资料",
"修改密码": "修改密码",
"用户昵称": "用户昵称",
"男": "男",
"女": "女",
"旧密码": "旧密码",
"新密码": "新密码",
"确认密码": "确认密码",
},
"device": {
"设备信息": "设备信息",
@ -188,7 +215,7 @@ export default {
"第几针": "第几针",
"步骤": "步骤",
"二维码": "二维码",
"编码": "编码",
},
"produce": {
"产品编码": "产品编码",

14
src/layout/components/Navbar.vue
View File

@ -17,10 +17,10 @@
</el-tooltip> -->
<screenfull id="screenfull" class="right-menu-item hover-effect" />
<el-tooltip content="选择语言" effect="dark" placement="bottom">
<el-tooltip :content="tLang('common','选择语言')" effect="dark" placement="bottom">
<lang-select id="lang-select" class="right-menu-item hover-effect" />
</el-tooltip>
<el-tooltip content="布局大小" effect="dark" placement="bottom">
<el-tooltip :content="tLang('common','布局大小')" effect="dark" placement="bottom">
<size-select id="size-select" class="right-menu-item hover-effect" />
</el-tooltip>
</template>
@ -33,13 +33,13 @@
<template #dropdown>
<el-dropdown-menu>
<router-link to="/user/profile">
<el-dropdown-item>个人中心</el-dropdown-item>
<el-dropdown-item>{{tLang('common','个人中心')}}</el-dropdown-item>
</router-link>
<el-dropdown-item command="setLayout" v-if="settingsStore.showSettings">
<span>布局设置</span>
</el-dropdown-item>
<!-- <el-dropdown-item command="setLayout" v-if="settingsStore.showSettings">
<span>{{tLang('common','布局设置')}}</span>
</el-dropdown-item> -->
<el-dropdown-item divided command="logout">
<span>退出登录</span>
<span>{{tLang('common','退出登录')}}</span>
</el-dropdown-item>
</el-dropdown-menu>
</template>

4
src/views/dashboard.vue
View File

@ -1,6 +1,6 @@
<template>
<div class="app-container">
<el-row :gutter="10" class="mb8">
<!-- <el-row :gutter="10" class="mb8">
<el-col :span="3">
<div class="card-box">
{{ tLang('home', '员工总数') }}：200{{ tLang('home', '人') }}
@ -11,7 +11,7 @@
{{ tLang('home', '产出进度') }}：60%
</div>
</el-col>
</el-row>
</el-row> -->
<div class="chart-content">
<div class="chart-content-card">
<v-chart ref="lineChartRef" class="line-chart" :option="line_option" />

2
src/views/index.vue
View File

@ -192,7 +192,7 @@ let bar_option = ref({
position: 'top',
color: "#797979",
formatter: function (p) {
let sum = pass.value[p.dataIndex] + noPass.value[p.dataIndex];
let sum = +pass.value[p.dataIndex] + (+noPass.value[p.dataIndex]);
return sum;
}
}

2
src/views/product/product/index.vue
View File

@ -156,7 +156,7 @@ function getProductQRCode(code) {
ctx.font = "bold 20px Arial";
ctx.fillStyle = "black";
ctx.textAlign="center";
ctx.fillText("产品编码" + ':' + code, 125, 310); // 调整文本的位置和行间距
ctx.fillText(proxy.tLang('product',"编码") + ':' + code, 125, 310); // 调整文本的位置和行间距
// Object.keys(list).forEach((key,index) => {
// ctx.fillText(key +':'+ list[key], 240, 30 + index * 20); // 调整文本的位置和行间距
// });

2
src/views/quality/index.vue
View File

@ -97,7 +97,7 @@
<div>
<el-tag type="success" size="mini" v-if="scope.row.state === '0'">{{tLang('common','合格')}}</el-tag>
<el-tag type="danger" size="mini" v-else-if="scope.row.state === '1'">{{tLang('common','不合格')}}</el-tag>
<el-tag type="error" size="mini" v-else>{{tLang('common','未完成')}}</el-tag>
<el-tag type="warning" size="mini" v-else>{{tLang('common','未完成')}}</el-tag>
</div>
</template>
</el-table-column>

18
src/views/system/user/profile/index.vue
View File

@ -14,27 +14,27 @@
</div>
<ul class="list-group list-group-striped">
<li class="list-group-item">
<svg-icon icon-class="user" />用户名称
<svg-icon icon-class="user" />{{tLang('user','用户名称')}}
<div class="pull-right">{{ state.user.userName }}</div>
</li>
<li class="list-group-item">
<svg-icon icon-class="phone" />手机号码
<svg-icon icon-class="phone" />{{tLang('user','手机号码')}}
<div class="pull-right">{{ state.user.phonenumber }}</div>
</li>
<li class="list-group-item">
<svg-icon icon-class="email" />用户邮箱
<svg-icon icon-class="email" />{{tLang('user','用户邮箱')}}
<div class="pull-right">{{ state.user.email }}</div>
</li>
<li class="list-group-item">
<svg-icon icon-class="tree" />所属部门
<svg-icon icon-class="tree" />{{tLang('user','所属部门')}}
<div class="pull-right" v-if="state.user.dept">{{ state.user.dept.deptName }} / {{ state.postGroup }}</div>
</li>
<li class="list-group-item">
<svg-icon icon-class="peoples" />所属角色
<svg-icon icon-class="peoples" />{{tLang('user','所属角色')}}
<div class="pull-right">{{ state.roleGroup }}</div>
</li>
<li class="list-group-item">
<svg-icon icon-class="date" />创建日期
<svg-icon icon-class="date" />{{tLang('user','创建日期')}}
<div class="pull-right">{{ state.user.createTime }}</div>
</li>
</ul>
@ -45,14 +45,14 @@
<el-card>
<template v-slot:header>
<div class="clearfix">
<span>基本资料</span>
<span>{{tLang('user','基本资料')}}</span>
</div>
</template>
<el-tabs v-model="activeTab">
<el-tab-pane label="基本资料" name="userinfo">
<el-tab-pane :label="tLang('user','基本资料')" name="userinfo">
<userInfo :user="state.user" />
</el-tab-pane>
<el-tab-pane label="修改密码" name="resetPwd">
<el-tab-pane :label="tLang('user','修改密码')" name="resetPwd">
<resetPwd />
</el-tab-pane>
</el-tabs>

18
src/views/system/user/profile/resetPwd.vue
View File

@ -1,17 +1,17 @@
<template>
<el-form ref="pwdRef" :model="user" :rules="rules" label-width="80px">
<el-form-item label="旧密码" prop="oldPassword">
<el-input v-model="user.oldPassword" placeholder="请输入旧密码" type="password" show-password />
<el-form ref="pwdRef" :model="user" :rules="rules" label-width="180px">
<el-form-item :label="tLang('user','旧密码')" prop="oldPassword">
<el-input v-model="user.oldPassword" :placeholder="tLang('common','请输入') + tLang('user','旧密码')" type="password" show-password />
</el-form-item>
<el-form-item label="新密码" prop="newPassword">
<el-input v-model="user.newPassword" placeholder="请输入新密码" type="password" show-password />
<el-form-item :label="tLang('user','新密码')" prop="newPassword">
<el-input v-model="user.newPassword" :placeholder="tLang('common','请输入') + tLang('user','新密码')" type="password" show-password />
</el-form-item>
<el-form-item label="确认密码" prop="confirmPassword">
<el-input v-model="user.confirmPassword" placeholder="请确认新密码" type="password" show-password/>
<el-form-item :label="tLang('user','确认密码')" prop="confirmPassword">
<el-input v-model="user.confirmPassword" :placeholder="tLang('common','请确认') + tLang('user','新密码')" type="password" show-password/>
</el-form-item>
<el-form-item>
<el-button type="primary" @click="submit">保存</el-button>
<el-button type="danger" @click="close">关闭</el-button>
<el-button type="primary" @click="submit">{{tLang('common','保存')}}</el-button>
<el-button type="danger" @click="close">{{tLang('common','关闭')}}</el-button>
</el-form-item>
</el-form>
</template>

16
src/views/system/user/profile/userInfo.vue
View File

@ -1,23 +1,23 @@
<template>
<el-form ref="userRef" :model="form" :rules="rules" label-width="80px">
<el-form-item label="用户昵称" prop="nickName">
<el-form-item :label="tLang('user','用户昵称')" prop="nickName">
<el-input v-model="form.nickName" maxlength="30" />
</el-form-item>
<el-form-item label="手机号码" prop="phonenumber">
<el-form-item :label="tLang('user','手机号码')" prop="phonenumber">
<el-input v-model="form.phonenumber" maxlength="11" />
</el-form-item>
<el-form-item label="邮箱" prop="email">
<el-form-item :label="tLang('user','用户邮箱')" prop="email">
<el-input v-model="form.email" maxlength="50" />
</el-form-item>
<el-form-item label="性别">
<el-form-item :label="性别">
<el-radio-group v-model="form.sex">
<el-radio label="0">男</el-radio>
<el-radio label="1">女</el-radio>
<el-radio label="0">{{tLang('user','男')}}</el-radio>
<el-radio label="1">{{tLang('user','女')}}</el-radio>
</el-radio-group>
</el-form-item>
<el-form-item>
<el-button type="primary" @click="submit">保存</el-button>
<el-button type="danger" @click="close">关闭</el-button>
<el-button type="primary" @click="submit">{{tLang('common','保存')}}</el-button>
<el-button type="danger" @click="close">{{tLang('common','关闭')}}</el-button>
</el-form-item>
</el-form>
</template>