洪海涛 4 жил өмнө
parent
commit
975ba0763f

+ 6 - 1
src/views/monthlyReport/childrenPage/editReport/components/Cascader.vue → src/components/select/selectCascader.vue

@@ -8,7 +8,7 @@
     clearable
     collapse-tags
     style="width: 100%"
-    placeholder="请选择"
+    :placeholder="placeholder"
     :remote-method="remoteMethod"
     @change="changeCascader"
   >
@@ -32,6 +32,11 @@ export default {
       type: [Array, String, Number],
       required: false,
       default: () => []
+    },
+    placeholder: {
+      type: String,
+      required: false,
+      default: '请选择'
     }
   },
   data() {

+ 100 - 0
src/components/select/selectCascaderInfo.vue

@@ -0,0 +1,100 @@
+<template>
+  <div v-if="teamData && teamData.length">
+    <span v-for="(item, index) in itemName" :key="index" style="margin-right: 10px">
+      <span>
+        <el-tooltip
+          class="item"
+          effect="dark"
+          :content="item.deptPath"
+          placement="top">
+          <span>{{ item.label }}</span>
+        </el-tooltip>
+        <span>{{ !(index >= itemName.length - 1) ? ',' : '' }}</span>
+      </span>
+    </span>
+  </div>
+</template>
+
+<script>
+// import _ from 'lodash'
+
+export default {
+  name: 'CascaderInfo',
+  props: {
+    teamData: {
+      type: [Array, String, Number],
+      required: false,
+      default: () => []
+    }
+  },
+  data() {
+    return {
+      itemName: []
+    }
+  },
+  computed: {
+    tabsActive() {
+      return this.$store.state.monthlyReportEdit.tabsActive
+    },
+    selectEnum() {
+      return this.$store.state.monthlyReportEdit.selectEnum
+    }
+  },
+  watch: {
+    tabsActive() {
+      this.init()
+    }
+  },
+  mounted() {
+    this.init()
+  },
+  methods: {
+    init() {
+      // console.log(this.selectEnum);
+      // console.log(this.teamData);
+      if (this.teamData && this.teamData.length && this.selectEnum) {
+        const itemName = []
+        const onlyId = []
+        this.teamData.forEach((elm) => {
+          if (onlyId.indexOf(elm) < 0) {
+            const item = this.find(elm)
+            // console.log(item);
+            // console.log({
+            //   label: item.label,
+            //   deptPath: item.deptPath
+            // })
+            onlyId.push(elm)
+            itemName.push({
+              label: item.label,
+              deptPath: item.deptPath
+            })
+          }
+        })
+        // 数组去重
+        this.itemName = [...itemName]
+        this.$forceUpdate()
+        // console.log(69, this.itemName)
+      }
+    },
+    find(id) {
+      let name = ''
+      const run = (arr) => {
+        for (let i = 0; i < arr.length; i++) {
+          const elm = arr[i]
+          if (`${elm.value}` === `${id}`) {
+            name = elm
+            return
+          }
+          if (elm.children) {
+            run(elm.children)
+          }
+        }
+      }
+      run(this.selectEnum)
+      return name
+    }
+  }
+}
+</script>
+
+<style scoped lang='less'></style>

+ 1 - 1
src/views/dataBigManage/components/drawerModal/drawerModalData.js

@@ -322,7 +322,7 @@ export const columns = {
       {
         label: '任务交付周期',
         key: 'title',
-        minWidth: 100,
+        minWidth: 130,
         tips: '计算范围内任务,任务从开始到交付(已上线取实际上线时间,未上线取排期交付时间)的总周期',
         align: 'center'
       },

+ 4 - 3
src/views/dataBigManage/components/efficiencyModule/index.vue

@@ -315,16 +315,17 @@
         />
         <!-- <div class="titleLevel3" style="color: #fff;">{{ mainData.testDevPeopleScale.label }}</div> -->
         <div class="content">
-               <div
-            v-for="item in mainData.testDevPeopleScale.subCountList"
+          <div
+            v-for="(item, itemIndex) in mainData.testDevPeopleScale.subCountList"
             :key="item.label"
+            :style="{marginRight: itemIndex ? '0' : '5px'}"
             class="item"
           >
           <!-- @click.stop="$emit(
               'checkDetialModal',
               { ...mainData.testDevPeopleScale, activeLabel: item.label }
             )" -->
-            <span class="title">{{ item.label }}:</span><span class="value"><span class="num noHover">{{ item.countStr }}</span></span>
+            <span class="title">{{ item.label }}:</span><span class="value"><span class="num noHover">{{ item.countStr }}&nbsp;&nbsp;</span></span>
           </div>
         </div>
         <!-- <div class="foot">