From a465652be6ffa1ceaab04bfb4c9171d857bd9d8a Mon Sep 17 00:00:00 2001 From: Pan <panfree23@gmail.com> Date: Tue, 24 Oct 2017 16:30:46 +0800 Subject: [PATCH] refactor: components name --- .../{Github => GithubCorner}/index.vue | 0 .../{jsonEditor.vue => JsonEditor.vue} | 7 +- src/views/dashboard/admin/index.vue | 122 +++++++++--------- src/views/dashboard/editor/index.vue | 6 +- 4 files changed, 68 insertions(+), 67 deletions(-) rename src/components/{Github => GithubCorner}/index.vue (100%) rename src/views/components/{jsonEditor.vue => JsonEditor.vue} (89%) diff --git a/src/components/Github/index.vue b/src/components/GithubCorner/index.vue similarity index 100% rename from src/components/Github/index.vue rename to src/components/GithubCorner/index.vue diff --git a/src/views/components/jsonEditor.vue b/src/views/components/JsonEditor.vue similarity index 89% rename from src/views/components/jsonEditor.vue rename to src/views/components/JsonEditor.vue index f71c4378..3bbbc34f 100644 --- a/src/views/components/jsonEditor.vue +++ b/src/views/components/JsonEditor.vue @@ -1,6 +1,6 @@ <template> <div class="components-container" style='height:100vh'> - <code>jsonEditor is base on <a href="https://github.com/codemirror/CodeMirror" target="_blank">CodeMirrorr</a> , lint base on json-lint </code> + <code>JsonEditor is base on <a href="https://github.com/codemirror/CodeMirror" target="_blank">CodeMirrorr</a> , lint base on json-lint </code> <div class="editor-container"> <json-editor ref="jsonEditor" v-model="value"></json-editor> </div> @@ -8,11 +8,12 @@ </template> <script> -import jsonEditor from '@/components/jsonEditor' +import JsonEditor from '@/components/JsonEditor' + const jsonData = '[{"items":[{"market_type":"forexdata","symbol":"XAUUSD"},{"market_type":"forexdata","symbol":"UKOIL"},{"market_type":"forexdata","symbol":"CORN"}],"name":""},{"items":[{"market_type":"forexdata","symbol":"XAUUSD"},{"market_type":"forexdata","symbol":"XAGUSD"},{"market_type":"forexdata","symbol":"AUTD"},{"market_type":"forexdata","symbol":"AGTD"}],"name":"贵金属"},{"items":[{"market_type":"forexdata","symbol":"CORN"},{"market_type":"forexdata","symbol":"WHEAT"},{"market_type":"forexdata","symbol":"SOYBEAN"},{"market_type":"forexdata","symbol":"SUGAR"}],"name":"农产品"},{"items":[{"market_type":"forexdata","symbol":"UKOIL"},{"market_type":"forexdata","symbol":"USOIL"},{"market_type":"forexdata","symbol":"NGAS"}],"name":"能源化工"}]' export default { - components: { jsonEditor }, + components: { JsonEditor }, data() { return { value: JSON.parse(jsonData) diff --git a/src/views/dashboard/admin/index.vue b/src/views/dashboard/admin/index.vue index ad657137..52808942 100644 --- a/src/views/dashboard/admin/index.vue +++ b/src/views/dashboard/admin/index.vue @@ -1,68 +1,68 @@ <template> - <div class="dashboard-editor-container"> - <github></github> - <el-row class="btn-group"> - <el-col :span="4" class='text-center'> - <router-link class="pan-btn blue-btn" to="/components/index">Components</router-link> - </el-col> - <el-col :span="4" class='text-center'> - <router-link class="pan-btn light-blue-btn" to="/charts/index">Charts</router-link> - </el-col> - <el-col :span="4" class='text-center'> - <router-link class="pan-btn pink-btn" to="/excel/download">Excel</router-link> - </el-col> - <el-col :span="4" class='text-center'> - <router-link class="pan-btn green-btn" to="/example/table/table">Table</router-link> - </el-col> - <el-col :span="4" class='text-center'> - <router-link class="pan-btn tiffany-btn" to="/example/form/edit">Form</router-link> - </el-col> - <el-col :span="4" class='text-center'> - <router-link class="pan-btn yellow-btn" to="/theme/index">Theme</router-link> - </el-col> - </el-row> + <div class="dashboard-editor-container"> + <github-corner></github-corner> + <el-row class="btn-group"> + <el-col :span="4" class='text-center'> + <router-link class="pan-btn blue-btn" to="/components/index">Components</router-link> + </el-col> + <el-col :span="4" class='text-center'> + <router-link class="pan-btn light-blue-btn" to="/charts/index">Charts</router-link> + </el-col> + <el-col :span="4" class='text-center'> + <router-link class="pan-btn pink-btn" to="/excel/download">Excel</router-link> + </el-col> + <el-col :span="4" class='text-center'> + <router-link class="pan-btn green-btn" to="/example/table/table">Table</router-link> + </el-col> + <el-col :span="4" class='text-center'> + <router-link class="pan-btn tiffany-btn" to="/example/form/edit">Form</router-link> + </el-col> + <el-col :span="4" class='text-center'> + <router-link class="pan-btn yellow-btn" to="/theme/index">Theme</router-link> + </el-col> + </el-row> - <el-row> - <el-col :span="6"> - <el-card class="box-card"> - <div slot="header" class="box-card-header"> - <pan-thumb class="panThumb" :image="avatar"> 你的权限: - <span class="pan-info-roles" :key='item' v-for="item in roles">{{item}}</span> - </pan-thumb> - </div> - <span class="display_name">{{name}}</span> - <div class="info-item"> - <count-to class="info-item-num" :startVal='0' :endVal='statisticsData.article_count' :duration='3400'></count-to> - <span class="info-item-text">文章</span> - <icon-svg icon-class="trendChart1" class="dashboard-editor-icon"></icon-svg> - </div> - <div class="info-item"> - <count-to class="info-item-num" :startVal='0' :endVal='statisticsData.pageviews_count' :duration='3600'></count-to> - <span class="info-item-text">浏览量</span> - <icon-svg icon-class="trendChart2" class="dashboard-editor-icon"></icon-svg> - </div> - </el-card> - </el-col> + <el-row> + <el-col :span="6"> + <el-card class="box-card"> + <div slot="header" class="box-card-header"> + <pan-thumb class="panThumb" :image="avatar"> 你的权限: + <span class="pan-info-roles" :key='item' v-for="item in roles">{{item}}</span> + </pan-thumb> + </div> + <span class="display_name">{{name}}</span> + <div class="info-item"> + <count-to class="info-item-num" :startVal='0' :endVal='statisticsData.article_count' :duration='3400'></count-to> + <span class="info-item-text">文章</span> + <icon-svg icon-class="trendChart1" class="dashboard-editor-icon"></icon-svg> + </div> + <div class="info-item"> + <count-to class="info-item-num" :startVal='0' :endVal='statisticsData.pageviews_count' :duration='3600'></count-to> + <span class="info-item-text">浏览量</span> + <icon-svg icon-class="trendChart2" class="dashboard-editor-icon"></icon-svg> + </div> + </el-card> + </el-col> - <el-col :span="8"> - <pie-chart></pie-chart> - </el-col> + <el-col :span="8"> + <pie-chart></pie-chart> + </el-col> - <el-col :span="10"> - <bar-chart></bar-chart> - </el-col> - </el-row> + <el-col :span="10"> + <bar-chart></bar-chart> + </el-col> + </el-row> - <el-row :gutter="20"> - <el-col :span="15"> - <line-chart></line-chart> - </el-col> - <el-col :span="9"> - <todo-list></todo-list> - </el-col> - </el-row> + <el-row :gutter="20"> + <el-col :span="15"> + <line-chart></line-chart> + </el-col> + <el-col :span="9"> + <todo-list></todo-list> + </el-col> + </el-row> - </div> + </div> </template> <script> @@ -70,14 +70,14 @@ import { mapGetters } from 'vuex' import countTo from 'vue-count-to' import panThumb from '@/components/PanThumb' import todoList from '@/components/TodoList' -import Github from '@/components/Github' +import GithubCorner from '@/components/GithubCorner' import pieChart from './pieChart' import barChart from './barChart' import lineChart from './lineChart' export default { name: 'dashboard-admin', - components: { countTo, panThumb, todoList, Github, pieChart, lineChart, barChart }, + components: { countTo, panThumb, todoList, GithubCorner, pieChart, lineChart, barChart }, data() { return { statisticsData: { diff --git a/src/views/dashboard/editor/index.vue b/src/views/dashboard/editor/index.vue index 07f30ee6..4ec2d16b 100644 --- a/src/views/dashboard/editor/index.vue +++ b/src/views/dashboard/editor/index.vue @@ -4,7 +4,7 @@ <pan-thumb style="float: left" :image="avatar"> 你的权限: <span class="pan-info-roles" :key='item' v-for="item in roles">{{item}}</span> </pan-thumb> - <github></github> + <github-corner></github-corner> <div class="info-container"> <span class="display_name">{{name}}</span> <span style='font-size:20px;padding-top:20px;display:inline-block;'>普通编辑dashboard</span> @@ -19,11 +19,11 @@ <script> import { mapGetters } from 'vuex' import PanThumb from '@/components/PanThumb' -import Github from '@/components/Github' +import GithubCorner from '@/components/GithubCorner' export default { name: 'dashboard-editor', - components: { PanThumb, Github }, + components: { PanThumb, GithubCorner }, data() { return { emptyGif: 'https://wpimg.wallstcn.com/0e03b7da-db9e-4819-ba10-9016ddfdaed3'