From 4ecbc3cb7682415babea4597ef211499d0c8aaa4 Mon Sep 17 00:00:00 2001
From: liujun <liujun@zcloudchina.com>
Date: Fri, 22 Mar 2024 22:24:16 +0800
Subject: [PATCH] =?UTF-8?q?1=E3=80=81=E6=97=A0=E6=B3=95=E5=B0=86=E4=BA=BA?=
 =?UTF-8?q?=E5=91=98=E6=89=93=E5=9B=9Ebug=E4=BF=AE=E5=A4=8D=202=E3=80=81fo?=
 =?UTF-8?q?rm=E8=A1=A8=E5=8D=95=E6=A0=A1=E9=AA=8C=E5=90=8E=E6=97=A0?=
 =?UTF-8?q?=E6=B3=95=E9=87=8D=E6=96=B0=E6=8F=90=E4=BA=A4bug=E4=BF=AE?=
 =?UTF-8?q?=E5=A4=8D=203=E3=80=81=E9=A1=B5=E9=9D=A2=E4=B8=A2=E5=A4=B1?=
 =?UTF-8?q?=E4=BF=A1=E6=81=AFbug=E4=BF=AE=E5=A4=8D=204=E3=80=81=E5=AF=BC?=
 =?UTF-8?q?=E5=87=BAexcel=E6=A0=BC=E5=BC=8F=E4=BF=AE=E6=94=B9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../components/dashboard.vue                              | 8 ++++----
 .../components/dashboard.vue                              | 6 +++---
 .../components/list.vue                                   | 1 +
 3 files changed, 8 insertions(+), 7 deletions(-)

diff --git a/src/views/threeSystems/safetyProductionManagementSystem/components/dashboard.vue b/src/views/threeSystems/safetyProductionManagementSystem/components/dashboard.vue
index 08e1c21..46937f0 100644
--- a/src/views/threeSystems/safetyProductionManagementSystem/components/dashboard.vue
+++ b/src/views/threeSystems/safetyProductionManagementSystem/components/dashboard.vue
@@ -1,10 +1,10 @@
 <template>
   <div class="app-container">
-    <el-tabs type="border-card" @tab-click="changTab">
-      <el-tab-pane label="监管端数据">
-        <list v-if="vectory === 'list'"/>
+    <el-tabs v-model="vectory" type="border-card" @tab-click="changTab">
+      <el-tab-pane label="监管端数据" name="list">
+        <list v-if="vectory === 'list'" />
       </el-tab-pane>
-      <el-tab-pane label="企业端数据">
+      <el-tab-pane label="企业端数据" name="listEm">
         <ListEm v-if="vectory === 'listEm'"/>
       </el-tab-pane>
     </el-tabs>
diff --git a/src/views/threeSystems/safetyProductionResponsibilitySystem/components/dashboard.vue b/src/views/threeSystems/safetyProductionResponsibilitySystem/components/dashboard.vue
index f28aad6..5ef299f 100644
--- a/src/views/threeSystems/safetyProductionResponsibilitySystem/components/dashboard.vue
+++ b/src/views/threeSystems/safetyProductionResponsibilitySystem/components/dashboard.vue
@@ -1,10 +1,10 @@
 <template>
   <div class="app-container">
-    <el-tabs type="border-card" @tab-click="changTab">
-      <el-tab-pane label="监管端数据">
+    <el-tabs v-model="vectory" type="border-card" @tab-click="changTab">
+      <el-tab-pane label="监管端数据" name="list">
         <list v-if="vectory === 'list'"/>
       </el-tab-pane>
-      <el-tab-pane label="企业端数据">
+      <el-tab-pane label="企业端数据" name="listEm">
         <ListEm v-if="vectory === 'listEm'"/>
       </el-tab-pane>
     </el-tabs>
diff --git a/src/views/threeSystems/safetyProductionResponsibilitySystem/components/list.vue b/src/views/threeSystems/safetyProductionResponsibilitySystem/components/list.vue
index 8e2c6eb..6e375ec 100644
--- a/src/views/threeSystems/safetyProductionResponsibilitySystem/components/list.vue
+++ b/src/views/threeSystems/safetyProductionResponsibilitySystem/components/list.vue
@@ -151,6 +151,7 @@
           <el-row style="margin-bottom: 10px">
             <el-col :span="24">
               <el-button v-show="!row.LOCKTOOL && edit" type="primary" icon="el-icon-edit" size="mini" @click="handleEdit(row)">编辑</el-button>
+              <el-button v-show="!row.LOCKTOOL && del" type="danger" icon="el-icon-delete" size="mini" @click="handleDelete(row)">删除</el-button>
               <el-button v-if="!row.LOCKTOOL && edit" type="success" icon="el-icon-lock" size="mini" @click="handleLock(row,'1')">锁定</el-button>
               <el-button v-if="row.LOCKTOOL && edit" type="info" icon="el-icon-unlock" size="mini" @click="handleLock(row,'0')">解锁</el-button>
             </el-col>