Skip to content

Z
zhichan
Commit f78e7c5e by 蒋勇
Options

Merge branch 'bigdata' of gitlab.gongsibao.com:jiangyong/zhichan into bigdata

parents e77f192f 21aac350
Showing with 218 additions and 114 deletions
bigdata/app/base/db/metadata/bizs/wx76a324c5d201d1a4/pmgmyapps.js
......@@ -67,9 +67,11 @@ module.exports={
"add":[
{"icon":"el-icon-plus","title":"新增","type":"default","key":"new","isOnGrid":true},
{"icon":"el-icon-save","title":"保存","type":"default","key":"save","isOnForm":true},
{"icon":"el-icon-cancel","title":"取消","type":"default","key":"cancel","isOnForm":true},
],
"edit":[
{"icon":"el-icon-edit","title":"修改","type":"default","key":"edit","isInRow":true},
// {"icon":"el-icon-edit","title":"管理员","type":"default","key":"adminModi","isInRow":true},
// {"icon":"el-icon-edit","title":"重置密码","type":"default","key":"resetpwd","isInRow":true},
],
......@@ -77,7 +79,7 @@ module.exports={
{"icon":"el-icon-remove","title":"删除","type":"default","key":"delete","isInRow":true},
],
"common":[
{"icon":"el-icon-cancel","title":"取消","type":"default","key":"cancel","isOnForm":true},
],
}
}
bigdata/app/base/service/impl/auth/userSve.js
......@@ -142,6 +142,7 @@ class UserService extends ServiceBase {
async createUser(pobj) {
var u = {
userName: pobj.userName,
nickName:pobj.nickName,
password: settings.defaultpwd,
app_id: pobj.appid,
mobile: pobj.mobile,
......
bigdata/app/config/environment.js
......@@ -54,7 +54,7 @@ module.exports = function (app) {
app.use(session(
{
name:'bigdatasid',
cookie: {maxAge: 3600000},
cookie: {maxAge: 3600000,domain:'open.gongsibao.com'},
rolling:true,
resave: false,
saveUninitialized: false,
......
bigdata/app/front/entry/gtb.ejs
......@@ -29,7 +29,13 @@
}
</script>
<style>
html {
width: 100%;
height: 100%;
}
body{
width: 100%;
height: 100%;
margin: 0px;
padding: 0px;
font-size: 14px;
......@@ -37,73 +43,21 @@
.app-main{
width:100%;
height:100%;
background:url("<%='/imgs/bklogin.png'%>") no-repeat;background-size: cover;
/* background:url("<%='/imgs/bklogin.png'%>") no-repeat;background-size: cover; */
box-sizing: border-box;
}
.app-header{
display: flex;
justify-content:space-between;
color: white;
padding: 15px;
box-sizing: border-box;
}
.app-stage{
display: flex;
width: 100%;
padding: 5px;
box-sizing: border-box;
}
.app-stage .rightcontent{
flex-grow:1;
box-sizing: border-box;
}
.app-stage .rightcontent .el-card__body {
height: 100%;
}
.app-stage .rightcontent >.el-card{
border-radius: 0px;
height: 100%;
box-shadow:unset;
box-sizing: border-box;
}
#appName{
font-size: 30px;
font-family:MicrosoftYaHei;
cursor: pointer;
}
.el-button--text{
color: white
}
.activeColor{
color:deepskyblue;
}
</style>
</head>
<body>
<div id="app" v-loading="loading" class="app-main" style="visibility:hidden">
<div id="app-header" class="app-header">
<div id="appName" >
<span @click=appclick> </span>
<span style="font-size:16px;" v-if="currentCompany">
<span style="font-size:20px" class="fa fa-home"></span>
<span v-if="currentUser && currentUser.owner && currentUser.owner.id!=1">{{currentUser.owner.name}}</span>
<!-- <span v-else>{{currentCompany.name}}</span> -->
</span>
</div>
<div id="login">
<gsb-button-group v-if="!currentUser" @select="onselect" ikey="login" :btns="logins"></gsb-button-group>
<span v-if="currentUser">欢迎您，{{currentUser.nickName}}<el-button @click="exitclick" type="text" icon="el-icon-setting">退出</el-button></span>
<!-- <span style="cursor:pointer" @click="settingclick" v-if="(currentUser && currentUser.roles.indexOf('common')>=0) || (currentUser && currentUser.isSuper)"><i class="el-icon-setting"></i>后台管理</span> -->
</div>
</div>
<div id="app" v-loading="loading" class="app-main">
<div id="app-stage" class="app-stage">
<div class="rightcontent">
<transition name="slide-fade">
<router-view>
</router-view>
</transition>
</div>
</div>
<router-view></router-view>
</div>
</div>
<script src="/js/vue/jquery.min.js"></script>
<script src="/js/common.js"></script>
......
bigdata/app/front/entry/public/imgs/bklogin.png 100644 → 100755
bigdata/app/front/entry/public/imgs/bklogin.png

360 KB | W: | H:

bigdata/app/front/entry/public/imgs/bklogin.png

586 KB | W: | H:

bigdata/app/front/entry/public/imgs/bklogin.png
bigdata/app/front/entry/public/imgs/bklogin.png
bigdata/app/front/entry/public/imgs/bklogin.png
bigdata/app/front/entry/public/imgs/bklogin.png
  • 2-up
  • Swipe
  • Onion skin
bigdata/app/front/entry/public/js/gtb.js
......@@ -98,15 +98,15 @@ axios.get("/vue/comp/base").then(function(res){
$(window).resize(()=>{
var h=$(window).height();
var m=h-90;
$("#app").css("min-height",h+"px");
$("#app-stage").css("min-height",m+"px");
// $("#app").css("min-height",h+"px");
// $("#app-stage").css("min-height",m+"px");
});
var h=$(window).height();
var m=h-90;
$("#app").css("min-height",h+"px");
$("#app-stage").css("min-height",m+"px");
// $("#app").css("min-height",h+"px");
// $("#app-stage").css("min-height",m+"px");
this.stageHeight=m;
$("#app").css("visibility",'visible');
// $("#app").css("visibility",'visible');
this.loading=false;
this.$store.state.company=companyinfo;
},
......
bigdata/app/front/vues/base/form/form.css
......@@ -7,7 +7,8 @@
.gsbform .el-form{
width: 100%;
height: 100%;
padding:10px;margin:5px;position:relative;
position:relative;
margin-top: 10px;
}
.frmcollapse{
......
bigdata/app/front/vues/pages/gtbhome/gtbhome.css
.gtb-home{
display: flex;
width: 100%;
height: 100%;
margin: auto;
background:url('/imgs/bkhome.png') no-repeat;
background-size: 100% 100%;
}
.gtb-home-main {
width: 100%;
display: flex;
opacity:0.8;
align-items:center;
justify-content: center;
margin-top: 250px;
}
.gtb-home .app-child{
width: 234px;
......@@ -14,7 +19,55 @@
margin: 15px;
background-color: bisque;
position: relative;
text-align: center;
padding-top: 36px;
box-sizing: border-box;
cursor: pointer;
border-radius:10px;
}
.gtb-home .app-child > div {
width: 100%;
text-align: center;
margin-top: 19px;
font-size:24px;
font-family:Microsoft YaHei;
font-weight:400;
color:rgba(255,255,255,1);
}
.gtb-home .app-child:hover{
border: 1px solid white
transform: translateY(-5%);
box-shadow: 0px 0px 25px #888888;
}
.gtb-home-title {
width: 100%;
overflow: hidden;
padding: 20px;
height: 76px;
box-sizing: border-box;
line-height: 36px;
}
.gtb-home-title > img {
float: left;
}
.gtb-home-title > span {
float: left;
font-size:22px;
font-family:Microsoft YaHei;
font-weight:300;
color:#333333;
}
.gtb-home-title > span > i {
color: #BEBEBE;
font-style:normal;
}
.gtb-home-title > div {
float: right;
height: 36px;
line-height: 36px;
overflow: hidden;
}
.gtb-ticon1 {
vertical-align: middle;
margin-right: 9px;
cursor: pointer;
}
\ No newline at end of file
bigdata/app/front/vues/pages/gtbhome/gtbhome.html
<div class="gtb-home">
<div v-for="app in myapps" class="app-child" :style="bgimg(app)">
<span @click="systemsetting(app)" v-if="currentUser && currentUser.roles.indexOf(\'common\')>=0" style="position: absolute;left:5px;top: 10px;font-size:20px;color:red;padding: 5px;cursor: pointer;"><i class="el-icon-setting"></i></span>
<div class="activeColor" @click="goapplogin(app)" style="text-align:right;font-size: 0.8em;cursor: pointer;">
GO
</div>
</div>
<div class="gtb-home-title">
<img src="/imgs/homeLogo.png" alt="">
<span><i>丨</i>个体宝</span>
<div>
<!-- <img src="/imgs/ticon2.png" alt=""> -->
<el-dropdown @command="exitclick">
<span class="el-dropdown-link">
<img class="gtb-ticon1" src="/imgs/ticon1.png" alt="">
</span>
<el-dropdown-menu slot="dropdown" >
<el-dropdown-item icon="el-icon-plus">退出</el-dropdown-item>
</el-dropdown-menu>
</el-dropdown>
</div>
</div>
<div class="gtb-home-main">
<div v-for="(item,key) in myapps" :key="key" class="app-child" :style="bgimg(item)" @click="goapplogin(item)" >
<img :src="item.logoUrl" alt="">
<div>{{item.name}}</div>
<span @click.stop="systemsetting(item)" v-if="currentUser && currentUser.roles.indexOf(\'common\')>=0" style="position: absolute;left:5px;top: 10px;font-size:20px;color:red;padding: 5px;cursor: pointer;"><i class="el-icon-setting"></i></span>
</div>
</div>
</div>
\ No newline at end of file
bigdata/app/front/vues/pages/gtbhome/gtbhome.js
{
template:'${tmpl}',
data:function(){
return {
apps:null,
bubbles:['x','y','x','y','x','y','x','y','x','y'],
pxheight:"800px",
myapps:[],
carisshow:false,
template: '${tmpl}',
data: function () {
return {
apps: null,
bubbles: ['x', 'y', 'x', 'y', 'x', 'y', 'x', 'y', 'x', 'y'],
pxheight: "800px",
myapps: [],
carisshow: false,
carisshow: false,
showimgUrl: [{
img: '/imgs/img1.png',
icon: '/imgs/icon1.png',
name: '个体工商宝'
},
{
img: '/imgs/img2.png',
icon: '/imgs/icon2.png',
name: '个体财务宝'
},
{
img: '/imgs/img3.png',
icon: '/imgs/icon3.png',
name: '个体税务宝'
},
{
img: '/imgs/img4.png',
icon: '/imgs/icon4.png',
name: '个体票据宝'
}
]
}
},
mounted: function () {
this.pxheight = (this.$root.stageHeight - 60) + "px";
this.myapps = tocompanyinfo ? tocompanyinfo.apps : [];
},
created: function () {
},
computed: {},
methods: {
async systemsetting(app) {
var d = await this.$root.postReq("/web/auth/userCtl/sysManageForApp?appKey=" + app.appkey + "&toKey=" + appinfo.appkey, tocompanyinfo);
window.open(d.data.jumpUrl);
},
mounted:function(){
this.pxheight=(this.$root.stageHeight-60)+"px";
this.myapps=tocompanyinfo?tocompanyinfo.apps:[];
async exitclick() {
var d = await this.$root.postReq("/web/auth/userCtl/exit", {});
this.$router.push("/tlogin");
},
created:function(){
bgimg(app) {
return "background:url('" + app.bkimageUrl + "') no-repeat;background-size: cover";
},
computed: {
},
methods:{
async systemsetting(app){
var d= await this.$root.postReq("/web/auth/userCtl/sysManageForApp?appKey="+app.appkey+"&toKey="+appinfo.appkey,tocompanyinfo);
async goapplogin(app) {
if (app.name == "个体税务宝") {
return this.$message({
message: '敬请期待',
type: 'warning'
});
}
if(app.name == "个体财务宝") {
window.open("http://192.168.1.221");
return;
}
var d = await this.$root.postReq("/web/auth/userCtl/goLoginForApp", app);
if (d && d.status == 0 && d.data) {
console.log(JSON.stringify(d.data));
window.open(d.data.jumpUrl);
},
bgimg(app){
console.log(app.showimgUrl);
return "background:url('"+app.showimgUrl+"') no-repeat;background-size: cover";
},
async goapplogin(app){
var d= await this.$root.postReq("/web/auth/userCtl/goLoginForApp",app);
if(d && d.status==0 && d.data){
console.log(JSON.stringify(d.data));
window.open(d.data.jumpUrl);
}else{
}
}
},
vname:"gsb_gtbhome"
}
} else {
}
}
},
vname: "gsb_gtbhome"
}
\ No newline at end of file
bigdata/app/front/vues/pages/home/home.js
......@@ -35,6 +35,11 @@
},
methods:{
async goapplogin(app){
if(app.appType=="api"){
var d= await this.$root.postReq("/web/auth/userCtl/sysManageForApp?appKey="+app.appkey+"&toKey="+appinfo.appkey,tocompanyinfo);
window.open(d.data.jumpUrl);
return;
}
var d= await this.$root.postReq("/web/auth/userCtl/goLoginForApp",app);
if(d && d.status==0 && d.data){
console.log(JSON.stringify(d.data));
......
bigdata/app/front/vues/pages/tlogin/tlogin.css
.tloginpage{
display: flex;
width: 100%;
height: 100%;
flex-direction: column;
align-items: center
align-items: center;
padding-top: 200px;
background:url('/imgs/bklogin.png') no-repeat;
background-size: 100% 100%;
box-sizing: border-box;
}
.tlogin{
width:428px;
height:308px;
margin: auto;
margin: 0 auto;
position: relative;
z-index: 99;
}
.tlogin .el-card{
background:rgba(255,255,255,1);
......@@ -22,3 +30,18 @@
.tlogin .el-col{
text-align:center
}
.tlogin-title {
margin-bottom: 18px;
}
.tlogin-name {
font-size:20px;
font-family:Microsoft YaHei;
font-weight:300;
color:rgba(255,255,255,1);
margin-bottom: 39px;
}
.tlogin-bottom {
position: absolute;
bottom: -120px;
left: -250px;
}
bigdata/app/front/vues/pages/tlogin/tlogin.html
<div class="tloginpage">
<div>公司宝logo</div>
<div>个体宝登录系统</div>
<div class="tlogin-title"><img src="/imgs/logo.png" alt=""></div>
<div class="tlogin-name">个体宝登录系统</div>
<div class="tlogin" >
<gsb-form class="tlogin" ref="loginFrm" @btnclick="loginclick" :metaData="ldms" :refvalidatemethod="validmethod">
</gsb-form>
<div class="tlogin-bottom">
<img src="/imgs/bottom.png" alt="">
</div>
</div>
</div>
......
bigdata/package-lock.json
This source diff could not be displayed because it is too large. You can view the blob instead.
bigdata/package.json
......@@ -56,7 +56,15 @@
"xml2js": "^0.4.19"
},
"devDependencies": {
"del": "^5.1.0",
"element-theme": "^2.0.1",
"element-theme-chalk": "^2.4.0"
"element-theme-chalk": "^2.4.0",
"gulp-concat": "^2.6.1",
"gulp-if": "^3.0.0",
"gulp-imagemin": "^6.2.0",
"gulp-minify-css": "^1.2.4",
"gulp-tap": "^2.0.0",
"imagemin-pngquant": "^8.0.0",
"merge-stream": "^2.0.0"
}
}
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