wenbobowen 4 anni fa
parent
commit
267473578f

+ 1 - 35
src/components/newLayout/Head.vue

@@ -19,40 +19,6 @@
       </div>
       <div class="name">{{ item.name }}</div>
     </div>
-    <!-- <div @mouseleave="target = true">
-      <div :class="[target ? 'nav-div1' : 'nav-div2']">
-        <el-tooltip
-          v-if="!target"
-          class="item"
-          effect="dark"
-          content="工具集合"
-          placement="right"
-        >
-          <div class="div-child" @click="goto('Interface')">
-            <svg-icon icon-class="b_工具集合" />
-          </div>
-        </el-tooltip>
-        <el-tooltip
-          v-if="!target"
-          class="item"
-          effect="dark"
-          content="环境平台"
-          placement="right"
-        >
-          <div class="div-child" @click="goto('env')">
-            <svg-icon icon-class="b_环境平台" />
-          </div>
-        </el-tooltip>
-      </div>
-      <div class="nav-div3 nav-circular" />
-      <div class="nav-div4 nav-circular" @mouseenter="target = false" />
-    </div>-->
-    <!-- <div v-show="navTagType === 2" class="nav-tag-type" @click="setNavTagType(1)">
-      <i class="el-icon-notebook-2" style="transform: rotate(90deg);" />
-    </div>
-    <div v-show="navTagType === 1" class="nav-tag-type" @click="setNavTagType(2)">
-      <i class="el-icon-notebook-2" />
-    </div> -->
     <HeaderMenu />
     <el-tooltip
       class="item"
@@ -363,9 +329,9 @@ export default {
   overflow: hidden;
   // margin-top: auto;
   margin-bottom: 20px;
-
   img {
     height: 30px;
+    width: 30px;
   }
 }
 

+ 8 - 3
src/views/dataBigManage/components/qualityModule/index.vue

@@ -248,24 +248,29 @@ export default {
         onlineProcessList,
         mobilePublishQualityList
       } = this.datas
-      console.log(223, this.datas)
+      const {
+        onlineProblemChart: mainDataOnlineProblemChart,
+        offlineProblemChart: mainDataOfflineProblemChart
+      } = this.mainData
       // 线上问题表
       if (onlineProblemList) {
         this.mainData = { ...this.mainData, onlineProblemList: this.getOnlineProblemList() }
       }
       // 线上问题图
-      if (onlineProblemChart) {
+      if (JSON.stringify(onlineProblemChart) !== JSON.stringify(mainDataOnlineProblemChart)) {
         const { xaxis, yaxis } = onlineProblemChart
         this.onlineProblemChartOption = getOption(xaxis, yaxis[0].data, 'bar', { endValue: 6 })
+        this.mainData = { ...this.mainData, onlineProblemChart }
       }
       // 线下质量表
       if (offlineProblemList) {
         this.mainData = { ...this.mainData, offlineProblemList: this.getOfflineProblemList() }
       }
       // 线下质量图
-      if (offlineProblemChart) {
+      if (JSON.stringify(offlineProblemChart) !== JSON.stringify(mainDataOfflineProblemChart)) {
         const { xaxis, yaxis } = offlineProblemChart
         this.offlineProblemChartOption = getOption(xaxis, yaxis[0].data, 'bar', { endValue: 6 })
+        this.mainData = { ...this.mainData, offlineProblemChart }
       }
       // 上线过程
       if (onlineProcessList) {

+ 12 - 3
src/views/dataBigManage/components/throughputModule/index.vue

@@ -168,20 +168,29 @@ export default {
         requirementBacklogRateChart, // 积压率
         versionRequirementChart // 版本需求
       } = this.datas
+
+      const {
+        requirementDirectionChart: mainDataRequirementDirectionChart,
+        requirementBacklogRateChart: mainDataRequirementBacklogRateChart,
+        versionRequirementChart: mainDataVersionRequirementChart
+      } = this.mainData
+
       // 需求任务项目
       if (throughputList) {
         this.mainData = { ...this.mainData, throughputList }
       }
-      if (requirementDirectionChart) {
+      if (JSON.stringify(requirementDirectionChart) !== JSON.stringify(mainDataRequirementDirectionChart)) {
         const { xaxis, yaxis } = requirementDirectionChart
         this.requirementDirectionChartOption = getOption(xaxis, yaxis[0].data, 'bar', { endValue: 6 })
+        this.mainData = { ...this.mainData, requirementDirectionChart }
       }
       // 积压率
-      if (requirementBacklogRateChart) {
+      if (JSON.stringify(requirementBacklogRateChart) !== JSON.stringify(mainDataRequirementBacklogRateChart)) {
         const { xaxis, yaxis } = requirementBacklogRateChart
         this.requirementBacklogRateChartOption = getOption(xaxis, yaxis[0].data, 'line', { endValue: 6 }, { formatter: '%' })
+        this.mainData = { ...this.mainData, requirementBacklogRateChart }
       }
-      if (versionRequirementChart) {
+      if (JSON.stringify(versionRequirementChart) !== JSON.stringify(mainDataVersionRequirementChart)) {
         this.mainData = { ...this.mainData, versionRequirementChart }
         this.verTab = versionRequirementChart[0] && versionRequirementChart[0].label
         const obj = {}

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

@@ -372,7 +372,7 @@ export default {
               let nowdepyList = []
               const defaultPath = depyList.slice(idPos, depyList.length)
               // 判断是否有子层级
-              if (res1.data.deptArch.children && res1.data.deptArch.children.length > 0) {
+              if (res1.data.deptArch && res1.data.deptArch.children && res1.data.deptArch.children.length > 0) {
                 this.resetdepyPath(defaultPath, res1.data.deptArch.children)
                 nowdepyList = this.depyResetList
               } else {

+ 5 - 4
src/views/workbench/components/listView.vue

@@ -46,7 +46,7 @@
       <el-table-column label="所属需求" min-width="150">
         <template slot-scope="scope">
           <span v-for="(item, index) in scope.row.requireList" :key="item.id">
-            <span class="jumpName" @click="jump(item.id, '需求详情')">{{ item.name }}</span>
+            <span class="jumpName" @click="jump(item, '需求详情')">{{ item.name }}</span>
             <span v-if="index < scope.row.requireList.length - 1"> , </span>
           </span>
           <!-- {{ scope.row.requireList ? scope.row.requireList.map(item=>item.name).join(','): '' }} -->
@@ -55,7 +55,7 @@
       <el-table-column label="所属任务" min-width="150">
         <template slot-scope="scope">
           <span v-for="(item, index) in scope.row.taskList" :key="item.id">
-            <span class="jumpName" @click="jump(item.id, '任务详情')">{{ item.name }}</span>
+            <span class="jumpName" @click="jump(item, '任务详情')">{{ item.name }}</span>
             <span v-if="index < scope.row.taskList.length - 1"> , </span>
           </span>
           <!-- {{ scope.row.taskList ? scope.row.taskList.map(item=>item.name).join(','): '' }} -->
@@ -304,8 +304,9 @@ export default {
         }
       }
     },
-    jump(id, name) {
-      const bizId_id = EncryptId(`${this.bizId}_${id}`)
+    jump(item, name) {
+      const { id, bizId } = item
+      const bizId_id = EncryptId(`${bizId}_${id}`)
       const { href } = this.$router.resolve({ name: name, query: { bizId_id: bizId_id }})
       window.open(href, '_blank')
     },