整体导出功能修改

src/assets/icons/svg/download.svg

@@ -1 +1,13 @@
-<?xml version="1.0" standalone="no"?><!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1//EN" "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11.dtd"><svg t="1569915748289" class="icon" viewBox="0 0 1024 1024" version="1.1" xmlns="http://www.w3.org/2000/svg" p-id="3062" xmlns:xlink="http://www.w3.org/1999/xlink" width="200" height="200"><defs><style type="text/css"></style></defs><path d="M768.35456 416a256 256 0 1 0-512 0 192 192 0 1 0 0 384v64a256 256 0 0 1-58.88-505.216 320.128 320.128 0 0 1 629.76 0A256.128 256.128 0 0 1 768.35456 864v-64a192 192 0 0 0 0-384z m-512 384h64v64H256.35456v-64z m448 0h64v64h-64v-64z" fill="#333333" p-id="3063"></path><path d="M539.04256 845.248V512.192a32.448 32.448 0 0 0-32-32.192c-17.664 0-32 14.912-32 32.192v333.056l-36.096-36.096a32.192 32.192 0 0 0-45.056 0.192 31.616 31.616 0 0 0-0.192 45.056l90.88 90.944a31.36 31.36 0 0 0 22.528 9.088 30.08 30.08 0 0 0 22.4-9.088l90.88-90.88a32.192 32.192 0 0 0-0.192-45.12 31.616 31.616 0 0 0-45.056-0.192l-36.096 36.096z" fill="#333333" p-id="3064"></path></svg>
+<svg width="18" height="18" viewBox="0 0 18 18" fill="none" xmlns="http://www.w3.org/2000/svg">
+<g clip-path="url(#clip0_700_3247)">
+<path d="M14.5 7.85599C14.5 6.20639 14.5 6.40966 14.5 5.07682C14.5 4.81072 14.3939 4.55453 14.2053 4.36685L10.9014 1.07973C10.714 0.893293 10.4604 0.788635 10.1961 0.788635H2C1.44772 0.788635 1 1.23635 1 1.78864V16.2114C1 16.7636 1.44772 17.2114 2 17.2114H9.22295" stroke="#595959" stroke-width="1.5" stroke-linecap="round"/>
+<path d="M9.40625 1C9.40625 2.56165 9.40625 3.5655 9.40625 4.91855C9.40625 5.47084 9.85397 5.91858 10.4062 5.91858H15" stroke="#595959" stroke-width="1.5"/>
+<path d="M9 13.2581L16.6232 13.2581" stroke="#595959" stroke-width="1.5" stroke-linecap="round"/>
+<path d="M14.873 10.8291L16.6659 12.622C17.0565 13.0125 17.0565 13.6457 16.6659 14.0362L14.873 15.8291" stroke="#595959" stroke-width="1.5" stroke-linecap="round"/>
+</g>
+<defs>
+<clipPath id="clip0_700_3247">
+<rect width="18" height="18" fill="white"/>
+</clipPath>
+</defs>
+</svg>

src/assets/icons/svg/refresh.svg

@@ -1,13 +0,0 @@
-<svg width="18" height="18" viewBox="0 0 18 18" fill="none" xmlns="http://www.w3.org/2000/svg">
-<g clip-path="url(#clip0_700_3247)">
-<path d="M14.5 7.85599C14.5 6.20639 14.5 6.40966 14.5 5.07682C14.5 4.81072 14.3939 4.55453 14.2053 4.36685L10.9014 1.07973C10.714 0.893293 10.4604 0.788635 10.1961 0.788635H2C1.44772 0.788635 1 1.23635 1 1.78864V16.2114C1 16.7636 1.44772 17.2114 2 17.2114H9.22295" stroke="#595959" stroke-width="1.5" stroke-linecap="round"/>
-<path d="M9.40625 1C9.40625 2.56165 9.40625 3.5655 9.40625 4.91855C9.40625 5.47084 9.85397 5.91858 10.4062 5.91858H15" stroke="#595959" stroke-width="1.5"/>
-<path d="M9 13.2581L16.6232 13.2581" stroke="#595959" stroke-width="1.5" stroke-linecap="round"/>
-<path d="M14.873 10.8291L16.6659 12.622C17.0565 13.0125 17.0565 13.6457 16.6659 14.0362L14.873 15.8291" stroke="#595959" stroke-width="1.5" stroke-linecap="round"/>
-</g>
-<defs>
-<clipPath id="clip0_700_3247">
-<rect width="18" height="18" fill="white"/>
-</clipPath>
-</defs>
-</svg>

src/components/FormModel/index.vue

@@ -74,10 +74,12 @@
                     >重置</el-button
                 >
               <el-button
-                icon="el-icon-refresh"
                 size="mini"
                 @click="exportList"
-              >导出</el-button
+                style="background-color:#fff;border: 1px solid #d9d9d9;color:rgba(0,0,0,.65)"
+              >
+                <svg-icon icon-class="download"/> 导出
+              </el-button
               >
 <!--              <el-button size="mini" type="primary" @click="onHandlePrint">打印</el-button>-->
             </el-form-item>

src/views/EquipmentLedger/index.vue

@@ -360,13 +360,12 @@
               ></right-toolbar>
               <span>
                   <el-button
-                    icon="el-icon-download"
+                    style="float: right;background-color:#fff;border: 1px solid #d9d9d9;color:rgba(0,0,0,.65)"
-                    style="float: right;"
                     type="primary"
                     size="mini"
                     @click="exportData"
                   >
-                    导出数据
+                    <svg-icon icon-class="download"/> 导出
                   </el-button>
                 </span>
             </el-col>
@@ -2291,4 +2290,13 @@ export default {
     display: none;
   }
 }
+
+.btn-icon {
+  width: 11px;
+  height: 11px;
+  margin-right: 6px;
+  vertical-align: top;
+  color: rgba(0,0,0,.65);
+}
+
 </style>

src/views/EquipmentRoamRecord/index.vue

@@ -44,7 +44,8 @@
         </el-form-item>
 
         <el-form-item class="button-group">
-          <el-button icon="el-icon-refresh" size="mini" @click="onHandleExport">导出数据</el-button>
+          <el-button size="mini" @click="onHandleExport" style="background-color:#fff;border: 1px solid #d9d9d9;color:rgba(0,0,0,.65)">
+            <svg-icon icon-class="download"/> 导出</el-button>
         </el-form-item>
       </el-form>
     </div>

src/views/EquipmentRoamRecord/maintenanceRecord/index.vue

@@ -43,7 +43,8 @@
           <span style="font-size: 20px; font-weight: 800">维修记录列表</span>
         </el-col>
         <el-col :span="22" style="text-align: right;">
-          <el-button type="primary" icon="el-icon-download" size="mini" @click="onHandleExport">导出数据</el-button>
+          <el-button type="primary" size="mini" @click="onHandleExport" style="background-color:#fff;border: 1px solid #d9d9d9;color:rgba(0,0,0,.65)">
+            <svg-icon icon-class="download"/> 导出</el-button>
         </el-col>
       </el-row>
 

src/views/EquipmentRoamRecord/outboundRecord/index.vue

@@ -39,7 +39,8 @@
           <span style="font-size: 20px; font-weight: 800">出库记录列表</span>
         </el-col>
         <el-col :span="22" style="text-align: right;">
-          <el-button type="primary" icon="el-icon-download" size="mini" @click="onHandleExport">导出数据</el-button>
+          <el-button type="primary" size="mini" @click="onHandleExport" style="background-color:#fff;border: 1px solid #d9d9d9;color:rgba(0,0,0,.65)">
+            <svg-icon icon-class="download"/> 导出</el-button>
         </el-col>
       </el-row>
 

src/views/EquipmentRoamRecord/retirementRecord/index.vue

@@ -42,7 +42,8 @@
           <span style="font-size: 20px; font-weight: 800">退役记录列表</span>
         </el-col>
         <el-col :span="22" style="text-align: right;">
-          <el-button type="primary" icon="el-icon-download" size="mini" @click="onHandleExport">导出数据</el-button>
+          <el-button type="primary" size="mini" @click="onHandleExport" style="background-color:#fff;border: 1px solid #d9d9d9;color:rgba(0,0,0,.65)">
+            <svg-icon icon-class="download"/> 导出</el-button>
         </el-col>
       </el-row>
 

src/views/EquipmentRoamRecord/returnRecord/index.vue

@@ -31,7 +31,8 @@
           <span style="font-size: 20px; font-weight: 800">退库记录列表</span>
         </el-col>
         <el-col :span="22" style="text-align: right;">
-          <el-button type="primary" icon="el-icon-download" size="mini" @click="onHandleExport">导出数据</el-button>
+          <el-button type="primary" size="mini" @click="onHandleExport" style="background-color:#fff;border: 1px solid #d9d9d9;color:rgba(0,0,0,.65)">
+            <svg-icon icon-class="download"/> 导出</el-button>
         </el-col>
       </el-row>
 

src/views/EquipmentTypeConfig/index.vue

@@ -112,8 +112,9 @@
           <el-row style="margin-bottom: 10px">
             <el-col :span="24" style="text-align: right">
               <el-button type="primary" size="mini" @click="handleAdd">新增</el-button>
-              <el-button type="primary" size="mini" @click="handleExport"
+              <el-button type="primary" size="mini" @click="handleExport" style="background-color:#fff;border: 1px solid #d9d9d9;color:rgba(0,0,0,.65)"
-              >导出
+              >
+                <svg-icon icon-class="download"/> 导出
               </el-button>
             </el-col>
           </el-row>

src/views/material/back/component/home.vue

@@ -133,10 +133,10 @@
             </el-col> -->
             <el-col :span="1.5">
                 <el-button
-                    icon="el-icon-download"
                     size="mini"
                     @click="handleExport"
-                    >导出</el-button
+                    style="background-color:#fff;border: 1px solid #d9d9d9;color:rgba(0,0,0,.65)"
+                    ><svg-icon icon-class="download"/> 导出</el-button
                 >
             </el-col>
 

src/views/material/basic/bmAssetAttributes/index.vue

@@ -51,10 +51,10 @@
               <el-button
                   type="warning"
                   plain
-                  icon="el-icon-download"
                   size="mini"
                   @click="handleExport"
-                  >导出</el-button
+                  style="background-color:#fff;border: 1px solid #d9d9d9;color:rgba(0,0,0,.65)"
+                  ><svg-icon icon-class="download"/> 导出</el-button
               >
           </el-col>
           <!-- <el-col :span="1.5">

src/views/material/basic/bmProject/index.vue

@@ -61,10 +61,10 @@
                 <el-button
                     type="warning"
                     plain
-                    icon="el-icon-download"
                     size="mini"
                     @click="handleExport"
-                    >导出数据</el-button
+                    style="background-color:#fff;border: 1px solid #d9d9d9;color:rgba(0,0,0,.65)"
+                    ><svg-icon icon-class="download"/> 导出</el-button
                 >
             </el-col>
 

src/views/material/basic/bmUnit/index.vue

@@ -61,10 +61,10 @@
                 <el-button
                     type="warning"
                     plain
-                    icon="el-icon-download"
                     size="mini"
                     @click="handleExport"
-                    >导出数据</el-button
+                    style="background-color:#fff;border: 1px solid #d9d9d9;color:rgba(0,0,0,.65)"
+                    ><svg-icon icon-class="download"/> 导出</el-button
                 >
             </el-col>
 

src/views/material/basic/unitType/index.vue

@@ -43,11 +43,11 @@
       <el-col :span="1.5">
         <el-button
           plain
-          icon="el-icon-download"
           size="mini"
           @click="handleExport"
           v-hasPermi="['system:role:export']"
-          >导出数据</el-button
+          style="background-color:#fff;border: 1px solid #d9d9d9;color:rgba(0,0,0,.65)"
+          ><svg-icon icon-class="download"/> 导出</el-button
         >
       </el-col>
       <right-toolbar

src/views/material/lease/apply/component/homeApply.vue

@@ -88,10 +88,10 @@
         <el-button
           type="warning"
           plain
-          icon="el-icon-download"
           size="mini"
           @click="handleExport"
-          >导出
+          style="background-color:#fff;border: 1px solid #d9d9d9;color:rgba(0,0,0,.65)"
+          > <svg-icon icon-class="download"/> 导出
         </el-button>
       </el-col>
       <right-toolbar

src/views/material/lease/apply/component/outbound.vue

@@ -86,11 +86,11 @@
                 <el-button
                     type="warning"
                     plain
-                    icon="el-icon-download"
                     size="mini"
                     @click="handleExport"
                     v-hasPermi="['picking:outbound:export']"
-                    >导出</el-button
+                    style="background-color:#fff;border: 1px solid #d9d9d9;color:rgba(0,0,0,.65)"
+                    ><svg-icon icon-class="download"/> 导出</el-button
                 >
             </el-col>
             <right-toolbar
@@ -364,7 +364,8 @@
                             size="small"
                             type="primary"
                             @click="onHandleExport"
-                            >导出</el-button
+                            style="background-color:#fff;border: 1px solid #d9d9d9;color:rgba(0,0,0,.65)"
+                            ><svg-icon icon-class="download"/> 导出</el-button
                         >
                     </el-form-item>
                 </el-form>

src/views/material/lease/apply/component/picking.vue

@@ -86,11 +86,11 @@
                 <el-button
                     type="warning"
                     plain
-                    icon="el-icon-download"
                     size="mini"
                     @click="handleExport"
                     v-hasPermi="['picking:outbound:export']"
-                    >导出</el-button
+                    style="background-color:#fff;border: 1px solid #d9d9d9;color:rgba(0,0,0,.65)"
+                    ><svg-icon icon-class="download"/> 导出</el-button
                 >
             </el-col>
             <right-toolbar
@@ -364,7 +364,8 @@
                             size="small"
                             type="primary"
                             @click="onHandleExport"
-                            >导出</el-button
+                            style="background-color:#fff;border: 1px solid #d9d9d9;color:rgba(0,0,0,.65)"
+                            ><svg-icon icon-class="download"/> 导出</el-button
                         >
                     </el-form-item>
                 </el-form>

src/views/material/lease/apply/component/queryToolsApply.vue

@@ -66,10 +66,10 @@
         <el-button
           type="warning"
           plain
-          icon="el-icon-download"
           size="mini"
           @click="handleExport"
-          >导出</el-button
+          style="background-color:#fff;border: 1px solid #d9d9d9;color:rgba(0,0,0,.65)"
+          ><svg-icon icon-class="download"/> 导出</el-button
         >
       </el-col>
     </el-row>

src/views/material/lease/outBound/component/queryToolsOutBound.vue

@@ -71,10 +71,10 @@
         <el-button
           type="warning"
           plain
-          icon="el-icon-download"
           size="mini"
           @click="handleExport"
-          >导出</el-button
+          style="background-color:#fff;border: 1px solid #d9d9d9;color:rgba(0,0,0,.65)"
+          ><svg-icon icon-class="download"/> 导出</el-button
         >
       </el-col>
     </el-row>

src/views/material/lease/protocol/index.vue

@@ -46,10 +46,10 @@
         <el-button
           type="warning"
           plain
-          icon="el-icon-download"
           size="mini"
           @click="handleExport"
-        >导出
+          style="background-color:#fff;border: 1px solid #d9d9d9;color:rgba(0,0,0,.65)"
+        ><svg-icon icon-class="download"/> 导出
         </el-button>
       </el-col>
       <right-toolbar

src/views/material/ma/partType/index.vue

@@ -118,10 +118,10 @@
             <el-button
               type="warning"
               plain
-              icon="el-icon-download"
               size="mini"
               @click="handleExport"
-              >导出
+              style="background-color:#fff;border: 1px solid #d9d9d9;color:rgba(0,0,0,.65)"
+              ><svg-icon icon-class="download"/> 导出
             </el-button>
           </el-col>
           <right-toolbar

src/views/material/ma/supplier/index.vue

@@ -80,10 +80,10 @@
             <el-button
               type="warning"
               plain
-              icon="el-icon-download"
               size="mini"
               @click="handleExport"
-            >导出
+              style="background-color:#fff;border: 1px solid #d9d9d9;color:rgba(0,0,0,.65)"
+            ><svg-icon icon-class="download"/> 导出
             </el-button>
           </el-col>
           <right-toolbar

src/views/material/ma/type/index.vue

@@ -101,8 +101,8 @@
         <el-card class="content-box" style="margin-top: 20px">
           <el-row :gutter="10" class="mb8" style="text-align: right">
             <el-col :span="24">
-              <el-button type="warning" plain size="mini" @click="handleExport"
+              <el-button type="warning" plain size="mini" @click="handleExport" style="background-color:#fff;border: 1px solid #d9d9d9;color:rgba(0,0,0,.65)"
-              >导出
+              ><svg-icon icon-class="download"/> 导出
               </el-button>
             </el-col>
           </el-row>

src/views/material/ma/typeConfigKeeper/index.vue

@@ -124,10 +124,10 @@
             <el-button
               type="warning"
               plain
-              icon="el-icon-download"
               size="mini"
               @click="handleExport"
-              >导出
+              style="background-color:#fff;border: 1px solid #d9d9d9;color:rgba(0,0,0,.65)"
+              ><svg-icon icon-class="download"/> 导出
             </el-button>
           </el-col>
           <right-toolbar

src/views/material/ma/typeConfigRepair/index.vue

@@ -124,10 +124,10 @@
             <el-button
               type="warning"
               plain
-              icon="el-icon-download"
               size="mini"
               @click="handleExport"
-              >导出
+              style="background-color:#fff;border: 1px solid #d9d9d9;color:rgba(0,0,0,.65)"
+              ><svg-icon icon-class="download"/> 导出
             </el-button>
           </el-col>
           <right-toolbar

src/views/material/ma/whHouse/index.vue

@@ -47,10 +47,10 @@
         <el-button
           type="warning"
           plain
-          icon="el-icon-download"
           size="mini"
           @click="handleExport"
-          >导出
+          style="background-color:#fff;border: 1px solid #d9d9d9;color:rgba(0,0,0,.65)"
+          ><svg-icon icon-class="download"/> 导出
         </el-button>
       </el-col>
       <right-toolbar

src/views/material/purchase/goodsAccept/detail.vue

@@ -70,10 +70,10 @@
         <el-button
           type="warning"
           plain
-          icon="el-icon-download"
           size="mini"
           @click="handleExport"
-          >导出</el-button
+          style="background-color:#fff;border: 1px solid #d9d9d9;color:rgba(0,0,0,.65)"
+          ><svg-icon icon-class="download"/> 导出</el-button
         >
       </el-col>
 

src/views/material/purchase/goodsAccept/index.vue

@@ -51,10 +51,10 @@
             <el-col :span="1.5">
                 <el-button
                     type="warning" plain
-                    icon="el-icon-download"
                     size="mini"
                     @click="handleExport"
-                >导出</el-button>
+                    style="background-color:#fff;border: 1px solid #d9d9d9;color:rgba(0,0,0,.65)"
+                ><svg-icon icon-class="download"/> 导出</el-button>
             </el-col>
         </el-row>
 

src/views/material/purchase/goodsArrived/component/home.vue

@@ -79,10 +79,10 @@
         <el-button
           type="warning"
           plain
-          icon="el-icon-download"
           size="mini"
           @click="handleExport"
-          >导出</el-button
+          style="background-color:#fff;border: 1px solid #d9d9d9;color:rgba(0,0,0,.65)"
+          ><svg-icon icon-class="download"/> 导出</el-button
         >
       </el-col>
       <right-toolbar

src/views/material/purchase/goodsArrived/component/queryTools.vue

@@ -3,7 +3,9 @@
 
         <el-row :gutter="10" class="mb8">
             <el-col :span="1.5">
-                <el-button type="warning" plain icon="el-icon-download" size="mini" @click="handleExport">导出</el-button>
+                <el-button type="warning" plain size="mini" @click="handleExport"
+                           style="background-color:#fff;border: 1px solid #d9d9d9;color:rgba(0,0,0,.65)">
+                  <svg-icon icon-class="download"/> 导出</el-button>
             </el-col>
         </el-row>
         <el-table

src/views/material/purchase/goodsBind/component/home.vue

@@ -72,10 +72,10 @@
                 <el-button
                     type="warning"
                     plain
-                    icon="el-icon-download"
                     size="mini"
                     @click="handleExport"
-                    >导出数据</el-button
+                    style="background-color:#fff;border: 1px solid #d9d9d9;color:rgba(0,0,0,.65)"
+                    ><svg-icon icon-class="download"/> 导出</el-button
                 >
             </el-col>
             <right-toolbar

src/views/material/purchase/goodsEntry/index.vue

@@ -76,10 +76,10 @@
                 <el-button
                     type="warning"
                     plain
-                    icon="el-icon-download"
                     size="mini"
                     @click="handleExport"
-                    >导出</el-button
+                    style="background-color:#fff;border: 1px solid #d9d9d9;color:rgba(0,0,0,.65)"
+                    ><svg-icon icon-class="download"/> 导出</el-button
                 >
             </el-col>
         </el-row>

src/views/material/repair/repairManage/component/home.vue

@@ -67,7 +67,8 @@
                 <el-button type="danger" plain size="mini" @click="handleReject">退回</el-button>
             </el-col>
             <el-col :span="1.5">
-                <el-button type="success" plain icon="el-icon-download" size="mini" @click="handleExport">导出</el-button>
+                <el-button type="success" plain  size="mini" @click="handleExport" style="background-color:#fff;border: 1px solid #d9d9d9;color:rgba(0,0,0,.65)">
+                  <svg-icon icon-class="download"/> 导出</el-button>
             </el-col>
             <right-toolbar :showSearch.sync="showSearch" @queryTable="getList"></right-toolbar>
         </el-row>

src/views/material/repair/testExamine/component/homeApply.vue

@@ -88,10 +88,10 @@
         <el-button
           type="warning"
           plain
-          icon="el-icon-download"
           size="mini"
           @click="handleExport"
-          >导出
+          style="background-color:#fff;border: 1px solid #d9d9d9;color:rgba(0,0,0,.65)"
+          ><svg-icon icon-class="download"/> 导出
         </el-button>
       </el-col>
       <right-toolbar

src/views/monitor/job/index.vue

@@ -72,11 +72,11 @@
         <el-button
           type="warning"
           plain
-          icon="el-icon-download"
           size="mini"
           @click="handleExport"
+          style="background-color:#fff;border: 1px solid #d9d9d9;color:rgba(0,0,0,.65)"
           v-hasPermi="['monitor:job:export']"
-        >导出</el-button>
+        ><svg-icon icon-class="download"/> 导出</el-button>
       </el-col>
       <el-col :span="1.5">
         <el-button

src/views/monitor/job/log.vue

@@ -83,11 +83,11 @@
         <el-button
           type="warning"
           plain
-          icon="el-icon-download"
           size="mini"
           @click="handleExport"
+          style="background-color:#fff;border: 1px solid #d9d9d9;color:rgba(0,0,0,.65)"
           v-hasPermi="['monitor:job:export']"
-        >导出</el-button>
+        ><svg-icon icon-class="download"/> 导出</el-button>
       </el-col>
       <el-col :span="1.5">
         <el-button

src/views/screen/gwScreen/components/left/AllEquip.vue

@@ -146,7 +146,8 @@
 
         <el-row :gutter="10" class="mb8">
           <el-col :span="1.5">
-            <el-button class="btn" plain icon="el-icon-download" size="mini" @click="handleExport">导出数据</el-button>
+            <el-button class="btn" plain size="mini" @click="handleExport" style="background-color:#fff;border: 1px solid #d9d9d9;color:rgba(0,0,0,.65)">
+              <svg-icon icon-class="download"/> 导出</el-button>
           </el-col>
           <right-toolbar :showSearch.sync="showSearch" @queryTable="getList" />
         </el-row>

src/views/screen/wsScreen/components/left/AllEquip.vue

@@ -175,7 +175,7 @@
 
         <el-row :gutter="10" class="mb8">
           <el-col :span="1.5">
-            <el-button class="btn" plain icon="el-icon-download" size="mini" @click="handleExport">导出数据</el-button>
+            <el-button class="btn" plain size="mini" @click="handleExport" style="background-color:#fff;border: 1px solid #d9d9d9;color:rgba(0,0,0,.65)"><svg-icon icon-class="download"/> 导出</el-button>
           </el-col>
           <right-toolbar :showSearch.sync="showSearch" @queryTable="getList" />
         </el-row>

src/views/screen/wsScreenWidescreen/components/left/AllEquip.vue

@@ -175,7 +175,8 @@
 
         <el-row :gutter="10" class="mb8">
           <el-col :span="1.5">
-            <el-button class="btn" plain icon="el-icon-download" size="mini" @click="handleExport">导出数据</el-button>
+            <el-button class="btn" plain size="mini" @click="handleExport" style="background-color:#fff;border: 1px solid #d9d9d9;color:rgba(0,0,0,.65)">
+              <svg-icon icon-class="download"/> 导出</el-button>
           </el-col>
           <right-toolbar :showSearch.sync="showSearch" @queryTable="getList" />
         </el-row>

src/views/system/config/index.vue

@@ -89,11 +89,11 @@
         <el-button
           type="warning"
           plain
-          icon="el-icon-download"
           size="mini"
           @click="handleExport"
+          style="background-color:#fff;border: 1px solid #d9d9d9;color:rgba(0,0,0,.65)"
           v-hasPermi="['system:config:export']"
-        >导出</el-button>
+        ><svg-icon icon-class="download"/> 导出</el-button>
       </el-col>
       <el-col :span="1.5">
         <el-button

src/views/system/dict/data.vue

@@ -79,12 +79,11 @@
             <el-col :span="1.5">
               <el-button
                 type="warning"
-                style="background: rgba(44,186,178,0.2);border-color: rgba(44,186,178,0.2);color: #2CBAB2;"
-                icon="el-icon-download"
                 size="mini"
                 @click="handleExport"
+                style="background-color:#fff;border: 1px solid #d9d9d9;color:rgba(0,0,0,.65)"
                 v-hasPermi="['system:dict:export']"
-              >导出</el-button>
+              ><svg-icon icon-class="download"/> 导出</el-button>
             </el-col>
             <right-toolbar :showSearch.sync="showSearch" @queryTable="getList"></right-toolbar>
           </div>

src/views/system/dict/index.vue

@@ -97,12 +97,11 @@
           <el-col :span="1.5">
             <el-button
               type="warning"
-              style="background: rgba(44,186,178,0.2);border-color: rgba(44,186,178,0.2);color: #2CBAB2;"
+              style="background-color:#fff;border: 1px solid #d9d9d9;color:rgba(0,0,0,.65)"
-              icon="el-icon-download"
               size="mini"
               @click="handleExport"
               v-hasPermi="['system:dict:export']"
-            >导出</el-button>
+            ><svg-icon icon-class="download"/> 导出</el-button>
           </el-col>
           <el-col :span="1.5">
             <el-button

src/views/system/logininfor/index.vue

@@ -92,11 +92,11 @@
         <el-button
           type="warning"
           plain
-          icon="el-icon-download"
           size="mini"
           @click="handleExport"
           v-hasPermi="['system:logininfor:export']"
-        >导出
+          style="background-color:#fff;border: 1px solid #d9d9d9;color:rgba(0,0,0,.65)"
+        ><svg-icon icon-class="download"/> 导出
         </el-button>
       </el-col>
       <right-toolbar :showSearch.sync="showSearch" @queryTable="getList"></right-toolbar>

src/views/system/operlog/index.vue

@@ -102,11 +102,11 @@
         <el-button
           type="warning"
           plain
-          icon="el-icon-download"
           size="mini"
           @click="handleExport"
+          style="background-color:#fff;border: 1px solid #d9d9d9;color:rgba(0,0,0,.65)"
           v-hasPermi="['system:operlog:export']"
-        >导出</el-button>
+        ><svg-icon icon-class="download"/> 导出</el-button>
       </el-col>
       <right-toolbar :showSearch.sync="showSearch" @queryTable="getList"></right-toolbar>
     </el-row>

src/views/system/post/index.vue

@@ -76,11 +76,11 @@
         <el-button
           type="warning"
           plain
-          icon="el-icon-download"
           size="mini"
           @click="handleExport"
           v-hasPermi="['system:post:export']"
-        >导出</el-button>
+          style="background-color:#fff;border: 1px solid #d9d9d9;color:rgba(0,0,0,.65)"
+        ><svg-icon icon-class="download"/> 导出</el-button>
       </el-col>
       <right-toolbar :showSearch.sync="showSearch" @queryTable="getList"></right-toolbar>
       </div>

src/views/system/role/index.vue

@@ -96,11 +96,11 @@
               </el-button>
               <el-button
                 type="warning"
-                icon="el-icon-download"
+                size="mini"
-                size="mini" style="background: rgba(44,186,178,0.2);color: #2CBAB2;border-color: rgba(44,186,178,0.2);"
+                style="background-color:#fff;border: 1px solid #d9d9d9;color:rgba(0,0,0,.65)"
                 @click="handleExport"
                 v-hasPermi="['system:role:export']"
-              >导出
+              ><svg-icon icon-class="download"/> 导出
               </el-button>
 
               <!-- 搜索工具栏 -->

src/views/system/user/index.vue

@@ -104,9 +104,10 @@
                       </el-button>
                     </el-col>
                     <el-col :span="1.5">
-                      <el-button type="primary" icon="el-icon-download" style="background: rgba(44,186,178,0.2);color: #2CBAB2;border-color: rgba(44,186,178,0.2);" size="mini" @click="handleExport"
+                      <el-button type="primary" size="mini" @click="handleExport"
+                                 style="background-color:#fff;border: 1px solid #d9d9d9;color:rgba(0,0,0,.65)"
                                 v-hasPermi="['system:user:export']"
-                      >导出
+                      ><svg-icon icon-class="download"/> 导出
                       </el-button>
                     </el-col>
                     <right-toolbar :showSearch.sync="showSearch" @queryTable="getList" :columns="columns"></right-toolbar>

src/views/toolsManage/codeToolsLedger/index.vue

@@ -97,8 +97,8 @@
           <div style="font-size: 20px; font-weight: 800">编码工具台账列表</div>
         </el-col>
         <el-col :span="16" style="text-align: right;">
-             <el-button icon="el-icon-download" style="margin-right: 20px" type="primary" size="mini" @click="handleExport">
+             <el-button style="background-color:#fff;border: 1px solid #d9d9d9;color:rgba(0,0,0,.65)" type="primary" size="mini" @click="handleExport">
-              导出数据
+               <svg-icon icon-class="download"/> 导出
             </el-button>
             <right-toolbar :showSearch.sync="showSearch" @queryTable="getList"/>
         </el-col>

src/views/toolsManage/toolsLedger/index.vue

@@ -110,8 +110,8 @@
           <div style="font-size: 20px; font-weight: 800">数量工具台账列表</div>
         </el-col>
         <el-col :span="16" style="text-align: right;">
-             <el-button icon="el-icon-download" style="margin-right: 20px" type="primary" size="mini" @click="handleExport">
+             <el-button style="background-color:#fff;border: 1px solid #d9d9d9;color:rgba(0,0,0,.65)" type="primary" size="mini" @click="handleExport">
-              导出数据
+               <svg-icon icon-class="download"/> 导出
             </el-button>
             <right-toolbar :showSearch.sync="showSearch" @queryTable="getList"/>
         </el-col>

vue.config.js

@@ -35,14 +35,15 @@ module.exports = {
         proxy: {
             // detail: https://cli.vuejs.org/config/#devserver-proxy
             [process.env.VUE_APP_BASE_API]: {
-                target: `http://10.125.30.218:28080`,
+                // target: `http://localhost:18080`,
                 // target: `http://192.168.0.96:28080`,//马
                 // target: `http://192.168.0.110:18080`,//洪
                 // target: `http://192.168.0.41:28080`,//蒋
                 // target: `http://36.33.26.201:17788/proxyApi`, //测试
-                // target: `http://36.33.26.201:21999/prod-api`, //测试
+                target: `http://36.33.26.201:21999/prod-api`, //测试
                 // target: `http://192.168.137.1:18080`,//
-                //target: `http://112.29.103.165:21001/prod-api`,//
+                // target: `http://112.29.103.165:21001/prod-api`,//
+                // target: `http://10.125.30.229:28080`,//
                 changeOrigin: true,
                 pathRewrite: {
                     ['^' + process.env.VUE_APP_BASE_API]: '',