master修改 开发新功能

src/components/chaogebrush.vue

@@ -22,7 +22,7 @@ import moment from 'moment'
 // import BrushView from './utils/BrushView'
 // import chartConfig from '@/utils/chart/baseConf.js'
 // import BrushView from '../utils/BrushView'
-var BrushView = require('../utils/BrushView')
+// var BrushView = require('../utils/BrushView')
 let startTimes = (new Date()).getTime() - 60 * 60 * 1000
 
 let MockData = Mock.mock({

src/views/homepage/index.vue

@@ -112,42 +112,16 @@
         <option value="">6</option>
         <option value="">7</option>
         <option value="">我来自release</option>
+        <option value="">我来自master</option>
       </select>
-       <el-table
-      :data="tableData"
-      style="width: 100%"
-      @sort-change='sortchange'
-      ref='sort'>
-      <el-table-column
-        prop="date"
-        label="日期"
-        width="180">
-      </el-table-column>
-      <el-table-column
-        prop="name"
-        label="姓名"
-        width="180">
-      </el-table-column>
-      <el-table-column
-        prop="address"
-        label="地址">
-      </el-table-column>
-      <el-table-column
-        prop="age"
-        label="年纪"
-        sortable='custom'
-        >
-      </el-table-column>
-      <el-table-column
-        label="操作"
-        >
-        <template slot-scope="scope">
-          <el-button
-          size="mini"
-          @click="handleClear">取消排序</el-button>
-        </template>
-      </el-table-column>
-    </el-table>
+      <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>