mt-fe-group/mt-yd-ui
12
0
Форк 1
Код Задачі Запити на злиття Релізи Вікі Активність

Merge pull request ''update'' (#23) from fzq into develop
Всі перевірки були успішними
continuous-integration/drone/push Build is passing
Подробиці

Переглянути джерело 
Reviewed-on: #23
This commit is contained in:
高天泽 2023-02-14 12:00:34 +08:00
джерело 1c67ef4c6a bc4cfdc990
коміт e81c4f6907
27 змінених файлів з 52 додано та 41 видалено
Показати статистику Завантажити патч Завантажити файл різниці Expand all files Collapse all files

3
src/assets/scss/common.scss
Переглянути файл

@ -543,7 +543,8 @@ img {
.el-menu-item.is-active,
.el-submenu.is-active > .el-submenu__title {
// color: mix(#fff, $sidebar--text-color-dark, 80%);
color: #409EFF;
// color: #409EFF;
color: #0B58FF;
}
}
}

2
src/views/main-navbar-update-password.vue
Переглянути файл

@ -1,6 +1,6 @@
<template>
<el-dialog :visible.sync="visible" :title="$t('updatePassword.title')" :close-on-click-modal="false" :close-on-press-escape="false" :append-to-body="true">
<el-form :model="dataForm" :rules="dataRule" ref="dataForm" @keyup.enter.native="dataFormSubmitHandle()" label-width="120px">
<el-form :model="dataForm" :rules="dataRule" ref="dataForm" @keyup.enter.native="dataFormSubmitHandle()" label-width="170px">
<el-form-item :label="$t('updatePassword.username')">
<span>{{ $store.state.user.name }}</span>
</el-form-item>

2
src/views/modules/home.vue
Переглянути файл

@ -152,7 +152,7 @@ export default {
background: url('../../assets/img/choicepart/choicepart-back.png') repeat;
background-size: cover;
overflow-x: scroll;
// flex布局
// flex布局
.choicepart-box {
display: flex;
flex-flow: row wrap;

2
src/views/modules/job/schedule-add-or-update.vue
Переглянути файл

@ -1,6 +1,6 @@
<template>
<el-dialog :visible.sync="visible" :title="!dataForm.id ? $t('add') : $t('update')" :close-on-click-modal="false" :close-on-press-escape="false">
<el-form :model="dataForm" :rules="dataRule" ref="dataForm" @keyup.enter.native="dataFormSubmitHandle()" label-width="120px">
<el-form :model="dataForm" :rules="dataRule" ref="dataForm" @keyup.enter.native="dataFormSubmitHandle()" label-width="170px">
<el-form-item prop="beanName" :label="$t('schedule.beanName')">
<el-input v-model="dataForm.beanName" :placeholder="$t('schedule.beanNameTips')"></el-input>
</el-form-item>

2
src/views/modules/monitoring/equipmentAlarmLog-add-or-update.vue
Переглянути файл

@ -1,6 +1,6 @@
<template>
<el-dialog :title="!dataForm.id ? i18n.t('add') : i18n.t('update')" :close-on-click-modal="false" :visible.sync="visible">
<el-form :model="dataForm" :rules="dataRule" ref="dataForm" @keyup.enter.native="dataFormSubmit()" label-width="80px">
<el-form :model="dataForm" :rules="dataRule" ref="dataForm" @keyup.enter.native="dataFormSubmit()" label-width="170px">
<el-form-item label="报警信息ID，关联T_equipment_group_alarm表" prop="alarmId">
<el-input v-model="dataForm.alarmId" placeholder="报警信息ID，关联T_equipment_group_alarm表"></el-input>
</el-form-item>

2
src/views/modules/monitoring/equipmentAttr-add-or-update.vue
Переглянути файл

@ -1,6 +1,6 @@
<template>
<el-dialog :title="!dataForm.id ? i18n.t('add') : i18n.t('update')" :close-on-click-modal="false" :visible.sync="visible">
<el-form :model="dataForm" :rules="dataRule" ref="dataForm" @keyup.enter.native="dataFormSubmit()" label-width="80px">
<el-form :model="dataForm" :rules="dataRule" ref="dataForm" @keyup.enter.native="dataFormSubmit()" label-width="170px">
<el-form-item label="设备ID" prop="equipmentId">
<el-input v-model="dataForm.equipmentId" placeholder="设备ID"></el-input>
</el-form-item>

11
src/views/modules/monitoring/equipmentEfficiencyGraph.vue
Переглянути файл

@ -2,7 +2,7 @@
/*
* @Author: lb
* @Date: 2022-07-24 13:30:00
* @LastEditTime: 2023-02-02 15:02:52
* @LastEditTime: 2023-02-09 15:25:13
* @LastEditors: fzq
* @Description: 设备效率分析-echarts图
*/
@ -333,11 +333,14 @@ export default {
}
.close-btn:hover {
color: #409eff;
/* color: #409eff; */
color: #0B58FF;
}
.head-radio-group >>> .el-radio-button__orig-radio:checked + .el-radio-button__inner {
background-color: #409eff;
border-color: #409eff;
/* background-color: #409eff;
border-color: #409eff; */
background-color: #0B58FF;
border-color: #0B58FF;
}
</style>

2
src/views/modules/monitoring/equipmentFile-add-or-update.vue
Переглянути файл

@ -1,6 +1,6 @@
<template>
<el-dialog :title="!dataForm.id ? i18n.t('add') : i18n.t('update')" :close-on-click-modal="false" :visible.sync="visible">
<el-form :model="dataForm" :rules="dataRule" ref="dataForm" @keyup.enter.native="dataFormSubmit()" label-width="80px">
<el-form :model="dataForm" :rules="dataRule" ref="dataForm" @keyup.enter.native="dataFormSubmit()" label-width="170px">
<el-form-item label="设备ID" prop="equipmentId">
<el-input v-model="dataForm.equipmentId" placeholder="设备ID"></el-input>
</el-form-item>

2
src/views/modules/monitoring/equipmentPlcParam-add-or-update.vue
Переглянути файл

@ -1,6 +1,6 @@
<template>
<el-dialog :title="!dataForm.id ? i18n.t('add') : i18n.t('update')" :close-on-click-modal="false" :visible.sync="visible">
<el-form :model="dataForm" :rules="dataRule" ref="dataForm" @keyup.enter.native="dataFormSubmit()" label-width="80px">
<el-form :model="dataForm" :rules="dataRule" ref="dataForm" @keyup.enter.native="dataFormSubmit()" label-width="170px">
<el-form-item label="plc连接表ID" prop="plcConId">
<el-input v-model="dataForm.plcConId" placeholder="plc连接表ID"></el-input>
</el-form-item>

2
src/views/modules/monitoring/equipmentQuantity-add-or-update.vue
Переглянути файл

@ -1,6 +1,6 @@
<template>
<el-dialog :title="!dataForm.id ? i18n.t('add') : i18n.t('update')" :close-on-click-modal="false" :visible.sync="visible">
<el-form :model="dataForm" :rules="dataRule" ref="dataForm" @keyup.enter.native="dataFormSubmit()" label-width="80px">
<el-form :model="dataForm" :rules="dataRule" ref="dataForm" @keyup.enter.native="dataFormSubmit()" label-width="170px">
<el-form-item label="设备外部编码" prop="externalCode">
<el-input v-model="dataForm.externalCode" placeholder="设备外部编码"></el-input>
</el-form-item>

2
src/views/modules/monitoring/equipmentStatusLog-add-or-update.vue
Переглянути файл

@ -1,6 +1,6 @@
<template>
<el-dialog :title="!dataForm.id ? i18n.t('add') : i18n.t('update')" :close-on-click-modal="false" :visible.sync="visible">
<el-form :model="dataForm" :rules="dataRule" ref="dataForm" @keyup.enter.native="dataFormSubmit()" label-width="80px">
<el-form :model="dataForm" :rules="dataRule" ref="dataForm" @keyup.enter.native="dataFormSubmit()" label-width="170px">
<el-form-item label="设备外部代码" prop="externalCode">
<el-input v-model="dataForm.externalCode" placeholder="设备外部代码"></el-input>
</el-form-item>

2
src/views/modules/monitoring/equipmentTypeFile-add-or-update.vue
Переглянути файл

@ -1,6 +1,6 @@
<template>
<el-dialog :title="!dataForm.id ? i18n.t('add') : i18n.t('update')" :close-on-click-modal="false" :visible.sync="visible">
<el-form :model="dataForm" :rules="dataRule" ref="dataForm" @keyup.enter.native="dataFormSubmit()" label-width="80px">
<el-form :model="dataForm" :rules="dataRule" ref="dataForm" @keyup.enter.native="dataFormSubmit()" label-width="170px">
<el-form-item label="设备类型ID" prop="equipmentTypeId">
<el-input v-model="dataForm.equipmentTypeId" placeholder="设备类型ID"></el-input>
</el-form-item>

2
src/views/modules/monitoring/productionLineRecSch-add-or-update.vue
Переглянути файл

@ -1,6 +1,6 @@
<template>
<el-dialog :title="!dataForm.id ? i18n.t('add') : i18n.t('update')" :close-on-click-modal="false" :visible.sync="visible">
<el-form :model="dataForm" :rules="dataRule" ref="dataForm" @keyup.enter.native="dataFormSubmit()" label-width="80px">
<el-form :model="dataForm" :rules="dataRule" ref="dataForm" @keyup.enter.native="dataFormSubmit()" label-width="170px">
<el-form-item label="产线id" prop="productionLineId">
<el-input v-model="dataForm.productionLineId" placeholder="产线id"></el-input>
</el-form-item>

2
src/views/modules/monitoring/reportSheet-add-or-update.vue
Переглянути файл

@ -1,6 +1,6 @@
<template>
<el-dialog :title="!dataForm.id ? i18n.t('add') : i18n.t('update')" :close-on-click-modal="false" :visible.sync="visible">
<el-form :model="dataForm" :rules="dataRule" ref="dataForm" @keyup.enter.native="dataFormSubmit()" label-width="80px">
<el-form :model="dataForm" :rules="dataRule" ref="dataForm" @keyup.enter.native="dataFormSubmit()" label-width="170px">
<el-form-item label="分类：关联report_sheet_category" prop="category">
<el-input v-model="dataForm.category" placeholder="分类：关联report_sheet_category"></el-input>
</el-form-item>

2
src/views/modules/monitoring/reportSheetCategory-add-or-update.vue
Переглянути файл

@ -1,6 +1,6 @@
<template>
<el-dialog :title="!dataForm.id ? i18n.t('add') : i18n.t('update')" :close-on-click-modal="false" :visible.sync="visible">
<el-form :model="dataForm" :rules="dataRule" ref="dataForm" @keyup.enter.native="dataFormSubmit()" label-width="80px">
<el-form :model="dataForm" :rules="dataRule" ref="dataForm" @keyup.enter.native="dataFormSubmit()" label-width="170px">
<el-form-item label="编码" prop="code">
<el-input v-model="dataForm.code" placeholder="编码"></el-input>
</el-form-item>

2
src/views/modules/monitoring/sysFile-add-or-update.vue
Переглянути файл

@ -1,6 +1,6 @@
<template>
<el-dialog :title="!dataForm.id ? i18n.t('add') : i18n.t('update')" :close-on-click-modal="false" :visible.sync="visible">
<el-form :model="dataForm" :rules="dataRule" ref="dataForm" @keyup.enter.native="dataFormSubmit()" label-width="80px">
<el-form :model="dataForm" :rules="dataRule" ref="dataForm" @keyup.enter.native="dataFormSubmit()" label-width="170px">
<el-form-item label="文件类型编号" prop="typeCode">
<el-input v-model="dataForm.typeCode" placeholder="文件类型编号"></el-input>
</el-form-item>

2
src/views/modules/monitoring/sysFileType-add-or-update.vue
Переглянути файл

@ -1,6 +1,6 @@
<template>
<el-dialog :title="!dataForm.id ? i18n.t('add') : i18n.t('update')" :close-on-click-modal="false" :visible.sync="visible">
<el-form :model="dataForm" :rules="dataRule" ref="dataForm" @keyup.enter.native="dataFormSubmit()" label-width="80px">
<el-form :model="dataForm" :rules="dataRule" ref="dataForm" @keyup.enter.native="dataFormSubmit()" label-width="170px">
<el-form-item label="文件类型编号" prop="typeCode">
<el-input v-model="dataForm.typeCode" placeholder="文件类型编号"></el-input>
</el-form-item>

2
src/views/modules/monitoring/workshopSectionEquipment-add-or-update.vue
Переглянути файл

@ -1,6 +1,6 @@
<template>
<el-dialog :title="!dataForm.id ? i18n.t('add') : i18n.t('update')" :close-on-click-modal="false" :visible.sync="visible">
<el-form :model="dataForm" :rules="dataRule" ref="dataForm" @keyup.enter.native="dataFormSubmit()" label-width="80px">
<el-form :model="dataForm" :rules="dataRule" ref="dataForm" @keyup.enter.native="dataFormSubmit()" label-width="170px">
<el-form-item label="工段ID" prop="workshopSectionId">
<el-input v-model="dataForm.workshopSectionId" placeholder="工段ID"></el-input>
</el-form-item>

2
src/views/modules/oss/oss-config.vue
Переглянути файл

@ -1,6 +1,6 @@
<template>
<el-dialog :visible.sync="visible" :title="$t('oss.config')" :close-on-click-modal="false" :close-on-press-escape="false">
<el-form :model="dataForm" :rules="dataRule" ref="dataForm" @keyup.enter.native="dataFormSubmitHandle()" label-width="120px">
<el-form :model="dataForm" :rules="dataRule" ref="dataForm" @keyup.enter.native="dataFormSubmitHandle()" label-width="170px">
<el-form-item :label="$t('oss.type')" size="mini">
<el-radio-group v-model="dataForm.type">
<el-radio :label="1">{{ $t('oss.type1') }}</el-radio>

2
src/views/modules/sys/dept-add-or-update.vue
Переглянути файл

@ -1,6 +1,6 @@
<template>
<el-dialog :visible.sync="visible" :title="!dataForm.id ? $t('add') : $t('update')" :close-on-click-modal="false" :close-on-press-escape="false">
<el-form :model="dataForm" :rules="dataRule" ref="dataForm" @keyup.enter.native="dataFormSubmitHandle()" label-width="120px">
<el-form :model="dataForm" :rules="dataRule" ref="dataForm" @keyup.enter.native="dataFormSubmitHandle()" label-width="170px">
<el-form-item prop="name" :label="$t('dept.name')">
<el-input v-model="dataForm.name" :placeholder="$t('dept.name')"></el-input>
</el-form-item>

2
src/views/modules/sys/dict-data-add-or-update.vue
Переглянути файл

@ -1,6 +1,6 @@
<template>
<el-dialog :visible.sync="visible" :title="!dataForm.id ? $t('add') : $t('update')" :close-on-click-modal="false" :close-on-press-escape="false">
<el-form :model="dataForm" :rules="dataRule" ref="dataForm" @keyup.enter.native="dataFormSubmitHandle()" label-width="120px">
<el-form :model="dataForm" :rules="dataRule" ref="dataForm" @keyup.enter.native="dataFormSubmitHandle()" label-width="170px">
<el-form-item prop="dictValue" :label="$t('dict.dictValue')">
<el-input v-model="dataForm.dictValue" :placeholder="$t('dict.dictValue')"></el-input>
</el-form-item>

2
src/views/modules/sys/dict-type-add-or-update.vue
Переглянути файл

@ -1,6 +1,6 @@
<template>
<el-dialog :visible.sync="visible" :title="!dataForm.id ? $t('add') : $t('update')" :close-on-click-modal="false" :close-on-press-escape="false">
<el-form :model="dataForm" :rules="dataRule" ref="dataForm" @keyup.enter.native="dataFormSubmitHandle()" label-width="130px">
<el-form :model="dataForm" :rules="dataRule" ref="dataForm" @keyup.enter.native="dataFormSubmitHandle()" label-width="170px">
<el-form-item prop="dictName" :label="$t('dict.dictName')">
<el-input v-model="dataForm.dictName" :placeholder="$t('dict.dictName')"></el-input>
</el-form-item>

2
src/views/modules/sys/menu-add-or-update.vue
Переглянути файл

@ -1,6 +1,6 @@
<template>
<el-dialog :visible.sync="visible" :title="!dataForm.id ? $t('add') : $t('update')" :close-on-click-modal="false" :close-on-press-escape="false">
<el-form :model="dataForm" :rules="dataRule" ref="dataForm" @keyup.enter.native="dataFormSubmitHandle()" label-width="120px">
<el-form :model="dataForm" :rules="dataRule" ref="dataForm" @keyup.enter.native="dataFormSubmitHandle()" label-width="170px">
<el-form-item prop="type" :label="$t('menu.type')" size="mini">
<el-radio-group v-model="dataForm.type" :disabled="!!dataForm.id">
<el-radio :label="0">{{ $t('menu.type0') }}</el-radio>

2
src/views/modules/sys/params-add-or-update.vue
Переглянути файл

@ -1,6 +1,6 @@
<template>
<el-dialog :visible.sync="visible" :title="!dataForm.id ? $t('add') : $t('update')" :close-on-click-modal="false" :close-on-press-escape="false">
<el-form :model="dataForm" :rules="dataRule" ref="dataForm" @keyup.enter.native="dataFormSubmitHandle()" label-width="120px">
<el-form :model="dataForm" :rules="dataRule" ref="dataForm" @keyup.enter.native="dataFormSubmitHandle()" label-width="170px">
<el-form-item prop="paramCode" :label="$t('params.paramCode')">
<el-input v-model="dataForm.paramCode" :placeholder="$t('params.paramCode')"></el-input>
</el-form-item>

21
src/views/modules/sys/role-add-or-update.vue
Переглянути файл

@ -1,6 +1,6 @@
<template>
<el-dialog :visible.sync="visible" :title="!dataForm.id ? $t('add') : $t('update')" :close-on-click-modal="false" :close-on-press-escape="false">
<el-form :model="dataForm" :rules="dataRule" ref="dataForm" @keyup.enter.native="dataFormSubmitHandle()" label-width="120px">
<el-form :model="dataForm" :rules="dataRule" ref="dataForm" @keyup.enter.native="dataFormSubmitHandle()" label-width="170px">
<el-form-item prop="name" :label="$t('role.name')">
<el-input v-model="dataForm.name" :placeholder="$t('role.name')"></el-input>
</el-form-item>
@ -11,7 +11,10 @@
<el-col :span="12">
<el-form-item size="mini" :label="$t('role.menuList')">
<!-- 这里改了nameEn -->
<el-tree :data="menuList" :props="{ label: 'nameEn', children: 'children' }" node-key="id" ref="menuListTree" accordion show-checkbox> </el-tree>
<el-tree v-if="$i18n.locale == 'zh-CN'" :data="menuList" :props="{ label: 'name', children: 'children' }" node-key="id" ref="menuListTree" accordion show-checkbox>
</el-tree>
<el-tree v-if="$i18n.locale == 'en'" :data="menuList" :props="{ label: 'nameEn', children: 'children' }" node-key="id" ref="menuListTree" accordion show-checkbox>
</el-tree>
</el-form-item>
</el-col>
<el-col :span="12">
@ -56,8 +59,8 @@ export default {
// destroy dialog
handleDestroyDialog() {
setTimeout(() => {
this.addOrUpdateVisible= false
}, /** after dialog animated */ 200);
this.addOrUpdateVisible = false
}, /** after dialog animated */ 200)
},
init() {
this.visible = true
@ -80,8 +83,9 @@ export default {
if (res.code !== 0) {
return this.$message.error(res.msg)
}
console.log('res.data', res.data)
this.menuList = res.data
console.log('this.menuList',this.menuList);
console.log('this.menuList', this.menuList)
})
.catch(() => {})
},
@ -94,6 +98,7 @@ export default {
return this.$message.error(res.msg)
}
this.deptList = res.data
console.log('this.deptList', this.deptList)
})
.catch(() => {})
},
@ -109,15 +114,15 @@ export default {
...this.dataForm,
...res.data
}
this.dataForm.menuIdList.forEach(item => this.$refs.menuListTree.setChecked(item, true))
this.dataForm.menuIdList.forEach((item) => this.$refs.menuListTree.setChecked(item, true))
this.$refs.deptListTree.setCheckedKeys(this.dataForm.deptIdList)
})
.catch(() => {})
},
// 表单提交
dataFormSubmitHandle: debounce(
function() {
this.$refs['dataForm'].validate(valid => {
function () {
this.$refs['dataForm'].validate((valid) => {
if (!valid) {
return false
}

8
src/views/modules/sys/user-add-or-update.vue
Переглянути файл

@ -1,6 +1,6 @@
<template>
<el-dialog :visible.sync="visible" :title="!dataForm.id ? $t('add') : $t('update')" :close-on-click-modal="false" :close-on-press-escape="false">
<el-form :model="dataForm" :rules="dataRule" ref="dataForm" @keyup.enter.native="dataFormSubmitHandle()" label-width="120px">
<el-form :model="dataForm" :rules="dataRule" ref="dataForm" @keyup.enter.native="dataFormSubmitHandle()" label-width="170px">
<el-form-item prop="username" :label="$t('user.username')">
<el-input v-model="dataForm.username" :placeholder="$t('user.username')"></el-input>
</el-form-item>
@ -17,12 +17,12 @@
<el-input v-model="dataForm.realName" :placeholder="$t('user.realName')"></el-input>
</el-form-item>
<el-form-item prop="gender" :label="$t('user.gender')">
<!-- <ren-radio-group v-model="dataForm.gender" dict-type="gender"></ren-radio-group> -->
<el-radio-group v-model="dataForm.gender">
<ren-radio-group v-model="dataForm.gender" dict-type="gender"></ren-radio-group>
<!-- <el-radio-group v-model="dataForm.gender">
<el-radio :label="0">{{ $t('user.gender0') }}</el-radio>
<el-radio :label="1">{{ $t('user.gender1') }}</el-radio>
<el-radio :label="2">{{ $t('user.gender2') }}</el-radio>
</el-radio-group>
</el-radio-group> -->
</el-form-item>
<el-form-item prop="email" :label="$t('user.email')">
<el-input v-model="dataForm.email" :placeholder="$t('user.email')"></el-input>

6
src/views/modules/sys/user.vue
Переглянути файл

@ -4,7 +4,7 @@
* @Author: fzq
* @Date: 2022-11-25 09:51:46
* @LastEditors: fzq
* @LastEditTime: 2023-02-07 15:29:45
* @LastEditTime: 2023-02-13 16:29:14
-->
<template>
<el-card shadow="never" class="aui-card--fill">
@ -134,8 +134,10 @@ export default {
let fileName = ''
const contentDisposition = response.headers['content-disposition']
if (contentDisposition) {
fileName = contentDisposition.slice(contentDisposition.indexOf('filename=') + 9).replace('.xls', this.$t('user.userTable')) + '.xls'
// fileName = contentDisposition.slice(contentDisposition.indexOf('filename=') + 9).replace('.xls', this.$t('user.userTable')) + '.xls'
fileName = contentDisposition.slice(contentDisposition.indexOf('filename=') + 9)
}
fileName = decodeURIComponent(fileName)
const blob = new Blob([response.data])
const reader = new FileReader()
reader.readAsDataURL(blob)