From df61269616afbc916a995ff545a3158ad93944f4 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E6=99=B6=E6=99=B6=20=E5=BC=A0?=
 <zhangjingjing@geedgenetworks.com>
Date: Mon, 26 Jul 2021 14:05:51 +0800
Subject: [PATCH] =?UTF-8?q?CN-72=20fix=EF=BC=9Asetting=20=E6=89=80?=
 =?UTF-8?q?=E6=9C=89=E5=88=97=E8=A1=A8=E9=A1=B5=E9=9D=A2=20=E8=A1=A8?=
 =?UTF-8?q?=E5=A4=B4=E8=AE=BE=E7=BD=AE=E6=A1=86=20=E6=A0=B7=E5=BC=8F?=
 =?UTF-8?q?=E8=B0=83=E6=95=B4=20CN-71=20feat:=E7=94=A8=E6=88=B7=EF=BC=8C?=
 =?UTF-8?q?=E8=A7=92=E8=89=B2=EF=BC=8Ci18n=EF=BC=8C=E6=93=8D=E4=BD=9C?=
 =?UTF-8?q?=E8=AE=B0=E5=BD=95=E5=88=97=E8=A1=A8=E9=A1=B5=E9=9D=A2=20?=
 =?UTF-8?q?=E6=B7=BB=E5=8A=A0=E6=90=9C=E7=B4=A2=E6=A1=86?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/components/table/CnDataList.vue      | 16 +++++++++++++++-
 src/components/table/ColumnCustomize.vue | 13 +++++++++++--
 2 files changed, 26 insertions(+), 3 deletions(-)

diff --git a/src/components/table/CnDataList.vue b/src/components/table/CnDataList.vue
index 16a0b8f3..dffb0365 100644
--- a/src/components/table/CnDataList.vue
+++ b/src/components/table/CnDataList.vue
@@ -9,6 +9,8 @@
             <slot name="top-tool-left"></slot>
           </div>
           <div class="top-tool-right">
+            <el-input v-model="keyWord" value="keyWord"></el-input>
+            <el-button @click="onSearch" icon="el-icon-search" type="info" size="mini" style="margin-right: 10px"></el-button>
             <div v-if="showLayout.indexOf('searchInput') > -1" class="top-tool-search margin-r-20"></div>
             <slot name="top-tool-right"></slot>
             <button v-if="showLayout.indexOf('elementSet') > -1"  class="top-tool-btn"
@@ -43,6 +45,7 @@
 <script>
 import columnCustomize from '@/components/table/ColumnCustomize'
 import { fromRoute } from '@/utils/constants'
+import { get } from '@/utils/http'
 
 export default {
   name: 'cnDataList',
@@ -70,16 +73,25 @@ export default {
   },
   data () {
     return {
+      keyWord:"",
       fromRoute: fromRoute,
       tools: {
         showCustomTableTitle: false // 自定义列弹框是否显示
       },
-      showLayout: []
+      showLayout: [],
+      Search:[],
     }
   },
   methods: {
     updateCustomTableTitle (custom) {
       this.$emit('update:customTableTitle', custom)
+    },
+    onSearch () {
+      get('sys/log?pageNo=1&pageSize=30').then(res => {
+        if(res.code === 200){
+          this.Search = res.data.list
+        }
+      })
     }
   },
   watch: {
@@ -93,3 +105,5 @@ export default {
   }
 }
 </script>
+<style>
+</style>
diff --git a/src/components/table/ColumnCustomize.vue b/src/components/table/ColumnCustomize.vue
index 567f8966..20cd8488 100644
--- a/src/components/table/ColumnCustomize.vue
+++ b/src/components/table/ColumnCustomize.vue
@@ -2,7 +2,7 @@
   <div class="pop-custom" v-ele-click-outside="esc">
     <div class="pop-title">{{$t('overall.select')}}</div>
     <div class="pop-box custom-labels">
-      <div style="height: 100%; overflow: auto;">
+      <div style="height: 100%; border-radius:2%; border:1px solid #DCDFE6; overflow: auto;">
         <!--NotSet 为true不可设置-->
         <div
           v-for="(item,index) in custom"
@@ -29,7 +29,7 @@
         <el-button size="mini" :id="tableId+'-element-set-esc'" class="cn-btn cn-btn-size-small-new cn-btn-style-light-new" type="button" @click="esc">
           <span class="top-tool-btn-txt">{{$t('overall.esc')}}</span>
         </el-button>
-        <el-button size="mini" :id="tableId+'-element-set-save'" class="cn-btn cn-btn-size-small-new cn-btn-style-normal-new" type="button" @click="save">
+        <el-button size="mini" :id="tableId+'-element-set-save'" class="cn-btn cn-btn-size-small-new cn-btn-style-normal-new" type="button" @click="save" style="background-color: #0091ff;color:#DCDFE6">
           <span class="top-tool-btn-txt">{{$t('overall.save')}}</span>
         </el-button>
       </div>
@@ -116,6 +116,9 @@ export default {
 </script>
 
 <style lang="scss">
+.pop-title{
+  margin-top: 7px;
+}
 .pop-custom {
   padding: 0 12px 12px 12px;
   border: 1px solid #EBEEF5;
@@ -127,6 +130,8 @@ export default {
   background: #fff;
   border-radius: 4px;
   z-index: 999999;
+  box-shadow: inset 0 0 10px #CCC;
+  box-sizing:border-box
 }
 .pop-custom-explore {
   top: 33px;
@@ -152,6 +157,10 @@ export default {
   cursor: default;
   font-size: 14px;
 }
+.custom-label:hover{
+  color: #cccccc;
+  background-color: #DCDFE6;
+}
 .custom-title{
   padding: 2px 0 2px 2px;
 }