From c6cf8edf2f0ff628ea5c1323eb9bc685398b3a43 Mon Sep 17 00:00:00 2001
From: 王震 <10952869+daywangzhen@user.noreply.gitee.com>
Date: 星期六, 09 九月 2023 17:06:00 +0800
Subject: [PATCH] 改bug
---
src/components/view/standard.vue | 2
src/components/view/technology.vue | 9 +
src/components/view/laboratoryManagement.vue | 1
src/components/view/mbom.vue | 2
src/components/view/self-inspection.vue | 18 +++-
src/components/view/equipmentmaintain.vue | 2
src/components/view/record-content.vue | 151 +++++++++++++++++++++++++------------
src/main.js | 2
src/components/view/Technicalindex.vue | 2
src/assets/api/controller.js | 6 +
10 files changed, 134 insertions(+), 61 deletions(-)
diff --git a/src/assets/api/controller.js b/src/assets/api/controller.js
index ee6631d..2024af8 100644
--- a/src/assets/api/controller.js
+++ b/src/assets/api/controller.js
@@ -109,8 +109,10 @@
delAll:"selfcheckModel/delAllTech",//鎵归噺鍒犻櫎---.鑷
selectjilu:"/recordModel/selectAllRecord",//鐢熶骇璁板綍缁存姢---銆嬪彸杈�
- selecRecord:"/recordModel/selecRecordById",//鐢熶骇璁板綍----.缂栬緫
- delQueById:"/recordModel/delQueById",//鍒犻櫎---.璁板綍鍐呭
+ selecRecord:"/recordModel/selecRecordById",//鐢熶骇璁板綍----.鏂板
+ writeRecordById:"/recordModel/writeRecordById",//缂栬緫
+ delQueByIdapi:"/recordModel/delQueById",//鍒犻櫎---.璁板綍鍐呭
+
delAllRecord:"/recordModel/delAllRecord",//鍒犻櫎鎵归噺--->璁板綍
addRecord:"/recordModel/addRecord",//鐢熶骇璁板綍-------.鏂板
diff --git a/src/components/view/Technicalindex.vue b/src/components/view/Technicalindex.vue
index 6aa8d70..7d7ded9 100644
--- a/src/components/view/Technicalindex.vue
+++ b/src/components/view/Technicalindex.vue
@@ -189,7 +189,7 @@
size="small"
clearable @input="query" ></el-input>
<el-tree :data="list" ref="tree" :props="{children: 'children',label: 'father'}" node-key="id" default-expand-all
- @node-click="handleNodeClick"
+ @node-click="handleNodeClick" highlight-current
>
<div class="custom-tree-node" slot-scope="{ node, data }">
<span><i :class="`node_i ${data.code != '[2]'?'el-icon-folder-opened':'el-icon-tickets'}`"></i>
diff --git a/src/components/view/equipmentmaintain.vue b/src/components/view/equipmentmaintain.vue
index 6bec45c..e2695da 100644
--- a/src/components/view/equipmentmaintain.vue
+++ b/src/components/view/equipmentmaintain.vue
@@ -163,7 +163,7 @@
suffix-icon="el-icon-search"
placeholder="璇疯緭鍏ユ悳绱㈠唴瀹�"
size="small" clearable ></el-input>
- <el-tree :data="list" ref="tree" :props="{children: 'children',label: 'name'}" node-key="id" default-expand-all
+ <el-tree :data="list" ref="tree" :props="{children: 'children',label: 'name'}" highlight-current node-key="id" default-expand-all
highlight-current :filter-node-method="filterNode"
@node-click="handleNodeClick"
>
diff --git a/src/components/view/laboratoryManagement.vue b/src/components/view/laboratoryManagement.vue
index 9cbf45d..441e709 100644
--- a/src/components/view/laboratoryManagement.vue
+++ b/src/components/view/laboratoryManagement.vue
@@ -209,6 +209,7 @@
:props="{ children: 'children', label: 'father' }"
node-key="id"
default-expand-all
+ highlight-current
@node-click="handleNodeClick"
>
<div class="custom-tree-node" slot-scope="{ node, data }">
diff --git a/src/components/view/mbom.vue b/src/components/view/mbom.vue
index 570c088..fbfa699 100644
--- a/src/components/view/mbom.vue
+++ b/src/components/view/mbom.vue
@@ -137,7 +137,7 @@
<div class="thing">
<div class="left">
<el-input v-model="search.technology" suffix-icon="el-icon-search" placeholder="璇疯緭鍏ユ悳绱㈠唴瀹�" size="small" clearable ></el-input>
- <el-tree :data="list" ref="tree"
+ <el-tree :data="list" ref="tree" highlight-current
:props="{children: 'children',label: 'name'}"
node-key="id" default-expand-all @node-click="handleNodeClick" >
<div class="custom-tree-node" slot-scope="{ node, data }">
diff --git a/src/components/view/record-content.vue b/src/components/view/record-content.vue
index a5b230f..129a6ca 100644
--- a/src/components/view/record-content.vue
+++ b/src/components/view/record-content.vue
@@ -39,6 +39,7 @@
height: calc(100% - 120px);
background-color: #fff;
display: flex;
+
}
.thing .left {
@@ -46,6 +47,7 @@
height: calc(100% - 20px);
border-right: 3px solid rgb(245, 247, 251);
padding: 16px;
+ /* height:calc(50vh - 250px) */
}
.thing .left .custom-tree-node span {
@@ -111,7 +113,7 @@
<div class="record_content">
<div class="title">
<el-row>
- <el-col :span="12" style="line-height: 32px;">璁板綍鍐呭缁存姢</el-col>
+ <el-col :span="12" style="line-height: 32px;">鐢熶骇璁板綍缁存姢</el-col>
<el-col :span="12" style="text-align: right;">
<el-button type="primary" icon="el-icon-plus" style="background: #004EA2;" @click="addend">鏂板</el-button>
<!-- <el-button icon="el-icon-edit-outline" @click="modify">淇敼</el-button> -->
@@ -134,16 +136,20 @@
<el-button size="mini" @click="clean()"><span>閲� 缃�</span></el-button>
<el-button size="mini" type="primary" style="background: #004EA2;"><span>鏌�
璇�</span></el-button> -->
+ <!-- :style="{height: scrollerHeight,overflow:'auto',display: 'flex'}" -->
+
</div>
<div class="thing">
<div class="left">
- <el-input v-model="search.technology" suffix-icon="el-icon-search" placeholder="璇疯緭鍏ユ悳绱㈠唴瀹�" size="small" clearable @input="(val)=>$refs.tree.filter(val)"></el-input>
- <el-tree :data="list" ref="tree" :props="{children: 'children',label: 'name'}" node-key="id" default-expand-all
- @node-click="handleNodeClick" highlight-current @node-expand="nodeOpen" @node-collapse="nodeClose" :filter-node-method="filterNode"
+ <el-input v-model="search.technology" suffix-icon="el-icon-search" placeholder="璇疯緭鍏ユ悳绱㈠唴瀹�" size="small" clearable @input="query"></el-input>
+ <el-tree :data="list" ref="tree"
+ style="height: 500px;overflow-y: auto;"
+ :props="{children: 'children',label: 'name'}" node-key="name" default-expand-all
+ @node-click="handleNodeClick" highlight-current
:key="upIndex">
<div class="custom-tree-node" slot-scope="{ node, data }">
<span><i :class="`node_i ${data.code != '[2]'?'el-icon-folder-opened':'el-icon-tickets'}`"></i>
- {{data.code}} {{ data.name }}</span>
+ {{ data.cord }}{{ data.name }}</span>
<!-- <el-button type="text" size="mini" @click.stop="remove(node, data)">
<i class="el-icon-delete"></i>
</el-button> -->
@@ -178,7 +184,7 @@
<el-col :span="4" style="font-size: 14px;text-align: right;">绫诲瀷:</el-col>
<el-col :span="16" :offset="1">
<template>
- <el-select v-model="edit.type" placeholder="璇烽�夋嫨" style="width: 310px;">
+ <el-select v-model="edit.type" disabled placeholder="璇烽�夋嫨" style="width: 310px;">
<el-option label="姗¤兌杩炴帴鍣�" :value="0"></el-option>
<el-option label="閲戝睘杩炴帴鍣�" :value="1"></el-option>
<el-option label="婀挎彃鎷旂數杩炴帴鍣�" :value="2"></el-option>
@@ -193,6 +199,7 @@
<template>
<el-select v-model="edit.techFather"
placeholder="璇烽�夋嫨"
+ disabled
@change="workevent"
style="width: 310px;">
<el-option
@@ -206,10 +213,10 @@
</el-col>
</el-row>
<el-row style="line-height: 46px;">
- <el-col :span="4" style="font-size: 14px;text-align: right;">宸ヨ壓:</el-col>
+ <el-col :span="4" style="font-size: 14px;text-align: right;">宸ヨ壓:</el-col>
<el-col :span="16" :offset="1">
<template>
- <el-select v-model="edit.techName" placeholder="璇烽�夋嫨" style="width: 310px;">
+ <el-select v-model="edit.techName" disabled placeholder="璇烽�夋嫨" style="width: 310px;">
<el-option
v-for="item in craftapi"
:key="item.id"
@@ -245,12 +252,12 @@
</span>
</el-dialog>
<!-- 鏂板寮圭獥 -->
- <el-dialog title="宸ュ簭鏂板" :visible.sync="dialogVisible" width="35%">
+ <el-dialog title="鐢熶骇璁板綍鏂板" :visible.sync="dialogVisible" width="35%">
<div>
<el-form ref="form" :model="form" label-width="80px">
<el-form-item label="绫诲瀷">
<template>
- <el-select v-model="form.type" placeholder="璇烽�夋嫨" style="width: 480px;">
+ <el-select v-model="form.type" @change="edittype" placeholder="璇烽�夋嫨" style="width: 480px;">
<el-option label="姗¤兌杩炴帴鍣�" :value="0"></el-option>
<el-option label="閲戝睘杩炴帴鍣�" :value="1"></el-option>
<el-option label="婀挎彃鎷旂數杩炴帴鍣�" :value="2"></el-option>
@@ -392,9 +399,13 @@
typeselect:0,
upDia: false,
checkTreeNode:{
- id:1,
+ id:'',
},
- upData:{},
+ upData:{
+ name:'',
+ unit:'',
+ note:'',
+ },
edit:{
name:'',
note:'',
@@ -403,12 +414,6 @@
type:'',
unit:'',
},
- upData: {
- id: 0,
- name: null,
- unit: null,
- thing: null
- }
}
},
mounted() {
@@ -420,11 +425,22 @@
this.$axios.get(this.$api.url.delQueById,)
},
childrenClick() {},
+ TYpe(val) {
+ this.typeselect = val
+ console.log(this.typeselect);
+ this.selectAllleft()
+ },
+ edittype(val) {
+ // this.typeselect = ''
+ this.typeselect = val
+ this.chooseTechFath()
+ },
//鏂板
workevent(val){
console.log(val);
let idx = this.process.findIndex(el => el.name === val)
this.craftapi = this.process[idx].children
+ console.log( this.craftapi);
},
chooseTechFath() {
this.$axios.get(this.$api.url.chooseTechFath,{
@@ -436,7 +452,9 @@
headers: {
"Content-Type": "application/json"
}
- })
+ }).then(res =>{
+
+ })
},
addRecord() {
this.$axios.post(this.$api.url.addRecord,{
@@ -458,30 +476,38 @@
this.selectjilu()
this.form = {};
},
- //缂栬緫 this.upData
- selecRecord() {
- this.$axios.get(this.$api.url.selecRecord,{
- params:{
- id:this.upData.id
- }
- }).then(res => {
- this.edit = res.data[0]
- // console.log(this.edit);
- })
+ query() {
+ this.selectAllleft()
},
- TYpe(val) {
- this.typeselect = val
- console.log(this.typeselect);
- this.selectAllleft()
- },
//涓讳綋宸�
selectAllleft() {
this.$axios.get(this.$api.url.selectAllleft,{
- params:{type:this.typeselect}
+ params:{type:this.typeselect,message:this.search.technology}
}).then(res => {
this.list = res.data;
- console.log(this.list);
this.selectDataList()
+ this.$nextTick(() => {
+ this.$refs.tree.setCurrentKey(this.list[0].children[0].name) // 榛樿閫変腑鑺傜偣绗竴涓�
+ })
+ console.log("=======");
+ console.log(this.list);
+ let one=this.list.filter(item=>{
+ return item.children.length>0
+ })[0]
+ console.log(one);
+ let name=one.children[0].id
+ console.log(name);
+ this.selectjiluStart(name)
+ this.selectDataList();
+ });
+ },
+ //榛樿
+ selectjiluStart(name) {
+ this.$axios.get(this.$api.url.selectjilu,{
+ params:{id:name}
+ }).then(res => {
+ this.tableData = res.data;
+ console.log(this.tableData);
})
},
//selectjilu checkTreeNode
@@ -571,35 +597,62 @@
},
//鍒犻櫎
- delQueById() {
- this.$axios.post(this.$api.url.delQueById,{
+ delQueByIdapi() {
+ this.$axios.post(this.$api.url.delQueByIdapi,{
id:this.upData.id
})
},
deleteRow(index, rows) {
this.tableData.splice(index,1)
this.upData.id = rows.id
- this.delQueById()
- this.selectjilu()
+ this.delQueByIdapi()
+ // this.selectjilu()
},
-
+ //缂栬緫
upContent(ob) {
this.upData = ob
- console.log(this.upData);
+ // console.log(this.upData);
this.selecRecord()
- this.chooseTechFath()
+ // this.chooseTechFath()
this.upDia = true
},
- submitUpData() {
- this.tableData.forEach(a => {
- if (a.id == this.upData.id) {
- a.name = this.upData.name
- a.unit = this.upData.unit
- a.thing = this.upData.thing
+ selecRecord() {
+ this.$axios.get(this.$api.url.selecRecord,{
+ params:{
+ id:this.upData.id
}
+ }).then(res => {
+ this.edit = res.data[0]
})
+ },
+ writeRecordById() {
+ // console.log(this.upData.id);
+ this.$axios.post(this.$api.url.writeRecordById + '?id=' + this.upData.id,{
+ name:this.upData.name,
+ note:this.upData.note,
+ techTemId:this.edit.id,
+ unit:this.upData.unit
+ }, {
+ headers: {
+ "Content-Type": "application/json"
+ }
+ }).then(res => {
+ this.selectjilu()
+ })
+ },
+ submitUpData() {
+ this.writeRecordById()
this.$message.success('淇敼鎴愬姛')
+
this.upDia = false
+ // this.tableData.forEach(a => {
+ // if (a.id == this.upData.id) {
+ // a.name = this.upData.name
+ // a.unit = this.upData.unit
+ // a.thing = this.upData.thing
+ // }
+ // })
+ // console.log(this.upData);
}
}
}
diff --git a/src/components/view/self-inspection.vue b/src/components/view/self-inspection.vue
index 9b35529..b994152 100644
--- a/src/components/view/self-inspection.vue
+++ b/src/components/view/self-inspection.vue
@@ -141,7 +141,7 @@
<div class="thing">
<div class="left">
<el-input v-model="search.technology" suffix-icon="el-icon-search" placeholder="璇疯緭鍏ユ悳绱㈠唴瀹�" size="small" clearable @input="(val)=>$refs.tree.filter(val)"></el-input>
- <el-tree :data="list" ref="tree" :props="{children: 'children',label: 'name'}" node-key="id" default-expand-all
+ <el-tree :data="list" style="height: 500px;overflow-y: auto;" ref="tree" :props="{children: 'children',label: 'name'}" node-key="name" default-expand-all
@node-click="handleNodeClick" highlight-current @node-expand="nodeOpen" @node-collapse="nodeClose" :filter-node-method="filterNode"
:key="upIndex">
<div class="custom-tree-node" slot-scope="{ node, data }">
@@ -216,7 +216,7 @@
<el-form ref="form" :model="form" label-width="80px">
<el-form-item label="绫诲瀷">
<template>
- <el-select v-model="form.value" placeholder="璇烽�夋嫨" style="width: 480px;">
+ <el-select v-model="form.value" placeholder="璇烽�夋嫨" @change="edittype" style="width: 480px;">
<el-option label="姗¤兌杩炴帴鍣�" :value="0"></el-option>
<el-option label="閲戝睘杩炴帴鍣�" :value="1"></el-option>
<el-option label="婀挎彃鎷旂數杩炴帴鍣�" :value="2"></el-option>
@@ -442,9 +442,10 @@
ids:this.delete
})
},
+ //缂栬緫
+ writeRecordById() {
-
-
+ },
//鏂板
add() {
this.dialogVisible = false
@@ -489,6 +490,11 @@
console.log(this.typeselect);
this.selectAllleft()
},
+ edittype(val) {
+ // this.typeselect = ''
+ this.typeselect = val
+ this.chooseTechFath()
+ },
//涓讳綋宸�
selectAllleft() {
this.$axios.get(this.$api.url.selectAllleft,{
@@ -497,8 +503,12 @@
this.list = res.data;
console.log(this.list);
this.selectDataList()
+ this.$nextTick(() => {
+ this.$refs.tree.setCurrentKey(this.list[0].children[0].name) // 榛樿閫変腑鑺傜偣绗竴涓�
+ })
})
},
+
//selectAllSelf checkTreeNode
selectAllSelf() {
this.$axios.get(this.$api.url.selectAllSelf,{
diff --git a/src/components/view/standard.vue b/src/components/view/standard.vue
index 0d1f689..09e4e74 100644
--- a/src/components/view/standard.vue
+++ b/src/components/view/standard.vue
@@ -16,7 +16,7 @@
<div class="left">
<el-input v-model="search" suffix-icon="el-icon-search" placeholder="璇疯緭鍏ユ悳绱㈠唴瀹�" size="small" clearable></el-input>
- <el-tree :data="list" ref="tree" :default-expand-all="false" :props="{ children: 'children', label: 'name' }"
+ <el-tree :data="list" ref="tree" default-expand-all :props="{ children: 'children', label: 'name' }"
node-key="id" :filter-node-method="filterNode" @node-click="handleNodeClick" highlight-current>
<div class="custom-tree-node" slot-scope="{ node, data }">
<span><i :class="`node_i ${data.code != '[4]' ? 'el-icon-folder-opened' : 'el-icon-tickets'}`"></i>
diff --git a/src/components/view/technology.vue b/src/components/view/technology.vue
index 221ebe2..fcd7756 100644
--- a/src/components/view/technology.vue
+++ b/src/components/view/technology.vue
@@ -174,7 +174,9 @@
node-key="id"
default-expand-all
@node-click="handleNodeClick"
+ style="height: 500px;overflow-y: auto;"
:key="upIndex"
+ highlight-current
>
<div class="custom-tree-node" slot-scope="{ node, data }">
<span
@@ -332,6 +334,8 @@
<template>
<el-select
v-model="form.father"
+ allow-create
+ filterable
placeholder="璇烽�夋嫨"
style="width: 480px"
>
@@ -368,6 +372,7 @@
<template>
<el-select
v-model="form.elementId"
+ multiple
placeholder="璇烽�夋嫨"
style="width: 200px"
>
@@ -567,7 +572,7 @@
Neworder() {
this.dialogVisible = false;
this.addTechTemp();
- // this.form = '';
+ this.form = {};
},
Deleteapi() {
this.dialogVisible = false;
@@ -581,7 +586,7 @@
{
deviceGroup: this.form.deviceGroup,
- elementId: this.form.elementId,
+ elementId: JSON.stringify(this.form.elementId).replace("[","").replace("]",""),
father: this.form.father,
name: this.form.name,
type: this.form.type,
diff --git a/src/main.js b/src/main.js
index 4df962d..811776f 100644
--- a/src/main.js
+++ b/src/main.js
@@ -25,6 +25,8 @@
const javaApi = 'http://192.168.0.23:8001'
+// const javaApi = '192.168.0.6'
+
axios.defaults.baseURL = javaApi
--
Gitblit v1.9.3