Skip to content

O
office-web
Commit 36a95280 by 无尘
Options

add: 引入公共插件到各个模块

parent 050b4fc1
Showing with 372 additions and 121 deletions
index.html
......@@ -3,7 +3,7 @@
<head>
<meta charset="utf-8">
<link rel="shortcut icon" href="./favicon.ico"/>
<title>GIC-集团后台</title>
<title>好办管理平台</title>
</head>
<body style="background-color: #f0f2f5;min-width: 1400px;">
<div id="app"></div>
......
package.json
......@@ -11,10 +11,10 @@
},
"dependencies": {
"@gic-test/vue-area-ab": "^1.4.3",
"@gic-test/vue-gic-aside-menu": "^1.1.45",
"@gic-test/vue-gic-footer": "^1.0.8",
"@gic-test/vue-gic-header": "^1.3.31",
"@gic-test/vue-office-header": "^1.0.2",
"@gic-test/vue-office-aside": "^1.0.2",
"@gic-test/vue-office-header": "^1.0.5",
"@riophae/vue-treeselect": "0.0.29",
"@tinymce/tinymce-vue": "^1.0.8",
"element-ui": "^2.3.9",
......
src/common/js/error.js
......@@ -14,7 +14,7 @@ export default {
console.log(response)
if (response.errorCode != 0) {
if (response.errorCode == 401) {
window.location.href = local + "/gic-web/#/";
// window.location.href = local + "/gic-web/#/";
return false;
}
Message.error({
......
src/main.js
......@@ -12,7 +12,7 @@ import '../static/font/iconfont.css'
import '../theme/index.css'
import vueOfficeHeader from '@gic-test/vue-office-header'
import vueGicAsideMenu from '@gic-test/vue-gic-aside-menu'
import vueOfficeAside from '@gic-test/vue-office-aside'
import vueAreaAb from '@gic-test/vue-area-ab'
// 新增公共 footer插件
import vueGicFooter from '@gic-test/vue-gic-footer'
......@@ -20,7 +20,7 @@ import vueGicFooter from '@gic-test/vue-gic-footer'
Vue.use(vueGicFooter)
Vue.use(vueAreaAb)
Vue.use(vueGicAsideMenu)
Vue.use(vueOfficeAside)
Vue.use(vueOfficeHeader)
Vue.config.productionTip = false;
......@@ -59,7 +59,7 @@ Vue.axios.interceptors.response.use(
// path: 'login',
// query: {redirect: router.currentRoute.fullPath}
// });
window.location.href = window.location.origin + '/gic-web/#/';
// window.location.href = window.location.origin + '/gic-web/#/';
case 500:
Message.error('服务器500')
}
......
src/views/contacts/administrativeFrame.vue
<template>
<div class="administrative-wrap">
<div class="inline-block administrative-wrap__left common-wrap__left">
</div>
<div class="inline-block administrative-wrap__right common-wrap__right">
</div>
</div>
</template>
<script>
......@@ -24,5 +30,28 @@ export default {
</script>
<style lang="less" scoped>
.administrative-wrap {
width: 100%;
font-size: 0;
&__left {
width: 260px;
height: 690px;
vertical-align: top;
font-size: 14px;
background: rgba(238,241,248,1);
border-radius: 2px;
}
&__right {
width: calc(100% - 260px);
min-height: 690px;
padding: 24px;
vertical-align: top;
font-size: 14px;
-webkit-box-sizing: border-box;
-moz-box-sizing: border-box;
box-sizing: border-box;
}
}
</style>
src/views/contacts/index.vue
<template>
<div class="contact-wrap">
<!-- 公共头部菜单插件 -->
<vue-office-header :projectName="projectName" @collapseTag="collapseTag" @toRouterView="toRouterView"></vue-office-header>
<div class="contact-wrap__body">
<!-- 公共左侧菜单插件 -->
<vue-office-aside ref="leftMenus" :projectName="projectName" :collapseFlag="collapseFlag"></vue-office-aside>
<!-- 右侧 body -->
<div class="contact-wrap__right">
<topNav :navpath="navpath"></topNav>
<div class="contact-wrap__right__body">
<transition name="fade" mode="out-in">
<router-view></router-view>
</transition>
</div>
</div>
</div>
</div>
</template>
<script>
import topNav from 'components/nav/nav'
export default {
name: "contact",
data() {
return {
projectName: 'gic-clique', // 当前项目名
collapseFlag: false, // 折叠参数
// 面包屑导航数据
navpath: [{
name: '首页',
path: '/'
},
{
name: '集团信息',
path: ''
}
],
}
},
computed: {
},
methods: {
// 处理路由跳转
toRouterView(val) {
var that = this;
// 模拟检查数据
// //有两个参数
//{
// name:,
// path:
//}
console.log(val);
that.$router.push({
path: val.path
})
},
// 折叠事件
collapseTag(val) {
var that = this;
console.log(val);
that.collapseFlag = val
},
},
mounted() {
},
components: {
topNav
},
}
</script>
<style lang="less" scoped>
<style lang="less">
.contact-wrap {
position: relative;
&__body {
display: -ms-flexbox;
display: flex;
width: 100%;
overflow: hidden;
padding-top: 64px;
-webkit-box-sizing: border-box;
-moz-box-sizing: border-box;
box-sizing: border-box;
overflow: auto;
min-width: 1400px;
background: #f5f7fa;
}
&__right {
-ms-flex: 1;
flex: 1;
overflow: auto;
width: 100%;
&__body {
padding: 24px;
}
}
}
</style>
src/views/enterpriseApp/index.vue
<template>
<div class="enterprise-wrap">
<!-- 公共头部菜单插件 -->
<vue-office-header :projectName="projectName" @collapseTag="collapseTag" @toRouterView="toRouterView"></vue-office-header>
<div class="enterprise-wrap__body">
</div>
</div>
</template>
<script>
......@@ -8,14 +12,35 @@ export default {
name: "enterprise",
data() {
return {
projectName: 'gic-clique', // 当前项目名
collapseFlag: false, // 折叠参数
}
},
computed: {
},
methods: {
// 处理路由跳转
toRouterView(val) {
var that = this;
// 模拟检查数据
// //有两个参数
//{
// name:,
// path:
//}
console.log(val);
that.$router.push({
path: val.path
})
},
// 折叠事件
collapseTag(val) {
var that = this;
console.log(val);
that.collapseFlag = val
},
},
mounted() {
......
src/views/index/index.vue
......@@ -22,8 +22,9 @@ export default {
name: 'index',
data() {
return {
projectName: 'gic-clique',
contentHeight: '0px', //页面内容高度
projectName: 'gic-clique', // 当前项目名
contentHeight: '0px', // 页面内容高度
collapseFlag: false, // 折叠参数
showCustomDialog: false, // 自定义弹框显示标志
}
......
src/views/reviewCenter/index.vue
<template>
<div class="review-wrap">
<!-- 公共头部菜单插件 -->
<vue-office-header :projectName="projectName" @collapseTag="collapseTag" @toRouterView="toRouterView"></vue-office-header>
<div class="review-wrap__body">
</div>
</div>
</template>
<script>
......@@ -8,14 +12,35 @@ export default {
name: "review",
data() {
return {
projectName: 'gic-clique', // 当前项目名
collapseFlag: false, // 折叠参数
}
},
computed: {
},
methods: {
// 处理路由跳转
toRouterView(val) {
var that = this;
// 模拟检查数据
// //有两个参数
//{
// name:,
// path:
//}
console.log(val);
that.$router.push({
path: val.path
})
},
// 折叠事件
collapseTag(val) {
var that = this;
console.log(val);
that.collapseFlag = val
},
},
mounted() {
......
src/views/setting/index.vue
<template>
<div class="setting-wrap">
<!-- 公共头部菜单插件 -->
<vue-office-header :projectName="projectName" @collapseTag="collapseTag" @toRouterView="toRouterView"></vue-office-header>
<div class="review-wrap__body">
</div>
</div>
</template>
<script>
......@@ -8,14 +12,35 @@ export default {
name: "setting",
data() {
return {
projectName: 'gic-clique', // 当前项目名
collapseFlag: false, // 折叠参数
}
},
computed: {
},
methods: {
// 处理路由跳转
toRouterView(val) {
var that = this;
// 模拟检查数据
// //有两个参数
//{
// name:,
// path:
//}
console.log(val);
that.$router.push({
path: val.path
})
},
// 折叠事件
collapseTag(val) {
var that = this;
console.log(val);
that.collapseFlag = val
},
},
mounted() {
......
static/css/public.css
......@@ -89,8 +89,9 @@ input {
font-size: 100%;
font-weight: normal;
vertical-align: baseline;
font-family: "Helvetica Neue",Helvetica,"PingFang SC","Hiragino Sans GB","Microsoft YaHei","微软雅黑",Arial,sans-serif;
font-family: "Helvetica Neue", Helvetica, "PingFang SC", "Hiragino Sans GB", "Microsoft YaHei", "微软雅黑", Arial, sans-serif;
}
/* HTML5 display-role reset for older browsers */
article,
aside,
......@@ -104,32 +105,39 @@ nav,
section {
display: block;
}
body {
line-height: 1;
}
blockquote,
q {
quotes: none;
}
blockquote:before,
blockquote:after,
q:before,
q:after {
content: none;
}
table {
border-collapse: collapse;
border-spacing: 0;
}
/* custom */
a {
color: #7e8c8d;
text-decoration: none;
-webkit-backface-visibility: hidden;
}
li {
list-style: none;
}
::-webkit-scrollbar {
width: 5px;
height: 5px;
......@@ -157,72 +165,81 @@ li {
background-color: rgba(0, 0, 0, 0.1)
}
@-moz-document url-prefix(http://),url-prefix(https://) {
/* 滚动条颜色 */
scrollbar {
-moz-appearance: none !important;
width: 5px;
height: 5px;
-webkit-border-radius: 6px;
border-radius: 6px;
}
/* 滚动条按钮颜色 */
thumb,scrollbarbutton {
-moz-appearance: none !important;
}
/* 鼠标悬停时按钮颜色 */
thumb:hover,scrollbarbutton:hover {
-moz-appearance: none !important;
}
/* 隐藏上下箭头 */
scrollbarbutton {
display: none !important;
}
/* 纵向滚动条宽度 */
scrollbar[orient="vertical"] {
/*min-width: 15px !important;*/
}
@-moz-document url-prefix(http: //),url-prefix(https://) {
/* 滚动条颜色 */
scrollbar {
-moz-appearance: none !important;
width: 5px;
height: 5px;
-webkit-border-radius: 6px;
border-radius: 6px;
}
/* 滚动条按钮颜色 */
thumb, scrollbarbutton {
-moz-appearance: none !important;
}
/* 鼠标悬停时按钮颜色 */
thumb:hover, scrollbarbutton:hover {
-moz-appearance: none !important;
}
/* 隐藏上下箭头 */
scrollbarbutton {
display: none !important;
}
/* 纵向滚动条宽度 */
scrollbar[orient="vertical"] {
/*min-width: 15px !important;*/
}
}
scrollbar {
/* clear useragent default style*/
-moz-appearance: none !important;
/* clear useragent default style*/
-moz-appearance: none !important;
}
/* buttons at two ends */
scrollbarbutton {
-moz-appearance: none !important;
-moz-appearance: none !important;
}
/* the sliding part*/
thumb{
-moz-appearance: none !important;
thumb {
-moz-appearance: none !important;
}
scrollcorner {
-moz-appearance: none !important;
resize:both;
-moz-appearance: none !important;
resize: both;
}
/* vertical or horizontal */
scrollbar[orient="vertical"] {
color:silver;
color: silver;
}
-moz-scrollbar-track {
width:5px;
border: none;
background: #ff0000;
width: 5px;
border: none;
background: #ff0000;
}
-moz-scrollbar-face {
width:5px;
border: none;
background: #ff0000;
width: 5px;
border: none;
background: #ff0000;
}
-moz-scrollbar-arrow {
width:5px;
border: none;
background: #ff0000;
width: 5px;
border: none;
background: #ff0000;
}
-moz-scrollbar {
......@@ -247,20 +264,24 @@ body {
/*background-color: #ffffff;*/
background-color: #f0f2f5;
}
body {
-webkit-text-size-adjust: none;
-webkit-tap-highlight-color: rgba(0, 0, 0, 0);
}
input:focus {
box-shadow: none;
outline: none;
}
.btn-default {
color: #333;
border: 1px solid #ddd;
background-color: #f7f7f7;
cursor: pointer;
}
.btn {
font-size: 12px;
border-radius: 2px;
......@@ -268,26 +289,35 @@ input:focus {
height: 32px;
line-height: 14px;
}
.btn-new {
color: #333;
border: 1px solid #fede29;
background-color: #fede29;
}
.fl{
.fl {
float: left;
}
.fr{
.fr {
float: right;
}
.clearfix:before, .clearfix:after {
display: block;
visibility: hidden;
height: 0;
content: "";
clear: both;
display: block;
visibility: hidden;
height: 0;
content: "";
clear: both;
}
.clearfix {
zoom: 1;
zoom: 1;
}
.inline-block {
display: inline-block;
}
.m-l-16 {
......@@ -298,97 +328,135 @@ input:focus {
margin-top: 10px;
}
.font-0 .el-form-item__content,.dialog-footer {
.font-0 .el-form-item__content, .dialog-footer {
font-size: 0;
}
.pagewrap{
/* 公共 body 内的 left 和 right */
.common-wrap__left {
width: 260px;
height: 690px;
vertical-align: top;
font-size: 14px;
background: rgba(238,241,248,1);
border-radius: 2px;
}
.common-wrap__right {
width: calc(100% - 260px);
min-height: 690px;
padding: 24px;
vertical-align: top;
font-size: 14px;
-webkit-box-sizing: border-box;
-moz-box-sizing: border-box;
box-sizing: border-box;
}
.pagewrap {
margin: 20px 0;
text-align: right;
}
.dialogwrap{
.dialogwrap {
position: relative;
}
.dialogwrap:before{
position: absolute;
left: -20px;
top: -20px;
right: -20px;
content: '';
border-bottom: 1px solid #dedede;
}
.dialogcontent{
.dialogwrap:before {
position: absolute;
left: -20px;
top: -20px;
right: -20px;
content: '';
border-bottom: 1px solid #dedede;
}
.dialogcontent {
padding: 0 10px;
}
input:-webkit-autofill, textarea:-webkit-autofill, select:-webkit-autofill {
background-color: rgb(250, 255, 189); /* #FAFFBD; */
background-color: rgb(250, 255, 189);
/* #FAFFBD; */
background-image: none;
color: rgb(0, 0, 0);
}
.el-table th{
background: #f1f3f7!important;
.el-table th {
background: #f1f3f7 !important;
}
.slide-fade-enter-active {
transition: all .3s cubic-bezier(1.0, 0.5, 0.8, 1.0);
}
.slide-fade-leave-active {
transition: all .3s cubic-bezier(1.0, 0.5, 0.8, 1.0);
}
.slide-fade-enter, .slide-fade-leave-to {
opacity: 0;
}
/* 丹 新加*/
#app,#index,#content{
#app, #index, #content {
height: 100%;
}
/* table 的表头 -- 背景色 */
.el-table thead tr,.el-table thead th{
.el-table thead tr, .el-table thead th {
background: #f1f3f7;
}
/* 面包屑 */
.breadcrumb{
padding: 24px;
background-color: #fff;
border-radius: 2px;
box-shadow: 0 -1px 10px #dfdfdf;
.breadcrumb {
padding: 24px;
background-color: #fff;
border-radius: 2px;
box-shadow: 0 -1px 10px #dfdfdf;
}
.breadcrumb .breadcrumb-title{
.breadcrumb .breadcrumb-title {
margin: 30px 0 10px 0;
font-size: 20px;
}
/*有侧边栏的 右侧 */
.content-wrap{
.content-wrap {
height: 100%;
display: flex;
}
.content-wrap .right-wrap{
.content-wrap .right-wrap {
width: 100%;
box-sizing: border-box;
height: 100%;
overflow-y: auto;
}
.content-wrap .right-wrap .right-content{
.content-wrap .right-wrap .right-content {
padding: 24px;
}
.content-wrap .right-wrap .right-content .right-box{
.content-wrap .right-wrap .right-content .right-box {
background: #fff;
padding: 24px;
}
/* 无侧边栏的底部 */
.bottom-wrap{
padding: 24px;
color: #606266;
font-size: 14px;
.bottom-wrap {
padding: 24px;
color: #606266;
font-size: 14px;
}
.bottom-content-wrap{
/*background: #fff;
.bottom-content-wrap {
/*background: #fff;
padding: 24px;*/
}
/*提示文字*/
.tip-text{
.tip-text {
font-size: 12px;
color: #909399;
position: absolute;
......@@ -396,14 +464,14 @@ input:-webkit-autofill, textarea:-webkit-autofill, select:-webkit-autofill {
}
.el-form .el-form-item.is-success .el-input__inner, .el-form .el-form-item.is-success .el-input__inner:focus, .el-form .el-form-item.is-success .el-textarea__inner, .el-form .el-form-item.is-success .el-textarea__inner:focus {
border-color: #dcdfe6;
border-color: #dcdfe6;
}
/* 开卡模板 */
.template-cell-r .el-input.is-disabled .el-input__inner {
font-size: 12px;
color: #fff;
background-color: rgba(255,255,255,.1);
background-color: rgba(255, 255, 255, .1);
}
.el-button--text.m-l-10 {
......@@ -422,29 +490,30 @@ input:-webkit-autofill, textarea:-webkit-autofill, select:-webkit-autofill {
/* 头部 */
.user-form-dialog .el-dialog__body {
padding: 30px 20px 0;
padding: 30px 20px 0;
}
.user-form-dialog .el-dialog__header {
padding: 0 20px;
height: 54px;
padding: 0 20px;
height: 54px;
}
.pass-form-dialog .el-dialog__body {
padding: 30px 20px 0;
padding: 30px 20px 0;
}
.pass-form-dialog .el-dialog__header {
padding: 0 20px;
height: 54px;
padding: 0 20px;
height: 54px;
}
/* 左侧菜单 */
.leftBar-wrap .el-menu{
.leftBar-wrap .el-menu {
background-color: #020b21;
}
.leftBar-wrap .cardmenu-item .el-submenu__title,.leftBar-wrap .cardmenu-item .el-menu-item,.leftBar-wrap .cardmenu-item .el-submenu .el-menu-item{
.leftBar-wrap .cardmenu-item .el-submenu__title, .leftBar-wrap .cardmenu-item .el-menu-item, .leftBar-wrap .cardmenu-item .el-submenu .el-menu-item {
height: 40px;
line-height: 40px;
}
......@@ -453,36 +522,37 @@ input:-webkit-autofill, textarea:-webkit-autofill, select:-webkit-autofill {
background-color: #020b21;
}
.leftBar-wrap .cardmenu-item li.el-menu-item:hover i{
.leftBar-wrap .cardmenu-item li.el-menu-item:hover i {
/*background-color: #1890ff;*/
color: #fff;
}
.leftBar-wrap .cardmenu-item li.el-menu-item:hover span{
.leftBar-wrap .cardmenu-item li.el-menu-item:hover span {
/*background-color: #1890ff;*/
color: #fff;
}
.leftBar-wrap .cardmenu-item li.el-submenu:hover i{
.leftBar-wrap .cardmenu-item li.el-submenu:hover i {
/*background-color: #1890ff;*/
color: #fff;
}
.leftBar-wrap .cardmenu-item li.el-submenu:hover span{
.leftBar-wrap .cardmenu-item li.el-submenu:hover span {
/*background-color: #1890ff;*/
color: #fff;
}
.leftBar-wrap .cardmenu-item li.el-submenu .el-menu-item:hover label{
.leftBar-wrap .cardmenu-item li.el-submenu .el-menu-item:hover label {
/*background-color: #1890ff;*/
color: #fff;
cursor: pointer;
}
.leftBar-wrap .cardmenu-item .el-submenu.is-active div.el-submenu__title i{
.leftBar-wrap .cardmenu-item .el-submenu.is-active div.el-submenu__title i {
color: #fff;
}
.leftBar-wrap .cardmenu-item .el-submenu.is-active div.el-submenu__title span{
.leftBar-wrap .cardmenu-item .el-submenu.is-active div.el-submenu__title span {
color: #fff;
}
......@@ -499,5 +569,3 @@ input:-webkit-autofill, textarea:-webkit-autofill, select:-webkit-autofill {
.table-label .el-form-item__label {
line-height: 48px;
}
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment