From 0989fc93dcc7308227c6510586eb1becae49fb83 Mon Sep 17 00:00:00 2001
From: 王震 <10952869+daywangzhen@user.noreply.gitee.com>
Date: 星期四, 14 九月 2023 11:45:23 +0800
Subject: [PATCH] 改bug
---
src/components/view/technology.vue | 6
src/components/view/laboratoryManagement.vue | 1
src/components/view/self-inspection.vue | 10 +
src/components/view/equipmentmaintain.vue | 7 +
src/components/view/record-content.vue | 221 ++++++++++++++++++++++----------------------
src/components/view/Technicalindex.vue | 17 ++-
6 files changed, 143 insertions(+), 119 deletions(-)
diff --git a/src/components/view/Technicalindex.vue b/src/components/view/Technicalindex.vue
index 96f7f9f..788d84a 100644
--- a/src/components/view/Technicalindex.vue
+++ b/src/components/view/Technicalindex.vue
@@ -94,7 +94,10 @@
<!-- 涓讳綋鍙� -->
<div class="right">
<el-table :data="tableData" style="width: 100%;overflow-y: auto;min-height: 100%"
- max-height="100%" row-key="name" border @selection-change="handleSelectionChange"
+ max-height="100%" row-key="name" border
+ @select="selectTr"
+ ref="multipleTable"
+ @selection-change="handleSelectionChange"
default-expand-all :tree-props="{children: 'children', hasChildren: 'hasChildren'}">
<el-table-column type="selection" width="55">
</el-table-column>
@@ -456,6 +459,7 @@
let cc = this.selects.map(el => {
return el.id
})
+ cc.splice(0,1)
this.delete = cc.join(',')
console.log(this.delete);
this.delAllTechskill()
@@ -596,12 +600,15 @@
modify() {
this.modifyevent = true
},
- // deleteRow(index, rows) {
- // console.log();
- // rows.splice(index, 1);
- // },
+
handleSelectionChange(val) {
this.selects = val;
+ this.deleteList = [];
+ val.forEach((v) => {
+ if (v.id !== undefined) {
+ this.deleteList.push(v.id);
+ }
+ });
},
//缂栬緫
diff --git a/src/components/view/equipmentmaintain.vue b/src/components/view/equipmentmaintain.vue
index 528295c..cf2d491 100644
--- a/src/components/view/equipmentmaintain.vue
+++ b/src/components/view/equipmentmaintain.vue
@@ -601,6 +601,11 @@
let cc = this.selects.map(el => {
return el.id
})
+ // cc.forEach((el,idx) =>{
+ // delete idx[0]
+ // })
+ cc.splice(0,1)
+ console.log(cc);
this.delete = cc.join(',')
console.log(this.delete);
this.delAllQue()
@@ -617,6 +622,7 @@
// },
handleSelectionChange(val) {
+ this.selects = val
this.deleteList = [];
val.forEach((v) => {
if (v.id !== undefined) {
@@ -639,6 +645,7 @@
this.isAllSelect = row.isChecked;
this.toggleSelect(row, row.isChecked, "tr");
});
+
},
//閫掑綊瀛愮骇
toggleSelect(data, flag, type) {
diff --git a/src/components/view/laboratoryManagement.vue b/src/components/view/laboratoryManagement.vue
index 38548d3..1016489 100644
--- a/src/components/view/laboratoryManagement.vue
+++ b/src/components/view/laboratoryManagement.vue
@@ -588,6 +588,7 @@
let one=this.towTree[0]
console.log(one);
let name =one.father
+ this.checkTreeNode.father = name
console.log(name);
this.selectDeviceStart(name)
});
diff --git a/src/components/view/record-content.vue b/src/components/view/record-content.vue
index 921e8f3..84d06bb 100644
--- a/src/components/view/record-content.vue
+++ b/src/components/view/record-content.vue
@@ -1,113 +1,3 @@
-<style scoped>
- .title .el-button {
- height: 32px;
- border: 1px solid rgba(190, 190, 190, 0.44);
- box-shadow: 0px 2px 4px rgba(220, 220, 220, 0.41);
- padding: 0 12px;
- }
-
- .title {
- margin-bottom: 10px;
- padding: 0 20px;
- }
-
- .title * {
- font-size: 16px;
- }
-
- .choose {
- padding: 21px 24px;
- display: flex;
- align-items: center;
- background-color: #fff;
- border-bottom: 3px solid rgb(245, 247, 251);
- }
-
- .choose * {
- font-size: 14px;
- }
-
- .choose .el-button {
- height: 32px;
- border: 1px solid rgba(190, 190, 190, 0.44);
- box-shadow: 0px 2px 4px rgba(220, 220, 220, 0.41);
- padding: 0 12px;
- }
-
- .thing {
- width: 100%;
- height: calc(100% - 120px);
- background-color: #fff;
- display: flex;
- }
-
- .thing .left {
- width: 295px;
- height: calc(100% - 20px);
- border-right: 3px solid rgb(245, 247, 251);
- padding: 16px;
- overflow-y: auto;
- }
-
- .thing .left .custom-tree-node span {
- font-size: 14px;
- }
-
- .thing .left .custom-tree-node {
- flex: 1;
- display: flex;
- align-items: center;
- justify-content: space-between;
- font-size: 14px;
- padding-right: 8px;
- }
-
- .node_i {
- color: orange;
- }
-
- .el-icon-delete {
- display: none;
- color: #004EA2;
- }
-
- .custom-tree-node:hover .el-icon-delete {
- display: inline;
- }
-
- .thing .right {
- width: calc(100% - 305px);
- height: calc(100% - 25px);
- overflow: hidden;
- padding: 10px;
- }
-
- .table_do {
- color: #004ea0;
- cursor: pointer;
- }
-</style>
-<style>
- .record_content .title .el-button * {
- font-size: 14px;
- }
-
- .record_content .title .el-button--default {
- color: #004EA2;
- }
-
- .record_content .thing .left .el-tree--highlight-current .el-tree-node.is-current>.el-tree-node__content {
- background: rgba(58, 124, 253, 0.2);
- color: #004EA2;
- }
-
- .record_content .el-tree-node__content {
- height: 30px;
- border-radius: 2px;
- }
-</style>
-
-
<template>
<div class="record_content">
<div class="title">
@@ -656,3 +546,114 @@
}
}
</script>
+
+<style scoped>
+ .title .el-button {
+ height: 32px;
+ border: 1px solid rgba(190, 190, 190, 0.44);
+ box-shadow: 0px 2px 4px rgba(220, 220, 220, 0.41);
+ padding: 0 12px;
+ }
+
+ .title {
+ margin-bottom: 10px;
+ padding: 0 20px;
+ }
+
+ .title * {
+ font-size: 16px;
+ }
+
+ .choose {
+ padding: 21px 24px;
+ display: flex;
+ align-items: center;
+ background-color: #fff;
+ border-bottom: 3px solid rgb(245, 247, 251);
+ }
+
+ .choose * {
+ font-size: 14px;
+ }
+
+ .choose .el-button {
+ height: 32px;
+ border: 1px solid rgba(190, 190, 190, 0.44);
+ box-shadow: 0px 2px 4px rgba(220, 220, 220, 0.41);
+ padding: 0 12px;
+ }
+
+ .thing {
+ width: 100%;
+ height: calc(100% - 120px);
+ background-color: #fff;
+ display: flex;
+ }
+
+ .thing .left {
+ width: 295px;
+ height: calc(100% - 20px);
+ border-right: 3px solid rgb(245, 247, 251);
+ padding: 16px;
+ overflow-y: auto;
+ }
+
+ .thing .left .custom-tree-node span {
+ font-size: 14px;
+ }
+
+ .thing .left .custom-tree-node {
+ flex: 1;
+ display: flex;
+ align-items: center;
+ justify-content: space-between;
+ font-size: 14px;
+ padding-right: 8px;
+ }
+
+ .node_i {
+ color: orange;
+ }
+
+ .el-icon-delete {
+ display: none;
+ color: #004EA2;
+ }
+
+ .custom-tree-node:hover .el-icon-delete {
+ display: inline;
+ }
+
+ .thing .right {
+ width: calc(100% - 305px);
+ height: calc(100% - 25px);
+ overflow: hidden;
+ padding: 10px;
+ }
+
+ .table_do {
+ color: #004ea0;
+ cursor: pointer;
+ }
+</style>
+<style>
+ .record_content .title .el-button * {
+ font-size: 14px;
+ }
+
+ .record_content .title .el-button--default {
+ color: #004EA2;
+ }
+
+ .record_content .thing .left .el-tree--highlight-current .el-tree-node.is-current>.el-tree-node__content {
+ background: rgba(58, 124, 253, 0.2);
+ color: #004EA2;
+ }
+
+ .record_content .el-tree-node__content {
+ height: 30px;
+ border-radius: 2px;
+ }
+</style>
+
+
diff --git a/src/components/view/self-inspection.vue b/src/components/view/self-inspection.vue
index 55b8cbc..b8213a2 100644
--- a/src/components/view/self-inspection.vue
+++ b/src/components/view/self-inspection.vue
@@ -448,8 +448,15 @@
},
//鏂板
add() {
- this.dialogVisible = false
+ if (this.form.standard[0] !== "<" && this.form.standard[0] !== "<=" && this.form.standard[0] !== ">"){
+ this.$message({
+ message: '杈撳叆鐨勭涓�涓瓧绗﹀繀椤绘槸 '<' 鎴� '<='锛�',
+ type: 'warning'
+ });
+ return;
+ }
this.addSelfcheck()
+ this.dialogVisible = false
},
addSelfcheck() {
this.$axios.post(this.$api.url.addSelfcheck,{
@@ -513,6 +520,7 @@
})[0]
console.log(one);
let id =one.children[0].id
+ this.checkTreeNode.id = id
console.log(id);
this.selectAllSelfStart(id)
this.selectDataList();
diff --git a/src/components/view/technology.vue b/src/components/view/technology.vue
index 09c9d13..aa700a6 100644
--- a/src/components/view/technology.vue
+++ b/src/components/view/technology.vue
@@ -518,9 +518,9 @@
elementId: "",
deviceGroup: "",
},
- search: {
- type: "",
- },
+ // search: {
+ // type: "",
+ // },
delete: [],
treetrunk: [],
process: [],
--
Gitblit v1.9.3