diff --git a/$Recycle.Bin/S-1-5-21-3231082881-2130090724-2273209683-500/desktop.ini b/$Recycle.Bin/S-1-5-21-3231082881-2130090724-2273209683-500/desktop.ini new file mode 100644 index 0000000..5d0694e --- /dev/null +++ b/$Recycle.Bin/S-1-5-21-3231082881-2130090724-2273209683-500/desktop.ini @@ -0,0 +1,3 @@ +[.ShellClassInfo] +CLSID={645FF040-5081-101B-9F08-00AA002F954E} +LocalizedResourceName=@%SystemRoot%\system32\shell32.dll,-8964 diff --git a/.babelrc b/.babelrc index d3cc83a..e2e03c6 100644 --- a/.babelrc +++ b/.babelrc @@ -5,11 +5,9 @@ }], "stage-2" ], - "plugins": ["transform-runtime", ["component", [ - { - "libraryName": "element-ui" - } - ]]], + "plugins": ["transform-runtime", ["component", [{ + "libraryName": "element-ui" + }]]], "env": { "test": { "presets": ["env", "stage-2"], diff --git a/.gitignore b/.gitignore new file mode 100644 index 0000000..dfb4167 --- /dev/null +++ b/.gitignore @@ -0,0 +1,17 @@ +.DS_Store +node_modules/ +/dist/ +npm-debug.log* +yarn-debug.log* +yarn-error.log* +/test/unit/coverage/ +/test/e2e/reports/ +selenium-debug.log + +# Editor directories and files +.idea +.vscode +*.suo +*.ntvs* +*.njsproj +*.sln diff --git a/index.html b/index.html index 11f621b..a052466 100644 --- a/index.html +++ b/index.html @@ -1,13 +1,17 @@ + + 数字化管理系统 +
+ diff --git a/package.json b/package.json index 4231af7..47da658 100644 --- a/package.json +++ b/package.json @@ -17,6 +17,7 @@ "axios": "^0.19.2", "babel-plugin-component": "0.10.1", "babel-polyfill": "6.26.0", + "echarts": "^4.7.0", "element-ui": "^2.13.1", "gulp": "3.9.1", "gulp-concat": "2.6.1", @@ -28,6 +29,7 @@ "npm": "^6.14.4", "sass-loader": "6.0.6", "svg-sprite-loader": "3.7.3", + "v-charts": "^1.19.0", "vue": "2.5.16", "vue-cookie": "1.1.4", "vue-router": "3.0.1", diff --git a/src/App.vue b/src/App.vue index aea2389..d97ce8f 100644 --- a/src/App.vue +++ b/src/App.vue @@ -5,6 +5,7 @@ diff --git a/src/assets/scss/_variables.scss b/src/assets/scss/_variables.scss index 5a058b8..f65294a 100644 --- a/src/assets/scss/_variables.scss +++ b/src/assets/scss/_variables.scss @@ -1,5 +1,12 @@ // 站点主色 // tips: 要达到整站主题修改效果, 请确保[$--color-primary]站点主色与[/src/element-ui-theme/index.js]文件中[import './element-[#17B3A3]/index.css']当前主题色一致 +/* 改变主题色变量 */ +$--color-primary: #3E8EF7; + +/* 改变 icon 字体路径变量，必需 */ +$--font-path: '~element-ui/lib/theme-chalk/fonts'; + +@import "~element-ui/packages/theme-chalk/src/index"; $--color-primary: #3E8EF7; // Navbar diff --git a/src/assets/scss/index.scss b/src/assets/scss/index.scss index c17d72c..1e624ce 100644 --- a/src/assets/scss/index.scss +++ b/src/assets/scss/index.scss @@ -1,3 +1,3 @@ -@import "normalize"; // api: https://github.com/necolas/normalize.css/ -@import "variables"; // 站点变量 +@import "normalize"; // api: https://github.com/necolas/normalize.css/ +@import "_variables"; // 站点变量 @import "base"; diff --git a/src/main.js b/src/main.js index 17c495d..6c75e37 100644 --- a/src/main.js +++ b/src/main.js @@ -5,12 +5,17 @@ import store from '@/store' // api: https://github.com/vuejs/v import VueCookie from 'vue-cookie' // api: https://github.com/alfhen/vue-cookie import '@/element-ui' // api: https://github.com/ElemeFE/element import '@/icons' // api: http://www.iconfont.cn/ -import '@/element-ui-theme' +// import '@/element-ui-theme' import '@/assets/scss/index.scss' import httpRequest from '@/utils/httpRequest' // api: https://github.com/axios/axios import { isAuth } from '@/utils' // import cloneDeep from 'lodash/cloneDeep' - +import VCharts from 'v-charts' +Vue.use(VCharts) +// import echarts from 'echarts/lib/echarts' +// console.log(111) +// console.log(echarts) +// debugger Vue.use(VueCookie) Vue.config.productionTip = false diff --git a/src/router/index.js b/src/router/index.js index bf9eabc..7759d15 100644 --- a/src/router/index.js +++ b/src/router/index.js @@ -35,9 +35,9 @@ const mainRoutes = { // 提示: 如需要通过iframe嵌套展示内容, 但不通过tab打开, 请自行创建组件使用iframe处理! { path: '/home', component: _import('common/home'), name: 'home', meta: { title: '首页' } }, { path: '/theme', component: _import('common/theme'), name: 'theme', meta: { title: '主题' } }, - { path: '/staff-manage', component: _import('business/staff/staff-manage/index'), name: 'staff-manage', meta: { title: '员工管理', isTab: true } }, - { path: '/staff-profile', component: _import('business/staff/staff-profile/index'), name: 'staff-profile', meta: { title: '员工概述', isTab: true } }, - { path: '/staff-archives', component: _import('business/staff/staff-archives/index'), name: 'staff-archives', meta: { title: '员工档案', isTab: true } } + { path: '/staff-manage', component: _import('business/staff/staff-manage/index'), name: 'staff-manage', meta: { title: '员工管理', isTab: true, isNoCard: true } }, + { path: '/staff-profile', component: _import('business/staff/staff-profile/index'), name: 'staff-profile', meta: { title: '员工概述', isTab: true, isNoCard: true } }, + { path: '/staff-archives', component: _import('business/staff/staff-archives/index'), name: 'staff-archives', meta: { title: '员工档案', isTab: true, isNoCard: true } } ], beforeEnter (to, from, next) { let token = Vue.cookie.get('token') @@ -127,7 +127,7 @@ function fnAddDynamicMenuRoutes (menuList = [], routes = []) { } else { try { route['component'] = _import(`modules/${menuList[i].url}`) || null - } catch (e) {} + } catch (e) { } } routes.push(route) } diff --git a/src/views/business/staff/staff-manage/compoments/staff-manage-left/index.vue b/src/views/business/staff/staff-manage/compoments/staff-manage-left/index.vue new file mode 100644 index 0000000..1013939 --- /dev/null +++ b/src/views/business/staff/staff-manage/compoments/staff-manage-left/index.vue @@ -0,0 +1,23 @@ + + + + + + \ No newline at end of file diff --git a/src/views/business/staff/staff-manage/compoments/staff-manage-right/index.vue b/src/views/business/staff/staff-manage/compoments/staff-manage-right/index.vue new file mode 100644 index 0000000..f010625 --- /dev/null +++ b/src/views/business/staff/staff-manage/compoments/staff-manage-right/index.vue @@ -0,0 +1,170 @@ + + + diff --git a/src/views/business/staff/staff-manage/index.vue b/src/views/business/staff/staff-manage/index.vue index 42a6d16..3750c80 100644 --- a/src/views/business/staff/staff-manage/index.vue +++ b/src/views/business/staff/staff-manage/index.vue @@ -1,5 +1,37 @@ + + + + + + \ No newline at end of file diff --git a/src/views/business/staff/staff-profile/componments/chart-form/index.vue b/src/views/business/staff/staff-profile/componments/chart-form/index.vue new file mode 100644 index 0000000..0ab619e --- /dev/null +++ b/src/views/business/staff/staff-profile/componments/chart-form/index.vue @@ -0,0 +1,41 @@ + + + + + + \ No newline at end of file diff --git a/src/views/business/staff/staff-profile/componments/employees-number/index.vue b/src/views/business/staff/staff-profile/componments/employees-number/index.vue new file mode 100644 index 0000000..5157c95 --- /dev/null +++ b/src/views/business/staff/staff-profile/componments/employees-number/index.vue @@ -0,0 +1,55 @@ + + + + + + \ No newline at end of file diff --git a/src/views/business/staff/staff-profile/componments/query-form/index.vue b/src/views/business/staff/staff-profile/componments/query-form/index.vue new file mode 100644 index 0000000..8714d10 --- /dev/null +++ b/src/views/business/staff/staff-profile/componments/query-form/index.vue @@ -0,0 +1,278 @@ + + + + + + \ No newline at end of file diff --git a/src/views/business/staff/staff-profile/index.vue b/src/views/business/staff/staff-profile/index.vue index fb39763..e7462a8 100644 --- a/src/views/business/staff/staff-profile/index.vue +++ b/src/views/business/staff/staff-profile/index.vue @@ -1,5 +1,63 @@ + + + + + + + \ No newline at end of file diff --git a/src/views/layout/main-content.vue b/src/views/layout/main-content.vue index f4b9f7a..7da5eb6 100644 --- a/src/views/layout/main-content.vue +++ b/src/views/layout/main-content.vue @@ -6,7 +6,8 @@ v-model="mainTabsActiveName" :closable="true" @tab-click="selectedTabHandle" - @tab-remove="removeTabHandle"> + @tab-remove="removeTabHandle" + > @@ -16,21 +17,33 @@ 刷新当前标签页 - - + + + width="100%" + height="100%" + frameborder="0" + scrolling="yes" + > - + + @@ -43,85 +56,85 @@