From c4355a18506cf0e8f63469a8a38f2e8d5e67d6f9 Mon Sep 17 00:00:00 2001
From: XiaoRuby <3114200645@qq.com>
Date: 星期六, 09 九月 2023 14:53:39 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
src/components/view/Technicalindex.vue | 50 +++++++++++++++++++++++++++++++++-----------------
1 files changed, 33 insertions(+), 17 deletions(-)
diff --git a/src/components/view/Technicalindex.vue b/src/components/view/Technicalindex.vue
index 6117dd3..6aa8d70 100644
--- a/src/components/view/Technicalindex.vue
+++ b/src/components/view/Technicalindex.vue
@@ -5,7 +5,7 @@
<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="event">鏂板</el-button>
- <el-button icon="el-icon-edit-outline" @click="modify">淇敼</el-button>
+ <!-- <el-button icon="el-icon-edit-outline" @click="modify">淇敼</el-button> -->
<el-button icon="el-icon-delete" @click="dels" >鍒犻櫎</el-button>
</el-col>
</el-row>
@@ -22,7 +22,7 @@
<el-form ref="form" :model="form" label-width="80px">
<el-form-item label="绫诲瀷">
<template>
- <el-select v-model="value" placeholder="璇烽�夋嫨绫诲瀷" style="width: 560px;">
+ <el-select v-model="value" placeholder="璇烽�夋嫨" style="width: 560px;">
<el-option
v-for="item in options"
:key="item.value"
@@ -47,8 +47,8 @@
<el-row>
<el-col :span="11">
- <el-form-item label="涓婄骇">
- <el-input v-model="form.name" placeholder="璇烽�夋嫨涓婄骇"></el-input>
+ <el-form-item label="椤圭洰缁�">
+ <el-input v-model="form.name" placeholder="璇烽�夋嫨"></el-input>
</el-form-item>
</el-col>
<el-col :span="11" :offset="2">
@@ -91,7 +91,7 @@
<el-form-item label="宸ュ簭">
<template>
<el-select v-model="form.work"
- placeholder="璇烽�夋嫨绫诲瀷"
+ placeholder="璇烽�夋嫨"
allow-create
filterable
@change="workevent"
@@ -110,7 +110,7 @@
<el-form-item label="宸ヨ壓">
<template>
<el-select v-model="form.name"
- placeholder="璇烽�夋嫨绫诲瀷"
+ placeholder="璇烽�夋嫨"
allow-create
filterable
>
@@ -128,10 +128,10 @@
<el-row>
<el-col :span="11">
- <el-form-item label="涓婄骇">
+ <el-form-item label="椤圭洰缁�">
<template>
<el-select v-model="form.father"
- placeholder="璇烽�夋嫨绫诲瀷"
+ placeholder="璇烽�夋嫨"
allow-create
filterable
>
@@ -192,11 +192,11 @@
@node-click="handleNodeClick"
>
<div class="custom-tree-node" slot-scope="{ node, data }">
- <span><i :class="`node_i ${data.code != '[3]'?'el-icon-folder-opened':'el-icon-tickets'}`"></i>
+ <span><i :class="`node_i ${data.code != '[2]'?'el-icon-folder-opened':'el-icon-tickets'}`"></i>
{{data.father}} {{ data.name }}</span>
- <el-button type="text" size="mini" @click.stop="remove(node, data)">
+ <!-- <el-button type="text" size="mini" @click.stop="remove(node, data)">
<i class="el-icon-delete"></i>
- </el-button>
+ </el-button> -->
</div>
</el-tree>
</div>
@@ -207,7 +207,6 @@
style="width: 100%;margin-bottom: 20px;"
row-key="name"
border
-
@selection-change="handleSelectionChange"
default-expand-all
:tree-props="{children: 'children', hasChildren: 'hasChildren'}">
@@ -271,7 +270,7 @@
<el-col :span="16" :offset="1">
<template>
<el-select v-model="form.work"
- placeholder="璇烽�夋嫨绫诲瀷"
+ placeholder="璇烽�夋嫨"
allow-create
filterable
@change="workevent"
@@ -291,7 +290,7 @@
<el-col :span="16" :offset="1">
<template>
<el-select v-model="form.name"
- placeholder="璇烽�夋嫨绫诲瀷"
+ placeholder="璇烽�夋嫨"
allow-create
filterable
>
@@ -333,12 +332,12 @@
data() {
return {
search:{
- type:'',
- technology:'',
+ type:0,
+ technology:null,
},
// handleClose:[],
checkTreeNode :{
- id:2,
+ id:1,
},
higherlevel:[],
value:{},
@@ -373,6 +372,22 @@
},
methods:{
+ selectDataList() {
+ this.list.forEach(a => {
+ a.code = '[1]'
+ if (a.children != undefined) {
+ a.children.forEach(b => {
+ b.code = '[2]'
+ if (b.children != undefined) {
+ b.children.forEach(c => {
+ c.code = '[3]'
+ })
+ }
+ })
+ }
+ })
+ this.upIndex++
+ },
//缂栬緫
selecTech() {
this.$axios.get(this.$api.url.selecTech,{
@@ -441,6 +456,7 @@
}).then(res => {
this.list = res.data;
console.log(this.list);
+ this.selectDataList()
})
},
//
--
Gitblit v1.9.3