Browse Source

L1app主框架页面更新:首页、待办、功能、我的

LongjoeDyy 5 years ago
parent
commit
9b33376ff0

BIN
src/assets/app_about_pic.png


BIN
src/assets/app_about_pic_bak.png


BIN
src/assets/app_about_pic_no_logo.png


BIN
src/assets/app_about_pic_no_logo_bak.png


+ 506 - 0
src/assets/iconfont/demo_index.html

@@ -48,6 +48,12 @@
                 <div class="code-name">&amp;#xe618;</div>
               </li>
           
+            <li class="dib">
+              <span class="icon iconfont">&#xe6d5;</span>
+                <div class="name">发货</div>
+                <div class="code-name">&amp;#xe6d5;</div>
+              </li>
+          
             <li class="dib">
               <span class="icon iconfont">&#xe7bd;</span>
                 <div class="name">排行榜</div>
@@ -96,12 +102,30 @@
                 <div class="code-name">&amp;#xe61e;</div>
               </li>
           
+            <li class="dib">
+              <span class="icon iconfont">&#xe659;</span>
+                <div class="name">支出情况</div>
+                <div class="code-name">&amp;#xe659;</div>
+              </li>
+          
+            <li class="dib">
+              <span class="icon iconfont">&#xe65a;</span>
+                <div class="name">收入情况</div>
+                <div class="code-name">&amp;#xe65a;</div>
+              </li>
+          
             <li class="dib">
               <span class="icon iconfont">&#xe674;</span>
                 <div class="name">不通过</div>
                 <div class="code-name">&amp;#xe674;</div>
               </li>
           
+            <li class="dib">
+              <span class="icon iconfont">&#xe687;</span>
+                <div class="name">扫描 识别 380%</div>
+                <div class="code-name">&amp;#xe687;</div>
+              </li>
+          
             <li class="dib">
               <span class="icon iconfont">&#xe632;</span>
                 <div class="name">搜索</div>
@@ -126,6 +150,12 @@
                 <div class="code-name">&amp;#xe64c;</div>
               </li>
           
+            <li class="dib">
+              <span class="icon iconfont">&#xe65f;</span>
+                <div class="name">报表</div>
+                <div class="code-name">&amp;#xe65f;</div>
+              </li>
+          
             <li class="dib">
               <span class="icon iconfont">&#xe648;</span>
                 <div class="name">手机</div>
@@ -138,12 +168,24 @@
                 <div class="code-name">&amp;#xe6c0;</div>
               </li>
           
+            <li class="dib">
+              <span class="icon iconfont">&#xe685;</span>
+                <div class="name">收货</div>
+                <div class="code-name">&amp;#xe685;</div>
+              </li>
+          
             <li class="dib">
               <span class="icon iconfont">&#xe8c3;</span>
                 <div class="name">soup-can</div>
                 <div class="code-name">&amp;#xe8c3;</div>
               </li>
           
+            <li class="dib">
+              <span class="icon iconfont">&#xe660;</span>
+                <div class="name">报表</div>
+                <div class="code-name">&amp;#xe660;</div>
+              </li>
+          
             <li class="dib">
               <span class="icon iconfont">&#xe638;</span>
                 <div class="name">邮件</div>
@@ -450,6 +492,12 @@
                 <div class="code-name">&amp;#xe602;</div>
               </li>
           
+            <li class="dib">
+              <span class="icon iconfont">&#xe665;</span>
+                <div class="name">交换</div>
+                <div class="code-name">&amp;#xe665;</div>
+              </li>
+          
             <li class="dib">
               <span class="icon iconfont">&#xe64e;</span>
                 <div class="name">设置</div>
@@ -558,6 +606,12 @@
                 <div class="code-name">&amp;#xe609;</div>
               </li>
           
+            <li class="dib">
+              <span class="icon iconfont">&#xe65b;</span>
+                <div class="name">审核</div>
+                <div class="code-name">&amp;#xe65b;</div>
+              </li>
+          
             <li class="dib">
               <span class="icon iconfont">&#xe613;</span>
                 <div class="name">奖牌-03</div>
@@ -588,6 +642,12 @@
                 <div class="code-name">&amp;#xe600;</div>
               </li>
           
+            <li class="dib">
+              <span class="icon iconfont">&#xe76f;</span>
+                <div class="name">收支管理</div>
+                <div class="code-name">&amp;#xe76f;</div>
+              </li>
+          
             <li class="dib">
               <span class="icon iconfont">&#xe639;</span>
                 <div class="name">星</div>
@@ -666,6 +726,12 @@
                 <div class="code-name">&amp;#xeb96;</div>
               </li>
           
+            <li class="dib">
+              <span class="icon iconfont">&#xe67d;</span>
+                <div class="name">检测</div>
+                <div class="code-name">&amp;#xe67d;</div>
+              </li>
+          
             <li class="dib">
               <span class="icon iconfont">&#xe67f;</span>
                 <div class="name">收支流水</div>
@@ -774,6 +840,12 @@
                 <div class="code-name">&amp;#xe672;</div>
               </li>
           
+            <li class="dib">
+              <span class="icon iconfont">&#xe675;</span>
+                <div class="name">报告</div>
+                <div class="code-name">&amp;#xe675;</div>
+              </li>
+          
             <li class="dib">
               <span class="icon iconfont">&#xe655;</span>
                 <div class="name">工序管理</div>
@@ -828,12 +900,24 @@
                 <div class="code-name">&amp;#xe634;</div>
               </li>
           
+            <li class="dib">
+              <span class="icon iconfont">&#xe663;</span>
+                <div class="name">报告</div>
+                <div class="code-name">&amp;#xe663;</div>
+              </li>
+          
             <li class="dib">
               <span class="icon iconfont">&#xe61d;</span>
                 <div class="name">销售订单</div>
                 <div class="code-name">&amp;#xe61d;</div>
               </li>
           
+            <li class="dib">
+              <span class="icon iconfont">&#xe723;</span>
+                <div class="name">文件-通知文件</div>
+                <div class="code-name">&amp;#xe723;</div>
+              </li>
+          
             <li class="dib">
               <span class="icon iconfont">&#xe621;</span>
                 <div class="name">进度</div>
@@ -852,12 +936,24 @@
                 <div class="code-name">&amp;#xe626;</div>
               </li>
           
+            <li class="dib">
+              <span class="icon iconfont">&#xe64b;</span>
+                <div class="name">关于</div>
+                <div class="code-name">&amp;#xe64b;</div>
+              </li>
+          
             <li class="dib">
               <span class="icon iconfont">&#xe615;</span>
                 <div class="name">关  闭</div>
                 <div class="code-name">&amp;#xe615;</div>
               </li>
           
+            <li class="dib">
+              <span class="icon iconfont">&#xe65d;</span>
+                <div class="name">委外发料</div>
+                <div class="code-name">&amp;#xe65d;</div>
+              </li>
+          
             <li class="dib">
               <span class="icon iconfont">&#xe616;</span>
                 <div class="name">图片</div>
@@ -918,18 +1014,48 @@
                 <div class="code-name">&amp;#xe71d;</div>
               </li>
           
+            <li class="dib">
+              <span class="icon iconfont">&#xe650;</span>
+                <div class="name">检测</div>
+                <div class="code-name">&amp;#xe650;</div>
+              </li>
+          
+            <li class="dib">
+              <span class="icon iconfont">&#xe65e;</span>
+                <div class="name">审核</div>
+                <div class="code-name">&amp;#xe65e;</div>
+              </li>
+          
             <li class="dib">
               <span class="icon iconfont">&#xe686;</span>
                 <div class="name">标签</div>
                 <div class="code-name">&amp;#xe686;</div>
               </li>
           
+            <li class="dib">
+              <span class="icon iconfont">&#xe662;</span>
+                <div class="name">排名</div>
+                <div class="code-name">&amp;#xe662;</div>
+              </li>
+          
             <li class="dib">
               <span class="icon iconfont">&#xe63e;</span>
                 <div class="name">未完成</div>
                 <div class="code-name">&amp;#xe63e;</div>
               </li>
           
+            <li class="dib">
+              <span class="icon iconfont">&#xe652;</span>
+                <div class="name">报价</div>
+                <div class="code-name">&amp;#xe652;</div>
+              </li>
+          
+            <li class="dib">
+              <span class="icon iconfont">&#xe661;</span>
+                <div class="name">文件夹缩略图</div>
+                <div class="code-name">&amp;#xe661;</div>
+              </li>
+          
             <li class="dib">
               <span class="icon iconfont">&#xe65c;</span>
                 <div class="name">通过</div>
@@ -948,6 +1074,12 @@
                 <div class="code-name">&amp;#xe649;</div>
               </li>
           
+            <li class="dib">
+              <span class="icon iconfont">&#xe64d;</span>
+                <div class="name">ICON-分配角色</div>
+                <div class="code-name">&amp;#xe64d;</div>
+              </li>
+          
             <li class="dib">
               <span class="icon iconfont">&#xe636;</span>
                 <div class="name">导航</div>
@@ -1043,6 +1175,15 @@
             </div>
           </li>
           
+          <li class="dib">
+            <span class="icon iconfont icon-fahuo"></span>
+            <div class="name">
+              发货
+            </div>
+            <div class="code-name">.icon-fahuo
+            </div>
+          </li>
+          
           <li class="dib">
             <span class="icon iconfont icon-paixingbang"></span>
             <div class="name">
@@ -1115,6 +1256,24 @@
             </div>
           </li>
           
+          <li class="dib">
+            <span class="icon iconfont icon-zhichuqingkuang"></span>
+            <div class="name">
+              支出情况
+            </div>
+            <div class="code-name">.icon-zhichuqingkuang
+            </div>
+          </li>
+          
+          <li class="dib">
+            <span class="icon iconfont icon-shouruqingkuang"></span>
+            <div class="name">
+              收入情况
+            </div>
+            <div class="code-name">.icon-shouruqingkuang
+            </div>
+          </li>
+          
           <li class="dib">
             <span class="icon iconfont icon-butongguo"></span>
             <div class="name">
@@ -1124,6 +1283,15 @@
             </div>
           </li>
           
+          <li class="dib">
+            <span class="icon iconfont icon-saomiaoshibie380"></span>
+            <div class="name">
+              扫描 识别 380%
+            </div>
+            <div class="code-name">.icon-saomiaoshibie380
+            </div>
+          </li>
+          
           <li class="dib">
             <span class="icon iconfont icon-sousuo"></span>
             <div class="name">
@@ -1160,6 +1328,15 @@
             </div>
           </li>
           
+          <li class="dib">
+            <span class="icon iconfont icon-20"></span>
+            <div class="name">
+              报表
+            </div>
+            <div class="code-name">.icon-20
+            </div>
+          </li>
+          
           <li class="dib">
             <span class="icon iconfont icon-tel"></span>
             <div class="name">
@@ -1178,6 +1355,15 @@
             </div>
           </li>
           
+          <li class="dib">
+            <span class="icon iconfont icon-shouhuo"></span>
+            <div class="name">
+              收货
+            </div>
+            <div class="code-name">.icon-shouhuo
+            </div>
+          </li>
+          
           <li class="dib">
             <span class="icon iconfont icon-soupcan"></span>
             <div class="name">
@@ -1187,6 +1373,15 @@
             </div>
           </li>
           
+          <li class="dib">
+            <span class="icon iconfont icon-baobiao"></span>
+            <div class="name">
+              报表
+            </div>
+            <div class="code-name">.icon-baobiao
+            </div>
+          </li>
+          
           <li class="dib">
             <span class="icon iconfont icon-youjian1"></span>
             <div class="name">
@@ -1646,6 +1841,15 @@
             </div>
           </li>
           
+          <li class="dib">
+            <span class="icon iconfont icon-jiaohuan"></span>
+            <div class="name">
+              交换
+            </div>
+            <div class="code-name">.icon-jiaohuan
+            </div>
+          </li>
+          
           <li class="dib">
             <span class="icon iconfont icon-shezhi"></span>
             <div class="name">
@@ -1808,6 +2012,15 @@
             </div>
           </li>
           
+          <li class="dib">
+            <span class="icon iconfont icon-shenhe"></span>
+            <div class="name">
+              审核
+            </div>
+            <div class="code-name">.icon-shenhe
+            </div>
+          </li>
+          
           <li class="dib">
             <span class="icon iconfont icon-jiangpai-1"></span>
             <div class="name">
@@ -1853,6 +2066,15 @@
             </div>
           </li>
           
+          <li class="dib">
+            <span class="icon iconfont icon-shouzhiguanli"></span>
+            <div class="name">
+              收支管理
+            </div>
+            <div class="code-name">.icon-shouzhiguanli
+            </div>
+          </li>
+          
           <li class="dib">
             <span class="icon iconfont icon-xing1"></span>
             <div class="name">
@@ -1970,6 +2192,15 @@
             </div>
           </li>
           
+          <li class="dib">
+            <span class="icon iconfont icon-jiance"></span>
+            <div class="name">
+              检测
+            </div>
+            <div class="code-name">.icon-jiance
+            </div>
+          </li>
+          
           <li class="dib">
             <span class="icon iconfont icon-shouzhiliushui"></span>
             <div class="name">
@@ -2132,6 +2363,15 @@
             </div>
           </li>
           
+          <li class="dib">
+            <span class="icon iconfont icon-baogao"></span>
+            <div class="name">
+              报告
+            </div>
+            <div class="code-name">.icon-baogao
+            </div>
+          </li>
+          
           <li class="dib">
             <span class="icon iconfont icon-gongxuguanli1"></span>
             <div class="name">
@@ -2213,6 +2453,15 @@
             </div>
           </li>
           
+          <li class="dib">
+            <span class="icon iconfont icon-yitihuachuxing"></span>
+            <div class="name">
+              报告
+            </div>
+            <div class="code-name">.icon-yitihuachuxing
+            </div>
+          </li>
+          
           <li class="dib">
             <span class="icon iconfont icon-xiaoshoudingdan"></span>
             <div class="name">
@@ -2222,6 +2471,15 @@
             </div>
           </li>
           
+          <li class="dib">
+            <span class="icon iconfont icon-wj-tzwj"></span>
+            <div class="name">
+              文件-通知文件
+            </div>
+            <div class="code-name">.icon-wj-tzwj
+            </div>
+          </li>
+          
           <li class="dib">
             <span class="icon iconfont icon-jindu"></span>
             <div class="name">
@@ -2249,6 +2507,15 @@
             </div>
           </li>
           
+          <li class="dib">
+            <span class="icon iconfont icon-guanyu"></span>
+            <div class="name">
+              关于
+            </div>
+            <div class="code-name">.icon-guanyu
+            </div>
+          </li>
+          
           <li class="dib">
             <span class="icon iconfont icon-guanbi1"></span>
             <div class="name">
@@ -2258,6 +2525,15 @@
             </div>
           </li>
           
+          <li class="dib">
+            <span class="icon iconfont icon-weiwaifaliao"></span>
+            <div class="name">
+              委外发料
+            </div>
+            <div class="code-name">.icon-weiwaifaliao
+            </div>
+          </li>
+          
           <li class="dib">
             <span class="icon iconfont icon-tupian"></span>
             <div class="name">
@@ -2348,6 +2624,24 @@
             </div>
           </li>
           
+          <li class="dib">
+            <span class="icon iconfont icon-jiance1"></span>
+            <div class="name">
+              检测
+            </div>
+            <div class="code-name">.icon-jiance1
+            </div>
+          </li>
+          
+          <li class="dib">
+            <span class="icon iconfont icon-shenhe1"></span>
+            <div class="name">
+              审核
+            </div>
+            <div class="code-name">.icon-shenhe1
+            </div>
+          </li>
+          
           <li class="dib">
             <span class="icon iconfont icon-biaoqian1"></span>
             <div class="name">
@@ -2357,6 +2651,15 @@
             </div>
           </li>
           
+          <li class="dib">
+            <span class="icon iconfont icon-paiming"></span>
+            <div class="name">
+              排名
+            </div>
+            <div class="code-name">.icon-paiming
+            </div>
+          </li>
+          
           <li class="dib">
             <span class="icon iconfont icon-weiwancheng"></span>
             <div class="name">
@@ -2366,6 +2669,24 @@
             </div>
           </li>
           
+          <li class="dib">
+            <span class="icon iconfont icon-baojia"></span>
+            <div class="name">
+              报价
+            </div>
+            <div class="code-name">.icon-baojia
+            </div>
+          </li>
+          
+          <li class="dib">
+            <span class="icon iconfont icon-wenjianjiasuolvetu"></span>
+            <div class="name">
+              文件夹缩略图
+            </div>
+            <div class="code-name">.icon-wenjianjiasuolvetu
+            </div>
+          </li>
+          
           <li class="dib">
             <span class="icon iconfont icon-tongguo"></span>
             <div class="name">
@@ -2393,6 +2714,15 @@
             </div>
           </li>
           
+          <li class="dib">
+            <span class="icon iconfont icon-ICON-fenpeijiaose"></span>
+            <div class="name">
+              ICON-分配角色
+            </div>
+            <div class="code-name">.icon-ICON-fenpeijiaose
+            </div>
+          </li>
+          
           <li class="dib">
             <span class="icon iconfont icon-icon_daohang-copy"></span>
             <div class="name">
@@ -2473,6 +2803,14 @@
                 <div class="code-name">#icon-iconfontscan</div>
             </li>
           
+            <li class="dib">
+                <svg class="icon svg-icon" aria-hidden="true">
+                  <use xlink:href="#icon-fahuo"></use>
+                </svg>
+                <div class="name">发货</div>
+                <div class="code-name">#icon-fahuo</div>
+            </li>
+          
             <li class="dib">
                 <svg class="icon svg-icon" aria-hidden="true">
                   <use xlink:href="#icon-paixingbang"></use>
@@ -2537,6 +2875,22 @@
                 <div class="code-name">#icon-guanyuwomen</div>
             </li>
           
+            <li class="dib">
+                <svg class="icon svg-icon" aria-hidden="true">
+                  <use xlink:href="#icon-zhichuqingkuang"></use>
+                </svg>
+                <div class="name">支出情况</div>
+                <div class="code-name">#icon-zhichuqingkuang</div>
+            </li>
+          
+            <li class="dib">
+                <svg class="icon svg-icon" aria-hidden="true">
+                  <use xlink:href="#icon-shouruqingkuang"></use>
+                </svg>
+                <div class="name">收入情况</div>
+                <div class="code-name">#icon-shouruqingkuang</div>
+            </li>
+          
             <li class="dib">
                 <svg class="icon svg-icon" aria-hidden="true">
                   <use xlink:href="#icon-butongguo"></use>
@@ -2545,6 +2899,14 @@
                 <div class="code-name">#icon-butongguo</div>
             </li>
           
+            <li class="dib">
+                <svg class="icon svg-icon" aria-hidden="true">
+                  <use xlink:href="#icon-saomiaoshibie380"></use>
+                </svg>
+                <div class="name">扫描 识别 380%</div>
+                <div class="code-name">#icon-saomiaoshibie380</div>
+            </li>
+          
             <li class="dib">
                 <svg class="icon svg-icon" aria-hidden="true">
                   <use xlink:href="#icon-sousuo"></use>
@@ -2577,6 +2939,14 @@
                 <div class="code-name">#icon-check1</div>
             </li>
           
+            <li class="dib">
+                <svg class="icon svg-icon" aria-hidden="true">
+                  <use xlink:href="#icon-20"></use>
+                </svg>
+                <div class="name">报表</div>
+                <div class="code-name">#icon-20</div>
+            </li>
+          
             <li class="dib">
                 <svg class="icon svg-icon" aria-hidden="true">
                   <use xlink:href="#icon-tel"></use>
@@ -2593,6 +2963,14 @@
                 <div class="code-name">#icon-wentibuchong</div>
             </li>
           
+            <li class="dib">
+                <svg class="icon svg-icon" aria-hidden="true">
+                  <use xlink:href="#icon-shouhuo"></use>
+                </svg>
+                <div class="name">收货</div>
+                <div class="code-name">#icon-shouhuo</div>
+            </li>
+          
             <li class="dib">
                 <svg class="icon svg-icon" aria-hidden="true">
                   <use xlink:href="#icon-soupcan"></use>
@@ -2601,6 +2979,14 @@
                 <div class="code-name">#icon-soupcan</div>
             </li>
           
+            <li class="dib">
+                <svg class="icon svg-icon" aria-hidden="true">
+                  <use xlink:href="#icon-baobiao"></use>
+                </svg>
+                <div class="name">报表</div>
+                <div class="code-name">#icon-baobiao</div>
+            </li>
+          
             <li class="dib">
                 <svg class="icon svg-icon" aria-hidden="true">
                   <use xlink:href="#icon-youjian1"></use>
@@ -3009,6 +3395,14 @@
                 <div class="code-name">#icon-CombinedShape</div>
             </li>
           
+            <li class="dib">
+                <svg class="icon svg-icon" aria-hidden="true">
+                  <use xlink:href="#icon-jiaohuan"></use>
+                </svg>
+                <div class="name">交换</div>
+                <div class="code-name">#icon-jiaohuan</div>
+            </li>
+          
             <li class="dib">
                 <svg class="icon svg-icon" aria-hidden="true">
                   <use xlink:href="#icon-shezhi"></use>
@@ -3153,6 +3547,14 @@
                 <div class="code-name">#icon-jiangpai-</div>
             </li>
           
+            <li class="dib">
+                <svg class="icon svg-icon" aria-hidden="true">
+                  <use xlink:href="#icon-shenhe"></use>
+                </svg>
+                <div class="name">审核</div>
+                <div class="code-name">#icon-shenhe</div>
+            </li>
+          
             <li class="dib">
                 <svg class="icon svg-icon" aria-hidden="true">
                   <use xlink:href="#icon-jiangpai-1"></use>
@@ -3193,6 +3595,14 @@
                 <div class="code-name">#icon-chakan</div>
             </li>
           
+            <li class="dib">
+                <svg class="icon svg-icon" aria-hidden="true">
+                  <use xlink:href="#icon-shouzhiguanli"></use>
+                </svg>
+                <div class="name">收支管理</div>
+                <div class="code-name">#icon-shouzhiguanli</div>
+            </li>
+          
             <li class="dib">
                 <svg class="icon svg-icon" aria-hidden="true">
                   <use xlink:href="#icon-xing1"></use>
@@ -3297,6 +3707,14 @@
                 <div class="code-name">#icon-tubiao-zhuzhuangtu</div>
             </li>
           
+            <li class="dib">
+                <svg class="icon svg-icon" aria-hidden="true">
+                  <use xlink:href="#icon-jiance"></use>
+                </svg>
+                <div class="name">检测</div>
+                <div class="code-name">#icon-jiance</div>
+            </li>
+          
             <li class="dib">
                 <svg class="icon svg-icon" aria-hidden="true">
                   <use xlink:href="#icon-shouzhiliushui"></use>
@@ -3441,6 +3859,14 @@
                 <div class="code-name">#icon-guanbi</div>
             </li>
           
+            <li class="dib">
+                <svg class="icon svg-icon" aria-hidden="true">
+                  <use xlink:href="#icon-baogao"></use>
+                </svg>
+                <div class="name">报告</div>
+                <div class="code-name">#icon-baogao</div>
+            </li>
+          
             <li class="dib">
                 <svg class="icon svg-icon" aria-hidden="true">
                   <use xlink:href="#icon-gongxuguanli1"></use>
@@ -3513,6 +3939,14 @@
                 <div class="code-name">#icon-buzhoutiaowancheng</div>
             </li>
           
+            <li class="dib">
+                <svg class="icon svg-icon" aria-hidden="true">
+                  <use xlink:href="#icon-yitihuachuxing"></use>
+                </svg>
+                <div class="name">报告</div>
+                <div class="code-name">#icon-yitihuachuxing</div>
+            </li>
+          
             <li class="dib">
                 <svg class="icon svg-icon" aria-hidden="true">
                   <use xlink:href="#icon-xiaoshoudingdan"></use>
@@ -3521,6 +3955,14 @@
                 <div class="code-name">#icon-xiaoshoudingdan</div>
             </li>
           
+            <li class="dib">
+                <svg class="icon svg-icon" aria-hidden="true">
+                  <use xlink:href="#icon-wj-tzwj"></use>
+                </svg>
+                <div class="name">文件-通知文件</div>
+                <div class="code-name">#icon-wj-tzwj</div>
+            </li>
+          
             <li class="dib">
                 <svg class="icon svg-icon" aria-hidden="true">
                   <use xlink:href="#icon-jindu"></use>
@@ -3545,6 +3987,14 @@
                 <div class="code-name">#icon-shuliangjia1</div>
             </li>
           
+            <li class="dib">
+                <svg class="icon svg-icon" aria-hidden="true">
+                  <use xlink:href="#icon-guanyu"></use>
+                </svg>
+                <div class="name">关于</div>
+                <div class="code-name">#icon-guanyu</div>
+            </li>
+          
             <li class="dib">
                 <svg class="icon svg-icon" aria-hidden="true">
                   <use xlink:href="#icon-guanbi1"></use>
@@ -3553,6 +4003,14 @@
                 <div class="code-name">#icon-guanbi1</div>
             </li>
           
+            <li class="dib">
+                <svg class="icon svg-icon" aria-hidden="true">
+                  <use xlink:href="#icon-weiwaifaliao"></use>
+                </svg>
+                <div class="name">委外发料</div>
+                <div class="code-name">#icon-weiwaifaliao</div>
+            </li>
+          
             <li class="dib">
                 <svg class="icon svg-icon" aria-hidden="true">
                   <use xlink:href="#icon-tupian"></use>
@@ -3633,6 +4091,22 @@
                 <div class="code-name">#icon-huisebuzhou</div>
             </li>
           
+            <li class="dib">
+                <svg class="icon svg-icon" aria-hidden="true">
+                  <use xlink:href="#icon-jiance1"></use>
+                </svg>
+                <div class="name">检测</div>
+                <div class="code-name">#icon-jiance1</div>
+            </li>
+          
+            <li class="dib">
+                <svg class="icon svg-icon" aria-hidden="true">
+                  <use xlink:href="#icon-shenhe1"></use>
+                </svg>
+                <div class="name">审核</div>
+                <div class="code-name">#icon-shenhe1</div>
+            </li>
+          
             <li class="dib">
                 <svg class="icon svg-icon" aria-hidden="true">
                   <use xlink:href="#icon-biaoqian1"></use>
@@ -3641,6 +4115,14 @@
                 <div class="code-name">#icon-biaoqian1</div>
             </li>
           
+            <li class="dib">
+                <svg class="icon svg-icon" aria-hidden="true">
+                  <use xlink:href="#icon-paiming"></use>
+                </svg>
+                <div class="name">排名</div>
+                <div class="code-name">#icon-paiming</div>
+            </li>
+          
             <li class="dib">
                 <svg class="icon svg-icon" aria-hidden="true">
                   <use xlink:href="#icon-weiwancheng"></use>
@@ -3649,6 +4131,22 @@
                 <div class="code-name">#icon-weiwancheng</div>
             </li>
           
+            <li class="dib">
+                <svg class="icon svg-icon" aria-hidden="true">
+                  <use xlink:href="#icon-baojia"></use>
+                </svg>
+                <div class="name">报价</div>
+                <div class="code-name">#icon-baojia</div>
+            </li>
+          
+            <li class="dib">
+                <svg class="icon svg-icon" aria-hidden="true">
+                  <use xlink:href="#icon-wenjianjiasuolvetu"></use>
+                </svg>
+                <div class="name">文件夹缩略图</div>
+                <div class="code-name">#icon-wenjianjiasuolvetu</div>
+            </li>
+          
             <li class="dib">
                 <svg class="icon svg-icon" aria-hidden="true">
                   <use xlink:href="#icon-tongguo"></use>
@@ -3673,6 +4171,14 @@
                 <div class="code-name">#icon-error</div>
             </li>
           
+            <li class="dib">
+                <svg class="icon svg-icon" aria-hidden="true">
+                  <use xlink:href="#icon-ICON-fenpeijiaose"></use>
+                </svg>
+                <div class="name">ICON-分配角色</div>
+                <div class="code-name">#icon-ICON-fenpeijiaose</div>
+            </li>
+          
             <li class="dib">
                 <svg class="icon svg-icon" aria-hidden="true">
                   <use xlink:href="#icon-icon_daohang-copy"></use>

File diff suppressed because it is too large
+ 94 - 6
src/assets/iconfont/iconfont.css


BIN
src/assets/iconfont/iconfont.eot


File diff suppressed because it is too large
+ 1 - 1
src/assets/iconfont/iconfont.js


File diff suppressed because it is too large
+ 66 - 0
src/assets/iconfont/iconfont.svg


BIN
src/assets/iconfont/iconfont.ttf


BIN
src/assets/iconfont/iconfont.woff


BIN
src/assets/iconfont/iconfont.woff2


+ 29 - 6
src/pages/buytaskdetail.vue

@@ -521,7 +521,9 @@
           </div>
 
           <!-- 审批流程主体内容 -->
-          <div style="margin:15px 0 0 0 ">
+          <!-- 注意:这里绑定了一个style,主要是动态调节审批人员区域的高度。屏幕高度 在生命周期钩子中通过js获取,然后减去顶部及动态判断有没有“催办”按钮,得出此区域的高度 -->
+          <!-- 审批流程状态为“处理中”的时候,才显示“催办”按钮,其余状态不显示 -->
+          <div style="margin:15px 0 0 0;overflow:auto" :style="oaempstype">
 
             <div class="oaview_emp">
               <div class="oaview_emp_title">
@@ -730,6 +732,7 @@
                 </div>
               </div>
 
+
             </div>
 
           </div>
@@ -760,19 +763,33 @@
         ifnew: 1,
         oaflag_dt: "处理中", //处理中,通过,否决
         ifmx: 0, //0-不弹出明细相关信息 1-数量相关信息 2-价格相关信息
-        ifoaview: 1 //0-不弹出审批流程界面 1-弹出
+        ifoaview: 1, //0-不弹出审批流程界面 1-弹出
+        ll_height: 0,
+        oaempstype: {
+          height: ''
+        }
       };
     },
+    created() {
+      this.hh();
+    },
+    activated() {
+      this.hh();
+    },
     methods: {
       goback() {
         {
           history.back();
         }
       },
-      gotomxjd() {
-        this.$router.push({
-          path: "/salemxjd"
-        });
+      hh() {
+        if (this.oaflag_dt == '处理中') {
+          this.oaempstype.height = window.innerHeight * 0.95 - 168 - 26 - 30 - 39 + 'px'
+        } else {
+          this.oaempstype.height = window.innerHeight * 0.95 - 168 - 26 - 10 + 'px'
+        }
+
+        console.log(this.oaempstype.height)
       }
     },
     computed: {
@@ -806,6 +823,12 @@
           pic_bg_blue: this.oaflag_dt == "处理中",
           pic_bg_green: this.oaflag_dt == "通过"
         };
+      },
+      oa_emp_height: function () {
+        return {
+          oa_emp_height_62: this.oaflag_dt == "处理中",
+          oa_emp_height_67: this.oaflag_dt != "处理中"
+        };
       }
     }
   }

+ 667 - 0
src/pages/funclist.vue

@@ -0,0 +1,667 @@
+<template>
+  <div class="main">
+
+    <div class="funclist">
+      <!-- 销售 -->
+      <div class="funclist_title">销售</div>
+      <div class="funclist_funcarea">
+        <div class="funclist_item">
+          <div class="funclist_icon func_icon_bg_red">
+            <svg class="icon" aria-hidden="true">
+              <use xlink:href="#icon-baojia"></use>
+            </svg>
+          </div>
+          <div class="funclist_text">销售报价单</div>
+        </div>
+
+        <div class="funclist_item">
+          <div class="funclist_icon func_icon_bg_blue" style="font-size:30px">
+            <svg class="icon" aria-hidden="true">
+              <use xlink:href="#icon-xiaoshoudingdan"></use>
+            </svg>
+          </div>
+          <div class="funclist_text">销售订单</div>
+        </div>
+
+        <div class="funclist_item">
+          <div class="funclist_icon func_icon_bg_green">
+            <svg class="icon" aria-hidden="true">
+              <use xlink:href="#icon-fahuo"></use>
+            </svg>
+          </div>
+          <div class="funclist_text">销售发货单</div>
+        </div>
+
+
+        <div class="funclist_item">
+          <div class="funclist_report_icon">
+            <svg class="icon" aria-hidden="true">
+              <use xlink:href="#icon-wenjianjiasuolvetu"></use>
+            </svg>
+          </div>
+          <div class="funclist_text">报表</div>
+        </div>
+
+      </div>
+
+      <!-- 采购 -->
+      <div class="funclist_title">采购</div>
+      <div class="funclist_funcarea">
+        <div class="funclist_item">
+          <div class="funclist_icon func_icon_bg_blue">
+            <svg class="icon" aria-hidden="true">
+              <use xlink:href="#icon-caigou"></use>
+            </svg>
+          </div>
+          <div class="funclist_text">采购订单</div>
+        </div>
+
+        <div class="funclist_item">
+          <div class="funclist_icon func_icon_bg_blue">
+            <svg class="icon" aria-hidden="true">
+              <use xlink:href="#icon-jiance"></use>
+            </svg>
+          </div>
+          <div class="funclist_text">采购送检单</div>
+        </div>
+
+        <div class="funclist_item ">
+          <div class="funclist_icon func_icon_bg_orange">
+            <svg class="icon" aria-hidden="true">
+              <use xlink:href="#icon-jiance1"></use>
+            </svg>
+          </div>
+          <div class="funclist_text">采购质检单</div>
+        </div>
+
+
+        <div class="funclist_item">
+          <div class="funclist_icon func_icon_bg_green">
+            <svg class="icon" aria-hidden="true">
+              <use xlink:href="#icon-shouhuo"></use>
+            </svg>
+          </div>
+          <div class="funclist_text">采购收货单</div>
+        </div>
+
+
+        <div class="funclist_item">
+          <div class="funclist_icon func_icon_bg_red">
+            <svg class="icon" aria-hidden="true">
+              <use xlink:href="#icon-renwu"></use>
+            </svg>
+          </div>
+          <div class="funclist_text">特采审核</div>
+        </div>
+
+        <div class="funclist_item">
+          <div class="funclist_icon func_icon_bg_red">
+            <svg class="icon" aria-hidden="true">
+              <use xlink:href="#icon-shenhe1"></use>
+            </svg>
+          </div>
+          <div class="funclist_text">采购审核</div>
+        </div>
+
+        <div class="funclist_item">
+          <div class="funclist_report_icon">
+            <svg class="icon" aria-hidden="true">
+              <use xlink:href="#icon-wenjianjiasuolvetu"></use>
+            </svg>
+          </div>
+          <div class="funclist_text">报表</div>
+        </div>
+
+      </div>
+
+      <!-- 生产 -->
+      <div class="funclist_title">生产</div>
+      <div class="funclist_funcarea">
+        <div class="funclist_item">
+          <div class="funclist_icon func_icon_bg_blue">
+            <svg class="icon" aria-hidden="true">
+              <use xlink:href="#icon-wj-tzwj"></use>
+            </svg>
+          </div>
+          <div class="funclist_text">发料通知单</div>
+        </div>
+
+        <div class="funclist_item">
+          <div class="funclist_icon func_icon_bg_green">
+            <svg class="icon" aria-hidden="true">
+              <use xlink:href="#icon-weiwaifaliao"></use>
+            </svg>
+          </div>
+          <div class="funclist_text">发料单</div>
+        </div>
+
+        <div class="funclist_item">
+          <div class="funclist_icon func_icon_bg_green">
+            <svg class="icon" aria-hidden="true">
+              <use xlink:href="#icon-xiaozu-"></use>
+            </svg>
+          </div>
+          <div class="funclist_text">工组完工</div>
+        </div>
+
+        <div class="funclist_item">
+          <div class="funclist_icon func_icon_bg_green">
+            <svg class="icon" aria-hidden="true">
+              <use xlink:href="#icon-qrcode-scan"></use>
+            </svg>
+          </div>
+          <div class="funclist_text">工序完工扫描</div>
+        </div>
+
+        <div class="funclist_item">
+          <div class="funclist_icon func_icon_bg_orange">
+            <svg class="icon" aria-hidden="true">
+              <use xlink:href="#icon-jiance1"></use>
+            </svg>
+          </div>
+          <div class="funclist_text">生产质检单</div>
+        </div>
+
+        <div class="funclist_item">
+          <div class="funclist_report_icon">
+            <svg class="icon" aria-hidden="true">
+              <use xlink:href="#icon-wenjianjiasuolvetu"></use>
+            </svg>
+          </div>
+          <div class="funclist_text">报表</div>
+        </div>
+
+      </div>
+
+      <!-- 财务 -->
+      <div class="funclist_title">财务</div>
+      <div class="funclist_funcarea">
+        <div class="funclist_item">
+          <div class="funclist_icon func_icon_bg_blue">
+            <svg class="icon" aria-hidden="true">
+              <use xlink:href="#icon-jiaohuan"></use>
+            </svg>
+          </div>
+          <div class="funclist_text">其它收入支出单</div>
+        </div>
+
+        <div class="funclist_item">
+          <div class="funclist_icon func_icon_bg_red" style="font-size:35px">
+            <svg class="icon" aria-hidden="true">
+              <use xlink:href="#icon-shouruqingkuang"></use>
+            </svg>
+          </div>
+          <div class="funclist_text">应收帐</div>
+        </div>
+
+        <div class="funclist_item">
+          <div class="funclist_icon func_icon_bg_orange" style="font-size:35px">
+            <svg class="icon" aria-hidden="true">
+              <use xlink:href="#icon-zhichuqingkuang"></use>
+            </svg>
+          </div>
+          <div class="funclist_text">应付帐</div>
+        </div>
+
+
+        <div class="funclist_item">
+          <div class="funclist_report_icon">
+            <svg class="icon" aria-hidden="true">
+              <use xlink:href="#icon-wenjianjiasuolvetu"></use>
+            </svg>
+          </div>
+          <div class="funclist_text">报表</div>
+        </div>
+
+      </div>
+    </div>
+
+    <!-- 文件夹视图 -->
+    <div v-if="ifreport==1">
+      <div style="    height: 100%;width: 100%;background-color: #ffd555;opacity: 0.95;position: fixed;top: 0px;z-index: 9998;"></div>
+      <div style="z-index: 9999;position: fixed;bottom: 0px;height: 100%;width: 100%;font-size:14px;">
+
+        <div style="width:100%;margin: 20% auto;height: 100%;    border-radius: 15px;overflow:hidden;">
+
+
+          <div style="position: relative;left:88%;top:40px;background-color:#fc4f4f;color:#fff;font-size:12px;width:20px;height:20px;line-height:20px;text-align: center;border-radius: 50%;">
+            <svg class="icon" aria-hidden="true">
+              <use xlink:href="#icon-guanbi"></use>
+            </svg>
+          </div>
+
+          <div style="display:flex;">
+            <div style="font-size:25px;font-weight:bold;color:#fff;margin:10px auto;">
+              销售报表
+            </div>
+          </div>
+          <div
+            style="background-color:rgba(255, 255, 255, 0.82);opacity: 1;margin: 0 auto;width:95%;height:75%;border-radius: 15px;overflow: auto;box-shadow: 0 0px 7px rgba(0, 0, 0, 0.2);">
+
+
+            <div style="padding:15px;">
+
+              <div class="report_list_item ">
+                <div class="report_list_item_icon func_icon_bg_blue">
+                  <svg class="icon" aria-hidden="true">
+                    <use xlink:href="#icon-baobiao"></use>
+                  </svg>
+                </div>
+
+                <div class="report_list_item_text report_list_item_border">
+                  <div class="report_list_item_name">新增销售订单统计表</div>
+                  <div class="report_list_item_right">
+                    <svg class="icon" aria-hidden="true">
+                      <use xlink:href="#icon-xing"></use>
+                    </svg>
+                  </div>
+                </div>
+              </div>
+
+              <div class="report_list_item ">
+                <div class="report_list_item_icon func_icon_bg_blue">
+                  <svg class="icon" aria-hidden="true">
+                    <use xlink:href="#icon-paiming"></use>
+                  </svg>
+                </div>
+
+                <div class="report_list_item_text report_list_item_border">
+                  <div class="report_list_item_name">业务员销售排名统计表</div>
+                  <div class="report_list_item_right">
+                    <svg class="icon" aria-hidden="true">
+                      <use xlink:href="#icon-xing1"></use>
+                    </svg>
+                  </div>
+                </div>
+              </div>
+
+
+              <div class="report_list_item ">
+                <div class="report_list_item_icon func_icon_bg_blue">
+                  <svg class="icon" aria-hidden="true">
+                    <use xlink:href="#icon-tubiao-zhuzhuangtu"></use>
+                  </svg>
+                </div>
+
+                <div class="report_list_item_text report_list_item_border">
+                  <div class="report_list_item_name">客户销售排名统计表</div>
+                  <div class="report_list_item_right">
+                    <svg class="icon" aria-hidden="true">
+                      <use xlink:href="#icon-xing1"></use>
+                    </svg>
+                  </div>
+                </div>
+              </div>
+
+              <div class="report_list_item ">
+                <div class="report_list_item_icon func_icon_bg_blue">
+                  <svg class="icon" aria-hidden="true">
+                    <use xlink:href="#icon-paiming"></use>
+                  </svg>
+                </div>
+
+                <div class="report_list_item_text report_list_item_border">
+                  <div class="report_list_item_name">产品销售排名统计表</div>
+                  <div class="report_list_item_right">
+                    <svg class="icon" aria-hidden="true">
+                      <use xlink:href="#icon-xing1"></use>
+                    </svg>
+                  </div>
+                </div>
+              </div>
+
+
+              <div class="report_list_item ">
+                <div class="report_list_item_icon func_icon_bg_red">
+                  <svg class="icon" aria-hidden="true">
+                    <use xlink:href="#icon-baojia"></use>
+                  </svg>
+                </div>
+
+                <div class="report_list_item_text report_list_item_border">
+                  <div class="report_list_item_name">销售订单收款统计表</div>
+                  <div class="report_list_item_right">
+                    <svg class="icon" aria-hidden="true">
+                      <use xlink:href="#icon-xing1"></use>
+                    </svg>
+                  </div>
+                </div>
+              </div>
+
+
+              <div class="report_list_item ">
+                <div class="report_list_item_icon func_icon_bg_red">
+                  <svg class="icon" aria-hidden="true">
+                    <use xlink:href="#icon-20"></use>
+                  </svg>
+                </div>
+
+                <div class="report_list_item_text report_list_item_border">
+                  <div class="report_list_item_name">周转统计表</div>
+                  <div class="report_list_item_right">
+                    <svg class="icon" aria-hidden="true">
+                      <use xlink:href="#icon-xing"></use>
+                    </svg>
+                  </div>
+                </div>
+              </div>
+
+
+
+              <div class="report_list_item ">
+                <div class="report_list_item_icon func_icon_bg_red">
+                  <svg class="icon" aria-hidden="true">
+                    <use xlink:href="#icon-baobiao"></use>
+                  </svg>
+                </div>
+
+                <div class="report_list_item_text report_list_item_border">
+                  <div class="report_list_item_name">产值统计表</div>
+                  <div class="report_list_item_right">
+                    <svg class="icon" aria-hidden="true">
+                      <use xlink:href="#icon-xing"></use>
+                    </svg>
+                  </div>
+                </div>
+              </div>
+
+
+              <div class="report_list_item ">
+                <div class="report_list_item_icon func_icon_bg_red">
+                  <svg class="icon" aria-hidden="true">
+                    <use xlink:href="#icon-baifenbi"></use>
+                  </svg>
+                </div>
+
+                <div class="report_list_item_text report_list_item_border">
+                  <div class="report_list_item_name">销售订单利润率统计表</div>
+                  <div class="report_list_item_right">
+                    <svg class="icon" aria-hidden="true">
+                      <use xlink:href="#icon-xing1"></use>
+                    </svg>
+                  </div>
+                </div>
+              </div>
+
+
+              <div class="report_list_item ">
+                <div class="report_list_item_icon func_icon_bg_green">
+                  <svg class="icon" aria-hidden="true">
+                    <use xlink:href="#icon-renwu"></use>
+                  </svg>
+                </div>
+
+                <div class="report_list_item_text report_list_item_border">
+                  <div class="report_list_item_name">在进行出口订单异常统计表</div>
+                  <div class="report_list_item_right">
+                    <svg class="icon" aria-hidden="true">
+                      <use xlink:href="#icon-xing"></use>
+                    </svg>
+                  </div>
+                </div>
+              </div>
+
+
+              <div class="report_list_item ">
+                <div class="report_list_item_icon func_icon_bg_green">
+                  <svg class="icon" aria-hidden="true">
+                    <use xlink:href="#icon-shujukanban"></use>
+                  </svg>
+                </div>
+
+                <div class="report_list_item_text report_list_item_border">
+                  <div class="report_list_item_name">销售准交统计表</div>
+                  <div class="report_list_item_right">
+                    <svg class="icon" aria-hidden="true">
+                      <use xlink:href="#icon-xing"></use>
+                    </svg>
+                  </div>
+                </div>
+              </div>
+
+            </div>
+          </div>
+
+        </div>
+
+      </div>
+
+
+    </div>
+
+
+    <!-- 底部按钮 -->
+    <div class="todolist-tab">
+      <div class="todolist-tab-btn">
+        <div class="todolist-tab-icon">
+          <svg class="icon" aria-hidden="true">
+            <use xlink:href="#icon-home"></use>
+          </svg>
+        </div>
+        首页
+      </div>
+      <div class="todolist-tab-btn  ">
+        <div class="todolist-tab-icon">
+          <svg class="icon" aria-hidden="true">
+            <use xlink:href="#icon-format-list-bulleted"></use>
+          </svg>
+        </div>
+        <div class="todolist-tab-count">9</div>
+        待办
+      </div>
+
+
+      <div class="todolist-tab-btn  todolist-tab-btn-on">
+        <div class="todolist-tab-icon">
+          <svg class="icon" aria-hidden="true">
+            <use xlink:href="#icon-google-drive"></use>
+          </svg>
+        </div>
+        功能
+      </div>
+
+      <div class="todolist-tab-btn">
+        <div class="todolist-tab-icon">
+          <svg class="icon" aria-hidden="true">
+            <use xlink:href="#icon-email-outline"></use>
+          </svg>
+        </div>
+        <div class="todolist-tab-count">5</div>
+        消息
+      </div>
+
+      <div class="todolist-tab-btn">
+        <div class="todolist-tab-icon">
+          <svg class="icon" aria-hidden="true">
+            <use xlink:href="#icon-account"></use>
+          </svg>
+        </div>
+        我的
+      </div>
+    </div>
+
+  </div>
+</template>
+<script>
+  export default {
+    name: 'funclist',
+    data() {
+      return {
+        ifreport: 1, //0-关闭文件夹 1-打开报表文件夹
+      }
+    }
+  }
+
+</script>
+<style>
+  body {
+    margin: 0;
+    padding: 0;
+    background-color: #fff;
+    font-family: "微软雅黑";
+  }
+
+  .funclist {
+    margin: 20px 0 50px 0;
+  }
+
+  .funclist_title {
+    font-size: 16px;
+    font-weight: bold;
+    padding: 0 0 10px 20px;
+  }
+
+  .funclist_funcarea {
+    display: flex;
+    align-items: flex-start;
+    flex-wrap: wrap;
+    padding: 0 10px 20px 10px;
+  }
+
+  .funclist_item {
+    flex: 0 0 25%;
+    text-align: center;
+    margin: 0 0 10px 0;
+  }
+
+  .funclist_icon {
+    width: 45px;
+    font-size: 25px;
+    line-height: 45px;
+    color: #fff;
+    border-radius: 50%;
+    text-align: center;
+    margin: 5px auto;
+  }
+
+  .funclist_report_icon {
+    width: 45px;
+    font-size: 45px;
+    line-height: 45px;
+    text-align: center;
+    margin: 5px auto;
+  }
+
+  .funclist_text {
+    font-size: 13px;
+    color: #666;
+  }
+
+  .func_icon_bg_blue {
+    background-color: #00aaee;
+  }
+
+  .func_icon_bg_green {
+    background-color: #47cc47;
+  }
+
+  .func_icon_bg_orange {
+    background-color: #ff9800;
+  }
+
+  .func_icon_bg_red {
+    background-color: #ff6f61;
+  }
+
+  .func_list_item_border {
+    border-bottom: 1px solid #f6f6f6;
+  }
+
+  /* 底部栏 */
+  .todolist-tab {
+    color: #666;
+    display: flex;
+    position: fixed;
+    bottom: 0;
+    background-color: #ffffff;
+    width: 100%;
+    z-index: 9995;
+    align-items: center;
+    justify-content: center;
+    padding: 5px 0 2px 0;
+    box-shadow: 0 -1px 3px #f1f1f1
+  }
+
+  .todolist-tab-btn {
+    font-size: 13px;
+    width: 25%;
+    text-align: center
+  }
+
+  .todolist-tab-btn-on {
+    color: #46a4da
+  }
+
+  .todolist-tab-icon {
+    font-size: 23px;
+  }
+
+  .todolist-tab-count {
+    position: absolute;
+    margin-left: 14%;
+    bottom: 30px;
+    font-size: 12px;
+    line-height: 12px;
+    width: 12px;
+    font-weight: bold;
+    color: #fff;
+    border-radius: 50%;
+    padding: 3px;
+    text-align: center;
+    background-color: #fc4f4f
+  }
+
+
+  .quote_edit_mask {
+    height: 100%;
+    width: 100%;
+    background-color: #1d1d1d;
+    opacity: 0.8;
+    position: fixed;
+    top: 0px;
+    z-index: 9998;
+  }
+
+  .report_list_item {
+    display: flex;
+    color: #606060;
+    font-size: 15px;
+    font-weight: bold;
+    line-height: 50px;
+    align-items: center;
+  }
+
+  .report_list_item_icon {
+    flex: 0 0 35px;
+    /* width: 35px;
+    height: 35px; */
+    font-size: 20px;
+    line-height: 35px;
+
+    color: #fff;
+    border-radius: 50%;
+    text-align: center;
+  }
+
+  /* .report_list_item_border {
+    border-bottom: 1px solid #fff;
+  } */
+
+  .report_list_item_text {
+    display: flex;
+    width: 100%;
+    margin: 0 5px 0 15px;
+  }
+
+  .report_list_item_name {
+    flex: 0 0 90%
+  }
+
+  .report_list_item_right {
+    color: #9b9b9b;
+    font-size: 28px;
+    /* position: absolute;
+    right: 8%; */
+  }
+
+</style>

+ 161 - 4
src/pages/homenew.vue

@@ -7,7 +7,7 @@
       <div class="task_selection_warp">
         <div class="task_selection">
           <div>时刻</div>
-          <div class='task_selection_check' style="margin-left:30px" >决策</div>
+          <div class='task_selection_check' style="margin-left:30px">决策</div>
           <div class="task_top_cnt"></div>
         </div>
       </div>
@@ -192,6 +192,102 @@
           </div>
         </div>
 
+        <!-- 收藏报表页面,如果没有收藏,就不显示 -->
+        <div class="home_widget_mx">
+          <div class="home_widget_mx_title">
+            <svg class="icon" aria-hidden="true">
+              <use xlink:href="#icon-yitihuachuxing"></use>
+            </svg>
+            收藏报表
+          </div>
+          <div class="home_report_list_item ">
+            <div class="home_report_list_item_icon func_icon_bg_blue">
+              <svg class="icon" aria-hidden="true">
+                <use xlink:href="#icon-paiming"></use>
+              </svg>
+            </div>
+
+            <div class="home_report_list_item_text home_report_list_item_border">
+              <div class="home_report_list_item_name">业务员销售排名统计表</div>
+              <div class="home_report_list_item_right">
+                <svg class="icon" aria-hidden="true">
+                  <use xlink:href="#icon-xing1"></use>
+                </svg>
+              </div>
+            </div>
+          </div>
+
+
+          <div class="home_report_list_item ">
+            <div class="home_report_list_item_icon func_icon_bg_blue">
+              <svg class="icon" aria-hidden="true">
+                <use xlink:href="#icon-tubiao-zhuzhuangtu"></use>
+              </svg>
+            </div>
+
+            <div class="home_report_list_item_text home_report_list_item_border">
+              <div class="home_report_list_item_name">客户销售排名统计表</div>
+              <div class="home_report_list_item_right">
+                <svg class="icon" aria-hidden="true">
+                  <use xlink:href="#icon-xing1"></use>
+                </svg>
+              </div>
+            </div>
+          </div>
+
+          <div class="home_report_list_item ">
+            <div class="home_report_list_item_icon func_icon_bg_blue">
+              <svg class="icon" aria-hidden="true">
+                <use xlink:href="#icon-paiming"></use>
+              </svg>
+            </div>
+
+            <div class="home_report_list_item_text home_report_list_item_border">
+              <div class="home_report_list_item_name">产品销售排名统计表</div>
+              <div class="home_report_list_item_right">
+                <svg class="icon" aria-hidden="true">
+                  <use xlink:href="#icon-xing1"></use>
+                </svg>
+              </div>
+            </div>
+          </div>
+
+
+          <div class="home_report_list_item ">
+            <div class="home_report_list_item_icon func_icon_bg_red">
+              <svg class="icon" aria-hidden="true">
+                <use xlink:href="#icon-baojia"></use>
+              </svg>
+            </div>
+
+            <div class="home_report_list_item_text home_report_list_item_border">
+              <div class="home_report_list_item_name">销售订单收款统计表</div>
+              <div class="home_report_list_item_right">
+                <svg class="icon" aria-hidden="true">
+                  <use xlink:href="#icon-xing1"></use>
+                </svg>
+              </div>
+            </div>
+          </div>
+
+          <div class="home_report_list_item ">
+            <div class="home_report_list_item_icon func_icon_bg_red">
+              <svg class="icon" aria-hidden="true">
+                <use xlink:href="#icon-baifenbi"></use>
+              </svg>
+            </div>
+
+            <div class="home_report_list_item_text ">
+              <div class="home_report_list_item_name">销售订单利润率统计表</div>
+              <div class="home_report_list_item_right">
+                <svg class="icon" aria-hidden="true">
+                  <use xlink:href="#icon-xing1"></use>
+                </svg>
+              </div>
+            </div>
+          </div>
+        </div>
+
         <div class="home_reload">重新载入数据</div>
 
       </div>
@@ -278,7 +374,7 @@
 
   .home_div {
     background-color: #f2f2f2;
-    padding: 0 0 10px 0 ;
+    padding: 0 0 10px 0;
   }
 
   .home_reload {
@@ -361,10 +457,10 @@
 
   .home_widget_mx_title {
     background-color: rgb(245, 245, 245);
-    font-size: 17px;
+    font-size: 15px;
     font-weight: bold;
     color: rgb(139, 139, 139);
-    padding: 8px 20px;
+    padding: 6px 15px;
 
   }
 
@@ -499,4 +595,65 @@
     border-bottom: 2px solid #fd7526;
   }
 
+
+  .home_report_list_item {
+    display: flex;
+    color: #606060;
+    font-size: 15px;
+    font-weight: bold;
+    line-height: 50px;
+    align-items: center;
+  }
+
+  .home_report_list_item_icon {
+    flex: 0 0 35px;
+    /* width: 35px;
+    height: 35px; */
+    margin: 0 0 0 10px;
+    font-size: 20px;
+    line-height: 35px;
+
+    color: #fff;
+    border-radius: 50%;
+    text-align: center;
+  }
+
+  .home_report_list_item_border {
+    border-bottom: 1px solid #f6f6f6;
+  }
+
+  .home_report_list_item_text {
+    display: flex;
+    width: 100%;
+    margin: 0 15px 0 15px;
+  }
+
+  .home_report_list_item_name {
+    flex: 0 0 90%
+  }
+
+  .home_report_list_item_right {
+    color: #9b9b9b;
+    font-size: 28px;
+    /* position: absolute;
+    right: 8%; */
+  }
+
+
+  .func_icon_bg_blue {
+    background-color: #00aaee;
+  }
+
+  .func_icon_bg_green {
+    background-color: #47cc47;
+  }
+
+  .func_icon_bg_orange {
+    background-color: #ff9800;
+  }
+
+  .func_icon_bg_red {
+    background-color: #ff6f61;
+  }
+
 </style>

+ 2 - 2
src/pages/l1todolist.vue

@@ -289,8 +289,8 @@
     },
     data() {
       return {
-        datetype: 1, //0-完整日历 1-只显示本周的日历
-        todotype:1,//0-任务 1-公文
+        datetype: 0, //0-完整日历 1-只显示本周的日历
+        todotype:0,//0-任务 1-公文
       }
     }
 

+ 65 - 41
src/pages/setting.vue

@@ -32,60 +32,70 @@
         </div>
       </div> -->
 
-      <div class="setting_list_item setting_list_item_border">
-        <div class="setting_list_item_icon">
+      <div class="setting_list_item ">
+        <div class="setting_list_item_icon setting_icon_bg_blue">
           <svg class="icon" aria-hidden="true">
-            <use xlink:href="#icon-faxian-xiaozu"></use>
+            <use xlink:href="#icon-ICON-fenpeijiaose"></use>
           </svg>
         </div>
-        <div class="setting_list_item_name">审批代理</div>
-        <div class="setting_list_item_right">
-          <svg class="icon" aria-hidden="true">
-            <use xlink:href="#icon-iconfontjiantou2"></use>
-          </svg>
+        <div class="setting_list_item_text setting_list_item_border">
+          <div class="setting_list_item_name">审批代理</div>
+          <div class="setting_list_item_right">
+            <svg class="icon" aria-hidden="true">
+              <use xlink:href="#icon-iconfontjiantou2"></use>
+            </svg>
+          </div>
         </div>
       </div>
 
-      <div class="setting_list_item setting_list_item_border">
-        <div class="setting_list_item_icon">
+      <div class="setting_list_item ">
+        <div class="setting_list_item_icon setting_icon_bg_green">
           <svg class="icon" aria-hidden="true">
             <use xlink:href="#icon-huaban"></use>
           </svg>
         </div>
-        <div class="setting_list_item_name">推送资讯</div>
-        <div class="setting_list_item_right">
-          <svg class="icon" aria-hidden="true">
-            <use xlink:href="#icon-iconfontjiantou2"></use>
-          </svg>
+
+        <div class="setting_list_item_text setting_list_item_border">
+          <div class="setting_list_item_name">推送资讯</div>
+          <div class="setting_list_item_right">
+            <svg class="icon" aria-hidden="true">
+              <use xlink:href="#icon-iconfontjiantou2"></use>
+            </svg>
+          </div>
         </div>
       </div>
 
-      <div class="setting_list_item setting_list_item_border">
-        <div class="setting_list_item_icon">
+      <div class="setting_list_item ">
+        <div class="setting_list_item_icon setting_icon_bg_orange">
           <svg class="icon" aria-hidden="true">
             <use xlink:href="#icon-xiugaimima"></use>
           </svg>
         </div>
-        <div class="setting_list_item_name">修改密码</div>
-        <div class="setting_list_item_right">
-          <svg class="icon" aria-hidden="true">
-            <use xlink:href="#icon-iconfontjiantou2"></use>
-          </svg>
 
+        <div class="setting_list_item_text setting_list_item_border">
+          <div class="setting_list_item_name">修改密码</div>
+          <div class="setting_list_item_right">
+            <svg class="icon" aria-hidden="true">
+              <use xlink:href="#icon-iconfontjiantou2"></use>
+            </svg>
+          </div>
         </div>
       </div>
 
-      <div class="setting_list_item setting_list_item_border">
-        <div class="setting_list_item_icon">
+      <div class="setting_list_item ">
+        <div class="setting_list_item_icon setting_icon_bg_red">
           <svg class="icon" aria-hidden="true">
-            <use xlink:href="#icon-guanyuwomen"></use>
+            <use xlink:href="#icon-guanyu"></use>
           </svg>
         </div>
-        <div class="setting_list_item_name">关于</div>
-        <div class="setting_list_item_right">
-          <svg class="icon" aria-hidden="true">
-            <use xlink:href="#icon-iconfontjiantou2"></use>
-          </svg>
+
+        <div class="setting_list_item_text setting_list_item_border">
+          <div class="setting_list_item_name">关于</div>
+          <div class="setting_list_item_right">
+            <svg class="icon" aria-hidden="true">
+              <use xlink:href="#icon-iconfontjiantou2"></use>
+            </svg>
+          </div>
         </div>
       </div>
 
@@ -204,7 +214,7 @@
     background-color: #ffffff;
     width: 100%;
     position: relative;
-    top: -55px;
+    top: -40px;
   }
 
   .setting_list_item {
@@ -214,27 +224,41 @@
     font-weight: bold;
     line-height: 55px;
     padding: 0 0 0 20px;
+    align-items: center;
   }
 
   .setting_list_item_icon {
+    flex: 0 0 35px;
+    /* width: 35px;
+    height: 35px; */
     font-size: 20px;
+    line-height: 35px;
+
+    color: #fff;
+    border-radius: 50%;
+    text-align: center;
   }
 
-  .setting_list_item_border {
-    border-bottom: 1px solid #f0f0f0;
+  .setting_icon_bg_blue {
+    background-color: #00aaee;
   }
 
-  .setting_list_item_name {
-    margin-left: 15px;
+  .setting_icon_bg_green {
+    background-color: #47cc47;
   }
 
-  .setting_list_item_right {
-    color: #9b9b9b;
-    font-size: 15px;
-    position: absolute;
-    right: 20px;
+  .setting_icon_bg_orange {
+    background-color: #ff9800;
+  }
+
+  .setting_icon_bg_red {
+    background-color: #ff6f61;
   }
 
+
+
+
+
   .setting_liubai {
     width: 100%;
     height: 10px;
@@ -302,7 +326,7 @@
     text-align: center;
   }
 
-/* 底部栏 */
+  /* 底部栏 */
   .todolist-tab {
     color: #666;
     display: flex;

+ 34 - 7
src/pages/testcss.vue

@@ -1,26 +1,24 @@
 <template>
-  <div style="z-index: 9999;height: 95%;width: 100%;font-size:14px;padding: 10px 0">
+  <!-- <div style="z-index: 9999;height: 95%;width: 100%;font-size:14px;padding: 10px 0">
     <div style="width:95%;border-radius: 15px;overflow:hidden;margin:0 auto;">
       <div style="width:100%;height:168px;overflow:hidden;background-color:#fa5a5a;">
         <div class="wave_one"></div>
         <div class="wave_two"></div>
         <div class="wave_three"></div>
-        <!-- <div class="wave_four"></div>
-        <div class="wave_five"></div> -->
       </div>
 
-      <!-- 图片 -->
+
       <div class="pic_warp">
         <div style="text-align: center;">
           <img src="../assets/toppic.png" style="display: inline-block;max-width:200px;"> </img> </div>
       </div>
-      <!-- 内容区域 -->
+
       <div style="height:1400px;background-color:#fff">
 
       </div>
     </div>
-
-  </div>
+  </div> -->
+  <div class="trapezoid">销售报表</div>
 </template>
 <script>
   export default {
@@ -36,6 +34,35 @@
     font-family: "微软雅黑";
   }
 
+  .trapezoid {
+    border-bottom: 100px solid #ffca29;
+    /* border-left: 50px solid transparent; */
+    border-right: 100px solid transparent;
+    width: 100px;
+  }
+
+  .nav {
+    position: relative;
+    display: inline-block;
+    padding: 0px 0px 55px 80px;
+    font-size: 14px;
+    color: white;
+    /* margin: 50px; */
+  }
+
+  .nav::before {
+    content: '';
+    position: absolute;
+    top: 0;
+    left: 0;
+    right: 0;
+    bottom: 0;
+    z-index: -1;
+    background: #58a;
+    transform: perspective(.5em) rotateX(5deg);
+    transform-origin: bottom left;
+  }
+
   .wave_one {
     width: 180%;
     height: 180%;

+ 9 - 0
src/router/index.js

@@ -37,6 +37,7 @@ import TodoList from '@/pages/l1todolist'
 import OaView from '@/pages/oaview'
 import Amerce from '@/pages/amerce'
 import Testcss from '@/pages/testcss'
+import Funclist from '@/pages/funclist'
 
 Vue.use(Router)
 
@@ -55,6 +56,14 @@ export default new Router({
         title: '工作任务'
       }
     },
+    {
+      path: '/funclist',
+      name: 'Funclist',
+      component: Funclist,
+      meta: {
+        title: '功能'
+      }
+    },
     {
       path: '/testcss',
       name: 'Testcss',