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

bigdata/app/front/entry/admin.ejs

@@ -122,7 +122,7 @@
 		</div>
 		<div id="app-stage" class="app-stage">
 			<div v-if="ismenuopen" id="clkhandle" @click="showmenu" class="el-icon-menu" style="position: relative;left:240px;margin-top:3px;cursor: pointer;"></div>
-			<div v-else id="clkhandle" @mouseover="showmenu" class="el-icon-menu" style="position: relative;left:240px;margin-top:3px;cursor: pointer;"></div>
+			<div v-else id="clkhandle" @click="showmenu" class="el-icon-menu" style="position: relative;left:240px;margin-top:3px;cursor: pointer;"></div>
 			<div  class="leftnav"  id="leftmenuid"> 
 				  <el-card id="leftnav">
 						<gsb-leftmenu bkcolor="white" ref="leftmenu"   key="leftmenu"  formatprop="formatItem" @menuselect="onMenuSelect"></gsb-leftmenu>

bigdata/app/front/vues/pages/gtbhome/gtbhome.css

 .gtb-home{
     width: 100%;
     height: 100%;
-    background:url('/imgs/bkhome.png') no-repeat;
+    background:url('https://gsb-zc.oss-cn-beijing.aliyuncs.com//zc_239101574154954768201919171554768bkhome.png') no-repeat;
     background-size: 100% 100%;
 
 }

bigdata/app/front/vues/pages/gtbhome/gtbhome.html

@@ -15,13 +15,10 @@
         </div>
     </div>
     <div class="gtb-home-main"> 
-        <div v-for="(item,key) in myapps" :key="key" class="app-child" :style="bgimg(item)">
+        <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="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 class="activeColor" @click="goapplogin(item)" style="text-align:right;font-size: 0.8em;cursor: pointer;">
-                GO
-            </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:#fff;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,
-          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: '个体票据宝'
-            }
-          ]
+  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);
-      },
-      async exitclick(){
-        var d=  await this.$root.postReq("/web/auth/userCtl/exit",{});
-        this.$router.push("/tlogin");
-      },
-      bgimg(app){
-        return "background:url('"+app.bkimageUrl+"') 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/tlogin/tlogin.css

@@ -5,7 +5,7 @@
     flex-direction: column;
     align-items: center;
     padding-top: 200px;
-    background:url('/imgs/bklogin.png') no-repeat;
+    background:url('https://gsb-zc.oss-cn-beijing.aliyuncs.com//zc_81101574154972666201919171612666bklogin.png') no-repeat;
     background-size: 100% 100%;
     box-sizing: border-box;
 }