From 638f3c0cfbf1ace8847dadf5c7b3215f371e9ba8 Mon Sep 17 00:00:00 2001
From: gaoshp <291585735@qq.com>
Date: 星期二, 22 十月 2024 22:34:05 +0800
Subject: [PATCH] update some bug

---
 src/views/console/workstation/index.vue |   18 ++++++++++++++----
 src/views/mdc/processParam/index.vue    |    6 +++---
 2 files changed, 17 insertions(+), 7 deletions(-)

diff --git a/src/views/console/workstation/index.vue b/src/views/console/workstation/index.vue
index d840a4b..cd2c407 100644
--- a/src/views/console/workstation/index.vue
+++ b/src/views/console/workstation/index.vue
@@ -150,8 +150,10 @@
 																type="primary" size="small">淇濆瓨</el-button> -->
 															<!-- <el-button text type="primary" size="small"
 																@click="editDMP">淇敼DMP閰嶇疆</el-button> -->
-															<el-button @click="getExport" style="margin-left: 12px" text type="primary" size="small">瀵煎嚭</el-button>
-															<el-button @click="editCollection" text type="primary" style="margin-left: 0px;" size="small">鏁版嵁鐐圭紪杈�</el-button>
+															<el-button @click="getExport" style="margin-left: 12px" text
+																type="primary" size="small">瀵煎嚭</el-button>
+															<el-button @click="editCollection" text type="primary"
+																style="margin-left: 0px;" size="small">鏁版嵁鐐圭紪杈�</el-button>
 
 														</el-header>
 														<el-main>
@@ -272,9 +274,17 @@
 							<el-header v-show="!addGroupShow">
 								<div class="left-panel">
 									<el-button @click="addChild" type="primary" plain>鏂板涓嬬骇</el-button>
-									<el-button @click="deleteWorkGroup"
+									<el-popconfirm width="220" cancel-button-text="鍋滅敤" confirm-button-text="鍒犻櫎"
+										title="鍒犻櫎浼氬皢宸ヤ綅缁勪笅鐨勫伐浣嶇Щ鍔ㄥ埌榛樿缁勪腑锛岃纭鏄惁鍒犻櫎锛�" @confirm="deleteWorkGroup"
+										@cancel="table_del([scope.row], '1')">
+										<template #reference>
+											<el-button v-show="!['1', '101'].includes(treeCheckedNode.id)" type="danger"
+												plain>鍒犻櫎</el-button>
+										</template>
+									</el-popconfirm>
+									<!-- <el-button @click="deleteWorkGroup"
 										v-show="!['1', '101'].includes(treeCheckedNode.id)" type="danger"
-										plain>鍒犻櫎</el-button>
+										plain>鍒犻櫎</el-button> -->
 								</div>
 							</el-header>
 							<el-main class="" v-show="!addGroupShow">
diff --git a/src/views/mdc/processParam/index.vue b/src/views/mdc/processParam/index.vue
index 587cf9c..6fab622 100644
--- a/src/views/mdc/processParam/index.vue
+++ b/src/views/mdc/processParam/index.vue
@@ -1,7 +1,7 @@
 <!--
  * @Date: 2024-04-09 22:11:21
- * @LastEditors: lzhe lzhe@example.com
- * @LastEditTime: 2024-10-10 11:04:05
+ * @LastEditors: gaoshp
+ * @LastEditTime: 2024-10-22 22:30:19
  * @FilePath: /cps-web/src/views/mdc/processParam/index.vue
  瀹炴椂鐪嬫澘
 -->
@@ -12,7 +12,7 @@
                 <el-aside width="300px" style="height: 100%;">
                     <el-container>
                         <el-main class="nopadding">
-                            <el-row style="margin-top: 14px;">
+                            <el-row style="margin: 8px;font-size: 14px;">
                                 宸ヤ綅
                             </el-row>
                             <MYTree v-model="treeChecked" @loaded="query"></MYTree>

--
Gitblit v1.9.3