修改图标渲染逻辑

zkqy-ui/src/views/tablelist/commonTable/BtnMenu.vue

@@ -2,23 +2,28 @@
   <div class="myDiv">
     <el-dropdown trigger="click" v-if="btnObj" :hide-on-click="false">
       <span class="el-dropdown-link">
-        <el-button v-if="btnObj.btnParentId == 0" type="warning"
-          ><span
-            ><svg-icon
+        <el-button
+          v-if="btnObj.btnParentId == 0"
+          :icon="btnObj.btnIcon"
+          type="warning"
+          ><span>
+            <!-- <svg-icon
               class="pre-icon"
               v-if="btnObj.btnIcon"
               slot="prefix"
-              :icon-class="btnObj.btnIcon" />{{ btnObj.btnName }}
+              :icon-class="btnObj.btnIcon" /> -->
+            {{ btnObj.btnName }}
             <i class="el-icon-arrow-down el-icon--right"></i></span
         ></el-button>
-        <el-button v-else>
-          <span
-            ><svg-icon
+        <el-button :icon="btnObj.btnIcon" v-else>
+          <span>
+            <!-- <svg-icon
               class="pre-icon"
               v-if="btnObj.btnIcon"
               slot="prefix"
               v-hasPermi="[btnObj.btnHasPermi]"
-              :icon-class="btnObj.btnIcon" />{{ btnObj.btnName }}
+              :icon-class="btnObj.btnIcon" /> -->
+            {{ btnObj.btnName }}
             <i class="el-icon-arrow-down el-icon--right"></i
           ></span>
         </el-button>
@@ -31,14 +36,16 @@
               size="mini"
               v-hasPermi="[item.btnHasPermi]"
               @click="clickHandler(item, row)"
+              :icon="item.btnIcon"
             >
-              <span
-                ><svg-icon
+              <span>
+                <!-- <svg-icon
                   v-if="item.btnIcon"
                   class="pre-icon"
                   slot="prefix"
                   :icon-class="item.btnIcon"
-                />{{ item.btnName }}</span
+                /> -->
+                {{ item.btnName }}</span
               >
             </el-button>
           </el-dropdown-item>

zkqy-ui/src/views/tablelist/commonTable/BtnMenuList.vue

@@ -8,13 +8,15 @@
       :disabled="btn.disabled"
       v-hasPermi="[btn.btnHasPermi]"
       @click="handleClick(btn)"
-      ><span
-        ><svg-icon
+      :icon="btn.icon"
+      ><span>
+        <!-- <svg-icon
           class="pre-icon"
           v-if="btn.icon"
           slot="prefix"
           :icon-class="btn.icon"
-        />{{ btn.btnName }}</span
+        /> -->
+        {{ btn.btnName }}</span
       >
     </el-button>
   </div>