From c37e4efb8a78a0f1bf85cf29a9286cc312469dbe Mon Sep 17 00:00:00 2001
From: 王震 <10952869+daywangzhen@user.noreply.gitee.com>
Date: 星期六, 09 九月 2023 17:09:51 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
src/components/view/record-content.vue | 22 +++++++++++-----------
1 files changed, 11 insertions(+), 11 deletions(-)
diff --git a/src/components/view/record-content.vue b/src/components/view/record-content.vue
index 129a6ca..62ecc41 100644
--- a/src/components/view/record-content.vue
+++ b/src/components/view/record-content.vue
@@ -39,7 +39,6 @@
height: calc(100% - 120px);
background-color: #fff;
display: flex;
-
}
.thing .left {
@@ -47,7 +46,6 @@
height: calc(100% - 20px);
border-right: 3px solid rgb(245, 247, 251);
padding: 16px;
- /* height:calc(50vh - 250px) */
}
.thing .left .custom-tree-node span {
@@ -120,7 +118,7 @@
<el-button icon="el-icon-delete" @click="dels">鍒犻櫎</el-button>
</el-col>
</el-row>
- </div>
+ </div>
<div class="choose">
<span>绫诲瀷锛�</span>
<el-select v-model="search.type" size="small" @change="TYpe" placeholder="璇烽�夋嫨" style="width: 224px;margin-right: 30px;">
@@ -142,10 +140,10 @@
<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"
+ <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
+ @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>
@@ -197,8 +195,10 @@
<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="璇烽�夋嫨"
+ <el-select v-model="edit.techFather"
+ placeholder="璇烽�夋嫨"
disabled
@change="workevent"
style="width: 310px;">
@@ -267,7 +267,7 @@
</el-form-item>
<el-form-item label="宸ュ簭">
<template>
- <el-select v-model="form.work"
+ <el-select v-model="form.work"
@change="workevent"
placeholder="璇烽�夋嫨" style="width: 480px;">
<el-option
@@ -428,7 +428,7 @@
TYpe(val) {
this.typeselect = val
console.log(this.typeselect);
- this.selectAllleft()
+ this.selectAllleft()
},
edittype(val) {
// this.typeselect = ''
@@ -453,7 +453,7 @@
"Content-Type": "application/json"
}
}).then(res =>{
-
+
})
},
addRecord() {
@@ -643,7 +643,7 @@
submitUpData() {
this.writeRecordById()
this.$message.success('淇敼鎴愬姛')
-
+
this.upDia = false
// this.tableData.forEach(a => {
// if (a.id == this.upData.id) {
--
Gitblit v1.9.3