From db3e181254d40737b5b4240b815daac6544e5a8b Mon Sep 17 00:00:00 2001
From: shijing <sj_mzw@163.com>
Date: Fri, 24 Nov 2023 10:33:13 +0800
Subject: [PATCH] =?UTF-8?q?el-tag=E6=A0=87=E7=AD=BE=E5=B1=9E=E6=80=A7type?=
 =?UTF-8?q?=E6=B2=A1=E6=9C=89primary=E4=BF=AE=E6=AD=A3?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/components/scScrollTable.vue                |  2 +-
 src/layout/components/userbar.vue               |  6 +++---
 src/views/ecm/event_from.vue                    | 12 ++++++------
 src/views/ecm/event_handlefrom.vue              | 12 ++++++------
 src/views/ecm/myevent.vue                       | 12 ++++++------
 src/views/home/event.vue                        | 12 ++++++------
 src/views/home/widgets/components/about.vue     |  4 ++--
 src/views/home/widgets/components/eventlist.vue |  2 +-
 src/views/home/widgets/components/ticket.vue    |  2 +-
 src/views/mtm/materials.vue                     |  2 +-
 src/views/pm/mtask.vue                          |  8 ++++----
 src/views/wf/details.vue                        |  8 ++++----
 src/views/wpm/worktask.vue                      |  4 ++--
 src/views/wpm/worktask2.vue                     |  2 +-
 14 files changed, 44 insertions(+), 44 deletions(-)

diff --git a/src/components/scScrollTable.vue b/src/components/scScrollTable.vue
index 6fc485d6..2583a621 100644
--- a/src/components/scScrollTable.vue
+++ b/src/components/scScrollTable.vue
@@ -104,7 +104,7 @@
         methods: {
             getTagType(type){
                 if(type==30){
-                    return "primary"
+                    return ""
                 }else if(type==40){
                     return "success"
                 }else if(type=='到岗'){
diff --git a/src/layout/components/userbar.vue b/src/layout/components/userbar.vue
index 603cb254..b39667be 100644
--- a/src/layout/components/userbar.vue
+++ b/src/layout/components/userbar.vue
@@ -24,8 +24,8 @@
                 <li v-for="item in msgList" v-bind:key="item.id">
                   <div style="width: 100%; padding: 10px">
                     <div style="width: 35%; float: left">
-                      <el-span style="color:red:float:left" v-for="items in item.event_.cates_" :key="items.id"
-                        :label="items.name" :value="items.id">{{ items.name }}</el-span>
+                      <span style="color:red:float:left" v-for="items in item.event_.cates_" :key="items.id"
+                        :label="items.name" :value="items.id">{{ items.name }}</span>
                     </div>
                     <div style="width: 32%; float: left">
                       <p>{{ item.event_.create_time }}</p>
@@ -69,7 +69,7 @@
     </el-dropdown>
   </div>
 
-  <el-dialog v-model="searchVisible" :width="700" title="搜索" custom-class="drawerBG" center destroy-on-close>
+  <el-dialog v-model="searchVisible" :width="700" title="搜索" class="drawerBG" center destroy-on-close>
     <search @success="searchVisible = false"></search>
   </el-dialog>
 </template>
diff --git a/src/views/ecm/event_from.vue b/src/views/ecm/event_from.vue
index 265f1b11..cae25fe8 100644
--- a/src/views/ecm/event_from.vue
+++ b/src/views/ecm/event_from.vue
@@ -112,12 +112,12 @@
         <el-table-column label="#" type="index" width="50"></el-table-column>
         <el-table-column label="事件种类">
           <template #default="scope">
-            <el-span
+            <span
               v-for="item in scope.row.event_.cates_"
               :key="item.id"
               :label="item.name"
               :value="item.id"
-              >{{ item.name }}</el-span
+              >{{ item.name }}</span
             >
           </template>
         </el-table-column>
@@ -134,14 +134,14 @@
 
         <el-table-column label="是否可处理" prop="can_handle">
           <template #default="scope">
-            <el-span v-if="scope.row.can_handle">是</el-span>
-            <el-span v-else>否</el-span>
+            <span v-if="scope.row.can_handle">是</span>
+            <span v-else>否</span>
           </template>
         </el-table-column>
         <el-table-column label="是否已读" prop="is_read">
           <template #default="scope">
-            <el-span v-if="scope.row.is_read" color="green">已读</el-span>
-            <el-span v-else>未读</el-span>
+            <span v-if="scope.row.is_read" color="green">已读</span>
+            <span v-else>未读</span>
           </template>
         </el-table-column>
 
diff --git a/src/views/ecm/event_handlefrom.vue b/src/views/ecm/event_handlefrom.vue
index 4d3a45f8..1fdc37aa 100644
--- a/src/views/ecm/event_handlefrom.vue
+++ b/src/views/ecm/event_handlefrom.vue
@@ -142,8 +142,8 @@
           </el-table-column>
           <el-table-column label="事件处理状态" prop="can_handle">
             <template #default="scope">
-              <el-span v-if="scope.row.handle_user == null">未处理</el-span>
-              <el-span v-else>已处理</el-span>
+              <span v-if="scope.row.handle_user == null">未处理</span>
+              <span v-else>已处理</span>
             </template>
           </el-table-column>
 
@@ -160,14 +160,14 @@
 
           <el-table-column label="是否可处理" prop="can_handle">
             <template #default="scope">
-              <el-span v-if="scope.row.can_handle">是</el-span>
-              <el-span v-else>否</el-span>
+              <span v-if="scope.row.can_handle">是</span>
+              <span v-else>否</span>
             </template>
           </el-table-column>
           <el-table-column label="是否已读" prop="is_read">
             <template #default="scope">
-              <el-span v-if="scope.row.is_read" color="green">已读</el-span>
-              <el-span v-else>未读</el-span>
+              <span v-if="scope.row.is_read" color="green">已读</span>
+              <span v-else>未读</span>
             </template>
           </el-table-column>
 
diff --git a/src/views/ecm/myevent.vue b/src/views/ecm/myevent.vue
index b5ebe881..534225ab 100644
--- a/src/views/ecm/myevent.vue
+++ b/src/views/ecm/myevent.vue
@@ -62,8 +62,8 @@
         </el-table-column>
          <el-table-column label="事件处理状态" prop="can_handle">
           <template #default="scope">
-            <el-span v-if="scope.row.handle_user==null">未处理</el-span>
-            <el-span v-else>已处理</el-span>
+            <span v-if="scope.row.handle_user==null">未处理</span>
+            <span v-else>已处理</span>
           </template>
         </el-table-column>
        
@@ -81,14 +81,14 @@
       
         <el-table-column label="是否可处理" prop="can_handle">
           <template #default="scope">
-            <el-span v-if="scope.row.can_handle">是</el-span>
-            <el-span v-else>否</el-span>
+            <span v-if="scope.row.can_handle">是</span>
+            <span v-else>否</span>
           </template>
         </el-table-column>
         <el-table-column label="是否已读" prop="is_read">
           <template #default="scope">
-            <el-span v-if="scope.row.is_read" color="green">已读</el-span>
-            <el-span v-else>未读</el-span>
+            <span v-if="scope.row.is_read" color="green">已读</span>
+            <span v-else>未读</span>
           </template>
         </el-table-column>
 
diff --git a/src/views/home/event.vue b/src/views/home/event.vue
index 8e8056da..d5605294 100644
--- a/src/views/home/event.vue
+++ b/src/views/home/event.vue
@@ -192,8 +192,8 @@
           </el-table-column>
           <el-table-column label="事件处理状态" prop="can_handle">
             <template #default="scope">
-              <el-span v-if="scope.row.handle_user == null">未处理</el-span>
-              <el-span v-else>已处理</el-span>
+              <span v-if="scope.row.handle_user == null">未处理</span>
+              <span v-else>已处理</span>
             </template>
           </el-table-column>
 
@@ -210,14 +210,14 @@
 
           <el-table-column label="是否可处理" prop="can_handle">
             <template #default="scope">
-              <el-span v-if="scope.row.can_handle">是</el-span>
-              <el-span v-else>否</el-span>
+              <span v-if="scope.row.can_handle">是</span>
+              <span v-else>否</span>
             </template>
           </el-table-column>
           <el-table-column label="是否已读" prop="is_read">
             <template #default="scope">
-              <el-span v-if="scope.row.is_read" color="green">已读</el-span>
-              <el-span v-else>未读</el-span>
+              <span v-if="scope.row.is_read" color="green">已读</span>
+              <span v-else>未读</span>
             </template>
           </el-table-column>
 
diff --git a/src/views/home/widgets/components/about.vue b/src/views/home/widgets/components/about.vue
index 64865f56..06f9cf06 100644
--- a/src/views/home/widgets/components/about.vue
+++ b/src/views/home/widgets/components/about.vue
@@ -11,8 +11,8 @@
 				<scTable ref="table" :apiObj="apiObj" :params="params" row-key="id" fit stripe hideDo  :height="tableHeight">
 					<el-table-column label="事件种类">
 					<template #default="scope">
-						<el-span v-for="item in scope.row.cates_" :key="item.id" :label="item.name" :value="item.id">{{
-						item.name }}/</el-span>
+						<span v-for="item in scope.row.cates_" :key="item.id" :label="item.name" :value="item.id">{{
+						item.name }}/</span>
 					</template>
 					</el-table-column>
 					<el-table-column label="发生区域" prop="area_.name"></el-table-column>
diff --git a/src/views/home/widgets/components/eventlist.vue b/src/views/home/widgets/components/eventlist.vue
index a87e7fb9..d5a659fe 100644
--- a/src/views/home/widgets/components/eventlist.vue
+++ b/src/views/home/widgets/components/eventlist.vue
@@ -39,7 +39,7 @@
           <el-table-column label="人员类型" prop="employee_.type">
             <template #default="scope">
               <span v-if="scope.row.employee_ ">
-                <el-tag type="primary" v-if="scope.row.employee_.type!=''&&scope.row.employee_.type =='employee'">正式员工</el-tag>
+                <el-tag v-if="scope.row.employee_.type!=''&&scope.row.employee_.type =='employee'">正式员工</el-tag>
                 <el-tag type="success" v-if="scope.row.employee_.type!=''&&scope.row.employee_.type=='remployee'">相关方</el-tag>
                 <el-tag type="warning" v-if="scope.row.employee_.type!=''&&scope.row.employee_.type=='visitor'">访客</el-tag>
               </span>
diff --git a/src/views/home/widgets/components/ticket.vue b/src/views/home/widgets/components/ticket.vue
index 7bdad7cd..12d6fd1f 100644
--- a/src/views/home/widgets/components/ticket.vue
+++ b/src/views/home/widgets/components/ticket.vue
@@ -131,7 +131,7 @@
           <el-table-column label="人员类型" prop="employee_.type">
             <template #default="scope">
               <span v-if="scope.row.employee_ ">
-                <el-tag type="primary" v-if="scope.row.employee_.type!=''&&scope.row.employee_.type =='employee'">正式员工</el-tag>
+                <el-tag v-if="scope.row.employee_.type!=''&&scope.row.employee_.type =='employee'">正式员工</el-tag>
                 <el-tag type="success" v-if="scope.row.employee_.type!=''&&scope.row.employee_.type=='remployee'">相关方</el-tag>
                 <el-tag type="warning" v-if="scope.row.employee_.type!=''&&scope.row.employee_.type=='visitor'">访客</el-tag>
               </span>
diff --git a/src/views/mtm/materials.vue b/src/views/mtm/materials.vue
index 6254becb..1b2a3fea 100644
--- a/src/views/mtm/materials.vue
+++ b/src/views/mtm/materials.vue
@@ -23,7 +23,7 @@
             </el-table-column>
             <el-table-column label="物料类别" prop="type">
               <template #default="scope">
-                <span><el-tag type="primary">{{ typeOptions[scope.row.type] }}</el-tag>
+                <span><el-tag>{{ typeOptions[scope.row.type] }}</el-tag>
                   <el-tag type="warning" v-if="scope.row.is_assemb">组</el-tag>
                   <el-tag type="warning" v-if="scope.row.process_name">{{ scope.row.process_name }}</el-tag>
                   <el-tag type="warning" v-if="scope.row.is_hidden">隐</el-tag></span>
diff --git a/src/views/pm/mtask.vue b/src/views/pm/mtask.vue
index 3401ab61..a7d17d62 100644
--- a/src/views/pm/mtask.vue
+++ b/src/views/pm/mtask.vue
@@ -27,7 +27,7 @@
             </el-table-column>
             <el-table-column label="任务状态" prop="state">
               <template #default="scope">
-                  <el-tag v-if="scope.row.state!==40" type="primary">
+                  <el-tag v-if="scope.row.state!==40">
                     {{ state_[scope.row.state] }}
                   </el-tag>
                   <el-tag v-else type="success">
@@ -91,7 +91,7 @@
             </el-table-column>
             <el-table-column label="任务状态" prop="state">
               <template #default="scope">
-                  <el-tag v-if="scope.row.state!==40" type="primary">
+                  <el-tag v-if="scope.row.state!==40">
                     {{ state_[scope.row.state] }}
                   </el-tag>
                   <el-tag v-else type="success">
@@ -153,7 +153,7 @@
             </el-table-column>
             <el-table-column label="任务状态" prop="state">
               <template #default="scope">
-                  <el-tag v-if="scope.row.state!==40" type="primary">
+                  <el-tag v-if="scope.row.state!==40">
                     {{ state_[scope.row.state] }}
                   </el-tag>
                   <el-tag v-else type="success">
@@ -299,7 +299,7 @@
           </el-table-column>
           <el-table-column label="状态" prop="state" show-overflow-tooltip>
             <template #default="scope">
-              <el-tag v-if="scope.row.state!==40" type="primary">
+              <el-tag v-if="scope.row.state!==40">
                 {{ state_[scope.row.state] }}
               </el-tag>
               <el-tag v-else type="success">
diff --git a/src/views/wf/details.vue b/src/views/wf/details.vue
index fe2b8234..e9ffd727 100644
--- a/src/views/wf/details.vue
+++ b/src/views/wf/details.vue
@@ -21,12 +21,12 @@
         </el-table-column>
         <el-table-column label="操作人">
           <template #default="scope">
-            <el-span v-if="scope.row.participant_">{{
+            <span v-if="scope.row.participant_">{{
               scope.row.participant_.name
-            }}</el-span>
-            <el-span v-if="scope.row.participant_str">{{
+            }}</span>
+            <span v-if="scope.row.participant_str">{{
               scope.row.participant_str
-            }}</el-span>
+            }}</span>
           </template>
         </el-table-column>
         <el-table-column label="操作属性">
diff --git a/src/views/wpm/worktask.vue b/src/views/wpm/worktask.vue
index 24896ff4..d83b40d0 100644
--- a/src/views/wpm/worktask.vue
+++ b/src/views/wpm/worktask.vue
@@ -242,7 +242,7 @@
                 </el-table-column>
                 <el-table-column label="状态" prop="state">
                   <template #default="scope">
-                    <el-tag v-if="scope.row.state !== 40" type="primary">
+                    <el-tag v-if="scope.row.state !== 40">
                       {{ state_[scope.row.state] }}
                     </el-tag>
                     <el-tag v-else type="success">
@@ -284,7 +284,7 @@
                 </el-table-column>
                 <el-table-column label="状态" prop="state">
                   <template #default="scope">
-                    <el-tag v-if="scope.row.state !== 40" type="primary">
+                    <el-tag v-if="scope.row.state !== 40">
                       {{ state_[scope.row.state] }}
                     </el-tag>
                     <el-tag v-else type="success">
diff --git a/src/views/wpm/worktask2.vue b/src/views/wpm/worktask2.vue
index f1a7b3b1..fb6134f5 100644
--- a/src/views/wpm/worktask2.vue
+++ b/src/views/wpm/worktask2.vue
@@ -43,7 +43,7 @@
                 </el-table-column>
                 <el-table-column label="状态" prop="state">
                   <template #default="scope">
-                    <el-tag v-if="scope.row.state!==40" type="primary">
+                    <el-tag v-if="scope.row.state!==40">
                       {{ state_[scope.row.state] }}
                     </el-tag>
                     <el-tag v-else type="success">