朱鑫波 3 роки тому
батько
коміт
cb05d70439

+ 2 - 4
.env.development

@@ -17,8 +17,6 @@ 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
+# 西安环境 http://192.168.1.59:7006
+
 
-#盯盘相关接口
-VUE_APP_BASE_STARE_URL = http://192.168.0.195:9999/material
-# 字安接口 http://192.168.1.43:9999
-# 测试环境 http://192.168.0.195:9999

+ 14 - 14
src/permission.js

@@ -57,14 +57,14 @@ router.beforeEach((to, from, next) => {
             } else {
               // 跳转到目的路由
               if( to.path === '/dashboard/analysis' && from.path == '/'){
-                if (store.getters.userInfo.id == '4aba62011120ac565c7f2b9f8f4aa96b' || store.getters.userInfo.id == 'e9ca23d68d884d4ebb19d07889727dae') {
+                if (store.getters.userInfo.id == '4aba62011120ac565c7f2b9f8f4aa96b' || store.getters.userInfo.id == 'e9ca23d68d884d4ebb19d07889727dae'|| store.getters.userInfo.id == 'db2d59e9b4a3b18629c838fd7f5b58d8') {
                   const a = document.createElement('a');
-                                      document.body.appendChild(a);
-                                      a.style.display = 'none';
-                                      a.href = 'http://192.168.0.195:9001/boss-data-kanban';
-                                      a.target = '_blank'
-                                      a.click();
-                                      document.body.removeChild(a);
+                  document.body.appendChild(a);
+                  a.style.display = 'none';
+                  a.href = 'http://adsp.c-top.com.cn/boss-data-kanban';
+                  a.target = '_blank'
+                  a.click();
+                  document.body.removeChild(a);
                   // let tempPage = window.open('', '_blank');
                   // tempPage.location="/boss-data-kanban";
                 }
@@ -88,14 +88,14 @@ router.beforeEach((to, from, next) => {
         next()
       }
       if( to.path === '/dashboard/analysis' && from.path == '/'){
-        if (store.getters.userInfo.id == '4aba62011120ac565c7f2b9f8f4aa96b' || store.getters.userInfo.id == 'e9ca23d68d884d4ebb19d07889727dae') {
+        if (store.getters.userInfo.id == '4aba62011120ac565c7f2b9f8f4aa96b' || store.getters.userInfo.id == 'e9ca23d68d884d4ebb19d07889727dae' || store.getters.userInfo.id == 'db2d59e9b4a3b18629c838fd7f5b58d8') {
           const a = document.createElement('a');
-                              document.body.appendChild(a);
-                              a.style.display = 'none';
-                              a.href = 'http://192.168.0.195:9001/boss-data-kanban';
-                              a.target = '_blank'
-                              a.click();
-                              document.body.removeChild(a);
+          document.body.appendChild(a);
+          a.style.display = 'none';
+          a.href = 'http://adsp.c-top.com.cn/boss-data-kanban';
+          a.target = '_blank'
+          a.click();
+          document.body.removeChild(a);
           // let tempPage = window.open('', '_blank');
           // tempPage.location="/boss-data-kanban";
           return

+ 2 - 2
src/store/modules/user.js

@@ -318,9 +318,9 @@ const user = {
         commit('SET_TOKEN', '')
         commit('SET_PERMISSIONLIST', [])
         Vue.ls.remove(ACCESS_TOKEN)
-        localStorage.removeItem("roleCode")
-        commit('SET_INFO', [])
         Vue.ls.remove(USER_INFO)
+        commit('SET_INFO', [])
+        localStorage.removeItem("roleCode")
         //console.log('logoutToken: '+ logoutToken)
         logout(logoutToken).then(() => {
           resolve()

+ 2 - 2
src/views/bossDataKanban/index.vue

@@ -392,6 +392,7 @@
 
 
 <script>
+    import { mapGetters, mapMutations, mapActions } from 'vuex'
     import { getPie3D, getParametricEquation } from './chart.js'
     import moment from 'moment'
     var echarts = require('echarts');
@@ -497,7 +498,6 @@
                 });
             }
         },
-
         mounted() {
 
             this.getData();
@@ -510,7 +510,7 @@
         },
         methods: {
 
-
+            ...mapGetters(['userInfo']),
             // 开启全屏
             fullScreen() {
                 let elem = document.documentElement;

+ 12 - 9
src/views/dashboard/Analysis.vue

@@ -70,8 +70,7 @@
 </style>
 <template>
   <div class="page-header-index-wide analysis">
-    <a-button  type='primary' style="position:absolute;z-index: 99;right: 28px;top: 133px;" @click="dataKanBan"
-    v-if="userInfoId">数据看板</a-button>
+    <!--  -->
     <div v-if="roleCode == 'operator'">
       <a-row :gutter="24">
         <a-col :sm="24" :md="12" :xl="6" :style="{ marginBottom: '24px' }">
@@ -215,22 +214,23 @@
         </a-col>
       </a-row>
     </div>
-    
+    <managerStatistics v-else-if="userInfoId || roleCode == 'CompanyManager'"/>
     <newHome v-else-if=" roleCode == 'touTiaoOperationManager'" />
     <statistics v-else-if="roleCode == 'kuaishouOperationManager'" />
     <statistics v-else-if="roleCode == 'sale'||roleCode=='saleDirector'" />
 
     <Workbench v-else-if="roleCode == 'clip'" />
     <Workbench v-else-if="roleCode == 'plane'" />
-    
-    <a-tabs default-active-key="1" v-else-if="roleCode == 'admin'" class="only-there">
+
+    <!-- <a-tabs default-active-key="1" v-else-if="roleCode == 'admin'" class="only-there">
       <a-tab-pane key="1" tab="快手">
         <statistics />
       </a-tab-pane>
       <a-tab-pane key="2" tab="头条">
         <newHome />
       </a-tab-pane>
-    </a-tabs>
+    </a-tabs> -->
+
     <!-- 更新公告 -->
     <a-modal v-model="visible" title="" @ok="handleOk" :closable='false' :footer="null" id="updateInfo">
       <div class="updateBOX">
@@ -285,6 +285,7 @@
   import { getAction, postAction, downFile, downFilePost } from '@/api/manage';
   import { mapActions, mapGetters } from 'vuex'
   import Trend from '@/components/Trend'
+  import managerStatistics from './managerStatistics'
   import {
     getLoginfo,
     getVisitInfo
@@ -322,7 +323,8 @@
       HeadInfo,
       newHome,
       Workbench,
-      Statistics
+      Statistics,
+      managerStatistics
     },
     data() {
       return {
@@ -351,7 +353,7 @@
     methods: {
       ...mapGetters(['userInfo']),
       getUserId(){
-        if (this.userInfo().id == '4aba62011120ac565c7f2b9f8f4aa96b' || this.userInfo().id == 'e9ca23d68d884d4ebb19d07889727dae') {
+        if (this.userInfo().id == '4aba62011120ac565c7f2b9f8f4aa96b' || this.userInfo().id == 'e9ca23d68d884d4ebb19d07889727dae' || this.userInfo().id == 'db2d59e9b4a3b18629c838fd7f5b58d8') {
           this.userInfoId = true;
         }else{
           this.userInfoId = false;
@@ -362,7 +364,8 @@
                     const a = document.createElement('a');
                     document.body.appendChild(a);
                     a.style.display = 'none';
-                    a.href = 'http://192.168.0.195:9001/boss-data-kanban';
+                    a.href = 'http://adsp.c-top.com.cn/boss-data-kanban';
+
                     a.target = '_blank'
                     a.click();
                     document.body.removeChild(a);

BIN
src/views/dashboard/assets/shang.png


BIN
src/views/dashboard/assets/xia.png


+ 278 - 0
src/views/dashboard/chart.js

@@ -0,0 +1,278 @@
+/**
+ * 绘制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,
+        width:'80%',
+        height:'80%',
+        left:'10%',
+        top:'10%',
+        boxHeight: boxHeight, // 圆环的高度
+        viewControl: {
+          // 3d效果可以放大、旋转等
+          alpha:40, // 角度
+          distance:400, // 调整视角到主体的距离,类似调整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 }

Різницю між файлами не показано, бо вона завелика
+ 1612 - 0
src/views/dashboard/managerStatistics.vue


Різницю між файлами не показано, бо вона завелика
+ 230 - 226
src/views/modules/autoLaunch/trusteeship/creatMaterialTest.vue


+ 1 - 1
src/views/modules/material/videoMaterial.vue

@@ -848,7 +848,7 @@ a {
                         <a-menu-item
                           key="1"
                           v-show="active != '3'"
-                          v-if="items.userId == userInfo().id || role.roleCode == 'designTeamLeader'|| userInfo().id == 'e9ca23d68d884d4ebb19d07889727dae'"
+                          v-if="userInfo().id == 'e9ca23d68d884d4ebb19d07889727dae'"
                         >
                           <a href="javascript:;" style="margin-right: 20px" @click="personEdit(items, '2')">人员修改</a>
                         </a-menu-item>

+ 7 - 8
src/views/user/Login.vue

@@ -447,14 +447,13 @@ export default {
       this.$router.push({
         path: '/dashboard/analysis',
       })
-      if (this.userInfo().id == '4aba62011120ac565c7f2b9f8f4aa96b' || this.userInfo().id == 'e9ca23d68d884d4ebb19d07889727dae') {
-                    const a = document.createElement('a');
-                    document.body.appendChild(a);
-                    a.style.display = 'none';
-                    a.href = 'http://192.168.0.195:9001/boss-data-kanban';
-                    a.target = '_blank'
-                    a.click();
-                    document.body.removeChild(a);
+      if (this.userInfo().id == '4aba62011120ac565c7f2b9f8f4aa96b' || this.userInfo().id == 'e9ca23d68d884d4ebb19d07889727dae' || this.userInfo().id == 'db2d59e9b4a3b18629c838fd7f5b58d8') {
+          const a = document.createElement('a');
+          document.body.appendChild(a);
+          a.style.display = 'none';
+          a.href = 'http://adsp.c-top.com.cn/boss-data-kanban';
+          a.target = '_blank'
+          a.click();
         // let tempPage = window.open('', '_blank');
         // tempPage.location="/boss-data-kanban";
         // window.open("/boss-data-kanban","_blank")