From 5e276ed0b37c72b8c8981ddbd5c826fb3e08d297 Mon Sep 17 00:00:00 2001
From: zhujida <zhujida@ldxinyong.com>
Date: Fri, 22 Jan 2021 17:14:39 +0800
Subject: [PATCH] =?UTF-8?q?=E5=8E=BB=E9=99=A4=20=E8=BE=93=E5=87=BA?=
 =?UTF-8?q?=EF=BC=8C=20=E6=8C=87=E6=A0=87=E5=BA=93=E6=B7=BB=E5=8A=A0?=
 =?UTF-8?q?=E6=9D=83=E9=99=90?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/components/ChooseTarget/index.vue   |  3 ---
 src/components/PopupRadio/index.vue     |  3 ---
 src/components/TargetFiltrate/index.vue |  3 ---
 src/views/kpi/set/index.vue             |  4 ++--
 src/views/kpi/set/target/add/index.vue  |  2 --
 src/views/kpi/set/target/index.vue      | 10 ----------
 6 files changed, 2 insertions(+), 23 deletions(-)

diff --git a/src/components/ChooseTarget/index.vue b/src/components/ChooseTarget/index.vue
index 9f0c848..31802e5 100644
--- a/src/components/ChooseTarget/index.vue
+++ b/src/components/ChooseTarget/index.vue
@@ -93,8 +93,6 @@ export default {
     handleSelectionChange (val) {
       // 选项
       this.selectedList = val
-      console.log('选中------')
-      console.log(val)
     },
     handelTargetFilterSubmit (val) {
       // 选择指标分类
@@ -113,7 +111,6 @@ export default {
     },
     handleSubmitPopup () {
       this.$emit('cd', this.selectedList)
-      console.log('选中')
       console.dir(this.selectedList)
       this.$emit('update:isShowPopup', false)
     },
diff --git a/src/components/PopupRadio/index.vue b/src/components/PopupRadio/index.vue
index 8e4da23..a25ac3a 100644
--- a/src/components/PopupRadio/index.vue
+++ b/src/components/PopupRadio/index.vue
@@ -29,12 +29,9 @@ import { apiGetIndicatorType } from '@/api/target'
 export default {
   methods: {
     hundlePopupHide () {
-      console.log('移动到---隐藏')
       this.$emit('update:isShowPopupRadio', false)
     },
     handleSubmitPopup () {
-      console.log('提交---隐藏')
-      console.log(this.radioSelectedId)
       this.$emit('cd', this.radioSelectedId)
       this.$emit('update:isShowPopupRadio', false)
     },
diff --git a/src/components/TargetFiltrate/index.vue b/src/components/TargetFiltrate/index.vue
index ee15fa6..c14bfe4 100644
--- a/src/components/TargetFiltrate/index.vue
+++ b/src/components/TargetFiltrate/index.vue
@@ -38,7 +38,6 @@ import { getDimensions } from '@/api/data'
 export default {
   methods: {
     hundlePopupHide () {
-      console.log('隐藏---------')
       this.$emit('update:isShowTargetFiltrate', false)
     },
     handleSubmitPopup () {
@@ -49,7 +48,6 @@ export default {
     },
     handleRadio (area, val) {
       // 选中值
-      console.log(val)
       area.selectedId = val.id
 
       this.areaSelectedDic = val.id === -1 ? null : val
@@ -67,7 +65,6 @@ export default {
             let data = res.data
             this.$nextTick(() => {
               this.listData[0].list = [{ id: -1, name: '全部' }].concat(data.list)
-              console.log(this.listData)
             })
           }
         })
diff --git a/src/views/kpi/set/index.vue b/src/views/kpi/set/index.vue
index 89e2f44..b273893 100644
--- a/src/views/kpi/set/index.vue
+++ b/src/views/kpi/set/index.vue
@@ -52,12 +52,12 @@ export default {
       this.activeIndex = '0'
     } else if (!this.auth.roleSet) {
       this.activeIndex = '1'
-    } else if (!this.auth.target) {
+    } else if (!this.auth.setIndicatrix) {
       this.activeIndex = '2'
     } else {
       this.activeIndex = ''
     }
-    if (this.auth.evaluationSet && this.auth.roleSet) {
+    if (this.auth.evaluationSet && this.auth.roleSet && this.auth.setIndicatrix) {
       this.activeIndex = this.$route.query.activeIndex
     } else {
       this.activeIndex = this.$route.query.activeIndex || '0'
diff --git a/src/views/kpi/set/target/add/index.vue b/src/views/kpi/set/target/add/index.vue
index 3968ed3..5b9be13 100644
--- a/src/views/kpi/set/target/add/index.vue
+++ b/src/views/kpi/set/target/add/index.vue
@@ -193,8 +193,6 @@ export default {
   },
   created () {
     if (this.$route.query.id) {
-      console.log('this.$route.query:')
-      console.log(this.$route.query)
       this.changeTargetId = this.$route.query.id
       this.formData = this.$route.query
     }
diff --git a/src/views/kpi/set/target/index.vue b/src/views/kpi/set/target/index.vue
index 76b07cd..d14dcbf 100644
--- a/src/views/kpi/set/target/index.vue
+++ b/src/views/kpi/set/target/index.vue
@@ -211,8 +211,6 @@ export default {
     },
     handlePopupMove (val) {
       // 移动指标分类
-      console.log('移动指标分类')
-      console.log(val)
       let ids = this.selectedRowList.map(item => {
         return item.id
       }).join(',')
@@ -231,7 +229,6 @@ export default {
       })
     },
     handleRemove () {
-      console.log('删除指标')
       this.$confirm('确认删除选中指标', '提示').then(() => {
         let ids = this.selectedRowList.map(item => {
           return item.id
@@ -350,8 +347,6 @@ export default {
         type: val.type,
         indicatorType: val.indicatorType
       }
-      console.log('跳转')
-      console.dir(val)
       this.$router.push({ name: 'workbench-target-add', query: changeVal })
     },
     handleSelectionChange (val) {
@@ -359,8 +354,6 @@ export default {
     },
     handlePopupFiltrateSubmit (val) {
       // 筛选 选择指标类型
-      console.log('筛选类型----')
-      console.log(val)
       this.selectedTargetType = val
       this.queryData.type = val ? val.id : -1
       this.handleGetMenuList(this.queryData.type)
@@ -389,8 +382,6 @@ export default {
             }
             return item
           })
-          console.log('获取类型')
-          console.log(this.tableMenuData)
           this.tableMenuData.forEach((item, index) => {
             if (item.indicatorType === this.queryData.indicatorType) {
               // 选中
@@ -405,7 +396,6 @@ export default {
     },
     //  获取指标列表
     handleGetTargetList (indicatorType = -1, type = -1, name = '', currPage = 1) {
-      console.log(name)
       this.queryData.name = name
       this.queryData.indicatorType = indicatorType
       let para = {