库存统计

api/init.json

@@ -26,18 +26,6 @@
               "href": "page/welcome-1.html",
               "icon": "fa fa-tachometer",
               "target": "_self"
-            },
-            {
-              "title": "首页1",
-              "href": "page/welcome-2.html",
-              "icon": "fa fa-tachometer",
-              "target": "_self"
-            },
-            {
-              "title": "首页1",
-              "href": "page/welcome-3.html",
-              "icon": "fa fa-tachometer",
-              "target": "_self"
             }
           ]
         },
@@ -82,7 +70,7 @@
               "target": "_self"
             },
             {
-              "title": "工程统计",
+              "title": "库存统计",
               "href": "page/accessory/inventory_statistics_list.html",
               "icon": "fa fa-tachometer",
               "target": "_self"

js/accessory/inventory_statistics_list.js

@@ -1,27 +1,9 @@
-let form, table, element;
+let form, table;
 let tableIns;
 let pageNum = 1; // 定义分页
 layui.use(["form", "table"], function () {
     form = layui.form;
     table = layui.table;
-  element = layui.element;
-  // 动态插入进度条元素
-  /* $("#num-progress").after(`
-    <div class="layui-progress layui-bg-red" lay-filter="demo-filter-progress" style="margin-top:10%;">
-      <div class="layui-progress-bar " lay-percent="30%"></div>
-    </div>
-  `);
-  $("#num-progress2").after(`
-    <div class="layui-progress" lay-filter="demo-filter-progress" style="margin-top:2%;">
-      <div class="layui-progress-bar layui-bg-red" lay-percent="30%"></div>
-    </div>
-  `);
-  $("#num-progress3").after(`
-    <div class="layui-progress" lay-filter="demo-filter-progress" style="margin-top:2%;">
-      <div class="layui-progress-bar" lay-percent="30%"></div>
-    </div>
-  `); */
-  element.render();
     initTable();
     getStatistics();
 });
@@ -46,25 +28,6 @@ function getStatistics() {
         $('#fhNum').html(obj.fhNum);
         $('#overNum').html(obj.overNum);
         $('#noPlanNum').html(obj.noPlanNum);
-    /* $('#dfh').html(obj.dfh + '%');
-    $('#yfh').html(obj.yfh + '%');
-    let dfh = obj.dfh;
-    let yfh = obj.yfh;
-    $("#num-progress").after(`
-      <div class="layui-progress layui-bg-red" lay-filter="demo-filter-progress" style="margin-top:10%;">
-        <div class="layui-progress-bar " lay-percent="${yfh}%"></div>
-      </div>
-    `);
-    $("#num-progress2").after(`
-      <div class="layui-progress" lay-filter="demo-filter-progress" style="margin-top:2%;">
-        <div class="layui-progress-bar layui-bg-red" lay-percent="${dfh}%"></div>
-      </div>
-    `);
-    $("#num-progress3").after(`
-      <div class="layui-progress" lay-filter="demo-filter-progress" style="margin-top:2%;">
-        <div class="layui-progress-bar" lay-percent="${yfh}%"></div>
-      </div>
-    `); */
     }
 }
 
@@ -73,8 +36,10 @@ function queryTable(type) {
     if (type === 1) {
         reloadTable(1);
     } else if (type === 2) {
-    $('#proName').val('');
+        $('#type').val('');
-    $('#status').val('0');
+        $('#name').val('');
+        $('#model').val('');
+        $('#status').val('');
         layui.form.render();
         reloadTable(1);
     }
@@ -93,7 +58,9 @@ function reloadTable(pageNum) {
         },
         where: {
             encryptedData: JSON.stringify({
-        'proName': $('#proName').val(),
+                'type': $('#type').val(),
+                'name': $('#name').val(),
+                'model': $('#model').val(),
                 'status': $('#status').val()
             }),
         },
@@ -109,11 +76,13 @@ function initTable() {
         headers: {
             authorization: sessionStorage.getItem("gz-token"),
         },
-    height: "full-350",
+        height: "full-300",
         url: dataUrl + "backstage/planOut/getProPlanPage",
         where: {
             encryptedData: JSON.stringify({
-        'proName': $('#proName').val(),
+                'type': $('#type').val(),
+                'name': $('#name').val(),
+                'model': $('#model').val(),
                 'status': $('#status').val()
             }),
         },
@@ -132,7 +101,7 @@ function initTable() {
         cols: [
             [
                 {
-          width: '5%',
+                    width: '9.9%',
                     title: "序号",
                     align: "center",
                     templet: function (d) {
@@ -141,69 +110,45 @@ function initTable() {
                 },
                 {
                     field: "proName",
-          width: '20%',
+                    width: '15%',
-          title: "工程名称",
+                    title: "配件类型",
                     unresize: true,
                     align: "center",
                 },
                 {
                     field: "planNum",
-          width: '10%',
+                    width: '15%',
-          title: "需求计划数量",
+                    title: "配件名称",
                     unresize: true,
                     align: "center",
-          templet: function (d) {
-            let html = "";
-            html += "<a onclick='view_plan(" + JSON.stringify(d) + ")'>" + setNumColor(d.planNum) + "</a>";
-            return html;
-          },
                 },
                 {
                     field: "recordNum",
-          width: '10%',
+                    width: '15%',
-          title: "出库单数量 ",
+                    title: "规格型号 ",
                     unresize: true,
                     align: "center",
-          templet: function (d) {
-            return setNumColor(d.recordNum);
-          },
                 },
                 {
                     field: "status",
-          title: "发货状态",
+                    title: "计量单位",
-          width: '10%',
+                    width: '15%',
                     unresize: true,
                     align: "center",
-          templet: function (d) {
-            return setStatusColor(d.status);
-          },
                 },
                 {
                     field: "lastDay",
                     width: '15%',
-          title: "最后发货时间",
+                    title: "库存数量",
                     unresize: true,
                     align: "center",
                 },
                 {
                     field: "progress",
-          width: '19.85%',
+                    width: '15%',
-          title: "进度",
+                    title: "平均单价（元）",
                     unresize: true,
-          align: "center",
+                    align: "center"
-          templet: schedule,
-        },
-        {
-          title: "操作",
-          width: '10%',
-          align: "center",
-          unresize: true,
-          templet: function (d) {
-            let html = "";
-            html += "<a onclick='deliveryDetail(" + JSON.stringify(d) + ")'>详情</a>";
-            html += "<div class='splitLine'>|</div><a onclick='sendGoods(" + JSON.stringify(d) + ")'>发货</a>";
-            return html;
-          },
                 },
             ],
         ],
@@ -212,56 +157,11 @@ function initTable() {
         page: true,
         done: function (res, curr, count) {
             pageNum = tableIns.config.page.curr;
-      element.render();
             table.resize("currentTableId");
         },
     });
 }
 
-// 数量颜色
-function setNumColor(value) {
-  return '<span style="color:#409Eff;font-weight:bold;">' + value + "</span>";
-}
-
-// 发货状态颜色
-function setStatusColor(value) {
-  value = value ? parseInt(value) : 0;
-  let color = "#409Eff";
-  let name = ''
-  if (value === 0) {
-    color = "#f56c6c";
-    name = '未发货';
-  } else if (value === 1) {
-    color = "#ff9900";
-    name = '部分发货'
-  } else if (value === 2) {
-    color = "#19be6b";
-    name = '全部发货'
-  }
-  return '<span style="color:' + color + '">' + name + "</span>";
-}
-
-// 设置进度值
-function schedule(d) {
-  d.progress = parseFloat(d.progress);
-  d.filter == undefined ? (d.filter = d.LAY_NUM) : d.filter;
-  d.progress == undefined ? (d.progress = 100) : d.progress;
-  var color = "layui-bg-orange";
-  if (d.progress < 100) {
-    color = "layui-bg-orange";
-  } else if (d.progress === 100) {
-    color = "layui-bg-primary";
-  } else if (d.progress > 100) {
-    color = "layui-bg-blue";
-  }
-  //设置页面进度条
-  return (
-    '<div class="layui-progress layui-progress-big" lay-showpercent="true" id="' + d.filter + '" lay-filter="progress' + d.filter + '">' +
-    '<div class="layui-progress-bar ' + color + '" lay-percent="' + d.progress + '%">' +
-    "</div></div>"
-  );
-}
-
 // 导出
 function exportExcel() {
     let params = {
@@ -271,28 +171,3 @@ function exportExcel() {
     let url = dataUrl + "backstage/export/exportFhList";
     exportExcelUtil(url, '机具公司发货数据', JSON.stringify(params));
 }
-
-// 发货详情
-function deliveryDetail(obj) {
-  openIframeByParamObj("deliveryDetail", "详情", "../demandPlan/child/delivery_detail_list.html", "92%", "95%", obj);
-}
-
-// 发货
-function sendGoods(obj) {
-  openIframeByParamObj("sendGoods", "发货", "../demandPlan/child/send_goods_form.html", "92%", "95%", obj);
-}
-
-// type 1.总需求量 2.待发货量 3.已发货量
-function openViewData(type) {
-  openIframeByParam("viewData", "数据概览", "../demandPlan/child/view_data_list.html", "92%", "95%", type);
-}
-
-// type 1.超库存量 2.计划外量
-function earlyInfo(type) {
-  openIframeByParam("viewData", "预警信息", "../demandPlan/child/early_info_list.html", "92%", "95%", type);
-}
-
-// 需求计划
-function view_plan(obj) {
-  openIframeByParamObj("view_plan", "需求计划", "../demandPlan/child/demand_plan_detail_list.html", "92%", "95%", obj);
-}

page/accessory/inventory_statistics_list.html

@@ -12,66 +12,84 @@
     <link rel="stylesheet" href="../../css/public.css" media="all">
     <link rel="stylesheet" href="../../css/demandPlan/delivery_list.css" media="all">
 </head>
+<style>
+    #data-overview {
+        width: 100%;
+        height: 80px;
+        justify-content: space-around;
+    }
+
+    .table-box {
+        height: calc(100% - 280px);
+    }
+
+    .unit-class {
+        margin: 10px 0 0 10px !important;
+        color: #666;
+    }
+</style>
 
 <body>
     <div class="layuimini-container">
         <div class="layuimini-main">
             <fieldset class="table-search-fieldset">
-                <legend>数据预览</legend>
+                <legend>数据概览</legend>
                 <div id="data-overview" class="layout">
-                    <div class="data-detail" onclick="openViewData(1)" style="cursor: pointer;">
+                    <div class="data-detail" style="cursor: pointer;">
-                        <div class="layout" style="justify-content: space-between;" id="num-progress">
+                        <div class="layout" style="justify-content: space-between;">
                             <div class="layout num-title">
-                                <p>总需求计划量</p>
+                                <p>配件类型</p>
+                                <div class="layout">
                                     <p class="num-style" id="totalNum">0</p>
+                                    <p class="unit-class">类</p>
+                                </div>
                             </div>
                             <div>
                                 <img src="../../images/demandPlan/num_icon.png">
                             </div>
                         </div>
                     </div>
-                    <div class="data-detail" onclick="openViewData(2)" style="cursor: pointer;">
+                    <div class="data-detail" style="cursor: pointer;">
-                        <div class="layout" style="justify-content: space-between;" id="num-progress2">
+                        <div class="layout" style="justify-content: space-between;">
                             <div class="layout num-title">
-                                <p>待发货量</p>
+                                <p>配件库存</p>
+                                <div class="layout">
                                     <p class="num-style" id="dfhNum"></p>
-                                <!-- <p id="dfh">0%</p> -->
+                                    <p class="unit-class">件</p>
+                                </div>
                             </div>
                             <div>
                                 <img src="../../images/demandPlan/num2_icon.png">
                             </div>
                         </div>
                     </div>
-                    <div class="data-detail" onclick="openViewData(3)" style="cursor: pointer;">
+                    <div class="data-detail" style="cursor: pointer;">
-                        <div class="layout" style="justify-content: space-between;" id="num-progress3">
+                        <div class="layout" style="justify-content: space-between;">
                             <div class="layout num-title">
-                                <p>已发货量</p>
+                                <p>配件价值</p>
+                                <div class="layout">
                                     <p class="num-style" id="fhNum"></p>
-                                <!-- <p id="yfh">0%</p> -->
+                                    <p class="unit-class">元</p>
+                                </div>
                             </div>
                             <div>
                                 <img src="../../images/demandPlan/num3_icon.png">
                             </div>
                         </div>
                     </div>
-                    <div class="layout data-detail" style="align-items: flex-start;justify-content: flex-start;">
+                    <div class="data-detail" style="cursor: pointer;">
-                        <p style="font-size: 16px; font-weight: bold;">预警信息</p>
+                        <div class="layout" style="justify-content: space-between;">
-                        <div class="layout common-style" onclick="earlyInfo(1)">
+                            <div class="layout num-title">
-                            <p>超库存量</p>
+                                <p>配件预警（库存为0）</p>
-                            <p style="color: #F56C6C; font-weight: 700; font-size: 16px;" id="overNum">0</p>
+                                <div class="layout">
+                                    <p class="num-style">200</p>
+                                    <p class="unit-class">类</p>
                                 </div>
-                        <div class="layout common-style" onclick="earlyInfo(2)">
-                            <p>计划外量</p>
-                            <p style="color: #00BFBF; font-weight: 700; font-size: 16px;" id="noPlanNum">0</p>
                             </div>
-                        <!-- <div class="layout common-style">
+                            <div>
-                            <p>据需用日期5日量</p>
+                                <img src="../../images/demandPlan/num3_icon.png">
-                            <p style="color: rgb(255, 153, 0);; font-weight: 700; font-size: 16px;">0</p>
+                            </div>
                         </div>
-                        <div class="layout common-style">
-                            <p>已超需用日期量</p>
-                            <p style="color: #D9001B; font-weight: 700; font-size: 16px;">0</p>
-                        </div> -->
                     </div>
                 </div>
             </fieldset>
@@ -82,24 +100,36 @@
                         <div class="layui-form-item">
                             <div class="layui-inline">
                                 <div class="layui-input-inline" style="width: 300px;">
-                                    <input type="text" name="proName" id="proName" autocomplete="off" class="layui-input" lay-affix="clear"
+                                    <input type="text" name="type" id="type" autocomplete="off"
-                                        placeholder="输入工程名称" maxlength="30">
+                                        class="layui-input" lay-affix="clear" placeholder="输入配件类型" maxlength="30">
+                                </div>
+                            </div>
+                            <div class="layui-inline">
+                                <div class="layui-input-inline" style="width: 300px;">
+                                    <input type="text" name="name" id="name" autocomplete="off"
+                                        class="layui-input" lay-affix="clear" placeholder="输入配件名称" maxlength="30">
+                                </div>
+                            </div>
+                            <div class="layui-inline">
+                                <div class="layui-input-inline" style="width: 300px;">
+                                    <input type="text" name="model" id="model" autocomplete="off"
+                                        class="layui-input" lay-affix="clear" placeholder="输入规格型号" maxlength="30">
                                 </div>
                             </div>
                             <div class="layui-inline">
                                 <div class="layui-input-inline">
                                     <select id="status">
-                                        <option value="">请选择状态</option>
+                                        <option value="">请选择预警配件</option>
-                                        <option value="0">未发货</option>
+                                        <option value="0">库存等于0</option>
-                                        <option value="1">部分发货</option>
+                                        <option value="1">库存大于0</option>
-                                        <option value="2">全部发货</option>
                                     </select>
                                     </select>
                                     </select>
                                 </div>
                             </div>
                             <div class="layui-inline">
-                                <button class="layui-btn layui-bg-blue" onclick="queryTable(1)"><i class="layui-icon"></i> 搜 索</button>
+                                <button class="layui-btn layui-bg-blue" onclick="queryTable(1)"><i
+                                        class="layui-icon"></i> 搜 索</button>
                                 <button class="layui-btn layui-btn-primary" onclick="queryTable(2)"><i
                                         class="layui-icon layui-icon-refresh"></i> 重 置</button>
                                 <button class="layui-btn layui-btn-primary" onclick="exportExcel()"><i
@@ -117,7 +147,7 @@
     <script src="../../lib/jquery-3.4.1/jquery-3.4.1.min.js" charset="utf-8"></script>
     <script src="../../js/public.js" charset="utf-8"></script>
     <script src="../../lib/layui-v2.9.18/layui/layui.js" charset="utf-8"></script>
-    <script src="../../js/demandPlan/delivery_list.js" charset="utf-8"></script>
+    <script src="../../js/accessory/inventory_statistics_list.js" charset="utf-8"></script>
     <script src="../../js/openIframe.js" charset="utf-8"></script>
 </body>
 

page/welcome-2.html

@@ -1,364 +0,0 @@
-<!DOCTYPE html>
-<html>
-<head>
-    <meta charset="utf-8">
-    <title>首页三</title>
-    <meta name="renderer" content="webkit">
-    <meta http-equiv="X-UA-Compatible" content="IE=edge,chrome=1">
-    <meta name="viewport" content="width=device-width, initial-scale=1, maximum-scale=1">
-    <link rel="stylesheet" href="../lib/layui-v2.6.3/css/layui.css" media="all">
-    <link rel="stylesheet" href="../lib/font-awesome-4.7.0/css/font-awesome.min.css" media="all">
-    <link rel="stylesheet" href="../css/public.css" media="all">
-    <style>
-        .top-panel {
-            border: 1px solid #eceff9;
-            border-radius: 5px;
-            text-align: center;
-        }
-        .top-panel > .layui-card-body{
-            height: 60px;
-        }
-        .top-panel-number{
-            line-height:60px;
-            font-size: 30px;
-            border-right:1px solid #eceff9;
-        }
-        .top-panel-tips{
-            line-height:30px;
-            font-size: 12px
-        }
-    </style>
-</head>
-<body>
-<!--<div class="layuimini-container">-->
-<div class="layuimini-main">
-
-    <div class="layui-row layui-col-space15">
-        <div class="layui-col-xs12 layui-col-md3">
-
-            <div class="layui-card top-panel">
-                <div class="layui-card-header">要展示的指标名称</div>
-                <div class="layui-card-body">
-                    <div class="layui-row layui-col-space5">
-                        <div class="layui-col-xs9 layui-col-md9 top-panel-number">
-                            9,054,056
-                        </div>
-                        <div class="layui-col-xs3 layui-col-md3 top-panel-tips">
-                            比昨天 <a style="color: #1aa094">▲0.12</a><br>
-                            比七日 <a style="color: #bd3004">▼0.06</a>
-                        </div>
-                    </div>
-                </div>
-            </div>
-
-        </div>
-        <div class="layui-col-xs12 layui-col-md3">
-
-            <div class="layui-card top-panel">
-                <div class="layui-card-header">要展示的指标名称</div>
-                <div class="layui-card-body">
-                    <div class="layui-row layui-col-space5">
-                        <div class="layui-col-xs9 layui-col-md9 top-panel-number">
-                            9,054,056
-                        </div>
-                        <div class="layui-col-xs3 layui-col-md3 top-panel-tips">
-                            比昨天 <a style="color: #1aa094">▲0.12</a><br>
-                            比七日 <a style="color: #bd3004">▼0.06</a>
-                        </div>
-                    </div>
-                </div>
-            </div>
-
-        </div>
-        <div class="layui-col-xs12 layui-col-md3">
-
-            <div class="layui-card top-panel">
-                <div class="layui-card-header">要展示的指标名称</div>
-                <div class="layui-card-body">
-                    <div class="layui-row layui-col-space5">
-                        <div class="layui-col-xs9 layui-col-md9 top-panel-number">
-                            9,054,056
-                        </div>
-                        <div class="layui-col-xs3 layui-col-md3 top-panel-tips">
-                            比昨天 <a style="color: #1aa094">▲0.12</a><br>
-                            比七日 <a style="color: #bd3004">▼0.06</a>
-                        </div>
-                    </div>
-                </div>
-            </div>
-
-        </div>
-        <div class="layui-col-xs12 layui-col-md3">
-
-            <div class="layui-card top-panel">
-                <div class="layui-card-header">要展示的指标名称</div>
-                <div class="layui-card-body">
-                    <div class="layui-row layui-col-space5">
-                        <div class="layui-col-xs9 layui-col-md9 top-panel-number">
-                            9,054,056
-                        </div>
-                        <div class="layui-col-xs3 layui-col-md3 top-panel-tips">
-                            比昨天 <a style="color: #1aa094">▲0.12</a><br>
-                            比七日 <a style="color: #bd3004">▼0.06</a>
-                        </div>
-                    </div>
-                </div>
-            </div>
-
-        </div>
-    </div>
-
-    <div class="layui-row layui-col-space15">
-        <div class="layui-col-xs12 layui-col-md9">
-            <div id="echarts-records" style="background-color:#ffffff;min-height:400px;padding: 10px"></div>
-        </div>
-        <div class="layui-col-xs12 layui-col-md3">
-            <div id="echarts-pies" style="background-color:#ffffff;min-height:400px;padding: 10px"></div>
-        </div>
-    </div>
-
-
-    <div class="layui-row layui-col-space15">
-        <div class="layui-col-xs12 layui-col-md6">
-            <div id="echarts-dataset" style="background-color:#ffffff;min-height:300px;padding: 10px"></div>
-        </div>
-        <div class="layui-col-xs12 layui-col-md6">
-            <div id="echarts-map" style="background-color:#ffffff;min-height:300px;padding: 10px"></div>
-        </div>
-    </div>
-
-
-</div>
-<!--</div>-->
-<script src="../lib/layui-v2.6.3/layui.js" charset="utf-8"></script>
-<script src="../js/lay-config.js?v=1.0.4" charset="utf-8"></script>
-<script>
-    layui.use(['layer', 'echarts'], function () {
-        var $ = layui.jquery,
-            layer = layui.layer,
-            echarts = layui.echarts;
-
-        /**
-         * 报表功能
-         */
-        var echartsRecords = echarts.init(document.getElementById('echarts-records'), 'walden');
-
-        var optionRecords = {
-            title: {
-                text: '指标名称-报表图'
-            },
-            tooltip: {
-                trigger: 'axis',
-                axisPointer: {
-                    type: 'cross',
-                    label: {
-                        backgroundColor: '#6a7985'
-                    }
-                }
-            },
-            legend: {
-                data: ['邮件营销', '联盟广告', '视频广告', '直接访问', '搜索引擎']
-            },
-            toolbox: {
-                feature: {
-                    saveAsImage: {}
-                }
-            },
-            grid: {
-                left: '3%',
-                right: '4%',
-                bottom: '3%',
-                containLabel: true
-            },
-            xAxis: [
-                {
-                    type: 'category',
-                    boundaryGap: false,
-                    data: ['周一', '周二', '周三', '周四', '周五', '周六', '周日']
-                }
-            ],
-            yAxis: [
-                {
-                    type: 'value'
-                }
-            ],
-            series: [
-                {
-                    name: '邮件营销',
-                    type: 'line',
-                    stack: '总量',
-                    areaStyle: {},
-                    data: [120, 132, 101, 134, 90, 230, 210]
-                },
-                {
-                    name: '联盟广告',
-                    type: 'line',
-                    areaStyle: {},
-                    data: [220, 182, 191, 234, 290, 330, 310]
-                },
-                {
-                    name: '视频广告',
-                    type: 'line',
-                    stack: '总量',
-                    areaStyle: {},
-                    data: [150, 232, 201, 154, 190, 330, 410]
-                },
-                {
-                    name: '直接访问',
-                    type: 'line',
-                    stack: '总量',
-                    areaStyle: {},
-                    data: [320, 332, 301, 334, 390, 330, 320]
-                },
-                {
-                    name: '搜索引擎',
-                    type: 'line',
-                    stack: '总量',
-                    label: {
-                        normal: {
-                            show: true,
-                            position: 'top'
-                        }
-                    },
-                    areaStyle: {},
-                    data: [820, 932, 901, 934, 1290, 1330, 1320]
-                }
-            ]
-        };
-        echartsRecords.setOption(optionRecords);
-
-
-        /**
-         * 玫瑰图表
-         */
-        var echartsPies = echarts.init(document.getElementById('echarts-pies'), 'walden');
-        var optionPies = {
-            title: {
-                text: '指标名称-玫瑰图',
-                left: 'center'
-            },
-            tooltip: {
-                trigger: 'item',
-                formatter: '{a} <br/>{b} : {c} ({d}%)'
-            },
-            legend: {
-                orient: 'vertical',
-                left: 'left',
-                data: ['直接访问', '邮件营销', '联盟广告', '视频广告', '搜索引擎']
-            },
-            series: [
-                {
-                    name: '访问来源',
-                    type: 'pie',
-                    radius: '55%',
-                    center: ['50%', '60%'],
-                    roseType: 'radius',
-                    data: [
-                        {value: 335, name: '直接访问'},
-                        {value: 310, name: '邮件营销'},
-                        {value: 234, name: '联盟广告'},
-                        {value: 135, name: '视频广告'},
-                        {value: 368, name: '搜索引擎'}
-                    ],
-                    emphasis: {
-                        itemStyle: {
-                            shadowBlur: 10,
-                            shadowOffsetX: 0,
-                            shadowColor: 'rgba(0, 0, 0, 0.5)'
-                        }
-                    }
-                }
-            ]
-        };
-        echartsPies.setOption(optionPies);
-
-
-        /**
-         * 柱状图
-         */
-        var echartsDataset = echarts.init(document.getElementById('echarts-dataset'), 'walden');
-
-        var optionDataset = {
-            legend: {},
-            tooltip: {},
-            dataset: {
-                dimensions: ['product', '2015', '2016', '2017'],
-                source: [
-                    {product: 'Matcha Latte', '2015': 43.3, '2016': 85.8, '2017': 93.7},
-                    {product: 'Milk Tea', '2015': 83.1, '2016': 73.4, '2017': 55.1},
-                    {product: 'Cheese Cocoa', '2015': 86.4, '2016': 65.2, '2017': 82.5},
-                    {product: 'Walnut Brownie', '2015': 72.4, '2016': 53.9, '2017': 39.1}
-                ]
-            },
-            xAxis: {type: 'category'},
-            yAxis: {},
-            // Declare several bar series, each will be mapped
-            // to a column of dataset.source by default.
-            series: [
-                {type: 'bar'},
-                {type: 'bar'},
-                {type: 'bar'}
-            ]
-        };
-
-        echartsDataset.setOption(optionDataset);
-
-
-        /**
-         * 中国地图
-         */
-        var echartsMap = echarts.init(document.getElementById('echarts-map'), 'walden');
-
-
-        var optionMap = {
-            legend: {},
-            tooltip: {
-                trigger: 'axis',
-                showContent: false
-            },
-            dataset: {
-                source: [
-                    ['product', '2012', '2013', '2014', '2015', '2016', '2017'],
-                    ['Matcha Latte', 41.1, 30.4, 65.1, 53.3, 83.8, 98.7],
-                    ['Milk Tea', 86.5, 92.1, 85.7, 83.1, 73.4, 55.1],
-                    ['Cheese Cocoa', 24.1, 67.2, 79.5, 86.4, 65.2, 82.5],
-                    ['Walnut Brownie', 55.2, 67.1, 69.2, 72.4, 53.9, 39.1]
-                ]
-            },
-            xAxis: {type: 'category'},
-            yAxis: {gridIndex: 0},
-            grid: {top: '55%'},
-            series: [
-                {type: 'line', smooth: true, seriesLayoutBy: 'row'},
-                {type: 'line', smooth: true, seriesLayoutBy: 'row'},
-                {type: 'line', smooth: true, seriesLayoutBy: 'row'},
-                {type: 'line', smooth: true, seriesLayoutBy: 'row'},
-                {
-                    type: 'pie',
-                    id: 'pie',
-                    radius: '30%',
-                    center: ['50%', '25%'],
-                    label: {
-                        formatter: '{b}: {@2012} ({d}%)'
-                    },
-                    encode: {
-                        itemName: 'product',
-                        value: '2012',
-                        tooltip: '2012'
-                    }
-                }
-            ]
-        };
-
-        echartsMap.setOption(optionMap);
-
-
-        // echarts 窗口缩放自适应
-        window.onresize = function () {
-            echartsRecords.resize();
-        }
-
-    });
-</script>
-</body>
-</html>

page/welcome-3.html

@@ -1,207 +0,0 @@
-<!DOCTYPE html>
-<html>
-<head>
-    <meta charset="utf-8">
-    <title>主页一</title>
-    <meta name="renderer" content="webkit">
-    <meta http-equiv="X-UA-Compatible" content="IE=edge,chrome=1">
-    <meta name="viewport" content="width=device-width, initial-scale=1, maximum-scale=1">
-    <link rel="stylesheet" href="../lib/layui-v2.6.3/css/layui.css" media="all">
-    <link rel="stylesheet" href="../lib/font-awesome-4.7.0/css/font-awesome.min.css" media="all">
-    <link rel="stylesheet" href="../css/public.css" media="all">
-</head>
-<style>
-    .layui-top-box {padding:40px 20px 20px 20px;color:#fff}
-    .panel {margin-bottom:17px;background-color:#fff;border:1px solid transparent;border-radius:3px;-webkit-box-shadow:0 1px 1px rgba(0,0,0,.05);box-shadow:0 1px 1px rgba(0,0,0,.05)}
-    .panel-body {padding:15px}
-    .panel-title {margin-top:0;margin-bottom:0;font-size:14px;color:inherit}
-    .label {display:inline;padding:.2em .6em .3em;font-size:75%;font-weight:700;line-height:1;color:#fff;text-align:center;white-space:nowrap;vertical-align:baseline;border-radius:.25em;margin-top: .3em;}
-    .layui-red {color:red}
-    .main_btn > p {height:40px;}
-</style>
-<body>
-<div class="layuimini-container">
-    <div class="layuimini-main layui-top-box">
-        <div class="layui-row layui-col-space10">
-
-            <div class="layui-col-md3">
-                <div class="col-xs-6 col-md-3">
-                    <div class="panel layui-bg-cyan">
-                        <div class="panel-body">
-                            <div class="panel-title">
-                                <span class="label pull-right layui-bg-blue">实时</span>
-                                <h5>用户统计</h5>
-                            </div>
-                            <div class="panel-content">
-                                <h1 class="no-margins">1234</h1>
-                                <div class="stat-percent font-bold text-gray"><i class="fa fa-commenting"></i> 1234</div>
-                                <small>当前分类总记录数</small>
-                            </div>
-                        </div>
-                    </div>
-                </div>
-            </div>
-
-            <div class="layui-col-md3">
-                <div class="col-xs-6 col-md-3">
-                    <div class="panel layui-bg-blue">
-                        <div class="panel-body">
-                            <div class="panel-title">
-                                <span class="label pull-right layui-bg-cyan">实时</span>
-                                <h5>商品统计</h5>
-                            </div>
-                            <div class="panel-content">
-                                <h1 class="no-margins">1234</h1>
-                                <div class="stat-percent font-bold text-gray"><i class="fa fa-commenting"></i> 1234</div>
-                                <small>当前分类总记录数</small>
-                            </div>
-                        </div>
-                    </div>
-                </div>
-            </div>
-
-            <div class="layui-col-md3">
-                <div class="col-xs-6 col-md-3">
-                    <div class="panel layui-bg-green">
-                        <div class="panel-body">
-                            <div class="panel-title">
-                                <span class="label pull-right layui-bg-orange">实时</span>
-                                <h5>浏览统计</h5>
-                            </div>
-                            <div class="panel-content">
-                                <h1 class="no-margins">1234</h1>
-                                <div class="stat-percent font-bold text-gray"><i class="fa fa-commenting"></i> 1234</div>
-                                <small>当前分类总记录数</small>
-                            </div>
-                        </div>
-                    </div>
-                </div>
-            </div>
-            <div class="layui-col-md3">
-                <div class="col-xs-6 col-md-3">
-                    <div class="panel layui-bg-orange">
-                        <div class="panel-body">
-                            <div class="panel-title">
-                                <span class="label pull-right layui-bg-green">实时</span>
-                                <h5>订单统计</h5>
-                            </div>
-                            <div class="panel-content">
-                                <h1 class="no-margins">1234</h1>
-                                <div class="stat-percent font-bold text-gray"><i class="fa fa-commenting"></i> 1234</div>
-                                <small>当前分类总记录数</small>
-                            </div>
-                        </div>
-                    </div>
-                </div>
-            </div>
-        </div>
-    </div>
-
-    <div class="layui-box">
-        <div class="layui-row layui-col-space10">
-            <div class="layui-col-md12">
-                <blockquote class="layui-elem-quote main_btn">
-                    <p>本模板基于layui2.5.4以及font-awesome-4.7.0进行实现。layui开发文档地址：<a class="layui-btn layui-btn-xs layui-btn-danger" target="_blank" href="http://www.layui.com/doc">layui文档</a></p>
-                    <p>技术交流QQ群（561838086）：<a target="_blank" href="https://jq.qq.com/?_wv=1027&k=5JRGVfe"><img border="0" src="//pub.idqqimg.com/wpa/images/group.png" alt="layuimini" title="layuimini"></a>（加群请备注来源：如gitee、github、官网等）</p>
-                    <p>喜欢此后台模板的可以给我的GitHub和Gitee加个Star支持一下</p>
-                    <p>GitHub地址：
-                        <iframe src="https://ghbtns.com/github-btn.html?user=zhongshaofa&repo=layuimini&type=star&count=true" frameborder="0" scrolling="0" width="100px" height="20px"></iframe>
-                        <iframe src="https://ghbtns.com/github-btn.html?user=zhongshaofa&repo=layuimini&type=fork&count=true" frameborder="0" scrolling="0" width="100px" height="20px"></iframe>
-                    </p>
-                    <p>Gitee地址：<a href="https://gitee.com/zhongshaofa/layuimini" target="_blank"><img src="https://gitee.com/zhongshaofa/layuimini/badge/star.svg?theme=dark" alt="star"></a> <a href="https://gitee.com/zhongshaofa/layuimini" target="_blank"><img src="https://gitee.com/zhongshaofa/layuimini/badge/fork.svg?theme=dark" alt="fork"></a></p>
-                </blockquote>
-            </div>
-        </div>
-    </div>
-
-    <div class="layui-box">
-        <div class="layui-row layui-col-space10">
-            <div class="layui-col-md6">
-                <table class="layui-table">
-                    <colgroup>
-                        <col width="150">
-                        <col width="200">
-                        <col>
-                    </colgroup>
-                    <thead>
-                    <tr>
-                        <th>昵称</th>
-                        <th>加入时间</th>
-                        <th>签名</th>
-                    </tr>
-                    </thead>
-                    <tbody>
-                    <tr>
-                        <td>贤心</td>
-                        <td>2016-11-29</td>
-                        <td>人生就像是一场修行</td>
-                    </tr>
-                    <tr>
-                        <td>许闲心</td>
-                        <td>2016-11-28</td>
-                        <td>于千万人之中遇见你所遇见的人，于千万年之中，时间的无涯的荒野里…</td>
-                    </tr>
-                    <tr>
-                        <td>许闲心</td>
-                        <td>2016-11-28</td>
-                        <td>于千万人之中遇见你所遇见的人，于千万年之中，时间的无涯的荒野里…</td>
-                    </tr>
-                    <tr>
-                        <td>许闲心</td>
-                        <td>2016-11-28</td>
-                        <td>于千万人之中遇见你所遇见的人，于千万年之中，时间的无涯的荒野里…</td>
-                    </tr>
-                    </tbody>
-                </table>
-            </div>
-            <div class="layui-col-md6">
-                <ul class="layui-timeline">
-                    <li class="layui-timeline-item">
-                        <i class="layui-icon layui-timeline-axis">&#xe63f;</i>
-                        <div class="layui-timeline-content layui-text">
-                            <h3 class="layui-timeline-title">8月18日</h3>
-                            <p>
-                                layui 2.0 的一切准备工作似乎都已到位。发布之弦，一触即发。
-                                <br>不枉近百个日日夜夜与之为伴。因小而大，因弱而强。
-                                <br>无论它能走多远，抑或如何支撑？至少我曾倾注全心，无怨无悔 <i class="layui-icon"></i>
-                            </p>
-                        </div>
-                    </li>
-                    <li class="layui-timeline-item">
-                        <i class="layui-icon layui-timeline-axis">&#xe63f;</i>
-                        <div class="layui-timeline-content layui-text">
-                            <h3 class="layui-timeline-title">8月16日</h3>
-                            <p>杜甫的思想核心是儒家的仁政思想，他有“<em>致君尧舜上，再使风俗淳</em>”的宏伟抱负。个人最爱的名篇有：</p>
-                            <ul>
-                                <li>《登高》</li>
-                                <li>《茅屋为秋风所破歌》</li>
-                            </ul>
-                        </div>
-                    </li>
-                    <li class="layui-timeline-item">
-                        <i class="layui-icon layui-timeline-axis">&#xe63f;</i>
-                        <div class="layui-timeline-content layui-text">
-                            <h3 class="layui-timeline-title">8月15日</h3>
-                            <p>
-                                中国人民抗日战争胜利72周年
-                                <br>常常在想，尽管对这个国家有这样那样的抱怨，但我们的确生在了最好的时代
-                                <br>铭记、感恩
-                                <br>所有为中华民族浴血奋战的英雄将士
-                                <br>永垂不朽
-                            </p>
-                        </div>
-                    </li>
-                    <li class="layui-timeline-item">
-                        <i class="layui-icon layui-timeline-axis">&#xe63f;</i>
-                        <div class="layui-timeline-content layui-text">
-                            <div class="layui-timeline-title">过去</div>
-                        </div>
-                    </li>
-                </ul>
-            </div>
-        </div>
-    </div>
-</div>
-<script src="../lib/layui-v2.6.3/layui.js" charset="utf-8"></script>
-</body>
-</html>