mirror of
https://github.com/eyebluecn/tank-front
synced 2024-04-21 12:31:55 +00:00
Revert to the normal version.
This commit is contained in:
zicla
@@ -8,7 +8,7 @@
|
||||
}],
|
||||
"stage-2"
|
||||
],
|
||||
"plugins": ["transform-runtime","babel-plugin-syntax-dynamic-import"],
|
||||
"plugins": ["transform-runtime"],
|
||||
"env": {
|
||||
"test": {
|
||||
"presets": ["env", "stage-2"],
|
||||
|
||||
@@ -3,7 +3,6 @@
|
||||
/dist/
|
||||
/static/
|
||||
/*.js
|
||||
/*.vue
|
||||
|
||||
src/common/fork/*
|
||||
|
||||
|
||||
@@ -12,10 +12,6 @@ module.exports = {
|
||||
entry: {
|
||||
app: './src/main.js'
|
||||
},
|
||||
externals:{
|
||||
'vue':'Vue',
|
||||
'element-ui':'ELEMENT'
|
||||
},
|
||||
output: {
|
||||
path: config.build.assetsRoot,
|
||||
filename: '[name].js',
|
||||
@@ -49,9 +45,6 @@ module.exports = {
|
||||
{
|
||||
test: /\.js$/,
|
||||
loader: 'babel-loader',
|
||||
options:{
|
||||
plugins:['babel-plugin-syntax-dynamic-import']
|
||||
},
|
||||
include: [resolve('src'),
|
||||
resolve('test'),
|
||||
resolve('node_modules/vue-echarts'),
|
||||
|
||||
+2
-1
@@ -33,7 +33,8 @@ module.exports = {
|
||||
assetsPublicPath: '/',
|
||||
proxyTable: {
|
||||
'/api': {
|
||||
target: 'https://tank.eyeblue.cn',
|
||||
//target: 'https://tank.eyeblue.cn',
|
||||
target: 'http://127.0.0.1:6010',
|
||||
changeOrigin: true,
|
||||
pathRewrite: {
|
||||
'^/api': '/api'
|
||||
|
||||
+1
-6
@@ -9,15 +9,10 @@
|
||||
<meta name="viewport" content="user-scalable=no,width=device-width,initial-scale=1,maximum-scale=1">
|
||||
<meta name="msapplication-tap-highlight" content="no">
|
||||
<meta name="apple-mobile-web-app-capable" content="yes">
|
||||
<link rel="stylesheet" href="https://unpkg.com/font-awesome@4.7.0/css/font-awesome.min.css">
|
||||
<link rel="stylesheet" href="https://unpkg.com/element-ui@2.0.2/lib/theme-chalk/index.css">
|
||||
<link rel="stylesheet" href="https://unpkg.com/animate.css@3.5.2/animate.min.css">
|
||||
|
||||
</head>
|
||||
<body>
|
||||
<div id="app"></div>
|
||||
<!-- built files will be auto injected -->
|
||||
<script src="https://unpkg.com/vue@2.5.2/dist/vue.js"></script>
|
||||
<script src="https://unpkg.com/element-ui@2.0.2/lib/index.js"></script>
|
||||
</body>
|
||||
|
||||
</html>
|
||||
|
||||
@@ -26,7 +26,6 @@
|
||||
"icheck": "^1.0.2",
|
||||
"jquery": "^3.2.1",
|
||||
"perfect-scrollbar": "^1.1.0",
|
||||
"resize-detector": "^0.1.10",
|
||||
"scriptjs": "^2.5.8",
|
||||
"swiper": "^4.0.3",
|
||||
"velocity-animate": "^1.5.0",
|
||||
@@ -45,7 +44,6 @@
|
||||
"babel-eslint": "^7.1.1",
|
||||
"babel-loader": "^7.1.1",
|
||||
"babel-plugin-istanbul": "^4.1.1",
|
||||
"babel-plugin-syntax-dynamic-import": "^6.18.0",
|
||||
"babel-plugin-transform-runtime": "^6.22.0",
|
||||
"babel-preset-env": "^1.3.2",
|
||||
"babel-preset-stage-2": "^6.22.0",
|
||||
|
||||
+1
-2
@@ -10,7 +10,6 @@
|
||||
<script>
|
||||
import NprogressContainer from 'vue-nprogress/src/NprogressContainer'
|
||||
|
||||
|
||||
export default {
|
||||
data () {
|
||||
return {
|
||||
@@ -33,7 +32,7 @@
|
||||
|
||||
<style lang="less" rel="stylesheet/less">
|
||||
|
||||
//@import "~font-awesome/css/font-awesome.css";
|
||||
@import "~font-awesome/css/font-awesome.css";
|
||||
@import "./assets/css/app.less";
|
||||
|
||||
.nb-app {
|
||||
|
||||
@@ -4,9 +4,9 @@
|
||||
@import "bootstrap/bootstrap.less";
|
||||
@import "inspinia/style.less";
|
||||
//Animated
|
||||
//@import "~animate.css/animate.min.css";
|
||||
@import "~animate.css/animate.min.css";
|
||||
//element-ui
|
||||
//@import "~element-ui/lib/theme-chalk/index.css";
|
||||
@import "~element-ui/lib/theme-chalk/index.css";
|
||||
//使用自定义的主题
|
||||
@import "global/border.less";
|
||||
@import "global/button.less";
|
||||
|
||||
@@ -129,26 +129,27 @@
|
||||
<script>
|
||||
|
||||
import ECharts from 'vue-echarts/components/ECharts'
|
||||
import 'echarts/lib/component/legend'
|
||||
|
||||
import 'echarts/lib/chart/bar'
|
||||
import 'echarts/lib/chart/line'
|
||||
|
||||
//import 'echarts/lib/chart/pie'
|
||||
//import 'echarts/lib/chart/map'
|
||||
//import 'echarts/lib/chart/radar'
|
||||
//import 'echarts/lib/chart/scatter'
|
||||
//import 'echarts/lib/chart/effectScatter'
|
||||
//import 'echarts/lib/component/tooltip'
|
||||
//import 'echarts/lib/component/polar'
|
||||
//import 'echarts/lib/component/geo'
|
||||
//import 'echarts/lib/component/title'
|
||||
//import 'echarts/lib/component/visualMap'
|
||||
//import 'echarts/lib/component/dataset'
|
||||
//import 'echarts/map/js/world'
|
||||
import 'echarts/lib/chart/pie'
|
||||
import 'echarts/lib/chart/map'
|
||||
import 'echarts/lib/chart/radar'
|
||||
import 'echarts/lib/chart/scatter'
|
||||
import 'echarts/lib/chart/effectScatter'
|
||||
import 'echarts/lib/component/tooltip'
|
||||
import 'echarts/lib/component/polar'
|
||||
import 'echarts/lib/component/geo'
|
||||
import 'echarts/lib/component/legend'
|
||||
import 'echarts/lib/component/title'
|
||||
import 'echarts/lib/component/visualMap'
|
||||
import 'echarts/lib/component/dataset'
|
||||
import 'echarts/map/js/world'
|
||||
import 'zrender/lib/svg/svg'
|
||||
|
||||
|
||||
import theme from "./theme"
|
||||
|
||||
import Dashboard from "../../common/model/dashboard/Dashboard";
|
||||
import Pager from "../../common/model/base/Pager";
|
||||
import {SortDirection} from "../../common/model/base/SortDirection";
|
||||
@@ -370,9 +371,9 @@
|
||||
},
|
||||
mounted() {
|
||||
let that = this;
|
||||
this.updateDateStrings();
|
||||
this.refreshDashboardPager();
|
||||
this.refreshMatterPager();
|
||||
this.updateDateStrings()
|
||||
this.refreshDashboardPager()
|
||||
this.refreshMatterPager()
|
||||
this.refreshActiveIpTop10()
|
||||
}
|
||||
}
|
||||
|
||||
+14
-16
@@ -1,23 +1,21 @@
|
||||
import Vue from 'vue'
|
||||
import Router from 'vue-router'
|
||||
import ByFrameView from '../../backyard/Frame.vue'
|
||||
import MatterList from '../../backyard/matter/List'
|
||||
import MatterDetail from '../../backyard/matter/Detail'
|
||||
import UserLogin from '../../backyard/user/Login.vue'
|
||||
import UserList from '../../backyard/user/List'
|
||||
import UserDetail from '../../backyard/user/Detail'
|
||||
import UserChangePassword from '../../backyard/user/ChangePassword'
|
||||
import UserCreate from '../../backyard/user/Create'
|
||||
import ImageCacheList from '../../backyard/image/cache/List'
|
||||
import DashboardIndex from '../../backyard/dashboard/Index'
|
||||
import PreferenceIndex from '../../backyard/preference/Index'
|
||||
import InstallIndex from '../../backyard/install/Index'
|
||||
import PreferenceEdit from '../../backyard/preference/Edit'
|
||||
import NotFound from '../../backyard/layout/NotFound'
|
||||
import store from '../vuex/index.js'
|
||||
|
||||
const ByFrameView = () => import('../../backyard/Frame');
|
||||
const MatterList = () => import('../../backyard/matter/List');
|
||||
const MatterDetail = () => import('../../backyard/matter/Detail');
|
||||
const UserLogin = () => import('../../backyard/user/Login');
|
||||
const UserList = () => import('../../backyard/user/List');
|
||||
const UserDetail = () => import('../../backyard/user/Detail');
|
||||
const UserChangePassword = () => import('../../backyard/user/ChangePassword');
|
||||
const UserCreate = () => import('../../backyard/user/Create');
|
||||
const ImageCacheList = () => import('../../backyard/image/cache/List');
|
||||
const DashboardIndex = () => import('../../backyard/dashboard/Index');
|
||||
const PreferenceIndex = () => import('../../backyard/preference/Index');
|
||||
const InstallIndex = () => import('../../backyard/install/Index');
|
||||
const PreferenceEdit = () => import('../../backyard/preference/Edit');
|
||||
const NotFound = () => import('../../backyard/layout/NotFound');
|
||||
|
||||
|
||||
Vue.use(Router)
|
||||
|
||||
const router = new Router({
|
||||
|
||||
@@ -19,6 +19,10 @@ import VueResource from 'vue-resource'
|
||||
import NProgress from 'vue-nprogress'
|
||||
import filters from './common/filter'
|
||||
|
||||
//将整个eleme 都引进来了。
|
||||
import ElementUI from 'element-ui'
|
||||
|
||||
Vue.use(ElementUI)
|
||||
|
||||
//expose to global.
|
||||
Vue.store = store;
|
||||
|
||||
Reference in New Issue
Block a user