Merge branch 'dev-rmd2' of http://101.126.133.7:9001/Rmengdi/LQBZ_web into dev-rmd2

src/views/als/faultCase/index.vue

@@ -299,8 +299,10 @@ export default {
             duration: 3000,
             message: '操作成功!ES数据同步中，稍后刷新查询!'
           })
-          this.getFaultCaseAPI({ faultPhenomenon: keyWordData })
           this.handleClose()
+          setTimeout(() => {
+            this.getFaultCaseAPI({ faultPhenomenon: this.keyWordData })
+          }, 2000)
         }
       } catch (error) {}
     },
@@ -324,17 +326,12 @@ export default {
       } catch (error) {}
     },
 
-    async getFaultCaseByEsAPI(keyWordData) {
-      console.log(keyWordData)
-    },
-
     fetch() {
-      this.getFaultCaseAPI({ faultPhenomenon: keyWordData })
+      this.getFaultCaseAPI({ faultPhenomenon: this.keyWordData })
     },
 
-    async searchClick(keyWordData) {
-      // this.getFaultCaseByEsAPI(keyWordData)
-      this.getFaultCaseAPI({ faultPhenomenon: keyWordData })
+    async searchClick() {
+      this.getFaultCaseAPI({ faultPhenomenon: this.keyWordData })
     },
 
     //更多按钮
@@ -348,11 +345,12 @@ export default {
           this.$message({
             type: 'success',
             duration: 3000,
-            message: 'ES数据同步中，稍后刷新查询!'
+            message: '添加成功，ES数据同步中!'
           })
-
           this.handleClose()
-          this.getFaultCaseAPI({ faultPhenomenon: keyWordData })
+          setTimeout(() => {
+            this.getFaultCaseAPI({ faultPhenomenon: this.keyWordData })
+          }, 2000)
         }
       } catch (error) {}
     },
@@ -364,10 +362,12 @@ export default {
           this.$message({
             type: 'success',
             duration: 3000,
-            message: '操作成功!ES数据同步中，稍后刷新查询!'
+            message: '操作成功!ES数据同步中...'
           })
           this.handleClose()
-          this.getFaultCaseAPI({ faultPhenomenon: keyWordData })
+          setTimeout(() => {
+            this.getFaultCaseAPI({ faultPhenomenon: this.keyWordData })
+          }, 2000)
         }
       } catch (error) {}
     },
@@ -450,15 +450,6 @@ export default {
       this.form = deepClone(row)
       const matchedItem = this.aircraftTypeAll.find((item) => row.aircraftTypeName.trim() === item.id.trim())
       this.detailAircraftType = matchedItem.label
-      // if (row.faultPicturePath) {
-      //   const res = await getListByIdsApi(row.faultPicturePath)
-      //   this.faultPicturePathUrl = res.data[0].url
-      //   const res2 = await getListByIdsApi(row.faultTreePath)
-      //   this.faultTreePathUrl = res.data[0].url
-      // } else {
-      //   this.faultPicturePathUrl = row.faultPicturePath
-      //   this.faultTreePathUrl = row.faultTreePathUrl
-      // }
       this.form.faultPhenomenon = row.pcontent
       this.form.faultCause = row.fcontent
       this.detailVisible = true

src/views/als/lifetimeSpareParts/index.vue

@@ -364,10 +364,10 @@ export default {
       const { keyWord } = this
       const { pageSize, pageIndex } = this.tableRequset
       const {
-        data: { list, totalCount }
+        data: { list, total }
       } = await getLifetimeSpareParts({ pageSize, pageNum: pageIndex, keyWord, ...params })
       this.tableData = list
-      this.tableRequset.total = totalCount
+      this.tableRequset.total = total
     },
 
     fetch() {