From ba03a2fa122db0666e575fd6e31e6f5b86226e18 Mon Sep 17 00:00:00 2001
From: wangpeng <wangpeng@zcloudchina.com>
Date: Tue, 9 Apr 2024 16:07:52 +0800
Subject: [PATCH] =?UTF-8?q?=E5=88=A0=E9=99=A4=E7=BB=9F=E4=B8=80=E6=A0=B7?=
 =?UTF-8?q?=E5=BC=8F=20=E4=BF=AE=E5=A4=8D=E5=AE=89=E5=85=A8=E4=BD=93?=
 =?UTF-8?q?=E7=B3=BB=E7=AE=A1=E7=90=86?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/request/map.js                            | 23 -------------------
 .../semester/components/review.vue            |  2 +-
 .../education_user/review_user/index.vue      |  2 +-
 src/views/education_user/sign_user/index.vue  |  2 +-
 .../waybill_registration/index.vue            |  2 +-
 .../department/index.vue                      |  2 +-
 .../electronic_fence/index.vue                |  2 +-
 .../industry_qualifications/index.vue         |  2 +-
 .../enterprise_management/user/index.vue      |  2 +-
 .../inspection_record.vue                     |  2 +-
 .../inspection_record/index.vue               |  2 +-
 .../inventory_troubleshooting/inspect.vue     |  2 +-
 .../inspect_custom.vue                        |  2 +-
 .../hidden_danger_government/ledger/index.vue |  2 +-
 src/views/labor_contract/index.vue            |  8 +++----
 src/views/management_staffing/index.vue       |  8 +++----
 src/views/mechanical_files/beidou/index.vue   |  7 +-----
 src/views/mechanical_files/insure/index.vue   |  7 +-----
 .../mechanical_files/maintenance/index.vue    |  2 +-
 .../mechanical_files/operations/index.vue     |  2 +-
 .../mechanical_files/scrap_manage/index.vue   |  2 +-
 .../notification_announcement/index.vue       |  2 +-
 src/views/occupational_hazards/index.vue      |  8 +++----
 .../index.vue                                 |  2 +-
 .../entrench_thing_grant/index.vue            |  2 +-
 .../firefightingmaintain.vue                  |  2 +-
 .../firefighting_equipment_facility/index.vue |  2 +-
 .../management_agreement/index.vue            |  2 +-
 .../production_equipment_facility/index.vue   |  2 +-
 .../maintain.vue                              |  2 +-
 .../reported_incident_dispose/index.vue       |  2 +-
 .../risk_control/identifying_parts/index.vue  |  2 +-
 src/views/risk_control/ledger/index.vue       |  2 +-
 src/views/risk_control/risk_point/index.vue   |  2 +-
 .../risk_four_color_chart/index.vue           |  2 +-
 src/views/safety_assessment/index.vue         |  8 +++----
 .../safety_activities/index.vue               |  2 +-
 .../safety_culture/safety_manual/index.vue    |  2 +-
 src/views/safety_production/index.vue         |  8 +++----
 src/views/safety_responsibility/index.vue     |  8 +++----
 src/views/security_commitment/index.vue       |  8 +++----
 .../system_documents/index.vue                |  2 +-
 .../components/list.vue                       |  2 +-
 .../components/curriculum.vue                 |  2 +-
 .../class_management/index.vue                |  2 +-
 .../exam_paper_management/add.vue             |  5 +++-
 .../exam_paper_management/index.vue           |  2 +-
 .../examdraft_management/edit.vue             |  5 +++-
 .../examdraft_management/index.vue            |  4 +++-
 .../course_management/add.vue                 |  4 ++--
 .../components/add_courseware.vue             |  4 ++--
 .../course_management/index.vue               |  2 +-
 src/views/workforce_management/index.vue      |  2 +-
 53 files changed, 83 insertions(+), 108 deletions(-)
 delete mode 100644 src/request/map.js

diff --git a/src/request/map.js b/src/request/map.js
deleted file mode 100644
index 5ec409e..0000000
--- a/src/request/map.js
+++ /dev/null
@@ -1,23 +0,0 @@
-import { post } from "./axios";
-
-export const getRealTimeList = (params) => post("/map/getRealTimeList", params); // 获取在线人员列表
-export const getFenceList = (params) => post("/map/getFenceList", params); // 获取围栏列表
-export const getPersonnelTrajectories = (params) =>
-  post("/map/getPersonnelTrajectories", params); // 获取拥有历史轨迹的全部角色
-
-export const getCharacterTrajectories = (params) =>
-  post("/map/getCharacterTrajectories", params); // 获取轨迹
-export const getUserByCardNo = (params) =>
-  post("/user/getUserByCardNo", params);
-
-export const getEightWorks = (params) => post("/map/getEightWorks", params);
-
-export const getHotworkList = (params) => post("/map/getHotworkList", params);
-export const getEightWorksByType = (params) =>
-  post("/map/getEightWorksByType", params);
-export const getCameraList = (params) => post("/map/getCameraList", params);
-
-export const getConfinedspaceWorkList = (params) =>
-  post("/map/getConfinedspaceWorkList", params);
-
-export const getHighWorkList = (params) => post("/map/getHighWorkList", params);
diff --git a/src/views/archives_management/semester/components/review.vue b/src/views/archives_management/semester/components/review.vue
index cf3ab3d..8ac90d5 100644
--- a/src/views/archives_management/semester/components/review.vue
+++ b/src/views/archives_management/semester/components/review.vue
@@ -86,7 +86,7 @@
             <el-table-column label="操作" width="80">
               <template #default="{ row }">
                 <el-button
-                  type="primary"
+                  type="danger"
                   text
                   link
                   @click="fnDelete(row.ARCHIVES_REVIEW_RECORD_ID)"
diff --git a/src/views/education_user/review_user/index.vue b/src/views/education_user/review_user/index.vue
index f0d6ca0..12ecff9 100644
--- a/src/views/education_user/review_user/index.vue
+++ b/src/views/education_user/review_user/index.vue
@@ -68,7 +68,7 @@
               查看
             </el-button>
             <el-button
-              type="primary"
+              type="danger"
               text
               link
               @click="fnDelete(row.REVIEW_USER_ID)"
diff --git a/src/views/education_user/sign_user/index.vue b/src/views/education_user/sign_user/index.vue
index a65cafd..fd21f1d 100644
--- a/src/views/education_user/sign_user/index.vue
+++ b/src/views/education_user/sign_user/index.vue
@@ -44,7 +44,7 @@
               查看
             </el-button>
             <el-button
-              type="primary"
+              type="danger"
               text
               link
               @click="fnDelete(row.USERSIGNID)"
diff --git a/src/views/electronic_waybill_management/waybill_registration/index.vue b/src/views/electronic_waybill_management/waybill_registration/index.vue
index 0922a01..a30b00f 100644
--- a/src/views/electronic_waybill_management/waybill_registration/index.vue
+++ b/src/views/electronic_waybill_management/waybill_registration/index.vue
@@ -68,9 +68,9 @@
         <el-table-column label="操作" width="120">
           <template #default="{ row }">
             <el-button
+              type="danger"
               text
               link
-              type="primary"
               @click="deleteItem(row.WAYBILLREGISTRATION_ID)"
             >
               删除
diff --git a/src/views/enterprise_management/department/index.vue b/src/views/enterprise_management/department/index.vue
index 36e8793..e1b7a5e 100644
--- a/src/views/enterprise_management/department/index.vue
+++ b/src/views/enterprise_management/department/index.vue
@@ -72,7 +72,7 @@
                   </el-button>
                   <el-button
                     v-if="buttonJurisdiction.del"
-                    type="primary"
+                    type="danger"
                     text
                     link
                     @click="fnDelete(row.DEPARTMENT_ID, row.NAME)"
diff --git a/src/views/enterprise_management/electronic_fence/index.vue b/src/views/enterprise_management/electronic_fence/index.vue
index 858dddb..81b7d66 100644
--- a/src/views/enterprise_management/electronic_fence/index.vue
+++ b/src/views/enterprise_management/electronic_fence/index.vue
@@ -78,7 +78,7 @@
                   </el-button>
                   <el-button
                     v-if="buttonJurisdiction.del"
-                    type="primary"
+                    type="danger"
                     text
                     link
                     @click="
diff --git a/src/views/enterprise_management/industry_qualifications/index.vue b/src/views/enterprise_management/industry_qualifications/index.vue
index 47c2cae..b4cb4b4 100644
--- a/src/views/enterprise_management/industry_qualifications/index.vue
+++ b/src/views/enterprise_management/industry_qualifications/index.vue
@@ -87,7 +87,7 @@
               修改
             </el-button>
             <el-button
-              type="primary"
+              type="danger"
               text
               link
               @click="fnDelete(row.QUALIFICATIONS_ID)"
diff --git a/src/views/enterprise_management/user/index.vue b/src/views/enterprise_management/user/index.vue
index c0476a3..5c89dda 100644
--- a/src/views/enterprise_management/user/index.vue
+++ b/src/views/enterprise_management/user/index.vue
@@ -165,7 +165,7 @@
                       ) >= 0
                     )
                   "
-                  type="primary"
+                  type="danger"
                   text
                   link
                   @click="fnDelete(row.USER_ID, row.NAME)"
diff --git a/src/views/hazard_investigation/checklist_inspection_status/inspection_record.vue b/src/views/hazard_investigation/checklist_inspection_status/inspection_record.vue
index 7a5a302..dd705f7 100644
--- a/src/views/hazard_investigation/checklist_inspection_status/inspection_record.vue
+++ b/src/views/hazard_investigation/checklist_inspection_status/inspection_record.vue
@@ -95,7 +95,7 @@
               </el-button>
               <el-button
                 v-if="buttonJurisdiction.del"
-                type="primary"
+                type="danger"
                 text
                 link
                 @click="fnDelete(row.CHECKRECORD_ID)"
diff --git a/src/views/hazard_investigation/inspection_record/index.vue b/src/views/hazard_investigation/inspection_record/index.vue
index f7035f9..9a9d44a 100644
--- a/src/views/hazard_investigation/inspection_record/index.vue
+++ b/src/views/hazard_investigation/inspection_record/index.vue
@@ -112,7 +112,7 @@
               </el-button>
               <el-button
                 v-if="buttonJurisdiction.del"
-                type="primary"
+                type="danger"
                 text
                 link
                 @click="fnDelete(row.LIST_TYPE, row.CHECKRECORD_ID)"
diff --git a/src/views/hazard_investigation/inventory_troubleshooting/inspect.vue b/src/views/hazard_investigation/inventory_troubleshooting/inspect.vue
index 85c4d3b..63cd567 100644
--- a/src/views/hazard_investigation/inventory_troubleshooting/inspect.vue
+++ b/src/views/hazard_investigation/inventory_troubleshooting/inspect.vue
@@ -110,7 +110,7 @@
             修改
           </el-button>
           <el-button
-            type="primary"
+            type="danger"
             :disabled="data.canDoCheck"
             text
             link
diff --git a/src/views/hazard_investigation/inventory_troubleshooting/inspect_custom.vue b/src/views/hazard_investigation/inventory_troubleshooting/inspect_custom.vue
index c15badf..8449093 100644
--- a/src/views/hazard_investigation/inventory_troubleshooting/inspect_custom.vue
+++ b/src/views/hazard_investigation/inventory_troubleshooting/inspect_custom.vue
@@ -102,7 +102,7 @@
             修改
           </el-button>
           <el-button
-            type="primary"
+            type="danger"
             text
             link
             @click="fnDeleteOtherHidden(row.HIDDEN_ID)"
diff --git a/src/views/hidden_danger_government/ledger/index.vue b/src/views/hidden_danger_government/ledger/index.vue
index 07be874..0bc20cb 100644
--- a/src/views/hidden_danger_government/ledger/index.vue
+++ b/src/views/hidden_danger_government/ledger/index.vue
@@ -138,7 +138,7 @@
             </el-button>
             <el-button
               v-if="buttonJurisdiction.del"
-              type="primary"
+              type="danger"
               text
               link
               @click="fnDelete(row.HIDDEN_ID, row.LIST_TYPE)"
diff --git a/src/views/labor_contract/index.vue b/src/views/labor_contract/index.vue
index f297ae3..1eec7b3 100644
--- a/src/views/labor_contract/index.vue
+++ b/src/views/labor_contract/index.vue
@@ -23,8 +23,8 @@
           <el-col :span="6">
             <el-form-item label="有效状态" prop="VALIDSTATUS">
               <el-select v-model="searchForm.VALIDSTATUS" clearable>
-                <el-option label="正常" :value="1" />
-                <el-option label="未生效" :value="0" />
+                <el-option label="有效" :value="1" />
+                <el-option label="失效" :value="0" />
               </el-select>
             </el-form-item>
           </el-col>
@@ -62,8 +62,8 @@
         </el-table-column>
         <el-table-column label="有效状态" prop="VALIDSTATUS">
           <template #default="{ row }">
-            <el-tag v-if="row.VALIDSTATUS === '1'">正常</el-tag>
-            <el-tag v-else>未生效</el-tag>
+            <el-tag v-if="row.VALIDSTATUS === '1'">有效</el-tag>
+            <el-tag v-else>失效</el-tag>
           </template>
         </el-table-column>
         <!--        <el-table-column prop="CORP_NAME" label="经营企业" width="150" />
diff --git a/src/views/management_staffing/index.vue b/src/views/management_staffing/index.vue
index d7a847f..a1e425c 100644
--- a/src/views/management_staffing/index.vue
+++ b/src/views/management_staffing/index.vue
@@ -23,8 +23,8 @@
           <el-col :span="6">
             <el-form-item label="有效状态" prop="VALIDSTATUS">
               <el-select v-model="searchForm.VALIDSTATUS" clearable>
-                <el-option label="正常" :value="1" />
-                <el-option label="未生效" :value="0" />
+                <el-option label="有效" :value="1" />
+                <el-option label="失效" :value="0" />
               </el-select>
             </el-form-item>
           </el-col>
@@ -61,8 +61,8 @@
         </el-table-column>
         <el-table-column label="有效状态" prop="VALIDSTATUS">
           <template #default="{ row }">
-            <el-tag v-if="row.VALIDSTATUS === '1'">正常</el-tag>
-            <el-tag v-else-if="row.VALIDSTATUS === '0'">未生效</el-tag>
+            <el-tag v-if="row.VALIDSTATUS === '1'">有效</el-tag>
+            <el-tag v-else-if="row.VALIDSTATUS === '0'">失效</el-tag>
           </template>
         </el-table-column>
         <!--        <el-table-column prop="CORP_NAME" label="经营企业" width="150" />
diff --git a/src/views/mechanical_files/beidou/index.vue b/src/views/mechanical_files/beidou/index.vue
index 88ba097..ee0a98d 100644
--- a/src/views/mechanical_files/beidou/index.vue
+++ b/src/views/mechanical_files/beidou/index.vue
@@ -163,12 +163,7 @@
             >
               编辑
             </el-button>
-            <el-button
-              type="primary"
-              text
-              link
-              @click="fnDelete(row.BEIDOU_ID)"
-            >
+            <el-button type="danger" text link @click="fnDelete(row.BEIDOU_ID)">
               删除
             </el-button>
             <el-button
diff --git a/src/views/mechanical_files/insure/index.vue b/src/views/mechanical_files/insure/index.vue
index e531d13..2ea926c 100644
--- a/src/views/mechanical_files/insure/index.vue
+++ b/src/views/mechanical_files/insure/index.vue
@@ -199,12 +199,7 @@
             >
               编辑
             </el-button>
-            <el-button
-              type="primary"
-              text
-              link
-              @click="fnDelete(row.INSURE_ID)"
-            >
+            <el-button type="danger" text link @click="fnDelete(row.INSURE_ID)">
               删除
             </el-button>
             <el-button
diff --git a/src/views/mechanical_files/maintenance/index.vue b/src/views/mechanical_files/maintenance/index.vue
index 239b23d..b3d0406 100644
--- a/src/views/mechanical_files/maintenance/index.vue
+++ b/src/views/mechanical_files/maintenance/index.vue
@@ -171,7 +171,7 @@
               编辑
             </el-button>
             <el-button
-              type="primary"
+              type="danger"
               text
               link
               @click="fnDelete(row.MAINTENANCE_ID)"
diff --git a/src/views/mechanical_files/operations/index.vue b/src/views/mechanical_files/operations/index.vue
index adf853e..7092075 100644
--- a/src/views/mechanical_files/operations/index.vue
+++ b/src/views/mechanical_files/operations/index.vue
@@ -188,7 +188,7 @@
               编辑
             </el-button>
             <el-button
-              type="primary"
+              type="danger"
               text
               link
               @click="fnDelete(row.OPERATIONS_ID)"
diff --git a/src/views/mechanical_files/scrap_manage/index.vue b/src/views/mechanical_files/scrap_manage/index.vue
index a5d7b98..e0e9df8 100644
--- a/src/views/mechanical_files/scrap_manage/index.vue
+++ b/src/views/mechanical_files/scrap_manage/index.vue
@@ -118,7 +118,7 @@
             </el-button>
             <el-button
               v-if="buttonJurisdiction.del"
-              type="primary"
+              type="danger"
               text
               link
               @click="fnDelete(row.SCRAP_ID)"
diff --git a/src/views/notification_announcement/notification_announcement/index.vue b/src/views/notification_announcement/notification_announcement/index.vue
index c0e7ec5..6f08a01 100644
--- a/src/views/notification_announcement/notification_announcement/index.vue
+++ b/src/views/notification_announcement/notification_announcement/index.vue
@@ -82,7 +82,7 @@
             </el-button>
             <el-button
               v-if="buttonJurisdiction.del"
-              type="primary"
+              type="danger"
               text
               link
               @click="fnDelete(row.NOTICECORP_ID)"
diff --git a/src/views/occupational_hazards/index.vue b/src/views/occupational_hazards/index.vue
index e6fbe08..f355e06 100644
--- a/src/views/occupational_hazards/index.vue
+++ b/src/views/occupational_hazards/index.vue
@@ -27,8 +27,8 @@
           <el-col :span="6">
             <el-form-item label="有效状态" prop="VALIDSTATUS">
               <el-select v-model="searchForm.VALIDSTATUS" clearable>
-                <el-option label="正常" :value="1" />
-                <el-option label="未生效" :value="0" />
+                <el-option label="有效" :value="1" />
+                <el-option label="失效" :value="0" />
               </el-select>
             </el-form-item>
           </el-col>
@@ -66,8 +66,8 @@
         </el-table-column>
         <el-table-column label="有效状态" prop="VALIDSTATUS" width="100">
           <template #default="{ row }">
-            <el-tag v-if="row.VALIDSTATUS === '1'">正常</el-tag>
-            <el-tag v-else>未生效</el-tag>
+            <el-tag v-if="row.VALIDSTATUS === '1'">有效</el-tag>
+            <el-tag v-else>失效</el-tag>
           </template>
         </el-table-column>
         <!--        <el-table-column prop="CORP_NAME" label="经营企业" width="220" />
diff --git a/src/views/production_course_regulate/enterprise_safety_production_shift/index.vue b/src/views/production_course_regulate/enterprise_safety_production_shift/index.vue
index f7f72c7..6b9f77c 100644
--- a/src/views/production_course_regulate/enterprise_safety_production_shift/index.vue
+++ b/src/views/production_course_regulate/enterprise_safety_production_shift/index.vue
@@ -82,7 +82,7 @@
             </el-button>
             <el-button
               v-if="buttonJurisdiction.del"
-              type="primary"
+              type="danger"
               text
               link
               @click="fnDelete(row.SAFETYPRODUCTION_ID)"
diff --git a/src/views/production_course_regulate/entrench_thing_grant/index.vue b/src/views/production_course_regulate/entrench_thing_grant/index.vue
index 2facb52..047ca3e 100644
--- a/src/views/production_course_regulate/entrench_thing_grant/index.vue
+++ b/src/views/production_course_regulate/entrench_thing_grant/index.vue
@@ -67,7 +67,7 @@
             </el-button>
             <el-button
               v-if="buttonJurisdiction.del"
-              type="primary"
+              type="danger"
               text
               link
               @click="fnDelete(row.PROTECTIVEEQUIPMENT_ID)"
diff --git a/src/views/production_course_regulate/firefighting_equipment_facility/firefightingmaintain.vue b/src/views/production_course_regulate/firefighting_equipment_facility/firefightingmaintain.vue
index 0974d35..151ddd6 100644
--- a/src/views/production_course_regulate/firefighting_equipment_facility/firefightingmaintain.vue
+++ b/src/views/production_course_regulate/firefighting_equipment_facility/firefightingmaintain.vue
@@ -60,7 +60,7 @@
           </el-button>
           <el-button
             v-if="buttonJurisdiction.del"
-            type="primary"
+            type="danger"
             text
             link
             @click="fnDelete(row.FIREFIGHTINGMAINTAIN_ID)"
diff --git a/src/views/production_course_regulate/firefighting_equipment_facility/index.vue b/src/views/production_course_regulate/firefighting_equipment_facility/index.vue
index 184ae3b..19b8a74 100644
--- a/src/views/production_course_regulate/firefighting_equipment_facility/index.vue
+++ b/src/views/production_course_regulate/firefighting_equipment_facility/index.vue
@@ -108,7 +108,7 @@
             </el-button>
             <el-button
               v-if="buttonJurisdiction.del"
-              type="primary"
+              type="danger"
               text
               link
               @click="fnDelete(row.FIREFIGHTINGFACILITY_ID)"
diff --git a/src/views/production_course_regulate/management_agreement/index.vue b/src/views/production_course_regulate/management_agreement/index.vue
index 247ab59..157ee29 100644
--- a/src/views/production_course_regulate/management_agreement/index.vue
+++ b/src/views/production_course_regulate/management_agreement/index.vue
@@ -96,7 +96,7 @@
             <el-button
               text
               link
-              type="primary"
+              type="danger"
               @click="deleteItem(row.MANAGEMENTAGREEMENT_ID)"
             >
               删除
diff --git a/src/views/production_course_regulate/production_equipment_facility/index.vue b/src/views/production_course_regulate/production_equipment_facility/index.vue
index cb17e3e..cbfaa38 100644
--- a/src/views/production_course_regulate/production_equipment_facility/index.vue
+++ b/src/views/production_course_regulate/production_equipment_facility/index.vue
@@ -104,7 +104,7 @@
             </el-button>
             <el-button
               v-if="buttonJurisdiction.del"
-              type="primary"
+              type="danger"
               text
               link
               @click="fnDelete(row.PRODUCTIONFACILITY_ID)"
diff --git a/src/views/production_course_regulate/production_equipment_facility/maintain.vue b/src/views/production_course_regulate/production_equipment_facility/maintain.vue
index d9b8b0c..b528e2a 100644
--- a/src/views/production_course_regulate/production_equipment_facility/maintain.vue
+++ b/src/views/production_course_regulate/production_equipment_facility/maintain.vue
@@ -63,7 +63,7 @@
           </el-button>
           <el-button
             v-if="buttonJurisdiction.del"
-            type="primary"
+            type="danger"
             text
             link
             @click="fnDelete(row.MAINTAIN_ID)"
diff --git a/src/views/production_course_regulate/reported_incident_dispose/index.vue b/src/views/production_course_regulate/reported_incident_dispose/index.vue
index b52b767..ad293fa 100644
--- a/src/views/production_course_regulate/reported_incident_dispose/index.vue
+++ b/src/views/production_course_regulate/reported_incident_dispose/index.vue
@@ -99,7 +99,7 @@
             </el-button>
             <el-button
               v-if="buttonJurisdiction.del"
-              type="primary"
+              type="danger"
               text
               link
               @click="fnDelete(row.REPORTEDINCIDENT_ID)"
diff --git a/src/views/risk_control/identifying_parts/index.vue b/src/views/risk_control/identifying_parts/index.vue
index 36ae34d..4117471 100644
--- a/src/views/risk_control/identifying_parts/index.vue
+++ b/src/views/risk_control/identifying_parts/index.vue
@@ -88,7 +88,7 @@
             </el-button>
             <el-button
               v-if="buttonJurisdiction.del"
-              type="primary"
+              type="danger"
               text
               link
               @click="fnDelete(row.IDENTIFICATIONPARTS_ID)"
diff --git a/src/views/risk_control/ledger/index.vue b/src/views/risk_control/ledger/index.vue
index 191440c..9d66245 100644
--- a/src/views/risk_control/ledger/index.vue
+++ b/src/views/risk_control/ledger/index.vue
@@ -137,7 +137,7 @@
             </el-button>
             <el-button
               v-if="buttonJurisdiction.del"
-              type="primary"
+              type="danger"
               text
               link
               @click="fnDelete(row.RISKPOINT_ID)"
diff --git a/src/views/risk_control/risk_point/index.vue b/src/views/risk_control/risk_point/index.vue
index 61d9e64..11d3fea 100644
--- a/src/views/risk_control/risk_point/index.vue
+++ b/src/views/risk_control/risk_point/index.vue
@@ -97,7 +97,7 @@
             </el-button>
             <el-button
               v-if="buttonJurisdiction.del"
-              type="primary"
+              type="danger"
               text
               link
               @click="fnDelete(row.RISKUNIT_ID)"
diff --git a/src/views/risk_statement/risk_four_color_chart/index.vue b/src/views/risk_statement/risk_four_color_chart/index.vue
index 830c095..f9f43a7 100644
--- a/src/views/risk_statement/risk_four_color_chart/index.vue
+++ b/src/views/risk_statement/risk_four_color_chart/index.vue
@@ -64,7 +64,7 @@
             </el-button>
             <el-button
               v-show="buttonJurisdiction.del"
-              type="primary"
+              type="danger"
               text
               link
               @click="fnDelete(row.RISKWARNING_ID)"
diff --git a/src/views/safety_assessment/index.vue b/src/views/safety_assessment/index.vue
index 105d846..3aa5b20 100644
--- a/src/views/safety_assessment/index.vue
+++ b/src/views/safety_assessment/index.vue
@@ -23,8 +23,8 @@
           <el-col :span="6">
             <el-form-item label="有效状态" prop="VALIDSTATUS">
               <el-select v-model="searchForm.VALIDSTATUS" clearable>
-                <el-option label="正常" :value="1" />
-                <el-option label="未生效" :value="0" />
+                <el-option label="有效" :value="0" />
+                <el-option label="失效" :value="1" />
               </el-select>
             </el-form-item>
           </el-col>
@@ -61,8 +61,8 @@
         </el-table-column>
         <el-table-column label="有效状态" prop="VALIDSTATUS">
           <template #default="{ row }">
-            <el-tag v-if="row.VALIDSTATUS === '1'">正常</el-tag>
-            <el-tag v-else-if="row.VALIDSTATUS === '0'">未生效</el-tag>
+            <el-tag v-if="row.VALIDSTATUS === '1'">有效</el-tag>
+            <el-tag v-else-if="row.VALIDSTATUS === '0'">失效</el-tag>
           </template>
         </el-table-column>
         <!--        <el-table-column prop="CORP_NAME" label="经营企业" width="150" />-->
diff --git a/src/views/safety_culture/safety_activities/index.vue b/src/views/safety_culture/safety_activities/index.vue
index 55b292e..9bac93b 100644
--- a/src/views/safety_culture/safety_activities/index.vue
+++ b/src/views/safety_culture/safety_activities/index.vue
@@ -90,7 +90,7 @@
             <el-button
               text
               link
-              type="primary"
+              type="danger"
               @click="deleteItem(row.ACTIVITIES_ID)"
             >
               删除
diff --git a/src/views/safety_culture/safety_manual/index.vue b/src/views/safety_culture/safety_manual/index.vue
index 848bfee..dbd0fc8 100644
--- a/src/views/safety_culture/safety_manual/index.vue
+++ b/src/views/safety_culture/safety_manual/index.vue
@@ -85,7 +85,7 @@
             <el-button
               text
               link
-              type="primary"
+              type="danger"
               @click="deleteItem(row.MANUAL_ID)"
             >
               删除
diff --git a/src/views/safety_production/index.vue b/src/views/safety_production/index.vue
index 60809a9..fb9a2ec 100644
--- a/src/views/safety_production/index.vue
+++ b/src/views/safety_production/index.vue
@@ -23,8 +23,8 @@
           <el-col :span="6">
             <el-form-item label="有效状态" prop="VALIDSTATUS">
               <el-select v-model="searchForm.VALIDSTATUS" clearable>
-                <el-option label="正常" value="1" />
-                <el-option label="未生效" value="2" />
+                <el-option label="有效" value="1" />
+                <el-option label="失效" value="2" />
               </el-select>
             </el-form-item>
           </el-col>
@@ -61,8 +61,8 @@
         </el-table-column>
         <el-table-column label="有效状态" prop="VALIDSTATUS">
           <template #default="{ row }">
-            <el-tag v-if="row.VALIDSTATUS === '1'">正常</el-tag>
-            <el-tag v-else-if="row.VALIDSTATUS === '2'">未生效</el-tag>
+            <el-tag v-if="row.VALIDSTATUS === '1'">有效</el-tag>
+            <el-tag v-else-if="row.VALIDSTATUS === '2'">失效</el-tag>
           </template>
         </el-table-column>
         <!--        <el-table-column prop="CORP_NAME" label="经营企业" width="150" />-->
diff --git a/src/views/safety_responsibility/index.vue b/src/views/safety_responsibility/index.vue
index a6ff2cb..4bb6d50 100644
--- a/src/views/safety_responsibility/index.vue
+++ b/src/views/safety_responsibility/index.vue
@@ -27,8 +27,8 @@
           <el-col :span="6">
             <el-form-item label="有效状态" prop="VALIDSTATUS">
               <el-select v-model="searchForm.VALIDSTATUS" clearable>
-                <el-option label="正常" :value="1" />
-                <el-option label="未生效" :value="0" />
+                <el-option label="有效" :value="1" />
+                <el-option label="失效" :value="0" />
               </el-select>
             </el-form-item>
           </el-col>
@@ -70,8 +70,8 @@
         </el-table-column>
         <el-table-column label="有效状态" prop="VALIDSTATUS">
           <template #default="{ row }">
-            <el-tag v-if="row.VALIDSTATUS === '1'">正常</el-tag>
-            <el-tag v-else>未生效</el-tag>
+            <el-tag v-if="row.VALIDSTATUS === '1'">有效</el-tag>
+            <el-tag v-else>失效</el-tag>
           </template>
         </el-table-column>
         <!--        <el-table-column prop="CORP_NAME" label="经营企业" width="150" />
diff --git a/src/views/security_commitment/index.vue b/src/views/security_commitment/index.vue
index 674bed0..cf21623 100644
--- a/src/views/security_commitment/index.vue
+++ b/src/views/security_commitment/index.vue
@@ -23,8 +23,8 @@
           <el-col :span="6">
             <el-form-item label="有效状态" prop="VALIDSTATUS">
               <el-select v-model="searchForm.VALIDSTATUS" clearable>
-                <el-option label="正常" :value="1" />
-                <el-option label="未生效" :value="0" />
+                <el-option label="有效" :value="1" />
+                <el-option label="失效" :value="0" />
               </el-select>
             </el-form-item>
           </el-col>
@@ -66,8 +66,8 @@
         </el-table-column>
         <el-table-column label="有效状态" prop="VALIDSTATUS">
           <template #default="{ row }">
-            <el-tag v-if="row.VALIDSTATUS === '1'">正常</el-tag>
-            <el-tag v-else>未生效</el-tag>
+            <el-tag v-if="row.VALIDSTATUS === '1'">有效</el-tag>
+            <el-tag v-else>失效</el-tag>
           </template>
         </el-table-column>
         <!--        <el-table-column prop="CORP_NAME" label="经营企业" width="150" />
diff --git a/src/views/system_operation/system_documents/index.vue b/src/views/system_operation/system_documents/index.vue
index 6840c72..06f1f42 100644
--- a/src/views/system_operation/system_documents/index.vue
+++ b/src/views/system_operation/system_documents/index.vue
@@ -52,7 +52,7 @@
         <template #default="{ row }">
           <el-button
             v-if="buttonJurisdiction.del && row.UNAME !== 'init'"
-            type="primary"
+            type="danger"
             text
             link
             @click="fnDelete(row.MFOLDER_ID, row.FILEPATH)"
diff --git a/src/views/three_institutional_libraries/safety_production_responsibility_system/components/list.vue b/src/views/three_institutional_libraries/safety_production_responsibility_system/components/list.vue
index f430c75..3851e5e 100644
--- a/src/views/three_institutional_libraries/safety_production_responsibility_system/components/list.vue
+++ b/src/views/three_institutional_libraries/safety_production_responsibility_system/components/list.vue
@@ -171,7 +171,7 @@
             </el-button>
             <el-button
               v-if="buttonJurisdiction.del"
-              type="primary"
+              type="danger"
               text
               link
               @click="fnDelete(row.BUS_TEXT_LIBRARY_ID)"
diff --git a/src/views/training_process_management/class_management/components/curriculum.vue b/src/views/training_process_management/class_management/components/curriculum.vue
index 64d0408..85797cc 100644
--- a/src/views/training_process_management/class_management/components/curriculum.vue
+++ b/src/views/training_process_management/class_management/components/curriculum.vue
@@ -79,7 +79,7 @@
           </el-button>
           <el-button
             v-if="!isEdit"
-            type="primary"
+            type="danger"
             text
             link
             @click="fnDelete(row.CLASSCURRICULUM_ID)"
diff --git a/src/views/training_process_management/class_management/index.vue b/src/views/training_process_management/class_management/index.vue
index 871b854..dfec4ee 100644
--- a/src/views/training_process_management/class_management/index.vue
+++ b/src/views/training_process_management/class_management/index.vue
@@ -209,7 +209,7 @@
             </el-button>
             <el-button
               v-if="row.STATE === '1' && row.STUDYRECORDCNT === 0"
-              type="primary"
+              type="danger"
               text
               link
               @click="fnDelete(row.CLASS_ID)"
diff --git a/src/views/training_process_management/exam_paper_management/add.vue b/src/views/training_process_management/exam_paper_management/add.vue
index 7a41016..9e4e23e 100644
--- a/src/views/training_process_management/exam_paper_management/add.vue
+++ b/src/views/training_process_management/exam_paper_management/add.vue
@@ -144,7 +144,10 @@
             </div>
             <div class="tr">
               <el-button @click="fnAddOrEdit(item, index)">编辑</el-button>
-              <el-button @click="fnDelete(item.PAPER_QUESTION_ID, index)">
+              <el-button
+                type="danger"
+                @click="fnDelete(item.PAPER_QUESTION_ID, index)"
+              >
                 删除
               </el-button>
             </div>
diff --git a/src/views/training_process_management/exam_paper_management/index.vue b/src/views/training_process_management/exam_paper_management/index.vue
index bcebd51..725139f 100644
--- a/src/views/training_process_management/exam_paper_management/index.vue
+++ b/src/views/training_process_management/exam_paper_management/index.vue
@@ -127,7 +127,7 @@
             </el-button>
             <el-button
               v-if="row.SOURCETYPE === '2' || row.PAPERUSERCOUNT === 0"
-              type="primary"
+              type="danger"
               text
               link
               @click="fnDelete(row.STAGEEXAMPAPERINPUT_ID)"
diff --git a/src/views/training_process_management/examdraft_management/edit.vue b/src/views/training_process_management/examdraft_management/edit.vue
index 685cc90..ab73b9d 100644
--- a/src/views/training_process_management/examdraft_management/edit.vue
+++ b/src/views/training_process_management/examdraft_management/edit.vue
@@ -119,7 +119,10 @@
             </div>
             <div class="tr">
               <el-button @click="fnAddOrEdit(item, index)">编辑</el-button>
-              <el-button @click="fnDelete(item.PAPER_QUESTION_ID, index)">
+              <el-button
+                type="danger"
+                @click="fnDelete(item.PAPER_QUESTION_ID, index)"
+              >
                 删除
               </el-button>
             </div>
diff --git a/src/views/training_process_management/examdraft_management/index.vue b/src/views/training_process_management/examdraft_management/index.vue
index fa37083..1b89db4 100644
--- a/src/views/training_process_management/examdraft_management/index.vue
+++ b/src/views/training_process_management/examdraft_management/index.vue
@@ -75,7 +75,9 @@
               "
               >编辑</el-button
             >
-            <el-button type="text" @click="fnDelete(row.STAGEEXAMPAPERINPUT_ID)"
+            <el-button
+              type="danger"
+              @click="fnDelete(row.STAGEEXAMPAPERINPUT_ID)"
               >删除</el-button
             >
             <el-button
diff --git a/src/views/training_resource_management/course_management/add.vue b/src/views/training_resource_management/course_management/add.vue
index 3078b77..4455692 100644
--- a/src/views/training_resource_management/course_management/add.vue
+++ b/src/views/training_resource_management/course_management/add.vue
@@ -127,7 +127,7 @@
             </div>
             <div>
               <el-button
-                type="primary"
+                type="danger"
                 @click="fnDeleteChapter(index, item, 'first')"
               >
                 删除
@@ -192,7 +192,7 @@
             </div>
             <div>
               <el-button
-                type="primary"
+                type="danger"
                 @click="fnDeleteChapter(index1, item, 'second')"
               >
                 删除
diff --git a/src/views/training_resource_management/course_management/components/add_courseware.vue b/src/views/training_resource_management/course_management/components/add_courseware.vue
index 71659f1..d82a2e1 100644
--- a/src/views/training_resource_management/course_management/components/add_courseware.vue
+++ b/src/views/training_resource_management/course_management/components/add_courseware.vue
@@ -126,7 +126,7 @@
                     </div>
                     <div>
                       <el-button
-                        type="primary"
+                        type="danger"
                         @click="fnDeleteChapter(index, item, 'first')"
                       >
                         删除
@@ -184,7 +184,7 @@
                     </div>
                     <div>
                       <el-button
-                        type="primary"
+                        type="danger"
                         @click="fnDeleteChapter(index1, item, 'second')"
                       >
                         删除
diff --git a/src/views/training_resource_management/course_management/index.vue b/src/views/training_resource_management/course_management/index.vue
index 733ef75..2d2b7c1 100644
--- a/src/views/training_resource_management/course_management/index.vue
+++ b/src/views/training_resource_management/course_management/index.vue
@@ -137,7 +137,7 @@
             </el-button>
             <el-button
               v-if="row.IS_CORP_CREATE === 1"
-              type="primary"
+              type="danger"
               text
               link
               @click="fnDelete(row.CURRICULUM_ID)"
diff --git a/src/views/workforce_management/index.vue b/src/views/workforce_management/index.vue
index a1c6b2b..8b09177 100644
--- a/src/views/workforce_management/index.vue
+++ b/src/views/workforce_management/index.vue
@@ -76,7 +76,7 @@
             </el-button>
             <el-button
               v-if="buttonJurisdiction.del"
-              type="primary"
+              type="danger"
               text
               link
               @click="fnDelete(row.SHIFTWORKRULES_ID)"