Browse Source

no message

linwenxin 1 tháng trước cách đây
mục cha
commit
e37551eeac
5 tập tin đã thay đổi với 28 bổ sung3 xóa
  1. 1 0
      .env.development
  2. 2 1
      .env.production
  3. 10 1
      src/api/bigView.js
  4. 14 0
      src/layout/components/Navbar.vue
  5. 1 1
      src/router/index.js

+ 1 - 0
.env.development

@@ -4,3 +4,4 @@ VUE_APP_BASE_OSS = 'https://jiasm.zfire.top/zfdapi/img/get?key='
 VUE_APP_BASE_API = 'https://jiasm.zfire.top/zfdapi/'
 VUE_APP_ONLINE_FILE = 'https://pgxtadm.greeapps.com/preview/onlinePreview?url='
 VUE_APP_PATH_ALIAS = '/'
+VUE_APP_NEW_BIG_VIEW = 'https://pgxtadm.greeapps.com/big_view/?token='

+ 2 - 1
.env.production

@@ -8,4 +8,5 @@ VUE_APP_BASE_API = 'https://fw.greeapps.com/zfdapi/'
 VUE_APP_ONLINE_FILE = 'https://pgxtadm.greeapps.com/preview/onlinePreview?url='
 # 页面访问路径别名
 VUE_APP_PATH_ALIAS = '/jsm-manager'
-
+# 数据大屏地址
+VUE_APP_NEW_BIG_VIEW = 'https://pgxtadm.greeapps.com/big_view/?token='

+ 10 - 1
src/api/bigView.js

@@ -43,4 +43,13 @@ export function getWorkorderTrend(params) {
     method: 'post',
     params
   })
-}
+}
+
+// 订单金额趋势
+export function bigDataJsmLogin(params) {
+  return request({
+    url: '/big/data/jsm/login',
+    method: 'post',
+    params
+  })
+}

+ 14 - 0
src/layout/components/Navbar.vue

@@ -30,6 +30,9 @@
         <div class="right-menu-item" v-if="bigViewsBool" @click="goBigViews">
           <el-button size="mini">数据大屏</el-button>
         </div>
+        <div class="right-menu-item" v-if="bigViews2Bool" @click="goBigViews2">
+          <el-button size="mini">NEW 数据大屏</el-button>
+        </div>
         <div class="right-menu-item">
           <el-autocomplete
             v-model="pathurl"
@@ -311,6 +314,7 @@ import vScrollView from 'v-scroll-view'
 import NoticeBar from '@/components/NoticeBar'
 import { pages } from '@/settings'
 import request from '@/utils/request'
+import { bigDataJsmLogin } from '@/api/bigView.js'
 function getc(obj) {
   if (!obj.children || !obj.children.length) {
     return obj
@@ -359,6 +363,9 @@ export default {
     bigViewsBool() {
       return !!global.antRouter.find(item => item.code == 'bigViews')
     },
+    bigViews2Bool() {
+      return !!global.antRouter.find(item => item.code == 'bigViews2')
+    },
     noticeVisible() {
       return this.noticeCount > 0
     },
@@ -473,6 +480,13 @@ export default {
         name: 'bigViews'
       })
     },
+    goBigViews2() {
+      bigDataJsmLogin().then(res => {
+        if (res.data) {
+          window.open(`${process.env.VUE_APP_NEW_BIG_VIEW}${res.data}`, '_blank')
+        }
+      })
+    },
     querySearchAsync(queryString, cb) {
       var data = pages.filter(
         item =>

+ 1 - 1
src/router/index.js

@@ -40,7 +40,7 @@ export const constantRoutes = [
     path: '/404',
     component: () => import('@/views/404'),
     hidden: true
-  },
+  }
   // {
   //   path: '/bigViews',
   //   component: () => import('@/views/bigViews/index'),