Merge branch 'ocr_2.0' of http://192.168.10.28:3000/Yaxin/fu-hsi-web into ocr_2.0

src/views/caseManagement/index.vue

@@ -143,7 +143,8 @@ export default {
       // 案件数据
       caseList: [],
       caseAnalysisStatus: '',
-      orderType: ''
+      orderType: '',
+      orderBy: 'create_time'
     }
   },
   mounted() {
@@ -170,7 +171,8 @@ export default {
       delete params['updateTime']
       if (params.identifyResult && params.identifyResult.length === 0) delete params['identifyResult']
       params.caseAnalysisStatus = this.caseAnalysisStatus
-      params.orderType = this.orderType
+      params.orderType = this.orderType || 'DESC'
+      params.orderBy = this.orderBy
       queryCaseList(params, this.queryForm.page, this.queryForm.size).then(res => {
         this.caseList = res.data.records
         this.caseList.forEach(e => {
@@ -296,6 +298,7 @@ export default {
     },
     changeType(val) {
       this.orderType = val
+      this.orderBy = 'total_score'
       this.queryForm.page = 1
       this.fetchData()
     },

src/views/login/index.vue

@@ -26,6 +26,7 @@
               :type="passwordType"
               placeholder="请输入密码"
               clearable
+              @keyup.enter.native="handleLoginClick"
             />
             <span
               v-if="passwordType === 'password'"

src/views/promptManagement/PromptConfig/add/index.vue

@@ -327,12 +327,14 @@ export default {
     submit() {
       this.$refs.form.validate(valid => {
         if (valid) {
+          if (this.dataInfo.type === '1') {
             for (const item of this.dataInfo.extractAttributes) {
               if (item.attrName === '' || item.attrValueType === '') {
                 this.$baseMessage.error('请填写完整属性')
                 return
               }
             }
+          }
           const params = {
             id: this.$route.params.id,
             ...this.dataInfo,