Merge branch 'statistical-analysis' into dev

src/api/statisticalAnalysis/statisticalAnalysis.js

@@ -0,0 +1,37 @@
+import request from '@/utils/request'
+
+// 获取绩效列表
+export function getItemPerformanceList(params) {
+  return request({
+    url: '/item/performance/list',
+    method: 'get',
+    params
+  })
+}
+
+// 获取绩效柱状图数据
+export function getItemPerformanceHistogram(params) {
+  return request({
+    url: '/item/performance/histogram',
+    method: 'get',
+    params
+  })
+}
+
+// 获取绩效箱线图数据
+export function getItemPerformanceBoxplot(params) {
+  return request({
+    url: '/item/performance/boxplot',
+    method: 'get',
+    params
+  })
+}
+
+// 获取绩效指标数据
+export function getItemPerformanceMetrics(data) {
+  return request({
+    url: '/item/performance/metrics',
+    method: 'post',
+    data
+  })
+}

src/config.js

@@ -4,8 +4,8 @@ module.exports = {
  // baseUrl: process.env.NODE_ENV === 'development' ? 'http://192.168.3.221:82/prod-api' : '/prod-api', //生产
   //  baseUrl: process.env.NODE_ENV === 'development' ? 'http://192.168.3.221:8080' : '/prod-api',
 // baseUrl: process.env.NODE_ENV === 'development' ? 'http://guangxi.qinghe.sundot.cn:8088' : 'http://guangxi.qinghe.sundot.cn:8088/prod-api',
-   baseUrl: 'http://airport.samsundot.com:9024/prod-api',//测试
- // baseUrl:'http://airport.samsundot.com:9021/prod-api',//生产
+    baseUrl: 'http://airport.samsundot.com:9024/prod-api',//测试
+// baseUrl:'http://airport.samsundot.com:9021/prod-api',//生产
   // 应用信息
   appInfo: {
     // 应用名称

src/pages.json

@@ -297,6 +297,12 @@
       }
     },
     {
+      "path": "pages/statisticalAnalysis/index",
+      "style": {
+        "navigationBarTitleText": "统计分析"
+      }
+    },
+    {
       "path": "pages/seizureRecord/index",
       "style": {
         "navigationBarTitleText": "查获记录"

src/pages/login.vue

@@ -78,7 +78,7 @@ export default {
   onLoad() {
     //#ifdef H5
     if (getToken()) {
-      this.$tab.reLaunch('/pages/home-new/index')
+      this.$tab.reLaunch('/pages/home/index')
     }
     this.getStorage()
     //#endif
@@ -164,7 +164,7 @@ export default {
       this.$store.dispatch('GetInfo').then(res => {
         // 登录成功后调用showMessageTabRedDot更新消息tab红点状态
         showMessageTabRedDot()
-        this.$tab.reLaunch('/pages/home-new/index')
+        this.$tab.reLaunch('/pages/home/index')
       })
     }
   }