brush

package-lock.json

@@ -2075,10 +2075,9 @@
       }
     },
     "circular-json": {
-      "version": "0.3.3",
-      "resolved": "https://registry.npmjs.org/circular-json/-/circular-json-0.3.3.tgz",
-      "integrity": "sha512-UZK3NBx2Mca+b5LsG7bY183pHWt5Y1xts4P3Pz7ENTwGVnJOUWbRb3ocjvX7hx9tq/yTAdclXm9sZ38gNuem4A==",
-      "dev": true
+      "version": "0.5.9",
+      "resolved": "https://registry.npmjs.org/circular-json/-/circular-json-0.5.9.tgz",
+      "integrity": "sha512-4ivwqHpIFJZBuhN3g/pEcdbnGUywkBblloGbkglyloVjjR3uT6tieI89MVOfbP2tHX5sgb01FuLgAOzebNlJNQ=="
     },
     "clap": {
       "version": "1.2.3",
@@ -4712,6 +4711,14 @@
         "del": "2.2.2",
         "graceful-fs": "4.1.11",
         "write": "0.2.1"
+      },
+      "dependencies": {
+        "circular-json": {
+          "version": "0.3.3",
+          "resolved": "https://registry.npmjs.org/circular-json/-/circular-json-0.3.3.tgz",
+          "integrity": "sha512-UZK3NBx2Mca+b5LsG7bY183pHWt5Y1xts4P3Pz7ENTwGVnJOUWbRb3ocjvX7hx9tq/yTAdclXm9sZ38gNuem4A==",
+          "dev": true
+        }
       }
     },
     "flatten": {

package.json

@@ -13,6 +13,7 @@
   "dependencies": {
     "@antv/g6": "^2.1.0",
     "axios": "^0.18.0",
+    "circular-json": "^0.5.9",
     "echarts": "^4.1.0",
     "element-ui": "^2.4.6",
     "highlight.js": "^9.12.0",

src/App.vue

@@ -1,7 +1,8 @@
 <template>
   <el-row id='app'>
-    <chaoge-brush></chaoge-brush>
+    <!-- <chaoge-brush></chaoge-brush> -->
     <el-col :span="24" class='main-container'>
+    <chao-ge></chao-ge>
     <router-view></router-view>
     </el-col>
   </el-row>
@@ -9,7 +10,6 @@
     <!-- <my-chart></my-chart> -->
      <!-- <hello-world></hello-world> -->
      <!-- <my-table></my-table> -->
-    <!-- <chao-ge></chao-ge> -->
     <!-- <test-com></test-com> -->
    <!-- <ant></ant> -->
    <!-- <my-list></my-list> -->

src/components/chaogebrush.vue

@@ -19,10 +19,19 @@ import { mapGetters } from 'vuex'
 import echarts from 'echarts'
 import Mock from 'mockjs'
 import moment from 'moment'
+// require('echarts/lib/echarts')
+// require('echarts/lib/chart/line')
+// require('echarts/lib/component/tooltip')
+// require('echarts/lib/component/toolbox')
+// require('echarts/lib/component/title')
+// require('echarts/lib/component/legend')
+// require('echarts/lib/component/datazoom')
+// require('echarts/lib/component/brush')
 // import BrushView from './utils/BrushView'
 // import chartConfig from '@/utils/chart/baseConf.js'
 // import BrushView from '../utils/BrushView'
-// var BrushView = require('../utils/BrushView')
+
+// require('../utils/BrushView')
 let startTimes = (new Date()).getTime() - 60 * 60 * 1000
 
 let MockData = Mock.mock({

src/main.js

@@ -17,6 +17,7 @@ Vue.prototype.$echarts = echarts
 Vue.config.productionTip = false
 Vue.use(ElementUI)
 /* eslint-disable no-new */
+
 new Vue({
   el: '#app',
   router,

src/utils/BrushController2.js

@@ -1,9 +1,18 @@
-import {__DEV__} from '../../node_modules/echarts/lib/config';
-import * as zrUtil from '../../node_modules/zrender/src/core/util';
-import Eventful from '../../node_modules/zrender/src/mixin/Eventful';
-import * as graphic from '../../node_modules/echarts/lib/util/graphic';
-import * as interactionMutex from '../../node_modules/echarts/lib/component/helper/interactionMutex';
-import DataDiffer from '../../node_modules/echarts/lib/data/DataDiffer';
+/* eslint-disable */
+
+var _config = require("../../node_modules/echarts/src/config");
+
+var __DEV__ = _config.__DEV__;
+
+var zrUtil = require("../../node_modules/zrender/lib/core/util");
+
+var Eventful = require("../../node_modules/zrender/lib/mixin/Eventful");
+
+var graphic = require("../../node_modules/echarts/lib/util/graphic");
+
+var interactionMutex = require("../../node_modules/echarts/lib/component/helper/interactionMutex");
+
+var DataDiffer = require("../../node_modules/echarts/lib/data/DataDiffer");
 
 /*
 * Licensed to the Apache Software Foundation (ASF) under one
@@ -60,6 +69,7 @@ var DEFAULT_BRUSH_OPT = {
   removeOnClick: false
 };
 var baseUID = 0;
+
 /**
  * @alias module:echarts/component/helper/BrushController
  * @constructor
@@ -346,115 +356,115 @@ function endCreating(controller, creatingCover) {
   var coverRenderer = getCoverRenderer(creatingCover);
 
   if (coverRenderer.endCreating) {
-    coverRenderer.endCreating(controller, creatingCover);
-    updateZ(creatingCover, creatingCover.__brushOption);
+    coverRenderer.endCreating(controller, creatingCover)
+    updateZ(creatingCover, creatingCover.__brushOption)
   }
 
-  return creatingCover;
+  return creatingCover
 }
 
 function updateCoverShape(controller, cover) {
-  var brushOption = cover.__brushOption;
-  getCoverRenderer(cover).updateCoverShape(controller, cover, brushOption.range, brushOption);
+  var brushOption = cover.__brushOption
+  getCoverRenderer(cover).updateCoverShape(controller, cover, brushOption.range, brushOption)
 }
 
 function updateZ(cover, brushOption) {
-  var z = brushOption.z;
-  z == null && (z = COVER_Z);
+  var z = brushOption.z
+  z == null && (z = COVER_Z)
   cover.traverse(function (el) {
-    el.z = z;
-    el.z2 = z; // Consider in given container.
-  });
+    el.z = z
+    el.z2 = z // Consider in given container.
+  })
 }
 
 function updateCoverAfterCreation(controller, cover) {
-  getCoverRenderer(cover).updateCommon(controller, cover);
-  updateCoverShape(controller, cover);
+  getCoverRenderer(cover).updateCommon(controller, cover)
+  updateCoverShape(controller, cover)
 }
 
 function getCoverRenderer(cover) {
-  return coverRenderers[cover.__brushOption.brushType];
+  return coverRenderers[cover.__brushOption.brushType]
 } // return target panel or `true` (means global panel)
 
 
 function getPanelByPoint(controller, e, localCursorPoint) {
-  var panels = controller._panels;
+  var panels = controller._panels
 
   if (!panels) {
-    return true; // Global panel
+    return true // Global panel
   }
 
-  var panel;
-  var transform = controller._transform;
+  var panel
+  var transform = controller._transform
   each(panels, function (pn) {
-    pn.isTargetByCursor(e, localCursorPoint, transform) && (panel = pn);
-  });
-  return panel;
+    pn.isTargetByCursor(e, localCursorPoint, transform) && (panel = pn)
+  })
+  return panel
 } // Return a panel or true
 
 
 function getPanelByCover(controller, cover) {
-  var panels = controller._panels;
+  var panels = controller._panels
 
   if (!panels) {
-    return true; // Global panel
+    return true // Global panel
   }
 
-  var panelId = cover.__brushOption.panelId; // User may give cover without coord sys info,
+  var panelId = cover.__brushOption.panelId // User may give cover without coord sys info,
   // which is then treated as global panel.
 
-  return panelId != null ? panels[panelId] : true;
+  return panelId != null ? panels[panelId] : true
 }
 
 function clearCovers(controller) {
-  var covers = controller._covers;
-  var originalLength = covers.length;
+  var covers = controller._covers
+  var originalLength = covers.length
   each(covers, function (cover) {
-    controller.group.remove(cover);
-  }, controller);
-  covers.length = 0;
-  return !!originalLength;
+    controller.group.remove(cover)
+  }, controller)
+  covers.length = 0
+  return !!originalLength
 }
 
 function trigger(controller, opt) {
   var areas = map(controller._covers, function (cover) {
-    var brushOption = cover.__brushOption;
-    var range = zrUtil.clone(brushOption.range);
+    var brushOption = cover.__brushOption
+    var range = zrUtil.clone(brushOption.range)
     return {
       brushType: brushOption.brushType,
       panelId: brushOption.panelId,
       range: range
-    };
-  });
+    }
+  })
   controller.trigger('brush', areas, {
     isEnd: !!opt.isEnd,
     removeOnClick: !!opt.removeOnClick
-  });
+  })
 }
 
 function shouldShowCover(controller) {
-  var track = controller._track;
+  var track = controller._track
 
   if (!track.length) {
-    return false;
+    return false
   }
 
-  var p2 = track[track.length - 1];
-  var p1 = track[0];
-  var dx = p2[0] - p1[0];
-  var dy = p2[1] - p1[1];
-  var dist = mathPow(dx * dx + dy * dy, 0.5);
-  return dist > UNSELECT_THRESHOLD;
+  var p2 = track[track.length - 1]
+  var p1 = track[0]
+  var dx = p2[0] - p1[0]
+  var dy = p2[1] - p1[1]
+  var dist = mathPow(dx * dx + dy * dy, 0.5)
+  return dist > UNSELECT_THRESHOLD
 }
 
 function getTrackEnds(track) {
-  var tail = track.length - 1;
-  tail < 0 && (tail = 0);
-  return [track[0], track[tail]];
+  var tail = track.length - 1
+  tail < 0 && (tail = 0)
+  return [track[0], track[tail]]
 }
 
 function createBaseRectCover(doDrift, controller, brushOption, edgeNames) {
-  var cover = new graphic.Group();
+  var cover = new graphic.Group()
   cover.add(new graphic.Rect({
     name: 'main',
     style: makeStyle(brushOption),
@@ -465,7 +475,7 @@ function createBaseRectCover(doDrift, controller, brushOption, edgeNames) {
     ondragend: curry(trigger, controller, {
       isEnd: true
     })
-  }));
+  }))
   each(edgeNames, function (name) {
     cover.add(new graphic.Rect({
       name: name,
@@ -479,12 +489,13 @@ function createBaseRectCover(doDrift, controller, brushOption, edgeNames) {
       ondragend: curry(trigger, controller, {
         isEnd: true
       })
-    }));
-  });
-  return cover;
+    }))
+  })
+  return cover
 }
 
 function updateBaseRect(controller, cover, localRange, brushOption) {
+  // debugger;
   var lineWidth = brushOption.brushStyle.lineWidth || 0
   var handleSize = mathMax(lineWidth, MIN_RESIZE_LINE_WIDTH)
   var x = localRange[0][0]
@@ -497,9 +508,9 @@ function updateBaseRect(controller, cover, localRange, brushOption) {
   var y2a = y2 - handleSize + lineWidth / 2
   var width = x2 - x;
   var height = y2 - y;
-  var widtha = width + lineWidth
-  var heighta = height + lineWidth
-  updateRectShape(controller, cover, 'main', x, y, width, height)
+  var widtha = width + lineWidth;
+  var heighta = height + lineWidth;
+  updateRectShape(controller, cover, 'main', x, y, width, height);
 
   if (brushOption.transformable) {
     // updateRectShape(controller, cover, 'w', xa, ya, handleSize, heighta);
@@ -514,10 +525,10 @@ function updateBaseRect(controller, cover, localRange, brushOption) {
 }
 
 function updateCommon(controller, cover) {
-  var brushOption = cover.__brushOption;
-  var transformable = brushOption.transformable;
-  var mainEl = cover.childAt(0);
-  mainEl.useStyle(makeStyle(brushOption));
+  var brushOption = cover.__brushOption
+  var transformable = brushOption.transformable
+  var mainEl = cover.childAt(0)
+  mainEl.useStyle(makeStyle(brushOption))
   mainEl.attr({
     silent: !transformable,
     cursor: transformable ? 'move' : 'default'
@@ -534,19 +545,19 @@ function updateCommon(controller, cover) {
 }
 
 function updateRectShape(controller, cover, name, x, y, w, h) {
-  var el = cover.childOfName(name);
-  el && el.setShape(pointsToRect(clipByPanel(controller, cover, [[x, y], [x + w, y + h]])));
+  var el = cover.childOfName(name)
+  el && el.setShape(pointsToRect(clipByPanel(controller, cover, [[x, y], [x + w, y + h]])))
 }
 
 function makeStyle(brushOption) {
   return zrUtil.defaults({
     strokeNoScale: true
-  }, brushOption.brushStyle);
+  }, brushOption.brushStyle)
 }
 
 function formatRectRange(x, y, x2, y2) {
-  var min = [mathMin(x, x2), mathMin(y, y2)];
-  var max = [mathMax(x, x2), mathMax(y, y2)];
+  var min = [mathMin(x, x2), mathMin(y, y2)]
+  var max = [mathMax(x, x2), mathMax(y, y2)]
   return [[min[0], max[0]], // x range
   [min[1], max[1]] // y range
   ];
@@ -558,9 +569,9 @@ function getTransform(controller) {
 
 function getGlobalDirection(controller, localDirection) {
   if (localDirection.length > 1) {
-    localDirection = localDirection.split('');
-    var globalDir = [getGlobalDirection(controller, localDirection[0]), getGlobalDirection(controller, localDirection[1])];
-    (globalDir[0] === 'e' || globalDir[0] === 'w') && globalDir.reverse();
+    localDirection = localDirection.split('')
+    var globalDir = [getGlobalDirection(controller, localDirection[0]), getGlobalDirection(controller, localDirection[1])]
+    (globalDir[0] === 'e' || globalDir[0] === 'w') && globalDir.reverse()
     return globalDir.join('');
   } else {
     var map = {
@@ -575,62 +586,62 @@ function getGlobalDirection(controller, localDirection) {
       top: 'n',
       bottom: 's'
     };
-    var globalDir = graphic.transformDirection(map[localDirection], getTransform(controller));
+    var globalDir = graphic.transformDirection(map[localDirection], getTransform(controller))
     return inverseMap[globalDir];
   }
 }
 
 function driftRect(toRectRange, fromRectRange, controller, cover, name, dx, dy, e) {
-  var brushOption = cover.__brushOption;
-  var rectRange = toRectRange(brushOption.range);
-  var localDelta = toLocalDelta(controller, dx, dy);
+  var brushOption = cover.__brushOption
+  var rectRange = toRectRange(brushOption.range)
+  var localDelta = toLocalDelta(controller, dx, dy)
   each(name.split(''), function (namePart) {
-    var ind = DIRECTION_MAP[namePart];
-    rectRange[ind[0]][ind[1]] += localDelta[ind[0]];
-  });
-  brushOption.range = fromRectRange(formatRectRange(rectRange[0][0], rectRange[1][0], rectRange[0][1], rectRange[1][1]));
-  updateCoverAfterCreation(controller, cover);
+    var ind = DIRECTION_MAP[namePart]
+    rectRange[ind[0]][ind[1]] += localDelta[ind[0]]
+  })
+  brushOption.range = fromRectRange(formatRectRange(rectRange[0][0], rectRange[1][0], rectRange[0][1], rectRange[1][1]))
+  updateCoverAfterCreation(controller, cover)
   trigger(controller, {
     isEnd: false
-  });
+  })
 }
 
 function driftPolygon(controller, cover, dx, dy, e) {
   var range = cover.__brushOption.range;
-  var localDelta = toLocalDelta(controller, dx, dy);
+  var localDelta = toLocalDelta(controller, dx, dy)
   each(range, function (point) {
-    point[0] += localDelta[0];
-    point[1] += localDelta[1];
-  });
-  updateCoverAfterCreation(controller, cover);
+    point[0] += localDelta[0]
+    point[1] += localDelta[1]
+  })
+  updateCoverAfterCreation(controller, cover)
   trigger(controller, {
     isEnd: false
-  });
+  })
 }
 
 function toLocalDelta(controller, dx, dy) {
   var thisGroup = controller.group;
-  var localD = thisGroup.transformCoordToLocal(dx, dy);
-  var localZero = thisGroup.transformCoordToLocal(0, 0);
-  return [localD[0] - localZero[0], localD[1] - localZero[1]];
+  var localD = thisGroup.transformCoordToLocal(dx, dy)
+  var localZero = thisGroup.transformCoordToLocal(0, 0)
+  return [localD[0] - localZero[0], localD[1] - localZero[1]]
 }
 
 function clipByPanel(controller, cover, data) {
-  var panel = getPanelByCover(controller, cover);
-  return panel && panel !== true ? panel.clipPath(data, controller._transform) : zrUtil.clone(data);
+  var panel = getPanelByCover(controller, cover)
+  return panel && panel !== true ? panel.clipPath(data, controller._transform) : zrUtil.clone(data)
 }
 
 function pointsToRect(points) {
-  var xmin = mathMin(points[0][0], points[1][0]);
-  var ymin = mathMin(points[0][1], points[1][1]);
-  var xmax = mathMax(points[0][0], points[1][0]);
-  var ymax = mathMax(points[0][1], points[1][1]);
+  var xmin = mathMin(points[0][0], points[1][0])
+  var ymin = mathMin(points[0][1], points[1][1])
+  var xmax = mathMax(points[0][0], points[1][0])
+  var ymax = mathMax(points[0][1], points[1][1])
   return {
     x: xmin,
     y: ymin,
     width: xmax - xmin,
     height: ymax - ymin
-  };
+  }
 }
 
 function resetCursor(controller, e, localCursorPoint) {
@@ -639,9 +650,9 @@ function resetCursor(controller, e, localCursorPoint) {
     return;
   }
 
-  var zr = controller._zr;
-  var covers = controller._covers;
-  var currPanel = getPanelByPoint(controller, e, localCursorPoint); // Check whether in covers.
+  var zr = controller._zr
+  var covers = controller._covers
+  var currPanel = getPanelByPoint(controller, e, localCursorPoint) // Check whether in covers.
 
   if (!controller._dragging) {
     for (var i = 0; i < covers.length; i++) {
@@ -649,53 +660,53 @@ function resetCursor(controller, e, localCursorPoint) {
 
       if (currPanel && (currPanel === true || brushOption.panelId === currPanel.panelId) && coverRenderers[brushOption.brushType].contain(covers[i], localCursorPoint[0], localCursorPoint[1])) {
         // Use cursor style set on cover.
-        return;
+        return
       }
     }
   }
 
-  currPanel && zr.setCursorStyle('crosshair');
+  currPanel && zr.setCursorStyle('crosshair')
 }
 
 function preventDefault(e) {
   var rawE = e.event;
-  rawE.preventDefault && rawE.preventDefault();
+  rawE.preventDefault && rawE.preventDefault()
 }
 
 function mainShapeContain(cover, x, y) {
-  return cover.childOfName('main').contain(x, y);
+  return cover.childOfName('main').contain(x, y)
 }
 
 function updateCoverByMouse(controller, e, localCursorPoint, isEnd) {
-  var creatingCover = controller._creatingCover;
-  var panel = controller._creatingPanel;
-  var thisBrushOption = controller._brushOption;
-  var eventParams;
+  var creatingCover = controller._creatingCover
+  var panel = controller._creatingPanel
+  var thisBrushOption = controller._brushOption
+  var eventParams
 
-  controller._track.push(localCursorPoint.slice());
+  controller._track.push(localCursorPoint.slice())
 
   if (shouldShowCover(controller) || creatingCover) {
     if (panel && !creatingCover) {
-      thisBrushOption.brushMode === 'single' && clearCovers(controller);
-      var brushOption = zrUtil.clone(thisBrushOption);
-      brushOption.brushType = determineBrushType(brushOption.brushType, panel);
+      thisBrushOption.brushMode === 'single' && clearCovers(controller)
+      var brushOption = zrUtil.clone(thisBrushOption)
+      brushOption.brushType = determineBrushType(brushOption.brushType, panel)
       brushOption.panelId = panel === true ? null : panel.panelId;
-      creatingCover = controller._creatingCover = createCover(controller, brushOption);
+      creatingCover = controller._creatingCover = createCover(controller, brushOption)
 
-      controller._covers.push(creatingCover);
+      controller._covers.push(creatingCover)
     }
 
     if (creatingCover) {
-      var coverRenderer = coverRenderers[determineBrushType(controller._brushType, panel)];
-      var coverBrushOption = creatingCover.__brushOption;
-      coverBrushOption.range = coverRenderer.getCreatingRange(clipByPanel(controller, creatingCover, controller._track));
+      var coverRenderer = coverRenderers[determineBrushType(controller._brushType, panel)]
+      var coverBrushOption = creatingCover.__brushOption
+      coverBrushOption.range = coverRenderer.getCreatingRange(clipByPanel(controller, creatingCover, controller._track))
 
       if (isEnd) {
-        endCreating(controller, creatingCover);
-        coverRenderer.updateCommon(controller, creatingCover);
+        endCreating(controller, creatingCover)
+        coverRenderer.updateCommon(controller, creatingCover)
       }
 
-      updateCoverShape(controller, creatingCover);
+      updateCoverShape(controller, creatingCover)
       eventParams = {
         isEnd: isEnd
       };
@@ -714,7 +725,7 @@ function updateCoverByMouse(controller, e, localCursorPoint, isEnd) {
     }
   }
 
-  return eventParams;
+  return eventParams
 }
 
 function determineBrushType(brushType, panel) {
@@ -730,12 +741,12 @@ var mouseHandlers = {
     if (this._dragging) {
       // In case some browser do not support globalOut,
       // and release mose out side the browser.
-      handleDragEnd.call(this, e);
+      handleDragEnd.call(this, e)
     } else if (!e.target || !e.target.draggable) {
-      preventDefault(e);
-      var localCursorPoint = this.group.transformCoordToLocal(e.offsetX, e.offsetY);
-      this._creatingCover = null;
-      var panel = this._creatingPanel = getPanelByPoint(this, e, localCursorPoint);
+      preventDefault(e)
+      var localCursorPoint = this.group.transformCoordToLocal(e.offsetX, e.offsetY)
+      this._creatingCover = null
+      var panel = this._creatingPanel = getPanelByPoint(this, e, localCursorPoint)
 
       if (panel) {
         this._dragging = true;
@@ -875,4 +886,5 @@ function getLineRenderer(xyIndex) {
 }
 
 var _default = BrushController;
+// debugger
 module.exports = _default;

src/utils/BrushView.js

@@ -1,8 +1,9 @@
-import * as echarts from '../../node_modules/echarts'
-// var echarts = require('../../node_modules/echarts')
-import * as zrUtil from '../../node_modules/zrender/src/core/util'
-// var zrUtil = require('../../node_modules/zrender/src/core/util')
-var BrushController = require('./BrushController2')
+/* eslint-disable */
+// import * as echarts from '../../node_modules/echarts'
+var echarts = require('../../node_modules/echarts')
+// import * as zrUtil from '../../node_modules/zrender/src/core/util'
+var zrUtil = require('../../node_modules/zrender/src/core/util')
+var BrushController = require('./BrushController')
 
 /*
 * Licensed to the Apache Software Foundation (ASF) under one
@@ -100,7 +101,7 @@ var _default = echarts.extendComponentView({
 
 function updateController (brushModel, ecModel, api, payload) {
   // Do not update controller when drawing.
-  (!payload || payload.$from !== brushModel.id) && this._brushController.setPanels(brushModel.brushTargetManager.makePanelOpts(api)).enableBrush(brushModel.brushOption).updateCovers(brushModel.areas.slice())
+  // (!payload || payload.$from !== brushModel.id) && this._brushController.setPanels(brushModel.brushTargetManager.makePanelOpts(api)).enableBrush(brushModel.brushOption).updateCovers(brushModel.areas.slice())
 }
 
 module.exports = _default

src/views/homepage/index.vue

@@ -99,29 +99,6 @@
   <el-container>
    <el-header><div class='menu-icon' @click='changeMenu'><i class='el-icon-arrow-right' v-if='isCollapse'></i><i class='el-icon-arrow-left' v-else></i></div></el-header>
     <el-main class='right-container'>
-      <select name="" id="">
-        <option value="">1</option>
-        <option value="">2</option>
-        <option value="">3</option>
-        <option value="">4</option>
-        <option value="">5</option>
-        <option value="">5</option>
-        <option value="">5</option>
-        <option value="">5</option>
-        <option value="">6</option>
-        <option value="">6</option>
-        <option value="">7</option>
-        <option value="">我来自release</option>
-        <option value="">我来自master</option>
-      </select>
-      <el-date-picker
-        v-model="value4"
-        type="datetimerange"
-        range-separator="至"
-        start-placeholder="开始日期"
-        end-placeholder="结束日期"
-        value-format='timestamp'>
-      </el-date-picker>
       <router-view></router-view>
     </el-main>
   </el-container>
@@ -129,6 +106,7 @@
   </div>
 </template>
 <script>
+// const JSON = require('circular-json')
 export default {
   name: 'homepage',
   data () {
@@ -157,6 +135,11 @@ export default {
       }]
     }
   },
+  beforeRouteEnter (to, from, next) {
+    // console.log(from)
+    localStorage.currentDomain = JSON.stringify(from)
+    next()
+  },
   methods: {
     handleClear () {
       this.$refs.sort.clearSort()