Merge branch 'develop' into 'master'

多级表头表格翻页图标修改

See merge request !59

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>
+<?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="1600047835797" class="icon" viewBox="0 0 1024 1024" version="1.1" xmlns="http://www.w3.org/2000/svg" p-id="8212" xmlns:xlink="http://www.w3.org/1999/xlink" width="200" height="200"><defs><style type="text/css"></style></defs><path d="M810.476403 511.9258a85.287562 85.287562 0 0 1-24.733393 60.554169l-426.437812 426.437812a85.287562 85.287562 0 0 1-121.108338-121.108339L604.933378 511.9258 238.19686 146.042157A85.287562 85.287562 0 0 1 359.305198 24.933819l426.437812 426.437812A85.287562 85.287562 0 0 1 810.476403 511.9258z" fill="#ffffff" p-id="8213"></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>
+<?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="1600048195218" class="icon" viewBox="0 0 1024 1024" version="1.1" xmlns="http://www.w3.org/2000/svg" p-id="875" xmlns:xlink="http://www.w3.org/1999/xlink" width="200" height="200"><defs><style type="text/css"></style></defs><path d="M414.42 530.583c12.377-7.888 28.994-6.427 39.802 4.381l282.843 282.843-90.51 90.51c-12.496 12.496-32.758 12.496-45.254 0L318.458 625.473l0.265-0.265-89.974-89.974c-12.497-12.497-12.497-32.758 0-45.255L624.729 94l90.51 90.51c12.496 12.496 12.496 32.758 0 45.255l-300.82 300.818z" p-id="876" fill="#ffffff"></path></svg>
\ No newline at end of file

src/components/multilHeaderTable/index.vue

@@ -30,17 +30,38 @@
        <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;">
              <el-row :class="{'dataCell':true}" style="position: relative">
+             <div
+               class="position left"
+               :style="{
+               padding: '2px',
+               width: '21px',
+               height: '21px',
+               lineHeight: '18px',
+               background: currentPageList[index].page === 1 ? '' : '#3974CA',
+               cursor: currentPageList[index].page === 1 ? 'default' : 'pointer'
+                }"
+             >
                <svg-icon
                  :icon-class="currentPageList[index].page === 1 ? 'prevPage-dis' : 'prevPage'"
-               class="position left scaleIcon"
-               @click="pagePrev(index)"
-               :disabled="currentPageList[index].page === 1"></svg-icon>
+                 class="scaleIcon"
+                 @click="pagePrev(index)"></svg-icon>
+             </div>
+             <div
+               class="position right"
+               :style="{
+               padding: '2px',
+               borderRadius: '4px',
+               width: '21px',
+               height: '21px',
+               lineHeight: '18px',
+               background: currentPageList[index].page === currentPageList[index].pages ? '' : '#3974CA',
+               cursor: currentPageList[index].page === currentPageList[index].pages ? 'default' : 'pointer'
+               }">
                <svg-icon
                  :icon-class="currentPageList[index].page === currentPageList[index].pages ? 'nextPage-dis' : 'nextPage'"
-                 class="position right scaleIcon"
-                 @click="pageNext(index)"
-                 :disabled="currentPageList[index].page === currentPageList[index].page"
-               ></svg-icon>
+                 class="scaleIcon"
+                 @click="pageNext(index)"></svg-icon>
+             </div>
                {{item.productionName}}
              </el-row>
                <el-col
@@ -280,15 +301,14 @@
     font-size: 16px;
     cursor: pointer;
     font-weight: 600;
-    color: #409eff;
     transform: translateY(-50%);
   }
   .left {
     left: 10px;
   }
   .scaleIcon {
-    width: 18px;
-    height: 18px;
+    width: 19px;
+    height: 19px;
   }
   .right {
     right: 10px;