From 6a69503f4a02a92b5ae4b9853dec812437b93b83 Mon Sep 17 00:00:00 2001
From: jiangyy <jiang478938504@126.com>
Date: Thu, 24 Sep 2020 14:04:11 +0800
Subject: [PATCH] =?UTF-8?q?=E4=B8=8A=E4=BC=A0=E4=BB=A3=E7=A0=81=E8=BF=87?=
 =?UTF-8?q?=E6=BB=A4?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../src/views/components/CTable.vue           | 22 ++++++++++++--
 .../src/views/components/CTableNoPage.vue     | 24 ++++++++++++++-
 .../miniProAgent/version/CommitForm.vue       | 29 +++++++++++++++++--
 .../miniProAgent/version/VersionItem.vue      |  2 +-
 4 files changed, 71 insertions(+), 6 deletions(-)

diff --git a/epmet-oper-web/src/views/components/CTable.vue b/epmet-oper-web/src/views/components/CTable.vue
index b905e31..b8a65a4 100644
--- a/epmet-oper-web/src/views/components/CTable.vue
+++ b/epmet-oper-web/src/views/components/CTable.vue
@@ -200,6 +200,12 @@ export default {
     operationWidth: {
       type: Number,
       default: 120
+    },
+    filterParams: {
+      type: Array,
+      default () {
+        return []
+      }
     }
 
   },
@@ -260,9 +266,21 @@ export default {
         this.table.params,
         (data, rspMsg) => {
           if (data) {
-
-            this.tableData = data.list
             this.total = data.total
+            this.tableData = data.list
+
+            if (this.filterParams.length > 0) {
+
+              this.filterParams.forEach(paramItem => {
+                const key = paramItem.key
+                const value = paramItem.value
+                this.tableData = this.tableData.filter(item => {
+                  item[key].indexOf(value) > 0
+                })
+              })
+
+            }
+
           }
           this.loading = false
         },
diff --git a/epmet-oper-web/src/views/components/CTableNoPage.vue b/epmet-oper-web/src/views/components/CTableNoPage.vue
index cc38a03..63df8d4 100644
--- a/epmet-oper-web/src/views/components/CTableNoPage.vue
+++ b/epmet-oper-web/src/views/components/CTableNoPage.vue
@@ -190,7 +190,14 @@ export default {
     tableHeight: {
       type: Number
     },
-    pageVisible: Boolean // 是否显示page分页     lyx   20190411
+    pageVisible: Boolean, // 是否显示page分页     lyx   20190411
+
+    filterParams: {
+      type: Array,
+      default () {
+        return []
+      }
+    }
   },
   activated () {
     // debugger
@@ -244,7 +251,22 @@ export default {
         (data, rspMsg) => {
           if (data) {
             this.tableData = data
+            console.log(this.filterParams)
+            if (this.filterParams.length > 0) {
+
+              this.filterParams.forEach(paramItem => {
+                const key = this.filterParams[0].key
+                const value = this.filterParams[0].value
+
+                this.tableData = this.tableData.filter(item => {
+                  // console.log(item[key])
+                  // console.log(item[key].indexOf(value))
+                  return item[key].indexOf(value) != -1
+
+                })
+              })
 
+            }
           }
           this.loading = false
         },
diff --git a/epmet-oper-web/src/views/modules/customer/miniProAgent/version/CommitForm.vue b/epmet-oper-web/src/views/modules/customer/miniProAgent/version/CommitForm.vue
index 5653a19..d6f9a76 100644
--- a/epmet-oper-web/src/views/modules/customer/miniProAgent/version/CommitForm.vue
+++ b/epmet-oper-web/src/views/modules/customer/miniProAgent/version/CommitForm.vue
@@ -20,6 +20,7 @@
                    :url="tableUrl"
                    :params="tableParams"
                    keyword="Temp"
+                   :filterParams="filterParams"
                    :operations="operations"
                    :orderOperations="orderOperations"
                    @selectRadioRow="selectRadioRow">
@@ -44,6 +45,7 @@ export default {
   data () {
     return {
       params: {},//父组件传来的
+      clientTypeShow: '',//父组件传来的
       tempForm: {
         commitUrl: 'https://epmet-cloud.elinkservice.cn/api/third/code/upload',
         // commitUrl: '/third/code/upload',
@@ -74,6 +76,7 @@ export default {
           return {}
         }
       },
+
       // 列表操作栏的操作项数组
       operations: [],
       orderOperations: [],
@@ -91,7 +94,28 @@ export default {
     tableHeight () {
       return this.clientHeight - 60 - 80 - 80 - 50 - 400
     },
-    ...mapGetters(['clientHeight'])
+    //需要过滤的字段
+    filterParams () {
+      let value = ''
+
+      if (this.env === 'prod') {
+        value = '正式服'
+      } else if (this.env === 'prod') {
+        value = '体验服'
+      } else {
+        value = '开发服'
+      }
+
+      let params = [
+        {
+          key: 'userDesc',
+          value: this.clientTypeShow + '-' + value
+        }
+      ]
+      // console.log(params)
+      return params
+    },
+    ...mapGetters(['clientHeight', 'env'])
   },
   props: {
     // optionData: {
@@ -103,10 +127,11 @@ export default {
   },
   methods: {
     // eslint-disable-next-line
-    initData (params, optionData) {
+    initData (params, optionData, clientTypeShow) {
       this.diaVisible = true
       this.optionData = optionData
       this.params = params
+      this.clientTypeShow = clientTypeShow
 
       this.$nextTick(() => {
         this.$refs['ref_form_temp'].assign(params)
diff --git a/epmet-oper-web/src/views/modules/customer/miniProAgent/version/VersionItem.vue b/epmet-oper-web/src/views/modules/customer/miniProAgent/version/VersionItem.vue
index 9a4743b..4b33e04 100644
--- a/epmet-oper-web/src/views/modules/customer/miniProAgent/version/VersionItem.vue
+++ b/epmet-oper-web/src/views/modules/customer/miniProAgent/version/VersionItem.vue
@@ -420,7 +420,7 @@ export default {
         //   clientType: 'resi',
         //   customerId: customerId
         // }
-        this.$refs['ref_commit_form'].initData(this.params, this.optionData)
+        this.$refs['ref_commit_form'].initData(this.params, this.optionData, this.clientTypeShow)
       })
     },