wenbobowen 4 年之前
父節點
當前提交
9193190801

+ 2 - 2
src/api/dataMarket.js

@@ -1,6 +1,6 @@
 import request from '@/utils/request'
-// import { TeamManagement } from '@/apiConfig/api'
-const TeamManagement = 'http://127.0.0.1:4523/mock/368525'
+import { TeamManagement } from '@/apiConfig/api'
+// const TeamManagement = 'http://127.0.0.1:4523/mock/368525'
 
 // 质量
 

+ 3 - 3
src/utils/options.js

@@ -1,4 +1,4 @@
-export function getOption(xAxis, data, type) {
+export function getOption(xAxis, data = [], type, dataZoom = {}) {
   return {
     'color': ['#3AA1FF'],
     'tooltip': {
@@ -19,14 +19,14 @@ export function getOption(xAxis, data, type) {
         'type': 'slider',
         'show': data && data.length > 50,
         'startValue': 0,
-        'endValue': 50,
+        'endValue': dataZoom.endValue || 50,
         'handleSize': 8,
         'bottom': '10%'
       }
     ],
     'xAxis': [{
       'type': 'category',
-      'data': xAxis,
+      'data': (!xAxis || xAxis.length < 1) ? [0] : xAxis,
       'axisLabel': {
         'interval': 0,
         'rotate': 40

+ 5 - 1
src/views/dataBigManage/components/efficiencyModule/index.vue

@@ -216,7 +216,11 @@
       </div>
     </el-col>
     <el-col :span="7">
-      <div class="itemBox" style="border-left-color: #999999; background: #FAFAFA">
+      <div
+        v-if="Object.keys(mainData).filter(t => mainData[t]).length >= 7"
+        class="itemBox"
+        style="border-left-color: #999999; background: #FAFAFA"
+      >
         <div class="empty">
           <svg-icon icon-class="empty" />
         </div>

+ 7 - 6
src/views/dataBigManage/components/qualityModule/index.vue

@@ -186,10 +186,10 @@ export default {
         'outColor': '#E4F2DC',
         'bgColor': '#F5F7FC'
       },
-      onlineProblemSelect: ['按时间', '按等级', '按影响业务方'],
-      offlineProblemSelect: ['按时间', '按缺陷等级', '按责任人'],
-      offlineProblemViweType: '按时间',
-      onlineProblemViweType: '按时间',
+      onlineProblemSelect: ['日期', '等级', '影响业务方'],
+      offlineProblemSelect: ['日期', '缺陷等级', '责任人'],
+      offlineProblemViweType: '日期',
+      onlineProblemViweType: '日期',
       onlineProblemChartOption: null,
       offlineProblemChartOption: null,
       echartsOption1: null,
@@ -227,7 +227,8 @@ export default {
       // 线上问题图
       if (onlineProblemChart) {
         const { xaxis, yaxis } = onlineProblemChart
-        this.onlineProblemChartOption = getOption(xaxis, yaxis.data, 'bar')
+        console.log(xaxis, yaxis[0].data)
+        this.onlineProblemChartOption = getOption(xaxis, yaxis[0].data, 'bar', { endValue: 10 })
       }
       // 线下质量表
       if (offlineProblemList) {
@@ -236,7 +237,7 @@ export default {
       // 线下质量图
       if (offlineProblemChart) {
         const { xaxis, yaxis } = offlineProblemChart
-        this.offlineProblemChartOption = getOption(xaxis, yaxis.data, 'bar')
+        this.offlineProblemChartOption = getOption(xaxis, yaxis[0].data, 'bar', { endValue: 10 })
       }
       // 上线过程
       if (onlineProcessList) {

+ 22 - 16
src/views/dataBigManage/components/throughputModule/index.vue

@@ -75,16 +75,18 @@
       <div class="itemBox">
         <div class="titleLevel3  mb25">版本需求</div>
         <div class="tab">
-          <span
-            v-for="item in verTabList"
-            :key="item"
-            class="tabItem"
-            :class="verTab === item && 'active'"
-            @click="changeTab('verTab', item)"
-          >{{ item }}</span>
+          <el-select
+            v-model="verTab"
+            size="small"
+            filterable
+            style="width: 115px"
+            @change="(e) => $emit('change', l.key, e)"
+          >
+            <el-option v-for="o in mainData.versionRequirementChart" :key="o.label" :label="o.label" :value="o.label" />
+          </el-select>
         </div>
-        <div class="chartViewHeight" style="height: 189px">
-          <normal-echart v-if="versionRequirementChartOption" :chart-id="'chart5'" :option="versionRequirementChartOption" @onClick="changeList" />
+        <div class="chartViewHeight" style="height: 178px">
+          <normal-echart v-if="versionRequirementChartOption[verTab]" :chart-id="'chart5'" :option="versionRequirementChartOption[verTab]" @onClick="changeList" />
         </div>
       </div>
     </el-col>
@@ -110,8 +112,8 @@ export default {
       requirementBacklogRateChartOption: null,
       versionRequirementChartOption: null,
       viewType: null,
-      verTabList: ['青桔端', '滴滴小程序'],
-      verTab: '青桔端',
+      // verTabList: ['青桔端', '滴滴小程序'],
+      verTab: '',
       wholeTabList: ['需求', '任务', '项目'],
       wholeTab: '需求',
       requirementBacklogOptionList: ['研发积压', '测试积压', '产品积压'],
@@ -138,23 +140,27 @@ export default {
         requirementBacklogRateChart, // 积压率
         versionRequirementChart // 版本需求
       } = this.datas
-      console.log(this.datas)
       // 需求任务项目
       if (throughputList) {
         this.mainData = { ...this.mainData, throughputList }
       }
       if (requirementDirectionChart) {
         const { xaxis, yaxis } = requirementDirectionChart
-        this.requirementDirectionChartOption = getOption(xaxis, yaxis.data, 'bar')
+        this.requirementDirectionChartOption = getOption(xaxis, yaxis[0].data, 'bar', { endValue: 10 })
       }
       // 积压率
       if (requirementBacklogRateChart) {
         const { xaxis, yaxis } = requirementBacklogRateChart
-        this.requirementBacklogRateChartOption = getOption(xaxis, yaxis.data, 'line')
+        this.requirementBacklogRateChartOption = getOption(xaxis, yaxis[0].data, 'line', { endValue: 10 })
       }
       if (versionRequirementChart) {
-        const { xaxis = [], yaxis = {}} = versionRequirementChart
-        this.versionRequirementChartOption = getOption(xaxis, yaxis.data, 'bar')
+        this.mainData = { ...this.mainData, versionRequirementChart }
+        this.verTab = versionRequirementChart[0] && versionRequirementChart[0].label
+        const obj = {}
+        versionRequirementChart.forEach(t => {
+          obj[t.label] = getOption(t.xaxis, t.yaxis[0].data, 'bar', { endValue: 10 })
+        })
+        this.versionRequirementChartOption = obj
       }
     },
     changeList() {},

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

@@ -93,8 +93,8 @@ export default {
       requireList: {},
       reqStatus: '缺陷状态',
       params: {
-        offlineProblemViweType: '按时间',
-        onlineProblemViweType: '按时间',
+        offlineProblemViweType: '日期',
+        onlineProblemViweType: '日期',
         wholeTab: '需求',
         verTab: '青桔端',
         requirementBacklogType: '研发积压'