From 78eb7de549a78e0ecd38d2ed4b793da73ce3119f Mon Sep 17 00:00:00 2001 From: zhangqun <179111901@qq.com> Date: Thu, 28 Dec 2023 17:29:46 +0800 Subject: [PATCH 1/4] =?UTF-8?q?=E9=9A=90=E8=97=8F=E5=A4=9A=E4=BD=99?= =?UTF-8?q?=E5=AF=BC=E8=88=AA=EF=BC=8C=E5=B7=A1=E6=A3=80=E4=BB=BB=E5=8A=A1?= =?UTF-8?q?-=E5=B7=A1=E6=A3=80=E7=BB=84=E5=9B=9E=E6=98=BE=E5=8F=98?= =?UTF-8?q?=E6=9B=B4?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/page/index/index.vue | 8 ++++---- src/page/index/top/index.vue | 8 ++++---- src/store/modules/common.js | 2 +- src/views/inspection/insTask.vue | 14 +++++++++++--- 4 files changed, 20 insertions(+), 12 deletions(-) diff --git a/src/page/index/index.vue b/src/page/index/index.vue index 2339a27..2401584 100644 --- a/src/page/index/index.vue +++ b/src/page/index/index.vue @@ -94,10 +94,10 @@ export default { clearInterval(this.timer); return; } - if (this.itemList.length === 0) { - this.notifyList = []; - this.notice(); - } + // if (this.itemList.length === 0) { + // this.notifyList = []; + // this.notice(); + // } }, 20000); }, // 消息通知 diff --git a/src/page/index/top/index.vue b/src/page/index/top/index.vue index 122d38e..26a733d 100644 --- a/src/page/index/top/index.vue +++ b/src/page/index/top/index.vue @@ -40,7 +40,7 @@ --> - 一键已读 {{total}} + - - + --> - + + + + @@ -470,7 +478,7 @@ {{taskForm.planName}} {{taskForm.taskCode}} - {{taskForm.groupId | groupName}} + {{taskForm.groupName}} {{taskForm.actStartTime}} {{taskForm.actFinishTime}} From 4dd6a0654500002ee12919f28f1dc8da756a50d7 Mon Sep 17 00:00:00 2001 From: jinna Date: Thu, 28 Dec 2023 17:56:43 +0800 Subject: [PATCH 2/4] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E9=A1=B5=E9=9D=A2bug,?= =?UTF-8?q?=E6=B7=BB=E5=8A=A0=E5=B7=A6=E4=BE=A7=E8=8F=9C=E5=8D=95=E6=A0=8F?= =?UTF-8?q?=E9=BB=98=E8=AE=A4=E5=B1=95=E5=BC=80=E5=8A=9F=E8=83=BD?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/page/index/sidebar/index.vue | 11 +- src/views/capital/components/scrapQuery.vue | 6 +- src/views/inspection/insTask.vue | 2 + src/views/inspection/leavepoints.vue | 4 +- src/views/inspection/setting/points.vue | 2 + src/views/oiling/statistics.vue | 10 +- src/views/oiling/task.vue | 2 +- src/views/repair/repairAppyDetail.vue | 109 +++++++++++--------- src/views/system/user.vue | 22 ++-- 9 files changed, 106 insertions(+), 62 deletions(-) diff --git a/src/page/index/sidebar/index.vue b/src/page/index/sidebar/index.vue index 3518ee5..7970c9f 100644 --- a/src/page/index/sidebar/index.vue +++ b/src/page/index/sidebar/index.vue @@ -7,6 +7,7 @@ @@ -30,9 +31,17 @@ components: {sidebarItem, logo}, inject: ["index"], data() { - return {}; + return { + menuArr:[] + }; }, created() { + setTimeout(() =>{ + this.menu.map((item,index) =>{ + this.menuArr.push(item.path) + }) + },300) + this.index.openMenu(); }, computed: { diff --git a/src/views/capital/components/scrapQuery.vue b/src/views/capital/components/scrapQuery.vue index 4363e59..d404fbe 100644 --- a/src/views/capital/components/scrapQuery.vue +++ b/src/views/capital/components/scrapQuery.vue @@ -53,7 +53,7 @@ export default { return { // 查询 searchForm: { - goodsName: "", + reportGoodsName: "", }, searchText: { flag: 1, @@ -101,10 +101,10 @@ export default { // 搜索 searchHandle (item, index) { this.page.currentPage = 1 - this.searchForm.goodsName = item.name + this.searchForm.reportGoodsName = item.name if (index === 1) { this.searchForm = { - goodsName: "", + reportGoodsName: "", } this.onLoad(this.page) } else { diff --git a/src/views/inspection/insTask.vue b/src/views/inspection/insTask.vue index b54e2f6..ef2e7c1 100644 --- a/src/views/inspection/insTask.vue +++ b/src/views/inspection/insTask.vue @@ -1044,6 +1044,7 @@ export default { console.log('res =====>',res) this.addForm = res.data.data this.addForm.orderList = res.data.data.taskPointList + this.addForm.planInspectionMethod = Number(this.addForm.planInspectionMethod) this.showAddDialog = true }) }, @@ -1068,6 +1069,7 @@ export default { getInsTaskDetail(this.currentId).then(res =>{ this.addForm = res.data.data this.addForm.orderList = res.data.data.taskPointList + this.addForm.planInspectionMethod = Number(this.addForm.planInspectionMethod) this.showExecuteDialog = false this.onLoad() this.$message.success('执行成功') diff --git a/src/views/inspection/leavepoints.vue b/src/views/inspection/leavepoints.vue index bc26a0f..ceba0e7 100644 --- a/src/views/inspection/leavepoints.vue +++ b/src/views/inspection/leavepoints.vue @@ -114,7 +114,7 @@ :before-close="handleClose" :cell-style="tableCellStyle" :visible.sync="showPlanDialog" - title="查看异常巡检任务单" + title="查看漏检巡检点" width="70%" :append-to-body="true" :close-on-click-modal="false" @@ -569,7 +569,7 @@ export default { // 查询数据 onLoad() { this.loading = true - getLeavePointList({current:this.listPage.current,size:this.listPage.size,...this.searchForm}).then(res =>{ + getLeavePointList({current:this.listPage.current,size:this.listPage.size,pointStatus:3,...this.searchForm}).then(res =>{ this.data = res.data.data.records this.listPage.total = res.data.data.total this.loading = false diff --git a/src/views/inspection/setting/points.vue b/src/views/inspection/setting/points.vue index cc53eda..958e24a 100644 --- a/src/views/inspection/setting/points.vue +++ b/src/views/inspection/setting/points.vue @@ -1306,6 +1306,8 @@ export default { this.addForm = { orderList:[] } + this.fileList = [] + this.imgList = [] this.title = '新建巡检点位' this.$refs.addForm.clearValidate() }) diff --git a/src/views/oiling/statistics.vue b/src/views/oiling/statistics.vue index 513220a..8d821ff 100644 --- a/src/views/oiling/statistics.vue +++ b/src/views/oiling/statistics.vue @@ -84,10 +84,16 @@ export default { overHidden: true, align: "left", }, + // { + // label: "设备ID", + // align: "left", + // prop: "assetId", + // overHidden: true, + // }, { - label: "设备ID", + label: "设备名称", align: "left", - prop: "assetId", + prop: "assetName", overHidden: true, }, { diff --git a/src/views/oiling/task.vue b/src/views/oiling/task.vue index 66700a5..c1b0740 100644 --- a/src/views/oiling/task.vue +++ b/src/views/oiling/task.vue @@ -1847,7 +1847,7 @@ export default { }, // 完成保养任务 handleComplete(row,index){ - this.$confirm("确定删除此保养任务吗?", "提示", { + this.$confirm("确定完成此保养任务吗?", "提示", { confirmButtonText: "确定", cancelButtonText: "取消", type: "warning", diff --git a/src/views/repair/repairAppyDetail.vue b/src/views/repair/repairAppyDetail.vue index d29092c..20b369d 100644 --- a/src/views/repair/repairAppyDetail.vue +++ b/src/views/repair/repairAppyDetail.vue @@ -5,6 +5,7 @@ @@ -300,7 +301,7 @@ - + - + @@ -647,6 +648,14 @@ export default { repairPerson:'', repairContent:'' }, + formRules:{ + repairTeam:[ + {required:true,message:'请选择维修班组',trigger:'change'} + ], + repairPerson:[ + {required:true,message:'请选择维修人员',trigger:'change'} + ] + }, //状态 status: 0, //当前行id @@ -690,6 +699,7 @@ export default { this.groupId = val getMainPer({deptId:val}).then(res =>{ this.perData = res.data.data + this.form.repairPerson = '' }) }, // 图片上传成功参数 @@ -748,7 +758,7 @@ export default { } getMainPer({deptId:this.form.repairTeam}).then(res =>{ this.perData = res.data.data - this.repairPerson = row.repairPerson + this.form.repairPerson = row.repairPerson }) // 特殊属性的给默认值 @@ -778,50 +788,55 @@ export default { * 按钮报修单提交 */ async submit() { - if (this.status > 2) { - if (this.form.status2 === undefined || this.form.status2 === "") { - this.$message({ type: "warning", message: "请选择维修结果" }); - return; + this.$refs.form.validate((valid) =>{ + if(valid){ + if (this.status > 2) { + if (this.form.status2 === undefined || this.form.status2 === "") { + this.$message({ type: "warning", message: "请选择维修结果" }); + return; + } + } + let status; + if (this.form.status2 === undefined || this.form.status2 === "") { + status = this.status + 1; + } else { + status = this.form.status2; + } + // 调修改接口 传状态、id、对象 + const params = { + id: this.id, + instrumentId: this.instrumentId, + ...this.form, + status, + // repairPerson:this.repairPerson + }; + if(this.imgList.length !== 0){ + params.repairAttach = this.imgList[0].url + } + this.$delete(params, "status2"); + this.$delete(params, "applyUser"); + this.$delete(params, "applyUserName"); + // console.log('params ==============>',params) + reportModify(params); + // if (this.status === 0) { + // await reportModify(1, this.id) + // } else if (this.status === 1) { + // await reportModify(2, this.id) + // } else if (this.status === 2) { + // await reportModify(3, this.id) + // } else if (this.status === 3) { + // await reportModify(4, this.id) + // } + // await reportModify(this.status + 1, this.id) + //关闭页面并跳转回列表页 + const tag = this.$store.getters.tagList.find( + (item) => item.value === this.$route.fullPath + ); + this.$store.commit("DEL_TAG", tag); + this.$router.push({ path: "/repair/proposer" }); } - } - let status; - if (this.form.status2 === undefined || this.form.status2 === "") { - status = this.status + 1; - } else { - status = this.form.status2; - } - // 调修改接口 传状态、id、对象 - const params = { - id: this.id, - instrumentId: this.instrumentId, - ...this.form, - status, - repairPerson:this.repairPerson - }; - if(this.imgList.length !== 0){ - params.repairAttach = this.imgList[0].url - } - this.$delete(params, "status2"); - this.$delete(params, "applyUser"); - this.$delete(params, "applyUserName"); - // console.log('params ==============>',params) - await reportModify(params); - // if (this.status === 0) { - // await reportModify(1, this.id) - // } else if (this.status === 1) { - // await reportModify(2, this.id) - // } else if (this.status === 2) { - // await reportModify(3, this.id) - // } else if (this.status === 3) { - // await reportModify(4, this.id) - // } - // await reportModify(this.status + 1, this.id) - //关闭页面并跳转回列表页 - const tag = this.$store.getters.tagList.find( - (item) => item.value === this.$route.fullPath - ); - this.$store.commit("DEL_TAG", tag); - this.$router.push({ path: "/repair/proposer" }); + }) + }, }, }; diff --git a/src/views/system/user.vue b/src/views/system/user.vue index fc0a305..0d31f3f 100644 --- a/src/views/system/user.vue +++ b/src/views/system/user.vue @@ -659,7 +659,8 @@ export default { label: "所属部门", prop: "deptId", type: "tree", - multiple: true, + popperClass:'popperClass', + // multiple: true, dicData: [], props: { label: "title", @@ -920,7 +921,7 @@ export default { }, rowSave(row, done, loading) { console.log(row, "rowww"); - row.deptId = row.deptId.join(","); + // row.deptId = row.deptId.join(","); row.roleId = row.roleId.join(","); row.postId = row.postId.join(","); add(row).then( @@ -940,7 +941,7 @@ export default { ); }, rowUpdate(row, index, done, loading) { - row.deptId = row.deptId.join(","); + // row.deptId = row.deptId.join(","); row.roleId = row.roleId.join(","); row.postId = row.postId.join(","); this.$delete(row, "electronicSignature"); @@ -1148,9 +1149,9 @@ export default { if (["edit", "view"].includes(type)) { getUser(this.form.id).then((res) => { this.form = res.data.data; - if (this.form.hasOwnProperty("deptId")) { - this.form.deptId = this.form.deptId.split(","); - } + // if (this.form.hasOwnProperty("deptId")) { + // this.form.deptId = this.form.deptId.split(","); + // } if (this.form.hasOwnProperty("roleId")) { this.form.roleId = this.form.roleId.split(","); } @@ -1310,4 +1311,13 @@ export default { line-height: 20px; width: 90px; } + + + From d11c4348b82f34b8146031ccf7690209df6aeeb1 Mon Sep 17 00:00:00 2001 From: zhangqun <179111901@qq.com> Date: Fri, 29 Dec 2023 15:05:30 +0800 Subject: [PATCH 3/4] =?UTF-8?q?=E8=8F=9C=E5=8D=95=E9=BB=98=E8=AE=A4?= =?UTF-8?q?=E9=A6=96=E9=A1=B5=E6=97=B6=E5=85=A8=E9=83=A8=E5=B1=95=E5=BC=80?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/page/index/sidebar/index.vue | 15 ++++++++------- 1 file changed, 8 insertions(+), 7 deletions(-) diff --git a/src/page/index/sidebar/index.vue b/src/page/index/sidebar/index.vue index 7970c9f..1caa4cd 100644 --- a/src/page/index/sidebar/index.vue +++ b/src/page/index/sidebar/index.vue @@ -36,12 +36,14 @@ }; }, created() { - setTimeout(() =>{ - this.menu.map((item,index) =>{ - this.menuArr.push(item.path) - }) - },300) - + console.log(this.tag) + if(this.tag.label == '首页') { + setTimeout(() =>{ + this.menu.map((item,index) =>{ + this.menuArr.push(item.path) + }) + },300) + } this.index.openMenu(); }, computed: { @@ -51,7 +53,6 @@ } }, methods: { - } }; From 1d3a4219dbaa37b08406ae08de79f9b4bfa5a4e5 Mon Sep 17 00:00:00 2001 From: jinna Date: Fri, 29 Dec 2023 17:56:22 +0800 Subject: [PATCH 4/4] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E9=A1=B5=E9=9D=A2bug?= =?UTF-8?q?=EF=BC=8C?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/const/limsConfig/equipmentManage.js | 28 +++++++++++----------- src/styles/sidebar.scss | 1 + src/views/capital/components/outStatic.vue | 2 +- src/views/capital/productstoreList.vue | 1 + src/views/repair/proposer.vue | 28 +++++++++++----------- src/views/repair/repairAppyDetail.vue | 8 +++---- src/views/wel/index.vue | 3 ++- 7 files changed, 37 insertions(+), 34 deletions(-) diff --git a/src/const/limsConfig/equipmentManage.js b/src/const/limsConfig/equipmentManage.js index 113481c..e532c24 100644 --- a/src/const/limsConfig/equipmentManage.js +++ b/src/const/limsConfig/equipmentManage.js @@ -45,20 +45,20 @@ export const tableOption = { overHidden: true, rules: [{ required: true, message: "请输入仪器/设备名称" }], }, - { - type: "select", - label: "仪器设备类型", - dicUrl: "/api/blade-system/dict-biz/dictionary?code=instrument", - props: { - label: "dictValue", - value: "dictKey", - }, - span: 8, - display: true, - prop: "type", - align: "left", - overHidden: true, - }, + // { + // type: "select", + // label: "仪器设备类型", + // dicUrl: "/api/blade-system/dict-biz/dictionary?code=instrument", + // props: { + // label: "dictValue", + // value: "dictKey", + // }, + // span: 8, + // display: true, + // prop: "type", + // align: "left", + // overHidden: true, + // }, { type: "input", span: 8, diff --git a/src/styles/sidebar.scss b/src/styles/sidebar.scss index f354731..89cbc8d 100644 --- a/src/styles/sidebar.scss +++ b/src/styles/sidebar.scss @@ -41,6 +41,7 @@ box-shadow: 2px 0 6px rgba(0,21,41,.35); .el-scrollbar__wrap { overflow-x: hidden; + height: 93% !important; } &--tip{ width:90%; diff --git a/src/views/capital/components/outStatic.vue b/src/views/capital/components/outStatic.vue index fd72f20..b428541 100644 --- a/src/views/capital/components/outStatic.vue +++ b/src/views/capital/components/outStatic.vue @@ -113,7 +113,7 @@
- 导出 +
diff --git a/src/views/capital/productstoreList.vue b/src/views/capital/productstoreList.vue index 7ac42a3..953eada 100644 --- a/src/views/capital/productstoreList.vue +++ b/src/views/capital/productstoreList.vue @@ -554,6 +554,7 @@ - + @@ -92,8 +92,6 @@ - - + + ',res1) let result1 = res1.data.data; this.cardInfoList[0].judjeVariable = result1.djy // 待接样 this.cardInfoList[1].judjeVariable = result1.djh // 带计划