Merge branch 'master-v32-xwx' into 'master'

杭州-缓存数据-缓存数据优化



See merge request !364

@@ -25,7 +25,7 @@
                                 <div v-html="getTextContent(scope.row[item.prop])">
                                 </div>
                             </template>
-                            <div style="overflow: hidden;	text-overflow: ellipsis;	display: -webkit-box;	-webkit-line-clamp: 2;	-webkit-box-orient: vertical;">
+                            <div style="overflow: hidden;	text-overflow: ellipsis; font-size:15px;	display: -webkit-box;	-webkit-line-clamp: 2;	-webkit-box-orient: vertical;">
                                 {{scope.row[item.prop]}}
                             </div>
                         </el-tooltip>

@@ -2,7 +2,7 @@
     <el-row>
         <el-col :span="24">
             <div class="flex-div-start margin-top-bottom-10">
-                <el-input  class="margin-right-10" v-model="keyword" placeholder="输入关键字" />
+                <el-input  class="margin-right-10"   @keydown.enter.native="onBtnSearch()" v-model="keyword" placeholder="输入关键字" />
 
                 <div class="flex-div-start">
 
@@ -26,7 +26,7 @@
         <el-col :span="24" class="flex-div-start margin-bottom-10">
 
 <!--           <span>匹配项：{{num}}个</span>-->
-           <span>[筛选：{{keyword}}]({{count}})</span>
+           <span style="font-size:15px;">[筛选：{{keyword}}]({{count}})</span>
 
         </el-col>
     </el-row>

@@ -82,6 +82,9 @@ export default {
             proxy.$http.get(`/api-web/manage/ddic/page`, params, function (res) {
                 if (res && res.data) {
                     tagData.value=res.data;
+                    checkedId.value = res.data[0].ddicCode;
+                    keyword.value=res.data[0].ddicCode;
+                    getDataList();
                 }
             });
         }
@@ -155,7 +158,6 @@ export default {
                 });
             }
 
-
         }
         //关闭弹框回调函数
         let closeDialog=()=>{
@@ -169,7 +171,6 @@ export default {
         // 挂载完
         Vue.onMounted(() => {
             getConf();
-            getDataList();
 
         })
         return {