From 452feba1b707bd93adc4be1565a76bdb109c4161 Mon Sep 17 00:00:00 2001
From: gaoshp <291585735@qq.com>
Date: 星期日, 24 三月 2024 15:46:42 +0800
Subject: [PATCH] 工位

---
 src/views/basicdata/machine/workstation.vue |   94 ++++++++++++++++++++--------------------------
 1 files changed, 41 insertions(+), 53 deletions(-)

diff --git a/src/views/basicdata/machine/workstation.vue b/src/views/basicdata/machine/workstation.vue
index 99ce2b5..198c179 100644
--- a/src/views/basicdata/machine/workstation.vue
+++ b/src/views/basicdata/machine/workstation.vue
@@ -1,17 +1,15 @@
 <template>
 	<el-main>
 		<el-card shadow="never">
-			<el-tabs tab-position="top" class="custom-tabs">
-				<el-tab-pane label="宸ヤ綅">
+			<el-tabs tab-position="top" class="custom-tabs" v-model="activeName">
+				<el-tab-pane label="宸ヤ綅" name="1">
 					<el-container>
 						<el-aside width="200px" v-loading="showGrouploading">
 							<el-container>
-								<el-header>
-									<el-input placeholder="杈撳叆鍏抽敭瀛楄繘琛岃繃婊�" v-model="groupFilterText" clearable></el-input>
-								</el-header>
 								<el-main class="nopadding">
 									<el-tree ref="group" class="menu" node-key="id" :data="group" :current-node-key="''"
 										:highlight-current="true" :expand-on-click-node="false"
+										:default-expanded-keys="[1]"
 										:filter-node-method="groupFilterNode" @node-click="groupClick"></el-tree>
 								</el-main>
 							</el-container>
@@ -19,18 +17,17 @@
 						<el-container>
 							<el-header>
 								<div class="left-panel">
-									<el-button type="primary" icon="el-icon-plus" @click="add"></el-button>
-									<el-button type="danger" plain icon="el-icon-delete"
-										:disabled="selection.length == 0" @click="batch_del"></el-button>
-									<el-button type="primary" plain :disabled="selection.length == 0">鍒嗛厤瑙掕壊</el-button>
-									<el-button type="primary" plain :disabled="selection.length == 0">瀵嗙爜閲嶇疆</el-button>
+									<el-button type="primary" icon="el-icon-plus"></el-button>
+									<el-button type="danger" plain icon="el-icon-delete"></el-button>
+									<el-button type="primary" plain >瀵煎叆</el-button>
+									<el-button type="primary" plain>鎵归噺鎿嶄綔</el-button>
 								</div>
-								<div class="right-panel">
+								<!-- <div class="right-panel">
 									<div class="right-panel-search">
 										<el-input v-model="search.name" placeholder="鐧诲綍璐﹀彿 / 濮撳悕" clearable></el-input>
 										<el-button type="primary" icon="el-icon-search" @click="upsearch"></el-button>
 									</div>
-								</div>
+								</div> -->
 							</el-header>
 							<el-main class="nopadding">
 								<scTable ref="table" :apiObj="apiObj" @selection-change="selectionChange" stripe
@@ -76,7 +73,7 @@
 					</el-container>
 				</el-tab-pane>
 
-				<el-tab-pane label="宸ヤ綅缁�">
+				<el-tab-pane label="宸ヤ綅缁�" name="2">
 
 				</el-tab-pane>
 
@@ -90,53 +87,44 @@
 	name: 'system',
 	data() {
 		return {
-			sys: {
-				name: "SCUI",
-				logoUrl: "",
-				login: true,
-				passwordRules: "^(?![0-9]+$)(?![a-zA-Z]+$)[0-9A-Za-z]{6,20}$",
-				copyright: "@SCUI"
-			},
-			msg: {
-				open: true,
-				appKey: "",
-				secretKey: ""
-			},
-			setting: [
-				{
-					key: "file_serve",
-					value: "https://file.scui.com",
-					category: "url",
-					title: "鏂囦欢鏈嶅姟鍣ㄥ湴鍧�"
-				},
-				{
-					key: "cloud_url",
-					value: "-",
-					category: "url",
-					title: "瀹㈡埛绔湴鍧�"
-				},
-				{
-					key: "crm_url",
-					value: "-",
-					category: "url",
-					title: "CRM鍦板潃"
-				},
-				{
-					key: "autoSwitch",
-					value: true,
-					category: "user",
-					title: "鑷姩鍒ゆ柇boolean绫诲瀷"
-				}
-			]
+			activeName: '1',
+			group: [],
+			groupFilterText: ''
 		}
 	},
 	created () {
 		this.$API.basicdata.getWorkstationGroup.get().then(res => {
-			console.log(res)
+			if (res.code == 200) {
+				let data = this.formatData(res.data)
+				this.group = data
+			}
 		})
 	},
 	methods: {
-		table_add() {
+		formatData (data,current) {
+			let newData = []
+			if (!current) {
+				newData = data.filter(item  => item.parentId == 0).map(v => {
+					v.children = this.formatData(data,v)
+					return v
+				})
+			} else {
+				let res = data.filter(v => v.parentId === current.id)
+				res  = res.map(item => {
+					item.children = this.formatData(data,item)
+					return item
+				})
+				return res
+			}
+			return newData
+		},
+		groupFilterNode () {
+
+		},
+ 		groupClick () {
+
+		},
+ 		table_add() {
 			var newRow = {
 				key: "",
 				value: "",

--
Gitblit v1.9.3