diff --git a/package.json b/package.json index 77c16b74..22d6b400 100644 --- a/package.json +++ b/package.json @@ -1,6 +1,6 @@ { "name": "scui", - "version": "1.2.2", + "version": "1.2.3", "private": true, "scripts": { "serve": "vue-cli-service serve", @@ -10,15 +10,15 @@ "dependencies": { "@tinymce/tinymce-vue": "4.0.4", "axios": "0.21.1", - "core-js": "3.16.1", + "core-js": "3.16.3", "cropperjs": "1.5.12", "crypto-js": "4.1.1", "echarts": "5.1.2", - "element-plus": "1.0.2-beta.71", + "element-plus": "1.1.0-beta.8", "nprogress": "0.2.0", "sortablejs": "1.14.0", - "tinymce": "5.8.2", - "vue": "3.2.2", + "tinymce": "5.9.0", + "vue": "3.2.6", "vue-i18n": "9.1.7", "vue-router": "4.0.10", "vuedraggable": "4.0.3", @@ -28,7 +28,7 @@ "@vue/cli-plugin-babel": "4.5.13", "@vue/cli-plugin-eslint": "4.5.13", "@vue/cli-service": "4.5.13", - "@vue/compiler-sfc": "3.2.2", + "@vue/compiler-sfc": "3.2.6", "babel-eslint": "10.1.0", "eslint": "6.8.0", "eslint-plugin-vue": "7.12.1", diff --git a/public/img/no-widgets.svg b/public/img/no-widgets.svg new file mode 100644 index 00000000..ec8b3ae5 --- /dev/null +++ b/public/img/no-widgets.svg @@ -0,0 +1,57 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/src/App.vue b/src/App.vue index 8903cba6..766d10be 100644 --- a/src/App.vue +++ b/src/App.vue @@ -1,5 +1,5 @@ diff --git a/src/components/scDialog/index.vue b/src/components/scDialog/index.vue new file mode 100644 index 00000000..cc915892 --- /dev/null +++ b/src/components/scDialog/index.vue @@ -0,0 +1,141 @@ + + + + + + + diff --git a/src/components/scIconSelect/index.vue b/src/components/scIconSelect/index.vue index a7ede11a..c19c6be3 100644 --- a/src/components/scIconSelect/index.vue +++ b/src/components/scIconSelect/index.vue @@ -1,10 +1,10 @@ - + - + diff --git a/src/layout/components/userbar.vue b/src/layout/components/userbar.vue index 6b2b7c1b..dc616b2e 100644 --- a/src/layout/components/userbar.vue +++ b/src/layout/components/userbar.vue @@ -168,4 +168,8 @@ .msg-list__main h2 {font-size: 15px;font-weight: normal;color: #333;} .msg-list__main p {font-size: 12px;color: #999;line-height: 1.8;margin-top: 5px;} .msg-list__time {width: 100px;text-align: right;color: #999;} + + [data-theme='dark'] .msg-list__main h2 {color: #d0d0d0;} + [data-theme='dark'] .msg-list li {border-top:1px solid #363636;} + [data-theme='dark'] .msg-list li a:hover {background: #383838;} diff --git a/src/locales/index.js b/src/locales/index.js index a043000d..d63e5d38 100644 --- a/src/locales/index.js +++ b/src/locales/index.js @@ -1,9 +1,9 @@ import sysConfig from "@/config" import tool from '@/utils/tool' import { createI18n } from 'vue-i18n' -import elementLocale_zh_cn from 'element-plus/lib/locale/lang/zh-cn' -import elementLocale_en from 'element-plus/lib/locale/lang/en' -import elementLocale_ja from 'element-plus/lib/locale/lang/ja' +import el_zh_cn from 'element-plus/lib/locale/lang/zh-cn' +import el_en from 'element-plus/lib/locale/lang/en' +import el_ja from 'element-plus/lib/locale/lang/ja' import zh_cn from './lang/zh-cn.js' import en from './lang/en.js' @@ -11,15 +11,15 @@ import ja from './lang/ja.js' const messages = { 'zh-cn': { - el: elementLocale_zh_cn.el, + el: el_zh_cn, ...zh_cn }, 'en': { - el: elementLocale_en.el, + el: el_en, ...en }, 'ja': { - el: elementLocale_ja.el, + el: el_ja, ...ja } } diff --git a/src/main.js b/src/main.js index 31d7e3bb..89e31527 100644 --- a/src/main.js +++ b/src/main.js @@ -1,7 +1,7 @@ import ElementPlus from 'element-plus' import i18n from './locales' -import 'element-plus/lib/theme-chalk/index.css' -import 'element-plus/lib/theme-chalk/display.css' +import 'element-plus/dist/index.css' +import 'element-plus/theme-chalk/display.css' import { createApp } from 'vue' import App from './App.vue' import config from "./config" @@ -20,8 +20,10 @@ import scFormTable from './components/scFormTable' import scTableSelect from './components/scTableSelect' import scPageHeader from './components/scPageHeader' import scSelect from './components/scSelect' +import scDialog from './components/scDialog' import auth from './directives/auth' import role from './directives/role' +import time from './directives/time' const app = createApp(App); @@ -48,10 +50,12 @@ app.component('scFormTable', scFormTable); app.component('scTableSelect', scTableSelect); app.component('scPageHeader', scPageHeader); app.component('scSelect', scSelect); +app.component('scDialog', scDialog); //注册全局指令 app.directive('auth', auth) app.directive('role', role) +app.directive('time', time) //全局代码错误捕捉 app.config.errorHandler = errorHandler diff --git a/src/style/fix.scss b/src/style/fix.scss index d5ccd3f3..a5ac3ae8 100644 --- a/src/style/fix.scss +++ b/src/style/fix.scss @@ -14,7 +14,7 @@ .el-main.nopadding {padding:0;background: #fff;} .el-drawer__body {overflow: auto;} .el-popconfirm__main {margin: 14px 0;} -.el-card__header {border-bottom: 0;font-size: 17px;font-weight: bold;padding:15px 20px;} +.el-card__header {border-bottom: 0;font-size: 17px;font-weight: bold;padding:15px 20px 0px 20px;} .el-dialog__title {font-size: 17px;font-weight: bold;} .el-drawer__header>:first-child {font-size: 17px;font-weight: bold;} .el-tree.menu .el-tree-node__content {height:36px;} diff --git a/src/style/media.scss b/src/style/media.scss index cd20f2ea..9e0158c4 100644 --- a/src/style/media.scss +++ b/src/style/media.scss @@ -3,12 +3,13 @@ .el-form-item {display: block;} .el-form-item__label {display: block;text-align: left;padding: 0 0 10px;} .el-dialog {width: 90%!important;} + .el-dialog.is-fullscreen {width: 100%!important;} .el-drawer.rtl {width: 90%!important;} .el-form-item__content {margin-left: 0px!important;} .adminui-main { - .el-container {display: block;height:auto;} - .el-aside {width: 100%!important;border: 0} + >.el-container {display: block;height:auto;} + >.el-container > .el-aside {width: 100%!important;border: 0} } .scTable { .el-table, diff --git a/src/style/theme/dark.scss b/src/style/theme/dark.scss index 76e8269b..9cf6ef70 100644 --- a/src/style/theme/dark.scss +++ b/src/style/theme/dark.scss @@ -106,7 +106,10 @@ .el-calendar { --el-calendar-selected-background-color: #222225; } - + .el-dropdown__popper { + --el-dropdown-menuItem-hover-fill: #222225; + } + /* 布局 */ .adminui-header {background: $--background;} .aminui-side-split {background: $--background;} diff --git a/src/utils/tool.js b/src/utils/tool.js index 0bcf321c..b90b2e79 100644 --- a/src/utils/tool.js +++ b/src/utils/tool.js @@ -87,7 +87,7 @@ tool.objCopy = function (obj) { } /* 日期格式化 */ -tool.dateFormat = function (date, fmt='yyyy-MM-dd') { +tool.dateFormat = function (date, fmt='yyyy-MM-dd hh:mm:ss') { date = new Date(date) var o = { "M+" : date.getMonth()+1, //月份 diff --git a/src/views/home/index.vue b/src/views/home/index.vue index 409e8344..dae58c7c 100644 --- a/src/views/home/index.vue +++ b/src/views/home/index.vue @@ -10,19 +10,19 @@ - + diff --git a/src/views/home/stats/components/C3.vue b/src/views/home/stats/components/C3.vue deleted file mode 100644 index c7747fa3..00000000 --- a/src/views/home/stats/components/C3.vue +++ /dev/null @@ -1,62 +0,0 @@ - - - diff --git a/src/views/home/stats/components/C4.vue b/src/views/home/stats/components/C4.vue deleted file mode 100644 index 0581744c..00000000 --- a/src/views/home/stats/components/C4.vue +++ /dev/null @@ -1,15 +0,0 @@ - - - diff --git a/src/views/home/stats/gridLayout.vue b/src/views/home/stats/gridLayout.vue deleted file mode 100644 index 665d62b5..00000000 --- a/src/views/home/stats/gridLayout.vue +++ /dev/null @@ -1,305 +0,0 @@ - - - - - - diff --git a/src/views/home/stats/index.vue b/src/views/home/stats/index.vue deleted file mode 100644 index 01e87486..00000000 --- a/src/views/home/stats/index.vue +++ /dev/null @@ -1,138 +0,0 @@ - - - - - diff --git a/src/views/home/widgets/components/about.vue b/src/views/home/widgets/components/about.vue new file mode 100644 index 00000000..91004388 --- /dev/null +++ b/src/views/home/widgets/components/about.vue @@ -0,0 +1,27 @@ + + + + + diff --git a/src/views/home/stats/components/C1.vue b/src/views/home/widgets/components/echarts.vue similarity index 92% rename from src/views/home/stats/components/C1.vue rename to src/views/home/widgets/components/echarts.vue index 783b1a04..e9fd5aee 100644 --- a/src/views/home/stats/components/C1.vue +++ b/src/views/home/widgets/components/echarts.vue @@ -1,7 +1,7 @@ + + diff --git a/src/views/home/widgets/components/time.vue b/src/views/home/widgets/components/time.vue new file mode 100644 index 00000000..4d45e1fb --- /dev/null +++ b/src/views/home/widgets/components/time.vue @@ -0,0 +1,40 @@ + + + + + diff --git a/src/views/home/widgets/components/var.vue b/src/views/home/widgets/components/var.vue new file mode 100644 index 00000000..2d4e7eee --- /dev/null +++ b/src/views/home/widgets/components/var.vue @@ -0,0 +1,33 @@ + + + diff --git a/src/views/home/widgets/components/welcome.vue b/src/views/home/widgets/components/welcome.vue new file mode 100644 index 00000000..8c9036d2 --- /dev/null +++ b/src/views/home/widgets/components/welcome.vue @@ -0,0 +1,59 @@ + + + + + diff --git a/src/views/home/widgets/index.vue b/src/views/home/widgets/index.vue new file mode 100644 index 00000000..8185413a --- /dev/null +++ b/src/views/home/widgets/index.vue @@ -0,0 +1,214 @@ + + + + + diff --git a/src/views/other/cmd.vue b/src/views/other/cmd.vue index 208fe342..a280bb5f 100644 --- a/src/views/other/cmd.vue +++ b/src/views/other/cmd.vue @@ -11,6 +11,9 @@ 
{{json.user}}
 + + 
{{json.token}}
+ 
{{json.grid}}
 @@ -34,6 +37,7 @@ title: "CMD", json: { user: null, + token: null, grid: null, config: null, api: null, @@ -41,7 +45,8 @@ } }, created() { - this.json.user = this.$TOOL.data.get("user"); + this.json.user = this.$TOOL.data.get("USER_INFO"); + this.json.token = this.$TOOL.data.get("TOKEN"); this.json.grid = this.$TOOL.data.get("grid")||'null'; this.json.config = this.$CONFIG; this.json.api = this.$API; diff --git a/src/views/other/directive.vue b/src/views/other/directive.vue index 1dc89185..630485b8 100644 --- a/src/views/other/directive.vue +++ b/src/views/other/directive.vue @@ -1,17 +1,30 @@ @@ -19,7 +32,11 @@ export default { name: 'directive', data() { - return {} + return { + time1: new Date(), + time2: new Date().setMinutes(new Date().getMinutes()-1), + time3: new Date().setMinutes(new Date().getMinutes()-120) + } }, created() { diff --git a/src/views/template/svgmap/index.vue b/src/views/template/svgmap/index.vue index ee14ff7f..9278ed0b 100644 --- a/src/views/template/svgmap/index.vue +++ b/src/views/template/svgmap/index.vue @@ -42,7 +42,8 @@ }, data() { return { - mapLoading: false + mapLoading: false, + option: {} } }, mounted() { diff --git a/src/views/userCenter/login.vue b/src/views/userCenter/login.vue index 92e6bf21..08e48112 100644 --- a/src/views/userCenter/login.vue +++ b/src/views/userCenter/login.vue @@ -97,6 +97,7 @@ this.$TOOL.data.remove("USER_INFO") this.$TOOL.data.remove("MENU") this.$TOOL.data.remove("PERMISSIONS") + this.$TOOL.data.remove("grid") this.$store.commit("clearViewTags") this.$store.commit("clearKeepLive") this.$store.commit("clearIframeList") diff --git a/src/views/vab/dialog/dialog1.vue b/src/views/vab/dialog/dialog1.vue new file mode 100644 index 00000000..c4a66e2b --- /dev/null +++ b/src/views/vab/dialog/dialog1.vue @@ -0,0 +1,28 @@ + + + + + diff --git a/src/views/vab/dialog/dialog2.vue b/src/views/vab/dialog/dialog2.vue new file mode 100644 index 00000000..fe1f8a2f --- /dev/null +++ b/src/views/vab/dialog/dialog2.vue @@ -0,0 +1,28 @@ + + + + + diff --git a/src/views/vab/dialog/index.vue b/src/views/vab/dialog/index.vue new file mode 100644 index 00000000..455b0388 --- /dev/null +++ b/src/views/vab/dialog/index.vue @@ -0,0 +1,101 @@ + + + + + + +