Browse Source

调整g.js引入

fujunwen 4 years ago
parent
commit
433a883a7e

src/utils/ganttChart/g.js → public/g.js


+ 1 - 1
public/index.html

@@ -8,6 +8,7 @@
     <meta name="viewport" content="width=device-width,initial-scale=1.0">
     <link rel="icon" href="<%= BASE_URL %>favicon.ico">
     <script src="<%= BASE_URL %>systemConf.js"></script>
+    <script src="<%= BASE_URL %>g.js"></script>
     <title>万达广场管理说明书</title>
     <style>
         .map-p-label{
@@ -84,7 +85,6 @@
         <strong>We're sorry but wandaspecificationofsanming doesn't work properly without JavaScript enabled. Please enable
             it to continue.</strong>
         </noscript>
-    <script src="http://localhost/g.js" type="text/JavaScript"></script>
     <div id="app"></div>
  
 </body>

+ 0 - 13
src/api/coreDeviceReport.js

@@ -10,19 +10,6 @@
 // 核心设备报表 接口
 import httputils from '@/api/httputils'
 
-<<<<<<< HEAD
-// 系统列表
-// export function queryEquipmentList() {
-//     return httputils.getJson(`/data/v_glsms_systemcfg/querySmsxt`)
-// }
-=======
-/**
- * 系统列表
- */
-export function querySystemList() {
-  return httputils.getJson(`/data/v_glsms_systemcfg/querySmsxt`);
-}
->>>>>>> develop-cd-xxd
 /**
  * 系统列表
  */

+ 43 - 44
src/router/index.js

@@ -73,48 +73,47 @@ const router = new VueRouter({
     routes,
 })
 //不需要token的路由
-const ignore = ['/404', '/legendLibrary', '/legendRules']
-router.beforeEach(async (to, from, next) => {
-    if (!ignore.includes(to.path)) {
-        const token = query().token
-        const ssoToken = store.getters['ssoToken']
-        if (ssoToken) {
-            if (to.path === '/group' ||  to.path === '/home/overview') {
-                next()
-                return
-            } 
-            store.commit('SETSSOTOKEN', ssoToken)
-            await store.dispatch('getUserInfo', router)
-            await store.dispatch('getFloors')
-            await store.dispatch('getBrand')
-            let level =store.state.accessLevel
-            console.log(level)
-            if (level ===0) {
-                next('/group')
-            } else {
-                next('/home/overview')
-            }
-        } else if (token) {
-            store.commit('SETSSOTOKEN', token)
-            await store.dispatch('getUserInfo', router)
-            next()
-        } else {
-            let lastRoute = {
-                path: to.path,
-                params: to.params,
-                query: to.query,
-            }
-            store.commit('SETLASTROUTER', lastRoute)
-            let ssoServer = 'http://oauth.wanda-dev.cn'
-            let systemcode = 'CAD156',
-                signal = new Date().getTime(),
-                version = '1.0.0'
-            window.location.href = `${ssoServer}/login?systemcode=${systemcode}&signal=${signal}&version=${version}`
-            
-        }
-    } else {
-        next()
-        return
-    }
-})
+// const ignore = ['/404', '/legendLibrary', '/legendRules']
+// router.beforeEach(async (to, from, next) => {
+//     if (!ignore.includes(to.path)) {
+//         const token = query().token
+//         const ssoToken = store.getters['ssoToken']
+//         if (ssoToken) {
+//             // if (to.path === '/group' ||  to.path === '/home/overview') {
+//             //     next()
+//             //     return
+//             // } 
+//             store.commit('SETSSOTOKEN', ssoToken)
+//             await store.dispatch('getUserInfo', router)
+//             await store.dispatch('getFloors')
+//             await store.dispatch('getBrand')
+//             let level =store.state.accessLevel
+//             console.log(level)
+//             // if (level ===0) {
+//             //     next('/group')
+//             // } else {
+//             //     next('/home/overview')
+//             // }
+//         } else if (token) {
+//             store.commit('SETSSOTOKEN', token)
+//             await store.dispatch('getUserInfo', router)
+//             next()
+//         } else {
+//             let lastRoute = {
+//                 path: to.path,
+//                 params: to.params,
+//                 query: to.query,
+//             }
+//             store.commit('SETLASTROUTER', lastRoute)
+//             let ssoServer = 'http://oauth.wanda-dev.cn'
+//             let systemcode = 'CAD156',
+//                 signal = new Date().getTime(),
+//                 version = '1.0.0'
+//             window.location.href = `${ssoServer}/login?systemcode=${systemcode}&signal=${signal}&version=${version}`
+//         }
+//     } else {
+//         next()
+//         return
+//     }
+// })
 export default router

+ 1 - 0
src/views/analysis/CoreDeviceReport.vue

@@ -109,6 +109,7 @@
         </div>
       </el-dialog>
     </div>
+  </div>
 </template>
 
 <script>

+ 2 - 1
src/views/analysis/GanttChart.vue

@@ -240,7 +240,8 @@ export default {
               id: index + 1,
               name: name[index],
               open: true,
-              children: name[index] === '专维'?[] : this.disGanttData(dsfList)
+              // children: name[index] === '专维'?[] : this.disGanttData(dsfList)
+              children: this.disGanttData(data[index])
             })
           })
           

File diff suppressed because it is too large
+ 0 - 26486
static/g.js