qinzhipeng_v@didiglobal.com 4 years ago
parent
commit
07d67a71d3

+ 9 - 7
src/views/projectManage/requirement/components/BasicsCode.vue

@@ -98,7 +98,7 @@
         </over-click>
       </el-form-item>
       <el-form-item label="所属迭代:">
-        <over-click id="iterationId-select" @overMouse="changeArea">
+        <over-click id="iterationId-select" :parameter="url1" @overMouse="changeArea">
           <template slot="active">
             <el-select v-model="form_query.iterationId" clearable placeholder="请选择">
               <el-option v-for="(item,index) in iterationList" :key="item.name + index" :label="item.name" :value="item.id" />
@@ -131,7 +131,7 @@
     </el-form>
     <el-form :inline="true" :model="form_query" class="demo-form-inline" label-position="left" label-width="100px">
       <el-form-item label="所属项目:">
-        <over-click id="belongingProject-select" @overMouse="changeArea">
+        <over-click id="belongingProject-select" :parameter="url" @overMouse="changeArea">
           <template slot="active">
             <el-select v-model="form_query.belongingProject" size="small" clearable placeholder="请选择">
               <el-option v-for="(item,index) in belongProjectList" :key="index" :label="item.name" :value="item.id" />
@@ -196,6 +196,8 @@ export default {
       appClient: [], // 跟版客户端列表
       demandDirection: [], // 需求方向option
       iterationList: [], // 所属迭代
+      url: {},
+      url1: {},
       belongProjectList: [], // 所属项目
       props: {
         value: 'id',
@@ -224,7 +226,6 @@ export default {
       requirementInfo.rdLeader = requirementInfo.rdLeader ? requirementInfo.rdLeader.join() : ''
       requirementInfo.qaLeader = requirementInfo.qaLeader ? requirementInfo.qaLeader.join() : ''
       requirementInfo.iterationId = requirementInfo.iterationId === '' ? requirementInfo.iterationId = -1 : requirementInfo.iterationId
-      console.log(requirementInfo, 'cndisn ')
       if (requirementInfo.referredClientType.length === 0) {
         if (this.form_query.referredClientTypeName === '无') {
           this.form_query.referredClientType = [-1]
@@ -254,11 +255,12 @@ export default {
         this.$message({ message: '修改成功', type: 'success', duration: 1000, offset: 150 })
       }
     },
-    // jump(page, id) { // 跳转
-    // @click="jump('项目详情',form_query.belongingProject)"
-    //   this.$router.push({ name: page, query: { id: id }})
-    // },
+    jump(page, id) { // 跳转
+      this.$router.push({ name: page, query: { id: id }})
+    },
     async showRequirementEnum() { // 获取需求状态列表,优先级列表,需求来源
+      this.url = { name: '项目详情', query: { id: this.form_query.belongingProject }}
+      this.url1 = { name: '迭代详情', query: { id: this.form_query.iterationId }}
       const res1 = await projectListProject({ bizId: Number(localStorage.getItem('bizId')) })
       if (res1.code === 200) {
         this.belongProjectList = res1.data

+ 7 - 1
src/views/reportManagement/daily/components/iconDisplay.vue

@@ -106,7 +106,13 @@ export default {
           grid: { left: '3%', right: '4%', bottom: '3%', containLabel: true },
           xAxis: [{ type: 'category', data: val.bugDisByDate.xAxis ? val.bugDisByDate.xAxis : ['未知'], axisTick: { alignWithLabel: true }}],
           yAxis: [{ type: 'value', axisLine: { show: false }, axisTick: { show: false }, splitLine: { show: true, lineStyle: { type: 'dashed' }}}],
-          series: val.bugDisByDate.yAxis[0].data <= 0 ? [{ name: '直接访问', type: 'line', smooth: true, data: [0] }] : data3
+          series: val.bugDisByDate.yAxis[0].data <= 0 ? [{ name: '直接访问', type: 'line', smooth: true, data: [0] }] : [{ data: data3, type: 'line', itemStyle: { normal: { label: { show: true }}}}]
+          // series: [{
+          //   data: data3,
+          //   type: 'line',
+          //   // 显示数值
+          //   itemStyle: { normal: { label: { show: true }}}
+          // }]
 
         })
       }, 200)