From c0bc2331e9abb2ae003c8dc0ab4524d6101493a1 Mon Sep 17 00:00:00 2001
From: 王震 <10952869+daywangzhen@user.noreply.gitee.com>
Date: 星期一, 25 九月 2023 09:12:51 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
src/components/view/equipmentmaintain.vue | 31 +++++++++++++++++--------------
1 files changed, 17 insertions(+), 14 deletions(-)
diff --git a/src/components/view/equipmentmaintain.vue b/src/components/view/equipmentmaintain.vue
index 55c2f5b..b9fcd0a 100644
--- a/src/components/view/equipmentmaintain.vue
+++ b/src/components/view/equipmentmaintain.vue
@@ -22,10 +22,7 @@
<el-form-item label="绫诲瀷">
<template>
<el-select v-model="edit.type" disabled placeholder="璇烽�夋嫨" style="width: 560px;">
- <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-option v-for="(a, ai) in bigType" :key="ai" :value="a"></el-option>
</el-select>
</template>
</el-form-item>
@@ -115,10 +112,7 @@
<el-form-item label="绫诲瀷">
<template>
<el-select v-model="form.type" placeholder="璇烽�夋嫨" @change="edittype" style="width: 100%;">
- <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-option v-for="(a, ai) in bigType" :key="ai" :value="a"></el-option>
</el-select>
</template>
</el-form-item>
@@ -224,10 +218,7 @@
<div class="choose">
<span>绫诲瀷锛�</span>
<el-select v-model="search.type" size="small" @change="TYpe" placeholder="璇烽�夋嫨" 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-option v-for="(a, ai) in bigType" :key="ai" :value="a"></el-option>
</el-select>
<!-- <span>宸ュ簭锛�</span>
<el-select v-model="search.name" size="small" placeholder="璇烽�夋嫨" style="width: 224px;margin-right: 30px;">
@@ -261,6 +252,7 @@
<!-- 涓讳綋鍙� -->
<div class="right">
<el-table
+ height="calc(90vh - 200px)"
:data="tableData"
row-key="rowId"
border
@@ -333,6 +325,7 @@
export default {
data() {
return {
+ bigType: [],
search: {
type: 0,
technology: null
@@ -351,6 +344,7 @@
upData:{
},
+
checkTreeNode:{
id:1,
},
@@ -375,10 +369,19 @@
},
mounted() {
+ this.chooseType()
this.selectAllleft()
this.selectAllTeque()
},
methods:{
+ chooseType() {
+ this.$axios.get(this.$api.url.chooseType).then(res => {
+ this.bigType = res.data
+ this.typeselect = res.data[0]
+ console.log(this.typeselect);
+ this.search.type = res.data[0]
+ })
+ },
selectDataList() {
this.list.forEach(a => {
a.code = '[1]'
@@ -776,8 +779,8 @@
width: calc(100% - 305px);
height: calc(100% - 25px);
/* overflow: hidden; */
- overflow-y: auto;
- overflow-x: auto;
+ overflow-y: scroll;
+ overflow-x: scroll;
padding: 10px;
}
--
Gitblit v1.9.3