Merge branch 'develop' into 'master'

Develop

See merge request !58

src/assets/icons/svg/nextPage-dis.svg

+<?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="1599806287838" class="icon" viewBox="0 0 1024 1024" version="1.1" xmlns="http://www.w3.org/2000/svg" p-id="2868" xmlns:xlink="http://www.w3.org/1999/xlink" width="48" height="48"><defs><style type="text/css"></style></defs><path d="M784.246262 454.443749L360.714443 30.88935a85.577949 85.577949 0 0 0-120.983285 121.005865l363.062756 363.040176-363.085336 362.995017a85.577949 85.577949 0 0 0 120.983285 120.983285l423.554399-423.464079a85.510209 85.510209 0 0 0 0-121.005865z" fill="#cdcdcd" p-id="2869"></path></svg>
\ No newline at end of file

src/assets/icons/svg/nextPage.svg

+<?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="1599805021250" class="icon" viewBox="0 0 1024 1024" version="1.1" xmlns="http://www.w3.org/2000/svg" p-id="1130" width="48" height="48" xmlns:xlink="http://www.w3.org/1999/xlink"><defs><style type="text/css"></style></defs><path d="M784.246262 454.443749L360.714443 30.88935a85.577949 85.577949 0 0 0-120.983285 121.005865l363.062756 363.040176-363.085336 362.995017a85.577949 85.577949 0 0 0 120.983285 120.983285l423.554399-423.464079a85.510209 85.510209 0 0 0 0-121.005865z" fill="#13227a" p-id="1131"></path></svg>

src/assets/icons/svg/prevPage-dis.svg

+<?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="1599805133863" class="icon" viewBox="0 0 1024 1024" version="1.1" xmlns="http://www.w3.org/2000/svg" p-id="2073" xmlns:xlink="http://www.w3.org/1999/xlink" width="48" height="48"><defs><style type="text/css"></style></defs><path d="M421.228666 514.957971L784.268842 151.917795a85.577949 85.577949 0 0 0 0-121.005866 85.532789 85.532789 0 0 0-120.983285 0L239.731158 454.443749a85.577949 85.577949 0 0 0 0 121.005865l423.554399 423.464079a85.532789 85.532789 0 1 0 120.983285-120.983285L421.228666 514.957971z" fill="#bfbfbf" p-id="2074"></path></svg>
\ No newline at end of file

src/assets/icons/svg/prevPage.svg

+<?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="1599805133863" class="icon" viewBox="0 0 1024 1024" version="1.1" xmlns="http://www.w3.org/2000/svg" p-id="2073" xmlns:xlink="http://www.w3.org/1999/xlink" width="48" height="48"><defs><style type="text/css"></style></defs><path d="M421.228666 514.957971L784.268842 151.917795a85.577949 85.577949 0 0 0 0-121.005866 85.532789 85.532789 0 0 0-120.983285 0L239.731158 454.443749a85.577949 85.577949 0 0 0 0 121.005865l423.554399 423.464079a85.532789 85.532789 0 1 0 120.983285-120.983285L421.228666 514.957971z" fill="#13227a" p-id="2074"></path></svg>

src/components/multilHeaderTable/index.vue

@@ -28,16 +28,20 @@
      </div>
      <div class="table_body" v-if="tableData instanceof Array" :style="{ width: bodyWidth + '%'}">
        <div class="productionName" v-if="tableData.length > 0" style="display: flex;flex-direction: row;width: 100%">
-         <div  v-for="(item,index) in tableData" :key="index" style="flex:1;min-width: 160px;overflow-x: auto;border-right: 1px solid #ffffff">
+         <div  v-for="(item,index) in tableData" :key="index" style="flex:1;min-width: 160px;overflow-x: auto;border-right: 1px solid #ffffff;">
              <el-row :class="{'dataCell':true}" style="position: relative">
-             <i class="el-icon-arrow-left position left"
+             <svg-icon
+               :icon-class="currentPageList[index].page === 1 ? 'prevPage-dis' : 'prevPage'"
+               class="position left scaleIcon"
                @click="pagePrev(index)"
-                :style="{ color: currentPageList[index].page === 1 ? '#ccc' : '' }"
-                :disabled="currentPageList[index].page === 1"></i>
-               <i class="el-icon-arrow-right position right"
+               :disabled="currentPageList[index].page === 1"></svg-icon>
+               <svg-icon
+                 :icon-class="currentPageList[index].page === currentPageList[index].pages ? 'nextPage-dis' : 'nextPage'"
+                 class="position right scaleIcon"
                  @click="pageNext(index)"
-                  :style="{ color: currentPageList[index].page === currentPageList[index].pages ? '#ccc' : '' }"
-                  :disabled="currentPageList[index].page === currentPageList[index].page"></i> {{item.productionName}}
+                 :disabled="currentPageList[index].page === currentPageList[index].page"
+               ></svg-icon>
+               {{item.productionName}}
              </el-row>
                <el-col
                  :span="8"
@@ -282,6 +286,10 @@
   .left {
     left: 10px;
   }
+  .scaleIcon {
+    width: 18px;
+    height: 18px;
+  }
   .right {
     right: 10px;
   }