From 2b5e0880896929389c873b3a1d9f47d789d0f6e1 Mon Sep 17 00:00:00 2001
From: 王震 <10952869+daywangzhen@user.noreply.gitee.com>
Date: 星期二, 12 九月 2023 09:07:15 +0800
Subject: [PATCH] 改bug
---
src/components/view/technology.vue | 53 ++--
src/components/view/laboratoryManagement.vue | 24 +
src/components/view/self-inspection.vue | 25 ++
src/components/view/record-content.vue | 6
src/main.js | 5
src/components/view/Technicalindex.vue | 465 ++++++++++++++++++++++++++++------------------
src/assets/api/controller.js | 2
7 files changed, 354 insertions(+), 226 deletions(-)
diff --git a/src/assets/api/controller.js b/src/assets/api/controller.js
index e9c4312..5b42371 100644
--- a/src/assets/api/controller.js
+++ b/src/assets/api/controller.js
@@ -91,11 +91,13 @@
addTechMode:"/technicalModel/addTechMode",//鎶�鏈寚鏍�---銆嬫柊澧�
delTechBy:"/technicalModel/delTechById",//鎶�鏈�--.鍒犻櫎
+ delAllTechskill:"/technicalModel/delAllTech",//鎵归噺鍒犻櫎
selectAllleft:"/technicalModel/selectAllTechTem",//鎶�鏈寚鏍�-->宸﹁竟
selectAllright:"/technicalModel/selectAllTechNam",//鎶�鏈寚鏍�--銆嬪彸杈�
chooseProFath:"/technicalModel/chooseProFath",//鎶�鏈寚鏍�---銆嬬埗绫婚�夋嫨
chooseTechFath: "/technicalModel/chooseTechFath",// 鎶�鏈�--->宸ュ簭宸ヨ壓
selecTech:"/technicalModel/selecTechById",//鎶�鏈�--->缂栬緫
+ writeTechByIdskill:"/technicalModel/writeTechById",//缂栬緫浼�
selectAllMbom:"/mbomModel/selectAllMbom",//鐗╂枡缁存姢--銆嬪彸杈�
addMbom:"/mbomModel/addMbom",//鐗╂枡--->鏂板
diff --git a/src/components/view/Technicalindex.vue b/src/components/view/Technicalindex.vue
index c48d631..9211f57 100644
--- a/src/components/view/Technicalindex.vue
+++ b/src/components/view/Technicalindex.vue
@@ -68,17 +68,188 @@
</span>
</el-dialog>
</div>
- <!-- 鏂板寮圭獥 -->
+ <div class="choose">
+ <span>绫诲瀷锛�</span>
+ <el-select v-model="search.type" size="small" placeholder="璇烽�夋嫨" @change="TYpe" style="width: 224px;margin-right: 30px;">
+ <el-option label="姗¤兌杩炴帴鍣�" :value="0"></el-option>
+ <el-option label="閲戝睘杩炴帴鍣�" :value="1"></el-option>
+ <el-option label="婀挎彃鎷旂數杩炴帴鍣�" :value="2"></el-option>
+ <el-option label="鍒嗘敮缁勪欢" :value="3"></el-option>
+ </el-select>
+ <!-- <span>宸ュ簭锛�</span>
+ <el-select v-model="search.name" size="small" placeholder="璇烽�夋嫨" style="width: 224px;margin-right: 30px;">
+ <el-option v-for="(a, ai) in process" key="ai" :label="a.name" :value="a.id"></el-option>
+ </el-select>
+ <el-button size="mini"><span>閲� 缃�</span></el-button>
+ <el-button size="mini" type="primary" style="background: #004EA2;"><span>鏌ヨ</span></el-button> -->
+ </div>
+ <div class="thing">
+ <!-- 涓讳綋宸� -->
+ <div class="left">
+ <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" :props="{children: 'children',label: 'father'}" node-key="name" default-expand-all
+ @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>
+ {{data.code}} {{ data.name }}</span>
+ <!-- <el-button type="text" size="mini" @click.stop="remove(node, data)">
+ <i class="el-icon-delete"></i>
+ </el-button> -->
+ </div>
+ </el-tree>
+ </div>
+ <!-- 涓讳綋鍙� -->
+ <div class="right">
+ <el-table
+ :data="tableData"
+ style="width: 100%;margin-bottom: 20px;"
+ row-key="name"
+ border
+ @selection-change="handleSelectionChange"
+ default-expand-all
+ :tree-props="{children: 'children', hasChildren: 'hasChildren'}">
+ <el-table-column
+ type="selection"
+ width="55">
+ </el-table-column>
+ <el-table-column
+ type="index"
+ width="50">
+ </el-table-column>
+ <el-table-column
+ prop="name"
+ label="椤圭洰"
+ sortable
+ width="400px">
+ <template slot-scope="scope">
+ <el-tag>
+ <div class="firstDiv" :style="`color: ${scope.row.children? '#16a7ff' : '#58c173'}`">
+ {{ scope.row.children ? "01" : "02" }}
+ </div>
+ </el-tag>
+ <span style="color: black">{{ scope.row.name }}</span>
+
+ </template>
+ </el-table-column>
+ <el-table-column
+ prop="unit"
+ label="鍗曚綅">
+ </el-table-column>
+ <el-table-column
+ prop="address"
+ label="鎿嶄綔"
+ width="200px">
+ <template slot-scope="scope" style="text-align: center;">
+ <div v-if="!scope.row.children">
+ <el-button type="text" size="mini" @click="childrenClick(scope.row)">缂栬緫</el-button>
+ <el-button type="text" size="mini" @click="deleteRow(scope.$index, scope.row)">鍒犻櫎</el-button>
+ </div>
+ </template>
+ </el-table-column>
+ </el-table>
+ </div>
+ <div>
+ <el-dialog title="缂栬緫鎶�鏈唴瀹�" :visible.sync="upDia" width="500px">
+ <div class="body">
+
+ <el-row style="line-height: 46px;">
+ <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" disabled placeholder="璇烽�夋嫨" @change="TYpe" style="width: 306px;margin-right: 30px;">
+ <el-option label="姗¤兌杩炴帴鍣�" :value="0"></el-option>
+ <el-option label="閲戝睘杩炴帴鍣�" :value="1"></el-option>
+ <el-option label="婀挎彃鎷旂數杩炴帴鍣�" :value="2"></el-option>
+ <el-option label="鍒嗘敮缁勪欢" :value="3"></el-option>
+ </el-select>
+ </template>
+ </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="16" :offset="1">
+ <template>
+ <el-select v-model="edit.techFather"
+ placeholder="璇烽�夋嫨"
+ allow-create
+ disabled
+ style="width: 306px;"
+ filterable
+ @change="workevent"
+ >
+ <el-option
+ v-for="(item,index) in process"
+ :key="item.name"
+ :label="item.name"
+ :value="item.name">
+ </el-option>
+ </el-select>
+ </template>
+ </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="16" :offset="1">
+ <template>
+ <el-select v-model="edit.techName"
+ placeholder="璇烽�夋嫨"
+ disabled
+ style="width: 306px;"
+ allow-create
+ filterable
+ >
+ <el-option
+ v-for="item in craftapi"
+ :key="item.id"
+ :label="item.name"
+ :value="item.id">
+ </el-option>
+ </el-select>
+ </template>
+ </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="16" :offset="1">
+ <el-input v-model="edit.father" :disabled="true" size="small" clearable></el-input>
+ </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="16" :offset="1">
+ <el-input v-model="edit.name" size="small" clearable></el-input>
+ </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="16" :offset="1">
+ <el-input v-model="edit.unit" size="small" clearable></el-input>
+ </el-col>
+ </el-row>
+ </div>
+ <span slot="footer" class="dialog-footer">
+ <el-button type="primary" @click="submitUpData">纭� 瀹�</el-button>
+ <el-button @click="upDia = false">鍙� 娑�</el-button>
+ </span>
+ </el-dialog>
+ </div>
+
+ <!-- 鏂板寮圭獥 -->
<div>
<el-dialog
title="鎶�鏈寚鏍囨柊澧�"
:visible.sync="dialogVisible"
width="40%"
- :before-close="handleClose">
+ >
<el-form ref="form" :model="form" label-width="80px">
<el-form-item label="绫诲瀷">
<template>
- <el-select v-model="form.type" size="small" placeholder="璇烽�夋嫨" @change="TYpe" style="width: 224px;margin-right: 30px;">
+ <el-select v-model="form.type" size="small" placeholder="璇烽�夋嫨" @change="edittype" style="width: 554px;margin-right: 30px;">
<el-option label="姗¤兌杩炴帴鍣�" :value="0"></el-option>
<el-option label="閲戝睘杩炴帴鍣�" :value="1"></el-option>
<el-option label="婀挎彃鎷旂數杩炴帴鍣�" :value="2"></el-option>
@@ -128,12 +299,13 @@
<el-row>
<el-col :span="11">
- <el-form-item label="椤圭洰缁�">
+ <el-form-item label="椤圭洰缁�" >
<template>
<el-select v-model="form.father"
placeholder="璇烽�夋嫨"
allow-create
filterable
+ @create="electadd"
>
<el-option
v-for="item in higherlevel"
@@ -142,18 +314,35 @@
:value="item">
</el-option>
</el-select>
+ <!-- <el-autocomplete
+ popper-class="my-autocomplete"
+ v-model="form.father"
+ :fetch-suggestions="higherlevel"
+ placeholder="璇疯緭鍏ュ唴瀹�"
+ @select="electadd">
+ <i
+ class="el-icon-edit el-input__icon"
+ slot="suffix"
+ @click="handleIconClick">
+ </i>
+ <template slot-scope="{ item }">
+ <div class="name">{{ item }}</div>
+ <span class="addr">{{ item}}</span>
+ </template>
+ </el-autocomplete> -->
+
</template>
</el-form-item>
</el-col>
<el-col :span="11" :offset="2">
<el-form-item label="椤圭洰">
- <el-input v-model="form.project" placeholder="璇疯緭鍏ラ」鐩�"></el-input>
+ <el-input v-model="form.project" style="width: 200px;" placeholder="璇疯緭鍏ラ」鐩�"></el-input>
</el-form-item>
</el-col>
</el-row>
<el-form-item label="鍗曚綅">
- <el-input v-model="form.unit" placeholder="璇疯緭鍏ュ崟浣�" style="width: 220px;"></el-input>
+ <el-input v-model="form.unit" placeholder="璇疯緭鍏ュ崟浣�" style="width: 200px;"></el-input>
</el-form-item>
</el-form>
<span slot="footer" class="dialog-footer">
@@ -164,166 +353,6 @@
</div>
</div>
-
- <div class="choose">
- <span>绫诲瀷锛�</span>
- <el-select v-model="search.type" size="small" placeholder="璇烽�夋嫨" @change="TYpe" style="width: 224px;margin-right: 30px;">
- <el-option label="姗¤兌杩炴帴鍣�" :value="0"></el-option>
- <el-option label="閲戝睘杩炴帴鍣�" :value="1"></el-option>
- <el-option label="婀挎彃鎷旂數杩炴帴鍣�" :value="2"></el-option>
- <el-option label="鍒嗘敮缁勪欢" :value="3"></el-option>
- </el-select>
- <!-- <span>宸ュ簭锛�</span>
- <el-select v-model="search.name" size="small" placeholder="璇烽�夋嫨" style="width: 224px;margin-right: 30px;">
- <el-option v-for="(a, ai) in process" key="ai" :label="a.name" :value="a.id"></el-option>
- </el-select>
- <el-button size="mini"><span>閲� 缃�</span></el-button>
- <el-button size="mini" type="primary" style="background: #004EA2;"><span>鏌ヨ</span></el-button> -->
- </div>
- <div class="thing">
- <!-- 涓讳綋宸� -->
- <div class="left">
- <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" :props="{children: 'children',label: 'father'}" node-key="id" default-expand-all
- @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>
- {{data.code}} {{ data.name }}</span>
- <!-- <el-button type="text" size="mini" @click.stop="remove(node, data)">
- <i class="el-icon-delete"></i>
- </el-button> -->
- </div>
- </el-tree>
- </div>
- <!-- 涓讳綋鍙� -->
- <div class="right">
- <el-table
- :data="tableData"
- style="width: 100%;margin-bottom: 20px;"
- row-key="name"
- border
- @selection-change="handleSelectionChange"
- default-expand-all
- :tree-props="{children: 'children', hasChildren: 'hasChildren'}">
- <el-table-column
- type="selection"
- width="55">
- </el-table-column>
- <el-table-column
- type="index"
- width="50">
- </el-table-column>
- <el-table-column
- prop="name"
- label="椤圭洰"
- sortable
- width="300px">
- <template slot-scope="scope">
- <el-tag>
- <div class="firstDiv" :style="`color: ${scope.row.children? '#16a7ff' : '#58c173'}`">
- {{ scope.row.children ? "01" : "02" }}
- </div>
- </el-tag>
- <span style="color: black">{{ scope.row.name }}</span>
-
- </template>
- </el-table-column>
- <el-table-column
- prop="unit"
- label="鍗曚綅">
- </el-table-column>
- <el-table-column
- prop="address"
- label="鎿嶄綔"
- width="200px">
- <template slot-scope="scope" style="text-align: center;">
- <el-button type="text" size="mini" @click="childrenClick(scope)">缂栬緫</el-button>
- <el-button type="text" size="mini" @click="deleteRow(scope.$index, scope.row)">鍒犻櫎</el-button>
- </template>
- </el-table-column>
- </el-table>
- </div>
- <div>
- <el-dialog title="缂栬緫鎶�鏈唴瀹�" :visible.sync="upDia" width="500px">
- <div class="body">
-
- <el-row style="line-height: 46px;">
- <el-col :span="4" style="font-size: 14px;text-align: right;">绫诲瀷:</el-col>
- <el-col :span="16" :offset="1">
- <template>
- <el-select v-model="form.type" size="small" placeholder="璇烽�夋嫨" @change="TYpe" style="width: 224px;margin-right: 30px;">
- <el-option label="姗¤兌杩炴帴鍣�" :value="0"></el-option>
- <el-option label="閲戝睘杩炴帴鍣�" :value="1"></el-option>
- <el-option label="婀挎彃鎷旂數杩炴帴鍣�" :value="2"></el-option>
- <el-option label="鍒嗘敮缁勪欢" :value="3"></el-option>
- </el-select>
- </template>
- </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="16" :offset="1">
- <template>
- <el-select v-model="form.work"
- placeholder="璇烽�夋嫨"
- allow-create
- filterable
- @change="workevent"
- >
- <el-option
- v-for="(item,index) in process"
- :key="item.name"
- :label="item.name"
- :value="item.name">
- </el-option>
- </el-select>
- </template>
- </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="16" :offset="1">
- <template>
- <el-select v-model="form.name"
- placeholder="璇烽�夋嫨"
- allow-create
- filterable
- >
- <el-option
- v-for="item in craftapi"
- :key="item.id"
- :label="item.name"
- :value="item.id">
- </el-option>
- </el-select>
- </template>
- </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="16" :offset="1">
- <el-input v-model="upData.name" size="small" clearable></el-input>
- </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="16" :offset="1">
- <el-input v-model="upData.device_group" size="small" clearable></el-input>
- </el-col>
- </el-row>
- </div>
- <span slot="footer" class="dialog-footer">
- <el-button type="primary" @click="submitUpData">纭� 瀹�</el-button>
- <el-button @click="upDia = false">鍙� 娑�</el-button>
- </span>
- </el-dialog>
- </div>
</div>
</div>
</template>
@@ -337,7 +366,7 @@
},
// handleClose:[],
checkTreeNode :{
- id:1,
+ id:'',
},
higherlevel:[],
value:{},
@@ -361,6 +390,12 @@
upDia:false,
craftapi:[],
edit:{
+ techFather:'',
+ techName:'',
+ father:'',
+ name:'',
+ unit:'',
+ id:'',
}
}
@@ -372,6 +407,9 @@
},
methods:{
+ handleClose(){
+
+ },
selectDataList() {
this.list.forEach(a => {
a.code = '[1]'
@@ -399,12 +437,29 @@
console.log(this.edit);
})
},
- childrenClick() {
+ childrenClick(val) {
+ this.upData = val
this.selecTech()
this.upDia = true
},
+ writeTechByIdskill() {
+ // console.log(this.upData.id);
+ this.$axios.post(this.$api.url.writeTechByIdskill + '?id=' + this.upData.id,{
+ name:this.edit.name,
+ father:this.edit.father,
+ techTemId:this.edit.id,
+ unit:this.edit.unit
+ }, {
+ headers: {
+ "Content-Type": "application/json"
+ }
+ }).then(res => {
+ this.selectAllright()
+ })
+ },
submitUpData() {//纭畾
-
+ this.writeTechByIdskill()
+ this.upDia = false
},
//鍒犻櫎
delTechBy() {
@@ -422,9 +477,40 @@
this.upData.id = rows.id
this.delTechBy()
},
+ //鎵归噺鍒犻櫎
+ delAllTechskill() {
+ this.$axios.post(this.$api.url.delAllTechskill,{
+ ids:this.delete
+ }).then(res =>{
+ this.selectAllright()
+ })
+ },
+ dels() {
+ this.selects.forEach(a => {
+ for (var b = 0; b < this.tableData.length; b++) {
+ if (this.tableData[b].id == a.id) {
+ this.tableData.splice(b, 1)
+ b--
+ }
+ }
+ })
+ let cc = this.selects.map(el => {
+ return el.id
+ })
+ this.delete = cc.join(',')
+ console.log(this.delete);
+ this.delAllTechskill()
+ this.$message.success('鍒犻櫎瀹屾垚')
+ },
add() {
this.dialogVisible = false
this.addTechMode()
+ this.form = {};
+ },
+ electadd(value) {
+ console.log(value);
+ this.higherlevel.push({});
+ this.form.father = value;
},
addTechMode() {
this.$axios.post(this.$api.url.addTechMode,{
@@ -439,16 +525,18 @@
}).then(res =>{
this.$message.success('鏂板瀹屾垚')
this.selectAllright()
- })
- },
- handleClose() {
+ })
},
TYpe(val) {
this.typeselect = val
console.log(this.typeselect);
this.selectAllleft()
},
+ edittype(val) {
+ this.typeselect = val
+ this.chooseTechFath()
+ },
//涓讳綋宸�
selectAllleft() {
this.$axios.get(this.$api.url.selectAllleft,{
@@ -457,13 +545,33 @@
this.list = res.data;
console.log(this.list);
this.selectDataList()
+ this.$nextTick(() => {
+ this.$refs.tree.setCurrentKey(this.list[0].children[0].name) // 榛樿閫変腑鑺傜偣绗竴涓�
})
+ 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.selectAllrightStart(name)
+ this.selectDataList();
+ });
+ },
+ selectAllrightStart(name) {
+ this.$axios.get(this.$api.url.selectAllright,{
+ params:{id:name}
+ }).then(res => {
+ this.tableData = res.data;
+ console.log(this.tableData);
+ });
},
//
//鏌ヨ
query(val) {
this.selectAllleft()
},
+ //鍙�
selectAllright() {
this.$axios.get(this.$api.url.selectAllright,{
params:{id:this.checkTreeNode.id}
@@ -504,6 +612,7 @@
let idx = this.process.findIndex(el => el.name === val)
this.craftapi = this.process[idx].children
},
+
handleNodeClick(data){
this.checkTreeNode = data
console.log(this.checkTreeNode.id);
@@ -524,17 +633,7 @@
handleSelectionChange(val) {
this.selects = val;
},
- dels() {
- this.selects.forEach(a => {
- for (var b = 0; b < this.tableData.length; b++) {
- if (this.tableData[b].id == a.id) {
- this.tableData.splice(b, 1)
- b--
- }
- }
- })
- this.$message.success('鍒犻櫎瀹屾垚')
- },
+ //缂栬緫
}
}
diff --git a/src/components/view/laboratoryManagement.vue b/src/components/view/laboratoryManagement.vue
index 441e709..34b1576 100644
--- a/src/components/view/laboratoryManagement.vue
+++ b/src/components/view/laboratoryManagement.vue
@@ -55,7 +55,7 @@
placeholder="璇烽�夋嫨璁惧缁�"
>
<el-option
- v-for="list in equip"
+ v-for="list in equaip"
:key="list"
:label="list"
:value="list"
@@ -190,7 +190,7 @@
<el-radio-button label="1">鐢熶骇璁惧</el-radio-button>
<el-radio-button label="2">妫�楠岃澶�</el-radio-button>
</el-radio-group>
- <el-input
+ <!-- <el-input
class="frame_input"
v-model="search_class"
placeholder="璇疯緭鍏ュ垎绫诲悕绉�"
@@ -202,7 +202,7 @@
style="font-size: 23px; padding: 5px 0;cursor:pointer;"
@click="handlerDeptList"
></i>
- </el-input>
+ </el-input> -->
<el-tree
:data="towTree"
ref="tree"
@@ -210,7 +210,9 @@
node-key="id"
default-expand-all
highlight-current
+ style="margin-top: 20px;"
@node-click="handleNodeClick"
+
>
<div class="custom-tree-node" slot-scope="{ node, data }">
<span
@@ -410,7 +412,7 @@
// BOM鏍戞暟鎹粨鏋�
towTree: [],
equipment: '',
- equip:'',
+ equaip:'',
ruleForm: {
// 鏂板浠櫒琛ㄥ崟
code: "",
@@ -425,7 +427,7 @@
treedata:{
father:'璁惧缁�1',
},
- equr:1,
+ equr:'',
},
delete:{},
equip:1,
@@ -533,15 +535,16 @@
.catch(_ => {});
},
testItem() {
+ this.listgroup()
this.dialogVisible = true;
this.$axios.get(this.$api.url.addDeviceKeeper).then(res => {
this.keeperList = res.data;
});
- this.listgroup()
},
listgroup() {
this.$axios.get(this.$api.url.listgroup).then(res =>{
- this.equip = res.data
+ this.equaip = res.data
+ console.log(this.equip);
})
},
RadioChange(val){
@@ -576,7 +579,12 @@
keeper:this.ruleForm.keeper,
name:this.ruleForm.name,
type:this.ruleForm.type,
- }, {headers: {"Content-Type": "application/json"}})
+ }, {headers: {"Content-Type": "application/json"}
+ }).then(res =>{
+ this.selectDevice()
+ this.$message.success('鏂板鎴愬姛')
+ this.ruleForm = {}
+ })
},
// tableDataApi() {
// this.$axios.get(this.$api.url.tableDeviceList).then(res => {
diff --git a/src/components/view/record-content.vue b/src/components/view/record-content.vue
index 62ecc41..5fbeedf 100644
--- a/src/components/view/record-content.vue
+++ b/src/components/view/record-content.vue
@@ -147,7 +147,7 @@
: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.cord }}{{ data.name }}</span>
+ {{ data.code }}{{ data.name }}</span>
<!-- <el-button type="text" size="mini" @click.stop="remove(node, data)">
<i class="el-icon-delete"></i>
</el-button> -->
@@ -195,8 +195,6 @@
<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.techFather"
- placeholder="璇烽�夋嫨"
<el-select v-model="edit.techFather"
placeholder="璇烽�夋嫨"
disabled
@@ -391,7 +389,6 @@
dialogVisible:false,
process: {},
list: [],
- checkTreeNode: {},
tableData: [],
upIndex: 0,
selects: [],
@@ -431,7 +428,6 @@
this.selectAllleft()
},
edittype(val) {
- // this.typeselect = ''
this.typeselect = val
this.chooseTechFath()
},
diff --git a/src/components/view/self-inspection.vue b/src/components/view/self-inspection.vue
index b994152..a10d40f 100644
--- a/src/components/view/self-inspection.vue
+++ b/src/components/view/self-inspection.vue
@@ -382,7 +382,7 @@
product: [],
list: [],
checkTreeNode: {
- id:1,
+ id:'',
},
tableData: [],
upIndex: 0,
@@ -506,10 +506,29 @@
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 id =one.children[0].id
+ console.log(id);
+ this.selectAllSelfStart(id)
+ this.selectDataList();
+ console.log("===========");
})
},
-
- //selectAllSelf checkTreeNode
+ //榛樿
+ selectAllSelfStart(id) {
+ this.$axios.get(this.$api.url.selectAllSelf,{
+ params:{id:id}
+ }).then(res => {
+ this.tableData = res.data;
+ console.log(this.tableData);
+ })
+ },
+ //鍙�
selectAllSelf() {
this.$axios.get(this.$api.url.selectAllSelf,{
params:{id:this.checkTreeNode.id}
diff --git a/src/components/view/technology.vue b/src/components/view/technology.vue
index c4e5282..12fc170 100644
--- a/src/components/view/technology.vue
+++ b/src/components/view/technology.vue
@@ -171,7 +171,7 @@
:data="towTree"
ref="tree"
:props="{ children: 'children', label: 'father' }"
- node-key="id"
+ node-key="name"
default-expand-all
@node-click="handleNodeClick"
style="height: 500px;overflow-y: auto;"
@@ -234,6 +234,7 @@
<el-select
v-model="edit.type"
placeholder="璇烽�夋嫨"
+ disabled
style="width: 310px"
>
<el-option label="姗¤兌杩炴帴鍣�" :value="0"></el-option>
@@ -252,12 +253,14 @@
<el-select
v-model="edit.father"
style="width: 310px"
+ disabled
placeholder="璇烽�夋嫨"
>
<el-option
v-for="item in procedure"
:key="item"
:label="item"
+ disabled
:value="item"
>
</el-option>
@@ -270,8 +273,9 @@
>
<el-col :span="16" :offset="1">
<el-select
- v-model="AAA.id"
+ v-model="edit.children"
style="width: 310px"
+
multiple
placeholder="璇烽�夋嫨"
>
@@ -279,7 +283,7 @@
v-for="item in element"
:key="item.id"
:label="item.name"
- :value="item.id"
+ :value="item.name"
>
</el-option>
</el-select>
@@ -322,6 +326,7 @@
v-model="form.type"
placeholder="璇烽�夋嫨"
style="width: 480px"
+ @change="edittype"
>
<el-option label="姗¤兌杩炴帴鍣�" :value="0"></el-option>
<el-option label="閲戝睘杩炴帴鍣�" :value="1"></el-option>
@@ -378,7 +383,7 @@
>
<el-option
v-for="item in element"
- :key="item.value"
+ :key="item.id"
:label="item.name"
:value="item.id"
>
@@ -521,11 +526,10 @@
],
edit: {
deviceGroup: "",
- elementId: "",
father: "",
name: "",
type: "",
- // children:[],
+ children:[],
},
upData: {
name: "",
@@ -576,7 +580,7 @@
},
Deleteapi() {
this.dialogVisible = false;
- this.form = "";
+ this.form = {};
},
addTechTemp() {
// console.log(this.$api.url.addTechTemp);
@@ -621,11 +625,19 @@
//宸ュ簭
chooseTech() {
- this.$axios.get(this.$api.url.chooseTech).then((res) => {
- this.procedure = res.data;
- console.log(this.procedure);
- });
+ this.$axios.get(this.$api.url.chooseTech,{
+ params:{
+ type:this.typeselect
+ }
+ }).then(res =>{
+ console.log(res);
+ this.procedure = res.data
+ })
},
+ edittype(val) {
+ this.typeselect = val
+ this.chooseTech()
+ },
//鎵归噺鍒犻櫎
delAllTech() {
console.log(this.delete);
@@ -679,7 +691,10 @@
})
.then((res) => {
this.towTree = res.data;
- console.log(this.towTree);
+ console.log(this.towTree);
+ this.$nextTick(() => {
+ this.$refs.tree.setCurrentKey(this.towTree[0].children[0].name) // 榛樿閫変腑鑺傜偣绗竴涓�
+ })
let one=this.towTree.filter(item=>{
return item.children.length>0
})[0]
@@ -792,25 +807,13 @@
})
.then((res) => {
this.edit = res.data[0];
- this.AAA = res.data[0].children;
console.log(this.edit);
- console.log(this.AAA);
- // this.edit.forEach(el => {
- // // el.children.forEach(ele =>{
- // // this.AAA.push(ele)
- // console.log(el);
- // })
- // console.log(this.AAA.id);
- // })
- // console.log(this.edit);
});
},
//缂栬緫鍐呭
upContent(ob) {
this.upData = ob;
- this.selecTechById();
- this.selecTechById();
- console.log(this.upData);
+ this.selecTechById()
this.upDia = true;
},
diff --git a/src/main.js b/src/main.js
index 9aff47f..a3be056 100644
--- a/src/main.js
+++ b/src/main.js
@@ -23,9 +23,10 @@
Vue.use(qs);
Vue.use(api);
-const javaApi = 'http://192.168.0.25:8001'
+const javaApi = 'http://192.168.0.23:8001'
+// localhost 127.0.0.1
-// const javaApi = '192.168.0.6'
+// const javaApi = 'http://127.0.0.1'
--
Gitblit v1.9.3