From b8694d86aea1a9154af99ee3e67ce4e6114aa091 Mon Sep 17 00:00:00 2001
From: gaoshp <291585735@qq.com>
Date: 星期一, 25 三月 2024 23:51:51 +0800
Subject: [PATCH] 修改readme

---
 src/views/basicdata/machine/workstation.vue |   57 ++++++++++++++++++++++++++++-----------------------------
 1 files changed, 28 insertions(+), 29 deletions(-)

diff --git a/src/views/basicdata/machine/workstation.vue b/src/views/basicdata/machine/workstation.vue
index 198c179..53d10bc 100644
--- a/src/views/basicdata/machine/workstation.vue
+++ b/src/views/basicdata/machine/workstation.vue
@@ -9,8 +9,8 @@
 								<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>
+										:default-expanded-keys="[1]" :filter-node-method="groupFilterNode"
+										@node-click="groupClick"></el-tree>
 								</el-main>
 							</el-container>
 						</el-aside>
@@ -19,36 +19,35 @@
 								<div class="left-panel">
 									<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>
 									<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>
+										<el-select v-model="value" placeholder="Select" style="width: 240px">
+											<el-option v-for="item in options" :key="item.value" :label="item.label"
+												:value="item.value" />
+										</el-select>
+										<el-select v-model="value" placeholder="Select" style="width: 240px">
+											<el-option v-for="item in options" :key="item.value" :label="item.label"
+												:value="item.value" />
+										</el-select>
+										<el-input style="width: 240px" placeholder="璇疯緭鍏ュ伐浣嶅悕绉�/缂栧彿" clearable></el-input>
+										<el-button type="primary" icon="el-icon-search"></el-button>
 									</div>
-								</div> -->
+								</div>
 							</el-header>
 							<el-main class="nopadding">
 								<scTable ref="table" :apiObj="apiObj" @selection-change="selectionChange" stripe
 									remoteSort remoteFilter>
 									<el-table-column type="selection" width="50"></el-table-column>
-									<el-table-column label="ID" prop="id" width="80"
+									<el-table-column label="宸ヤ綅缂栧彿" prop="id" width="120"
 										sortable='custom'></el-table-column>
-									<el-table-column label="澶村儚" width="80" column-key="filterAvatar"
-										:filters="[{ text: '宸蹭笂浼�', value: '1' }, { text: '鏈笂浼�', value: '0' }]">
-										<template #default="scope">
-											<el-avatar :src="scope.row.avatar" size="small"></el-avatar>
-										</template>
-									</el-table-column>
-									<el-table-column label="鐧诲綍璐﹀彿" prop="userName" width="150" sortable='custom'
-										column-key="filterUserName"
-										:filters="[{ text: '绯荤粺璐﹀彿', value: '1' }, { text: '鏅�氳处鍙�', value: '0' }]"></el-table-column>
-									<el-table-column label="濮撳悕" prop="name" width="150"
+									<el-table-column label="宸ヤ綅鍚嶇О" prop="id" width="120"
 										sortable='custom'></el-table-column>
-									<el-table-column label="鎵�灞炶鑹�" prop="groupName" width="200"
+									<el-table-column label="宸ヤ綅绫诲瀷" prop="id" width="120"
 										sortable='custom'></el-table-column>
-									<el-table-column label="鍔犲叆鏃堕棿" prop="date" width="170"
+									<el-table-column label="宸ヤ綅鏃ュ巻" prop="id" width="120"
 										sortable='custom'></el-table-column>
 									<el-table-column label="鎿嶄綔" fixed="right" align="right" width="160">
 										<template #default="scope">
@@ -92,7 +91,7 @@
 			groupFilterText: ''
 		}
 	},
-	created () {
+	created() {
 		this.$API.basicdata.getWorkstationGroup.get().then(res => {
 			if (res.code == 200) {
 				let data = this.formatData(res.data)
@@ -101,30 +100,30 @@
 		})
 	},
 	methods: {
-		formatData (data,current) {
+		formatData(data, current) {
 			let newData = []
 			if (!current) {
-				newData = data.filter(item  => item.parentId == 0).map(v => {
-					v.children = this.formatData(data,v)
+				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)
+				res = res.map(item => {
+					item.children = this.formatData(data, item)
 					return item
 				})
 				return res
 			}
 			return newData
 		},
-		groupFilterNode () {
+		groupFilterNode() {
 
 		},
- 		groupClick () {
+		groupClick() {
 
 		},
- 		table_add() {
+		table_add() {
 			var newRow = {
 				key: "",
 				value: "",

--
Gitblit v1.9.3