diff --git a/package.json b/package.json index 7012a52..49eb142 100644 --- a/package.json +++ b/package.json @@ -59,7 +59,8 @@ "vue-splitpane": "1.0.4", "vuex": "3.1.0", "wangeditor": ">=3.0.0", - "xlsx": "^0.11.16" + "xlsx": "^0.11.16", + "vue-highlightjs": "^1.3.3" }, "devDependencies": { "@babel/core": "7.0.0", diff --git a/src/main.js b/src/main.js index 6bb9280..989a3d8 100644 --- a/src/main.js +++ b/src/main.js @@ -11,6 +11,8 @@ import permission from './components/Permission' import 'mavon-editor/dist/css/index.css' import './assets/styles/element-variables.scss' import './assets/styles/index.scss' // global css +import VueHighlightJS from 'vue-highlightjs' +import 'highlight.js/styles/atom-one-dark.css' import App from './App' import store from './store' @@ -19,6 +21,7 @@ import router from './router/routers' import './assets/icons' // icon import './router/index' // permission control +Vue.use(VueHighlightJS) Vue.use(mavonEditor) Vue.use(permission) Vue.use(dict) diff --git a/src/views/login.vue b/src/views/login.vue index 5095120..cc81d5f 100644 --- a/src/views/login.vue +++ b/src/views/login.vue @@ -22,7 +22,7 @@ - + 记住我 diff --git a/src/views/monitor/log/errorLog.vue b/src/views/monitor/log/errorLog.vue index 31f5fd0..506c441 100644 --- a/src/views/monitor/log/errorLog.vue +++ b/src/views/monitor/log/errorLog.vue @@ -31,10 +31,8 @@ - -
-        {{ errorInfo }}
-      
+ +
- diff --git a/src/views/system/timing/log.vue b/src/views/system/timing/log.vue index 3606d9b..d29d866 100644 --- a/src/views/system/timing/log.vue +++ b/src/views/system/timing/log.vue @@ -55,9 +55,7 @@ -
-        {{ errorInfo }}
-      
+
+ + diff --git a/src/views/system/user/index.vue b/src/views/system/user/index.vue index ee55d35..86f4d45 100644 --- a/src/views/system/user/index.vue +++ b/src/views/system/user/index.vue @@ -75,7 +75,7 @@ />
- + - +
发送邮件