Merge branch 'dev_zwpt' of http://39.99.224.27:9022/changchao/founder_vue into dev_zwpt

src/i18n/zh-cn.js

@@ -1300,7 +1300,7 @@ export default {
     work_queue: '工作队列',
     description_cannot_exceed_50_words: '说明不能超过50个字！',
     please_input_logical_name: '请输入逻辑库名称',
-    name_includes_Chinese_characters_letters_and_two_Chinese_characters: '名称包括汉字、字母，至少两个汉字!',
+    name_includes_Chinese_characters_letters_and_two_Chinese_characters: '支持中英文组合，不少于2个汉字！',
     newly_added: '新增',
     logical_library_already_exists: '已有该逻辑库',
     unknown_exception: '未知异常！',

src/views/SystemManage/systemLog.vue

@@ -168,7 +168,7 @@ export default {
       let _that = this
       //事件中keycode=13为回车事件
       if (code === 13) {
-        _that.clear()
+        _that.getLogList()
       }
     },
     getLogList (page = 1) {
@@ -179,7 +179,7 @@ export default {
         .post('/api/log/logList', this.systemLogParam)
         .then(response => {
           console.log(response);
-          if(response.data.code == 200) {
+          if (response.data.code == 200) {
             this.tableDate = response.data.detail.systemLogs
             this.systemLogParam.total = response.data.detail.total
             this.pages = response.data.detail.pages
@@ -312,28 +312,28 @@ export default {
     right: 0;
   }
 }
-@import "@/assets/css/globalBase.scss";
+@import '@/assets/css/globalBase.scss';
 </style>
 <style scoped lang="scss">
-  /deep/ .el-table .el-table__body tr.current-row > td {
-    background-color: transparent !important;
-  }
+/deep/ .el-table .el-table__body tr.current-row > td {
+  background-color: transparent !important;
+}
 
-  /deep/ .el-table .el-table__body tr:hover > td {
-    background-color: transparent !important;
-  }
+/deep/ .el-table .el-table__body tr:hover > td {
+  background-color: transparent !important;
+}
 
-  // tabel当前列数据为null时展示 ---
-  /deep/.el-table {
+// tabel当前列数据为null时展示 ---
+/deep/.el-table {
+  .cell:empty::before {
+    content: '---';
+    color: #666666;
+  }
+  .is-leaf {
     .cell:empty::before {
-      content: "---";
+      content: '---';
       color: #666666;
     }
-    .is-leaf {
-      .cell:empty::before {
-        content: "---";
-        color: #666666;
-      }
-    }
   }
+}
 </style>

src/views/xtfkgl/RyXtljfkView.vue

@@ -145,7 +145,7 @@
 
                         </el-tooltip>
 
-                        <el-tooltip
+                        <!-- <el-tooltip
                                 effect="dark"
                                 :content="$t('Xtfkgl.data_management')"
                                 placement="top"
@@ -154,7 +154,7 @@
                                  style="width: 1.125rem;height: 1.125rem; margin-right: 1.125rem;cursor: pointer;">
                                 <use xlink:href="#icon-shujuguanli" />
                             </svg>
-                        </el-tooltip>
+                        </el-tooltip> -->
 
 
                     </template>

src/views/zljc/Index.vue

@@ -14,7 +14,7 @@
             <el-input
               v-model.trim="formInline.barcode"
               :placeholder="$t('Common.rybh_placeholder')"
-              @keyup.enter.native="search"
+              @keyup.enter.native="search()"
               maxlength="23"
               show-word-limit
               clearable
@@ -28,7 +28,7 @@
               v-model="formInline.inspectionFlag"
               :placeholder="$t('Zljc.select_check_result')"
               clearable
-              @keyup.enter.native="search"
+              @keyup.enter.native="search()"
             >
               <el-option
                 :label="$t('Zljc.be_checked')"