Merge pull request #31 from a54552239/dev

v2.8.9
a54552239 · Feb 23, 2020 · 2e22b97 · 2e22b97
2 parents e3f07f1 + bf1e212
commit 2e22b97
Show file tree

Hide file tree

Showing 14 changed files with 109 additions and 43 deletions.
diff --git a/public/index.html b/public/index.html
@@ -12,5 +12,14 @@
 <!--<script src="https://webapi.amap.com/js/marker.js"></script>
 <script type="text/javascript"
         src="https://webapi.amap.com/maps?v=1.4.7&key=936c5eca7d2e763f953a0483e75637c8&plugin=AMap.Transfer,AMap.Driving,AMap.Walking,AMap.LineSearch,AMap.Geocoder"></script>-->
+<script>
+  var _hmt = _hmt || [];
+  (function() {
+    var hm = document.createElement("script");
+    hm.src = "https://hm.baidu.com/hm.js?eb6ecfed64ffefae6d5d74ea2945e7aa";
+    var s = document.getElementsByTagName("script")[0];
+    s.parentNode.insertBefore(hm, s);
+  })();
+</script>
 </body>
 </html>
diff --git a/src/api/organization.js b/src/api/organization.js
@@ -1,7 +1,17 @@
 import $http from '@/assets/js/http'
+import store from '@/store';
 
 export function list(data) {
-    return $http.post('project/organization',data);
+    return $http.post('project/organization', data);
+}
+
+export function _getOrgList(data) {
+    return $http.post('project/organization/_getOrgList', data).then(res => {
+        if (res.data) {
+            store.dispatch('setOrganizationList', res.data);
+        }
+        return Promise.resolve(res);
+    });
 }
 
 export function doData(data) {

diff --git a/src/api/user.js b/src/api/user.js
@@ -1,4 +1,7 @@
 import $http from '@/assets/js/http'
+import router from '@/router';
+import store from '@/store';
+import {checkResponse, createRoute} from "../assets/js/utils";
 
 export async function Login(data) {
     return $http.post('project/login', data);
@@ -20,8 +23,40 @@ export function _resetPasswordByMail(data) {
     return $http.post('project/login/_resetPasswordByMail', data);
 }
 
-export function changeCurrentOrganization(organizationCode) {
-    return $http.post('project/index/changeCurrentOrganization', {organizationCode: organizationCode});
+export function changeCurrentOrganization(organization) {
+    const organizationCode = organization.code;
+    store.dispatch('setCurrentOrganization', organization);
+    return $http.post('project/index/changeCurrentOrganization', {organizationCode: organizationCode}).then(res=>{
+        if (checkResponse(res)) {
+            store.dispatch('SET_MENU', res.data.menuList);
+            store.dispatch('SET_USER', res.data.member);
+            store.dispatch('windowLoading', true);
+            setTimeout(function () {
+                const menu = res.data.menuList;
+                if (menu) {
+                    let routes = router.options.routes;
+                    menu.forEach(function (v) {
+                        routes[0].children.push(createRoute(v));
+                        if (v.children) {
+                            v.children.forEach(function (v2) {
+                                routes[0].children.push(createRoute(v2));
+                                if (v2.children) {
+                                    v2.children.forEach(function (v3) {
+                                        routes[0].children.push(createRoute(v3));
+                                    });
+                                }
+
+                            });
+                        }
+                    });
+                    router.addRoutes(routes);
+                    store.dispatch('windowLoading', false);
+                    // router.replace('/');
+                }
+            }, 500);
+            return Promise.resolve(res);
+        }
+    });
 }
 
 export function list(data) {

diff --git a/src/assets/js/http.js b/src/assets/js/http.js
@@ -7,7 +7,11 @@ import $router from '../../router/index';
 import {notice} from './notice';
 import config from "../../config/config";
 
-const HOME_PAGE = config.HOME_PAGE;
+let HOME_PAGE = config.HOME_PAGE;
+const currentOrganization = getStore('currentOrganization', true);
+if (currentOrganization) {
+    HOME_PAGE = HOME_PAGE + '/' + currentOrganization.code;
+}
 const crossDomain = config.crossDomain;
 let axiosConfig = {};
 if (crossDomain) {

diff --git a/src/components/error/errorPage.vue b/src/components/error/errorPage.vue
@@ -20,6 +20,8 @@
 </template>
 <script>
     import {Button} from 'ant-design-vue';
+    import {getStore} from "../../assets/js/storage";
+    const currentOrganization = getStore('currentOrganization', true);
 
     export default {
         components: {
@@ -33,7 +35,7 @@
                 default: '抱歉，服务器出错了',
             },
             url: {
-                default: '/home'
+                default: currentOrganization ? '/home/' + currentOrganization.code : '/home'
             },
             urlText: {
                 default: '返回首页'

diff --git a/src/components/layout/header/HeaderSelect.vue b/src/components/layout/header/HeaderSelect.vue
@@ -3,11 +3,14 @@
         <a-dropdown class="action-item" placement="bottomCenter">
             <div class="organization-select">
                 <span>{{currentOrganization.name}}</span>
-               <a-icon :style="{fontSize: '14px'}" type="down" />
+               <a-icon :style="{fontSize: '14px', marginLeft: '2px'}" type="down" />
             </div>
             <a-menu slot="overlay" class="middle-menu organization-menu" :selectable="false" @click="organizationAction">
                 <a-menu-item v-for="(organization,index) in organizationList" :key="index">
-                    <a href="javascript:;">{{organization.name}}</a>
+                    <div class="muted flex ant-row-flex-middle">
+                        <span href="javascript:;" class="text-default">{{organization.name}} </span>
+                        <a-icon v-show="currentOrganization.code == organization.code" class="muted m-l-lg" type="check" />
+                    </div>
                 </a-menu-item>
             </a-menu>
         </a-dropdown>
@@ -35,36 +38,11 @@
         methods: {
             organizationAction(action) {
                 let app = this;
-                app.$store.dispatch('setCurrentOrganization', app.organizationList[action.key]);
-                changeCurrentOrganization(app.organizationList[action.key].code).then(res=>{
+                changeCurrentOrganization(app.organizationList[action.key]).then(res=>{
                     if (checkResponse(res)) {
-                        app.$store.dispatch('SET_MENU', res.data.menuList);
-                        app.$store.dispatch('SET_USER', res.data.member);
-                        app.$store.dispatch('windowLoading', true);
-                        setTimeout(function () {
-                            const menu = res.data.menuList;
-                            if (menu) {
-                                let routes = app.$router.options.routes;
-                                menu.forEach(function (v) {
-                                    routes[0].children.push(createRoute(v));
-                                    if (v.children) {
-                                        v.children.forEach(function (v2) {
-                                            routes[0].children.push(createRoute(v2));
-                                            if (v2.children) {
-                                                v2.children.forEach(function (v3) {
-                                                    routes[0].children.push(createRoute(v3));
-                                                });
-                                            }
-
-                                        });
-                                    }
-                                });
-                                app.$router.addRoutes(routes);
-                                app.$store.dispatch('windowLoading', false);
-                                app.$router.replace('/');
-                            }
-                        }, 500);
+                        app.$router.replace('/home/' + app.organizationList[action.key].code);
                     }
+                    console.log(res);
                 })
             },
         }

diff --git a/src/components/project/projectSelect.vue b/src/components/project/projectSelect.vue
@@ -97,6 +97,7 @@
             getProjectList(loading = true) {
                 this.loading = loading;
                 this.requestData.pageSize = 50;
+                this.requestData.archive = -1;
                 getProjectList(this.requestData).then(res => {
                     console.log(res);
                     this.projectList = res.data.list;

diff --git a/src/config/version.js b/src/config/version.js
@@ -1,3 +1,3 @@
 export default {
-    VERSION: '2.8.8',
+    VERSION: '2.8.9',
 };
diff --git a/src/mixins/common.js b/src/mixins/common.js
@@ -1,4 +1,7 @@
 // common-mixin.vue
+import {getStore} from "../assets/js/storage";
+import config from "../config/config";
+
 export default {
     data() {
         return {}
@@ -11,5 +14,13 @@ export default {
                 this.$router.push(page);
             }
         },
+        toHome() {
+            const currentOrganization = getStore('currentOrganization', true);
+            let home = config.HOME_PAGE;
+            if (currentOrganization) {
+                home = home + '/' + currentOrganization.code;
+            }
+            this.$router.push(home);
+        },
     }
 }
diff --git a/src/router/index.js b/src/router/index.js
@@ -146,6 +146,11 @@ router.beforeEach((to, from, next) => {
         });
         return false;
     }
+    // 统计代码
+    if (to.path) {
+        _hmt.push(['_trackPageview', '/#' + to.fullPath]);
+        console.log(_hmt);
+    }
     next();
 });
 router.afterEach(route => {

diff --git a/src/views/home/index.vue b/src/views/home/index.vue
@@ -231,6 +231,9 @@
             this.init();
         },
         watch:{
+            $route: function (to, from) {
+                this.init();
+            },
             socketAction(val) {
                 console.log(val);
                 if (val.action === 'organization:task') {

diff --git a/src/views/index.vue b/src/views/index.vue
@@ -4,7 +4,7 @@
         <a-spin :spinning="windowLoading">
             <a-layout id="layout" :class="layoutClass">
                 <a-layout-header :class="{'collapsed':collapsed}">
-                    <div class="logo" @click="()=>{this.$router.push(config.HOME_PAGE)}">
+                    <div class="logo" @click="toHome">
                         <img class="logo-img" src="../assets/image/common/logo.png" alt="">
                         <span class="title" v-if="system">
                             {{system.app_name}}
@@ -127,7 +127,8 @@
     import Socket from '../components/websocket/socket';
     import config from "../config/config";
     import {notice} from "../assets/js/notice";
-
+    import {getStore} from "../assets/js/storage";
+    import {_getOrgList} from "../api/organization";
 
     const ASider = ALayout.Sider;
     const AFooter = ALayout.Footer;
@@ -187,6 +188,9 @@
                 notice({title: this.$route.query.message}, 'notice');
                 // notice(this.$route.query.message);
             }
+            if (this.logged) {
+                _getOrgList();
+            }
         },
         watch: {
             $route: function (to, from) {
@@ -328,6 +332,10 @@
                         } else {
                             turnPath += v.children[0].children[0].fullUrl;
                         }
+                        if (turnPath == '/home') {
+                            that.toHome();
+                            return false;
+                        }
                         if (turnPath != '/#') {
                             that.$router.push(turnPath);
                         }

diff --git a/src/views/member/login.vue b/src/views/member/login.vue
@@ -294,7 +294,7 @@
                     }
                 })
             },
-            loginSuccess(res) {
+            loginSuccess(res, org) {
                 setTimeout(() => {
                     const menu = getStore('menu', true);
                     if (menu) {
@@ -314,7 +314,7 @@
                         });
                         this.loginBtn = false;
                         this.$router.addRoutes(routes);
-                        let redirect = this.$route.query.redirect || config.HOME_PAGE;
+                        let redirect = this.$route.query.redirect || config.HOME_PAGE + '/' + org.code;
                         this.$router.push({
                             path: redirect
                         });
@@ -377,7 +377,7 @@
                     }
                     app.$store.dispatch('setCurrentOrganization', currentOrganization);
                     app.$store.dispatch('GET_MENU').then(() => {
-                        app.loginSuccess(res);
+                        app.loginSuccess(res, currentOrganization);
                     });
                 } else {
                     app.oauthLoading = false;

diff --git a/src/views/project/space/task.vue b/src/views/project/space/task.vue
@@ -4,10 +4,10 @@
             <div class="project-nav-header">
                 <a-breadcrumb>
                     <a-breadcrumb-item>
-                        <router-link to="/home">
+                        <a @click="toHome">
                             <a-icon type="home"/>
                             首页
-                        </router-link>
+                        </a>
                     </a-breadcrumb-item>
                     <a-breadcrumb-item>
                         <project-select class="nav-title" style="display: inline-block" :code="code"></project-select>