diff --git a/package.json b/package.json index ebc9d559..b83f1720 100644 --- a/package.json +++ b/package.json @@ -48,6 +48,7 @@ "vue-count-to": "1.0.13", "vue-cropper": "^0.2.9", "vue-gantt-schedule-timeline-calendar": "^1.0.33", + "vue-grid-layout": "^2.3.12", "vue-i18n": "7.3.2", "vue-okr-tree": "^1.0.10", "vue-print-nb": "^1.7.5", diff --git a/src/main.js b/src/main.js index d754424b..f9754266 100644 --- a/src/main.js +++ b/src/main.js @@ -21,6 +21,9 @@ import 'echarts/map/js/china.js' import * as filters from './filters' // global filters import Print from 'vue-print-nb' + + + Vue.prototype.$echarts = echarts Vue.use(Print); //注册 Vue.use(Element, { diff --git a/src/router/routes_my_work.js b/src/router/routes_my_work.js index 6d1c474c..a012cdd8 100644 --- a/src/router/routes_my_work.js +++ b/src/router/routes_my_work.js @@ -9,21 +9,30 @@ export default { component: Layout, name: '我的工作台', meta: { - title: 'TaskCenter', + title: '我的工作台', icon: 'task' }, iconCls: 'fa el-icon-menu', // leaf: true, children: [ + { + path: 'index', + component: _import('myWork/my/index'), + name: '我的', + meta: { + title: '我的', + icon: 'component' + } + }, { - path: 'updateUserInfo', - component: _import('mdp/sys/user/UpdateUserInfo'), - name: '账户设置', - meta: { - title: '修改个人信息', - icon: 'component' - } - } + path: 'updateUserInfo', + component: _import('myWork/set/index'), + name: '账户设置', + meta: { + title: '设置', + icon: 'component' + } + }, ] } ] diff --git a/src/styles/variables.scss b/src/styles/variables.scss index 2602efa4..4855dd9d 100644 --- a/src/styles/variables.scss +++ b/src/styles/variables.scss @@ -11,3 +11,8 @@ $panGreen: #30B08F; $menuBg: #F4F5F8; $subMenuBg:#1f2d3d; $menuHover:#001528; + + + +//MyWork +$bgCor: #F4F5F8 \ No newline at end of file diff --git a/src/views/mdp/workflow/ru/task/TaskMng.vue b/src/views/mdp/workflow/ru/task/TaskMng.vue index 01b6842b..9ff2e018 100644 --- a/src/views/mdp/workflow/ru/task/TaskMng.vue +++ b/src/views/mdp/workflow/ru/task/TaskMng.vue @@ -8,6 +8,7 @@ 查询 +

{{weixinContent}}

@@ -17,17 +18,13 @@ 微信催办 - 短信催办 + 短信催办 OAMSG催办 - 标签 - - - 查询条件 @@ -37,7 +34,6 @@ - 标签查找 @@ -79,14 +75,15 @@ 导出数据 - + + + @selection-change="selsChange" @row-click="rowClick" style="width: 100%;" height="tableHeight"> diff --git a/src/views/myWork/common.scss b/src/views/myWork/common.scss new file mode 100644 index 00000000..0f8c598f --- /dev/null +++ b/src/views/myWork/common.scss @@ -0,0 +1,10 @@ +.m_container { + width: 100%; + height: 100%; + background: rgb(238, 238, 238); + .m_content { + padding:30px 18px 18px 18px; + overflow: hidden; + position: relative; + } +} \ No newline at end of file diff --git a/src/views/myWork/img/cp.png b/src/views/myWork/img/cp.png new file mode 100644 index 00000000..d7bed55d Binary files /dev/null and b/src/views/myWork/img/cp.png differ diff --git a/src/views/myWork/img/dsp.png b/src/views/myWork/img/dsp.png new file mode 100644 index 00000000..8956ae34 Binary files /dev/null and b/src/views/myWork/img/dsp.png differ diff --git a/src/views/myWork/img/kfrw.png b/src/views/myWork/img/kfrw.png new file mode 100644 index 00000000..88a587fb Binary files /dev/null and b/src/views/myWork/img/kfrw.png differ diff --git a/src/views/myWork/img/l1.png b/src/views/myWork/img/l1.png new file mode 100644 index 00000000..8edbae5d Binary files /dev/null and b/src/views/myWork/img/l1.png differ diff --git a/src/views/myWork/img/qb.png b/src/views/myWork/img/qb.png new file mode 100644 index 00000000..05b5adbc Binary files /dev/null and b/src/views/myWork/img/qb.png differ diff --git a/src/views/myWork/img/qx.png b/src/views/myWork/img/qx.png new file mode 100644 index 00000000..79a8c789 Binary files /dev/null and b/src/views/myWork/img/qx.png differ diff --git a/src/views/myWork/img/tdgl.png b/src/views/myWork/img/tdgl.png new file mode 100644 index 00000000..dd73b9ad Binary files /dev/null and b/src/views/myWork/img/tdgl.png differ diff --git a/src/views/myWork/img/ty.png b/src/views/myWork/img/ty.png new file mode 100644 index 00000000..3ec75460 Binary files /dev/null and b/src/views/myWork/img/ty.png differ diff --git a/src/views/myWork/img/wdcp.png b/src/views/myWork/img/wdcp.png new file mode 100644 index 00000000..e320dfad Binary files /dev/null and b/src/views/myWork/img/wdcp.png differ diff --git a/src/views/myWork/img/wdrw.png b/src/views/myWork/img/wdrw.png new file mode 100644 index 00000000..25e8be65 Binary files /dev/null and b/src/views/myWork/img/wdrw.png differ diff --git a/src/views/myWork/img/wdxm.png b/src/views/myWork/img/wdxm.png new file mode 100644 index 00000000..afc5119d Binary files /dev/null and b/src/views/myWork/img/wdxm.png differ diff --git a/src/views/myWork/img/xmgl.png b/src/views/myWork/img/xmgl.png new file mode 100644 index 00000000..f9e0fe8a Binary files /dev/null and b/src/views/myWork/img/xmgl.png differ diff --git a/src/views/myWork/img/xqgl.png b/src/views/myWork/img/xqgl.png new file mode 100644 index 00000000..378e9c55 Binary files /dev/null and b/src/views/myWork/img/xqgl.png differ diff --git a/src/views/myWork/my/components/boxCard.vue b/src/views/myWork/my/components/boxCard.vue new file mode 100644 index 00000000..a2478ef3 --- /dev/null +++ b/src/views/myWork/my/components/boxCard.vue @@ -0,0 +1,176 @@ + + + + + + + \ No newline at end of file diff --git a/src/views/myWork/my/components/moduleSet.vue b/src/views/myWork/my/components/moduleSet.vue new file mode 100644 index 00000000..9cf511f9 --- /dev/null +++ b/src/views/myWork/my/components/moduleSet.vue @@ -0,0 +1,218 @@ + + + + + + + \ No newline at end of file diff --git a/src/views/myWork/my/index.scss b/src/views/myWork/my/index.scss new file mode 100644 index 00000000..edc6f41d --- /dev/null +++ b/src/views/myWork/my/index.scss @@ -0,0 +1,96 @@ +.m_top { + background: #fff; + display: flex; + flex-direction: row; + height: 100px; + align-items: center; + border: 1px solid #ebeef5; + box-shadow: 0 2px 12px 0 rgba($color: #000000, $alpha: .2); + .m_avatar { + width: 58px; + height: 58px; + margin-left: 34px; + } + .m_msg { + margin-left: 22px; + p:nth-child(1) { + font-size: 22px; + font-weight: bold; + color: #7D7D7D; + opacity: 0.92; + } + p:nth-child(2) { + margin-top: 12px; + font-size: 16px; + font-weight: bold; + color: #7D7D7D; + opacity: 0.53; + } + } + .m_btn { + margin-left: auto; + margin-right: 20px; + } +} + + +.m_middle { + display: flex; + flex-direction: row; + margin-top: 20px; + height: 280px; + .m_left, .m_right { + flex: 1; + padding: 30px; + background: #fff; + border: 1px solid #ebeef5; + box-shadow: 0 2px 12px 0 rgba($color: #000000, $alpha: .2); + } + .m_left { + display: flex; + flex-direction: row; + margin-right: 10px; + .m_left_1 { + flex: 1.5; + p { + font-size: 20px; + margin-bottom: 30px; + } + span { + font-size: 16px; + line-height: 42px; + color: #7D7D7D; + } + } + .m_left_2 { + flex: 1; + img { + width: 100%; + margin-left: 20px; + } + } + } + + .m_right { + display: flex; + flex-direction: row; + flex-wrap: wrap; + .m_right_menu { + display: flex; + width: 33.3%; + flex-direction: column; + align-items: center; + justify-content: center; + font-size: 16px; + cursor: pointer; + img { + width: 68px; + height: 68px; + } + span { + margin-top: 12px; + } + } + } +} + diff --git a/src/views/myWork/my/index.vue b/src/views/myWork/my/index.vue new file mode 100644 index 00000000..3f68aa7f --- /dev/null +++ b/src/views/myWork/my/index.vue @@ -0,0 +1,97 @@ + + + + + \ No newline at end of file diff --git a/src/views/myWork/set/index.scss b/src/views/myWork/set/index.scss new file mode 100644 index 00000000..88a49cbc --- /dev/null +++ b/src/views/myWork/set/index.scss @@ -0,0 +1,57 @@ +.m_msgcard { + width: 100%; + height: 120px; + background: #E0D6CB; + display: flex; + align-items: center; + .m_avater { + margin-left: 50px; + width: 107px; + height: 107px; + } + .m_msg { + margin-left: 33px; + display: flex; + flex-direction: column; + .m_name { + margin-bottom: 10px; + font-weight: bold; + color: #7D7D7D; + font-size: 20px; + } + .m_dept { + margin-bottom: 10px; + font-size: 16px; + font-weight: bold; + color: #7D7D7D; + } + .m_btn { + width: 100px !important; + } + } +} + +.m_opercard { + width: 100%; + background: #fff; + margin-top: 15px; + padding: 50px; + display: flex; + h3 { + margin-top: 16px; + font-size: 24px; + color: #7D7D7D; + } + h3:before { + content: " "; + border-left: 10px #AEB8CE solid; + margin-right: 12px; + } + .m_base, .m_setpwd { + flex: 1; + } + + .m_f { + margin: 80px 0 0 0; + } +} \ No newline at end of file diff --git a/src/views/myWork/set/index.vue b/src/views/myWork/set/index.vue new file mode 100644 index 00000000..9588e223 --- /dev/null +++ b/src/views/myWork/set/index.vue @@ -0,0 +1,280 @@ + + + + + \ No newline at end of file