Forráskód Böngészése

Merge branch 'feature/work-test' of http://git.tjyourong.com.cn/ctop/adsp-vue into feature/work-test

朱鑫波 3 éve
szülő
commit
03049f5769

+ 2 - 0
.env.development

@@ -15,3 +15,5 @@ VUE_APP_BASE_SCRIPT_URL = http://192.168.0.195:31013
 
 #素材大盘相关接口
 VUE_APP_BASE_MATERIAL_URL = http://192.168.0.195:9999/material
+# 字安接口 http://192.168.1.43:9999
+# 测试环境 http://192.168.0.195:9999

BIN
src/assets/img/head_bg.png


+ 6 - 0
src/assets/img/u2.svg

@@ -0,0 +1,6 @@
+<?xml version="1.0" encoding="utf-8"?>
+<svg version="1.1" xmlns:xlink="http://www.w3.org/1999/xlink" width="739px" height="357px" xmlns="http://www.w3.org/2000/svg">
+  <g transform="matrix(1 0 0 1 -590 -298 )">
+    <path d="M 959.5 298  C 1166.42 298  1329 376.54  1329 476.5  C 1329 576.46  1166.42 655  959.5 655  C 752.58 655  590 576.46  590 476.5  C 590 376.54  752.58 298  959.5 298  Z " fill-rule="nonzero" fill="#6633ff" stroke="none" fill-opacity="0.0980392156862745" />
+  </g>
+</svg>

+ 6 - 0
src/assets/img/u3.svg

@@ -0,0 +1,6 @@
+<?xml version="1.0" encoding="utf-8"?>
+<svg version="1.1" xmlns:xlink="http://www.w3.org/1999/xlink" width="639px" height="309px" xmlns="http://www.w3.org/2000/svg">
+  <g transform="matrix(1 0 0 1 -640 -302 )">
+    <path d="M 959.5 302  C 1138.42 302  1279 369.98  1279 456.5  C 1279 543.02  1138.42 611  959.5 611  C 780.58 611  640 543.02  640 456.5  C 640 369.98  780.58 302  959.5 302  Z " fill-rule="nonzero" fill="#6633ff" stroke="none" fill-opacity="0.0980392156862745" />
+  </g>
+</svg>

+ 6 - 0
src/assets/img/u4.svg

@@ -0,0 +1,6 @@
+<?xml version="1.0" encoding="utf-8"?>
+<svg version="1.1" xmlns:xlink="http://www.w3.org/1999/xlink" width="480px" height="232px" xmlns="http://www.w3.org/2000/svg">
+  <g transform="matrix(1 0 0 1 -720 -330 )">
+    <path d="M 960 330  C 1094.4 330  1200 381.04  1200 446  C 1200 510.96  1094.4 562  960 562  C 825.6 562  720 510.96  720 446  C 720 381.04  825.6 330  960 330  Z " fill-rule="nonzero" fill="#6633ff" stroke="none" fill-opacity="0.0980392156862745" />
+  </g>
+</svg>

BIN
src/assets/img/wangge2.png


+ 5 - 0
src/config/router.config.js

@@ -115,5 +115,10 @@ export const constantRouterMap = [
     name: 'errorPage',
     component: () => import(/* webpackChunkName: "fail" */ '@/views/errorPage')
   },
+  {
+    path: '/boss-data-kanban',
+    name: 'bossDataKanban',
+    component: () => import(/* webpackChunkName: "fail" */ '@/views/bossDataKanban/index')
+  },
 
 ]

+ 25 - 6
src/permission.js

@@ -8,27 +8,35 @@ import { ACCESS_TOKEN } from '@/store/mutation-types'
 import { generateIndexRouter } from "@/utils/util"
 import warterMark from './warterMark'
 import { mapGetters, mapMutations, mapActions } from 'vuex'
+import { cmpPos } from 'codemirror'
 NProgress.configure({ showSpinner: false }) // NProgress Configuration
 
 
-const whiteList = ['/user/login', '/user/register', '/user/register-result', '/user/alteration', '/user/transfer-local', '/errorPage', '/user/new-batch', '/user/lookPreview', 'http://192.168.0.111:8088/jeecg-boot/sys/feishu/url', '/user/FStransfer','/creat-config','/create-launch'] // no redirect whitelist
+const whiteList = ['/user/login', '/user/register', '/user/register-result', '/user/alteration', '/user/transfer-local', '/errorPage', '/user/new-batch', '/user/lookPreview', 'http://192.168.0.111:8088/jeecg-boot/sys/feishu/url', '/user/FStransfer', '/creat-config', '/create-launch', '/boss-data-kanban'] // no redirect whitelist
 
 router.beforeEach((to, from, next) => {
   NProgress.start() // start progress bar
   //if (whiteList.indexOf(to.path) !== -1) {
-    // 在免登录白名单,直接进入
-   // next()
- //}
+  // 在免登录白名单,直接进入
+  // next()
+  //}
+  console.log(to,from)
   if (Vue.ls.get(ACCESS_TOKEN)) {
+    console.log(store.getters.userInfo.id);
     /* has token */
-
+   
     if (to.path === '/user/login') {
-      warterMark.out()
+      warterMark.out();
+     
       next({ path: '/dashboard/workplace' })
+     
       NProgress.done()
     } else {
+
       // warterMark.set(store.getters.userInfo.roleName)
+
       if (store.getters.permissionList.length === 0) {
+       
         store.dispatch('GetPermissionList').then(res => {
           const menuData = res.result.menu;
           localStorage.setItem("roleCode", res.result.roleCode)
@@ -48,6 +56,11 @@ router.beforeEach((to, from, next) => {
               next({ ...to, replace: true })
             } else {
               // 跳转到目的路由
+              if( to.path === '/dashboard/analysis' && from.path == '/'){
+                if (store.getters.userInfo.id == '4aba62011120ac565c7f2b9f8f4aa96b' || store.getters.userInfo.id == 'e9ca23d68d884d4ebb19d07889727dae') {
+                  window.open("/boss-data-kanban", "_blank");
+                }
+              }
               next({ path: redirect })
             }
           })
@@ -66,6 +79,12 @@ router.beforeEach((to, from, next) => {
         warterMark.set(store.getters.userInfo.realname)
         next()
       }
+      if( to.path === '/dashboard/analysis' && from.path == '/'){
+        if (store.getters.userInfo.id == '4aba62011120ac565c7f2b9f8f4aa96b' || store.getters.userInfo.id == 'e9ca23d68d884d4ebb19d07889727dae') {
+          window.open("/boss-data-kanban", "_blank");
+          return
+        }
+      }
     }
   } else {
     if (whiteList.indexOf(to.path) !== -1) {

+ 274 - 0
src/views/bossDataKanban/chart.js

@@ -0,0 +1,274 @@
+/**
+ * 绘制3d图
+ * @param pieData 总数据
+ * @param internalDiameterRatio:透明的空心占比
+ * @param distance 视角到主体的距离
+ * @param alpha 旋转角度
+ * @param pieHeight 立体的高度
+ * @param opacity 饼或者环的透明度
+ */
+ const getPie3D = (pieData, internalDiameterRatio, distance, alpha, pieHeight, opacity = 1) => {
+    const series = []
+    let sumValue = 0
+    let startValue = 0
+    let endValue = 0
+    let legendData = []
+    let legendBfb = []
+    const k = 1 - internalDiameterRatio
+    pieData.sort((a, b) => {
+      return b.value - a.value
+    })
+    // 为每一个饼图数据,生成一个 series-surface 配置
+    for (let i = 0; i < pieData.length; i++) {
+      sumValue += pieData[i].value
+      const seriesItem = {
+        name:
+            typeof pieData[i].name === 'undefined'
+              ? `series${i}`
+              : pieData[i].name,
+        type: 'surface',
+        parametric: true,
+        wireframe: {
+          show: false
+        },
+        pieData: pieData[i],
+        pieStatus: {
+          selected: false,
+          hovered: false,
+          k: k
+        },
+        center: ['10%', '50%']
+      }
+      if (typeof pieData[i].itemStyle !== 'undefined') {
+        const itemStyle = {}
+        itemStyle.color =
+            typeof pieData[i].itemStyle.color !== 'undefined'
+              ? pieData[i].itemStyle.color
+              : opacity
+        itemStyle.opacity =
+            typeof pieData[i].itemStyle.opacity !== 'undefined'
+              ? pieData[i].itemStyle.opacity
+              : opacity
+        seriesItem.itemStyle = itemStyle
+      }
+      series.push(seriesItem)
+    }
+   
+    // 使用上一次遍历时,计算出的数据和 sumValue,调用 getParametricEquation 函数,
+    // 向每个 series-surface 传入不同的参数方程 series-surface.parametricEquation,也就是实现每一个扇形。
+    legendData = []
+    legendBfb = []
+    for (let i = 0; i < series.length; i++) {
+      endValue = startValue + series[i].pieData.value
+      series[i].pieData.startRatio = startValue / sumValue
+      series[i].pieData.endRatio = endValue / sumValue
+      series[i].parametricEquation = getParametricEquation(
+        series[i].pieData.startRatio,
+        series[i].pieData.endRatio,
+        false,
+        false,
+        k,
+        series[i].pieData.value
+      )
+      startValue = endValue
+      const bfb = fomatFloat(series[i].pieData.value / sumValue, 4)
+      legendData.push({
+        name: series[i].name,
+        value: bfb
+      })
+      legendBfb.push({
+        name: series[i].name,
+        value: bfb
+      })
+    }
+    const boxHeight = getHeight3D(series, pieHeight) // 通过pieHeight设定3d饼/环的高度,单位是px
+    // 准备待返回的配置项,把准备好的 legendData、series 传入。
+    const option = {
+      legend: {
+        show: false,
+        data: legendData,
+        orient: 'vertical',
+        left: 10,
+        top: 10,
+        itemGap: 10,
+        textStyle: {
+          color: '#A1E2FF'
+        },
+        icon: 'circle',
+        formatter: function (param) {
+          const item = legendBfb.filter(item => item.name === param)[0]
+          const bfs = fomatFloat(item.value * 100, 2) + '%'
+          return `${item.name}  ${bfs}`
+        }
+      },
+      labelLine: {
+        show: true,
+        lineStyle: {
+          color: '#fff'
+        }
+      },
+      label: {
+        show: true,
+        position: 'outside',
+        formatter: '{b} \n{c} {d}%'
+      },
+      tooltip: {
+        backgroundColor: '#033b77',
+        borderColor: '#21f2c4',
+        textStyle: {
+          color: '#fff',
+          fontSize: 13
+        },
+        formatter: params => {
+          if (
+            params.seriesName !== 'mouseoutSeries' &&
+              params.seriesName !== 'pie2d'
+          ) {
+            const bfb = (
+              (option.series[params.seriesIndex].pieData.endRatio -
+                  option.series[params.seriesIndex].pieData.startRatio) *
+                100
+            ).toFixed(2)
+            return (
+              `${params.seriesName}<br/>` +
+              `<span style="display:inline-block;margin-right:5px;border-radius:10px;width:10px;height:10px;background-color:${params.color};"></span>` +
+              `${bfb}%`
+            )
+          }
+        }
+      },
+      xAxis3D: {
+        min: -1,
+        max: 1
+      },
+      yAxis3D: {
+        min: -1,
+        max: 1
+      },
+      zAxis3D: {
+        min: -1,
+        max: 1
+      },
+      grid3D: {
+        show: false,
+        boxHeight: boxHeight, // 圆环的高度
+        viewControl: {
+          // 3d效果可以放大、旋转等
+          alpha:30, // 角度
+          distance:350, // 调整视角到主体的距离,类似调整zoom
+          rotateSensitivity: 0, // 设置为0无法旋转
+          zoomSensitivity: 0, // 设置为0无法缩放
+          panSensitivity: 0, // 设置为0无法平移
+          autoRotate: false // 自动旋转
+        },
+      },
+      series: series
+    }
+    return option
+  }
+   
+  /**
+   * 生成扇形的曲面参数方程,用于 series-surface.parametricEquation
+   */
+  const getParametricEquation = (startRatio, endRatio, isSelected, isHovered, k, h) => {
+    // 计算
+    const midRatio = (startRatio + endRatio) / 2
+    const startRadian = startRatio * Math.PI * 2
+    const endRadian = endRatio * Math.PI * 2
+    const midRadian = midRatio * Math.PI * 2
+    // 如果只有一个扇形,则不实现选中效果。
+    if (startRatio === 0 && endRatio === 1) {
+      isSelected = false
+    }
+    // 通过扇形内径/外径的值,换算出辅助参数 k(默认值 1/3)
+    k = typeof k !== 'undefined' ? k : 1 / 3
+    // 计算选中效果分别在 x 轴、y 轴方向上的位移(未选中,则位移均为 0)
+    const offsetX = isSelected ? Math.cos(midRadian) * 0.1 : 0
+    const offsetY = isSelected ? Math.sin(midRadian) * 0.1 : 0
+    // 计算高亮效果的放大比例(未高亮,则比例为 1)
+    const hoverRate = isHovered ? 1.05 : 1
+    // 返回曲面参数方程
+    return {
+      u: {
+        min: -Math.PI,
+        max: Math.PI * 3,
+        step: Math.PI / 32
+      },
+      v: {
+        min: 0,
+        max: Math.PI * 2,
+        step: Math.PI / 20
+      },
+      x: function (u, v) {
+        if (u < startRadian) {
+          return (
+            offsetX +
+            Math.cos(startRadian) * (1 + Math.cos(v) * k) * hoverRate
+          )
+        }
+        if (u > endRadian) {
+          return (
+            offsetX + Math.cos(endRadian) * (1 + Math.cos(v) * k) * hoverRate
+          )
+        }
+        return offsetX + Math.cos(u) * (1 + Math.cos(v) * k) * hoverRate
+      },
+      y: function (u, v) {
+        if (u < startRadian) {
+          return (
+            offsetY +
+            Math.sin(startRadian) * (1 + Math.cos(v) * k) * hoverRate
+          )
+        }
+        if (u > endRadian) {
+          return (
+            offsetY + Math.sin(endRadian) * (1 + Math.cos(v) * k) * hoverRate
+          )
+        }
+        return offsetY + Math.sin(u) * (1 + Math.cos(v) * k) * hoverRate
+      },
+      z: function (u, v) {
+        if (u < -Math.PI * 0.5) {
+          return Math.sin(u)
+        }
+        if (u > Math.PI * 2.5) {
+          return Math.sin(u) * h * 0.1
+        }
+        return Math.sin(v) > 0 ? 1 * h * 0.1 : -1
+      }
+    }
+  }
+   
+  /**
+   * 获取3d丙图的最高扇区的高度
+   */
+  const getHeight3D = (series, height) => {
+    series.sort((a, b) => {
+      return b.pieData.value - a.pieData.value
+    })
+    return (height * 25) / series[0].pieData.value
+  }
+   
+  /**
+   * 格式化浮点数
+   */
+  const fomatFloat = (num, n) => {
+    let f = parseFloat(num)
+    if (isNaN(f)) {
+      return false
+    }
+    f = Math.round(num * Math.pow(10, n)) / Math.pow(10, n) // n 幂
+    let s = f.toString()
+    let rs = s.indexOf('.')
+    // 判定如果是整数,增加小数点再补0
+    if (rs < 0) {
+      rs = s.length
+      s += '.'
+    }
+    while (s.length <= rs + n) {
+      s += '0'
+    }
+    return s
+  }
+   
+  export { getPie3D, getParametricEquation }

A különbségek nem kerülnek megjelenítésre, a fájl túl nagy
+ 1584 - 0
src/views/bossDataKanban/index.vue


+ 6 - 1
src/views/user/Login.vue

@@ -159,7 +159,7 @@
 //import md5 from "md5"
 import api from '@/api'
 import TwoStepCaptcha from '@/components/tools/TwoStepCaptcha'
-import { mapActions } from 'vuex'
+import { mapActions, mapGetters } from 'vuex'
 import { timeFix } from '@/utils/util'
 import Vue from 'vue'
 import { ACCESS_TOKEN } from '@/store/mutation-types'
@@ -287,6 +287,7 @@ export default {
   },
   methods: {
     ...mapActions(['Login', 'Logout', 'PhoneLogin']),
+    ...mapGetters(['userInfo']),
     setData() {
       if (this.creativeTag == 'huichuang') {
         this.appId = 'ww24b8a47826f5875f'
@@ -446,6 +447,10 @@ export default {
       this.$router.push({
         path: '/dashboard/analysis',
       })
+      if (this.userInfo().id == '4aba62011120ac565c7f2b9f8f4aa96b' || this.userInfo().id == 'e9ca23d68d884d4ebb19d07889727dae') {
+        window.open("/boss-data-kanban","_blank")
+      }
+      
       this.$notification.success({
         message: '欢迎',
         description: `${timeFix()},欢迎回来`,