From 49c3dcece70dc96ad630b60b95af44fc45783f63 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E6=9D=A8=E5=A5=89=E6=BA=90?= <1976974459@qq.com> Date: Wed, 16 Aug 2023 18:07:42 +0800 Subject: [PATCH] =?UTF-8?q?2023-08-16=20=E8=AE=BE=E5=A4=87=E5=92=8C?= =?UTF-8?q?=E8=B4=A8=E9=87=8F=E4=BF=AE=E6=94=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../modules/eam/com_eam_object_add_update.vue | 4 +- src/views/modules/eam/eamAdmin.vue | 52 ++--- src/views/modules/eam/eamFamily.vue | 23 +- .../modules/eam/eamWorkOrderForDefect.vue | 200 +++++++++++++++++- src/views/modules/eam/eamWorkPlanForCheck.vue | 83 ++++++-- src/views/modules/qc/qcItem.vue | 185 ++++++++++++---- src/views/modules/qc/qcMethod.vue | 180 ++++++++++++---- src/views/modules/qc/qcTemplate.vue | 6 +- .../modules/sys/sceneDynamicControlModel.vue | 188 +++++++++++++--- 9 files changed, 736 insertions(+), 185 deletions(-) diff --git a/src/views/modules/eam/com_eam_object_add_update.vue b/src/views/modules/eam/com_eam_object_add_update.vue index 41f000a..9324333 100644 --- a/src/views/modules/eam/com_eam_object_add_update.vue +++ b/src/views/modules/eam/com_eam_object_add_update.vue @@ -27,8 +27,7 @@ 区域: - - + @@ -215,7 +214,6 @@ export default { init(currentRow) { //初始化参数 this.pageData = JSON.parse(JSON.stringify(currentRow)); - console.log(this.pageData) //打开页面 this.visible = true; //判断是否是新增 diff --git a/src/views/modules/eam/eamAdmin.vue b/src/views/modules/eam/eamAdmin.vue index 9bd50cd..f1f269a 100644 --- a/src/views/modules/eam/eamAdmin.vue +++ b/src/views/modules/eam/eamAdmin.vue @@ -172,10 +172,10 @@
- + - + 查询 @@ -209,7 +209,7 @@ :min-width="item.columnWidth" :label="item.columnLabel"> @@ -221,7 +221,7 @@ - +
@@ -248,7 +248,6 @@ this.searchData.adminID = this.searchData.adminID.toUpperCase() } }, - modalData: { deep: true, handler: function (newV, oldV) { @@ -658,7 +657,7 @@ this.departmentListSelections = val }, getRowKeys(row) { - //唯一值，一般都未id + //唯一值，一般都为id return row.deptId; }, selectFlag(){ @@ -667,7 +666,7 @@ // 确认多选部门 confirmDepartment(){ - if(this.departmentListSelections.length == 0){ + if(this.departmentListSelections.length === 0){ this.$alert('请勾选部门！', '提示', { confirmButtonText: '确定' }) @@ -736,7 +735,7 @@ this.searchData.limit = this.pageSize this.searchData.page = this.pageIndex eamAdminSearch(this.searchData).then(({data}) => { - if (data.code == 0) { + if (data.code === 0) { this.dataList = data.page.list this.pageIndex = data.page.currPage this.pageSize = data.page.pageSize @@ -841,37 +840,37 @@ }) }, saveData(){ - if (this.modalData.adminID == '' || this.modalData.adminID == null) { + if (this.modalData.adminID === '' || this.modalData.adminID == null) { this.$alert('请输入机修人员编码！', '错误', { confirmButtonText: '确定' }) return false } - if (this.modalData.adminName == '' || this.modalData.adminName == null) { + if (this.modalData.adminName === '' || this.modalData.adminName == null) { this.$alert('请输入机修人员姓名！', '错误', { confirmButtonText: '确定' }) return false } - if (this.modalData.active == '' || this.modalData.active == null) { + if (this.modalData.active === '' || this.modalData.active == null) { this.$alert('选择是否在用！', '错误', { confirmButtonText: '确定' }) return false } - if (this.modalData.department == '' || this.modalData.department == null) { + if (this.modalData.department === '' || this.modalData.department == null) { this.$alert('请选择部门！', '错误', { confirmButtonText: '确定' }) return false } - if (this.modalData.levelID == '' || this.modalData.levelID == null) { + if (this.modalData.levelID === '' || this.modalData.levelID == null) { this.$alert('请选择工种！', '错误', { confirmButtonText: '确定' }) return false } - if(this.modalData.flag=='1'){ + if(this.modalData.flag === '1'){ eamAdminSave(this.modalData).then(({data}) => { if (data && data.code === '0') { this.getDataList() @@ -941,16 +940,12 @@ userId: this.$store.state.user.id, languageCode: this.$i18n.locale } - console.log(this.$route.meta.menuId) userFavoriteList(userFavorite).then(({data}) => { for (let i = 0; i < data.list.length; i++) { - // let flag=false; - if(this.$route.meta.menuId==data.list[i].menuId){ - this.favorite = true - // flag=true; - } + if(this.$route.meta.menuId==data.list[i].menuId){ + this.favorite = true + } } - }) }, // 收藏 OR 取消收藏 @@ -960,17 +955,10 @@ functionId: this.$route.meta.menuId, } if (this.favorite) { - // 取消收藏 - // this.$confirm(`确定取消收藏`, '提示', { - // confirmButtonText: '确定', - // cancelButtonText: '取消', - // type: 'warning' - // }).then(() => { - removeUserFavorite(userFavorite).then(({data}) => { - this.$message.success(data.msg) - this.favorite = false - }) - // }) + removeUserFavorite(userFavorite).then(({data}) => { + this.$message.success(data.msg) + this.favorite = false + }) } else { // 收藏 saveUserFavorite(userFavorite).then(({data}) => { diff --git a/src/views/modules/eam/eamFamily.vue b/src/views/modules/eam/eamFamily.vue index ba5484a..3a47116 100644 --- a/src/views/modules/eam/eamFamily.vue +++ b/src/views/modules/eam/eamFamily.vue @@ -178,7 +178,6 @@ pageIndex: 1, pageSize: 50, totalPage: 0, - dataList: [], dataListLoading: false, dataListSelections: [], @@ -411,17 +410,10 @@ functionId: this.$route.meta.menuId, } if (this.favorite) { - // 取消收藏 - // this.$confirm(`确定取消收藏`, '提示', { - // confirmButtonText: '确定', - // cancelButtonText: '取消', - // type: 'warning' - // }).then(() => { - removeUserFavorite(userFavorite).then(({data}) => { - this.$message.success(data.msg) - this.favorite = false - }) - // }) + removeUserFavorite(userFavorite).then(({data}) => { + this.$message.success(data.msg) + this.favorite = false + }) } else { // 收藏 saveUserFavorite(userFavorite).then(({data}) => { @@ -429,7 +421,6 @@ this.favorite = true }) } - }, // 获取数据列表 @@ -437,7 +428,7 @@ this.searchData.limit = this.pageSize this.searchData.page = this.pageIndex eamFamilySearch(this.searchData).then(({data}) => { - if (data.code == 0) { + if (data.code === 0) { this.dataList = data.page.list this.pageIndex = data.page.currPage this.pageSize = data.page.pageSize @@ -471,8 +462,8 @@ createBy: this.$store.state.user.name, updateBy: this.$store.state.user.name, }; - this.modalDisableFlag=false; - this.modalFlag=true; + this.modalDisableFlag = false; + this.modalFlag = true; }, updateModal(row){ this.modalData={ diff --git a/src/views/modules/eam/eamWorkOrderForDefect.vue b/src/views/modules/eam/eamWorkOrderForDefect.vue index 7104429..2f70380 100644 --- a/src/views/modules/eam/eamWorkOrderForDefect.vue +++ b/src/views/modules/eam/eamWorkOrderForDefect.vue @@ -1,22 +1,27 @@ @@ -120,8 +176,9 @@ import { sysControlModelSearch, // 列表查询 controlData, // 控制 - sysControlModelUpdate // 编辑 + sysControlModelUpdate, // 编辑 } from "@/api/base.js" +import {getObjectList} from "@/api/eam/eam.js" import {userFavoriteList, saveUserFavorite, removeUserFavorite} from '@/api/userFavorite.js' export default { data() { @@ -158,6 +215,7 @@ export default { thirdType: '', secondType: '', controlStyle: '', + parameterTable: '' }, // 检验项目展示标头 columnList: [ @@ -270,18 +328,103 @@ export default { fixed: '', }, ], + objectList: [], + objectModelFlag: false, + objectData: { + site: this.$store.state.user.site, + objectID: '', + objectDesc: '' + }, + dataListSelections: [], + objectDetailList: [ + { + columnProp: 'objectID', + headerAlign: "center", + align: "center", + columnLabel: '设备编码', + columnHidden: false, + columnImage: false, + columnSortable: false, + sortLv: 0, + status: true, + fixed: '', + }, + { + columnProp: 'objectDesc', + headerAlign: "center", + align: "center", + columnLabel: '设备名称', + columnHidden: false, + columnImage: false, + columnSortable: false, + sortLv: 0, + status: true, + fixed: '', + } + ], } }, created() { this.getDataList() }, methods: { + // 点击行选中复选框 + // 机修人员 + objectClickRow(row){ + this.$refs.objectTable.toggleRowSelection(row); + }, + // 多选 + selectionChangeHandle (val) { + this.dataListSelections = val + }, + selectFlag(){ + return true; + }, + // 确认多选设备 + confirmObject(){ + if(this.dataListSelections.length === 0){ + this.$message.warning("请勾选设备!") + return + } + this.modalData.thirdType = '' + for (let i = 0; i < this.dataListSelections.length; i++) { + this.modalData.thirdType = this.modalData.thirdType + ";" + this.dataListSelections[i].objectID + } + this.modalData.thirdType = this.modalData.thirdType.substring(1) + this.objectModelFlag = false + }, + // 获取数据列表 getDataList () { sysControlModelSearch(this.searchData).then(({data}) => { this.dataList = data.rows }) }, + + // 获取设备列表 + getObjectList(){ + // 先清空缓存选中 + this.$nextTick(() => this.$refs.objectTable.clearSelection()) + // 拿到选中的设备编号 + let tempDataList = this.modalData.thirdType.split(';') + // 查询所有设备 + getObjectList(this.objectData).then(({data}) => { + if (data && data.code === 0) { + this.objectList = data.rows + this.objectList.forEach(val => { + // 回显选中的设备 + if (tempDataList.includes(val.objectID)) { + this.$nextTick(() => this.$refs.objectTable.toggleRowSelection(val, true)) + } + }) + this.objectModelFlag = true; + }else { + this.$alert(data.msg, '错误', { + confirmButtonText: '确定' + }) + } + }) + }, // 控制 control(row){ this.modalData = { @@ -296,9 +439,10 @@ export default { thirdType: row.thirdType, secondType: row.secondType, controlStyle: row.controlStyle, + parameterTable: row.parameterTable } controlData(this.modalData).then(({data}) => { - if (data && data.code == 0) { + if (data && data.code === 0) { this.getDataList() this.$message({ message: '操作成功', @@ -328,13 +472,14 @@ export default { thirdType: row.thirdType, secondType: row.secondType, controlStyle: row.controlStyle, + parameterTable: row.parameterTable }; this.modalDisableFlag = true; this.modalFlag = true; }, // 保存编辑 saveData(){ - if (this.modalData.controlStyle == '' || this.modalData.controlStyle == null) { + if (this.modalData.controlStyle === '' || this.modalData.controlStyle == null) { this.$alert('请选择控制方式！', '错误', { confirmButtonText: '确定' }) @@ -380,17 +525,10 @@ export default { functionId: this.$route.meta.menuId, } if (this.favorite) { - // 取消收藏 - // this.$confirm(`确定取消收藏`, '提示', { - // confirmButtonText: '确定', - // cancelButtonText: '取消', - // type: 'warning' - // }).then(() => { - removeUserFavorite(userFavorite).then(({data}) => { - this.$message.success(data.msg) - this.favorite = false - }) - // }) + removeUserFavorite(userFavorite).then(({data}) => { + this.$message.success(data.msg) + this.favorite = false + }) } else { // 收藏 saveUserFavorite(userFavorite).then(({data}) => {