yuwandanmian 1 year ago
parent
commit
c356c914ab
2 changed files with 8 additions and 3 deletions
  1. 6 2
      src/views/allcase/caseIndexList.vue
  2. 2 1
      src/views/yyps/index/index.vue

+ 6 - 2
src/views/allcase/caseIndexList.vue

@@ -107,7 +107,7 @@ export default {
   },
   watch: {
     $route(to, from) {
-      if (from.path === '/caseIndex' && to.path === '/caseIndexList') {
+      if (['/caseIndex', '/yypsIndex'].includes(from.path) && to.path === '/caseIndexList') {
         this.searchData.is_error = ''
         this.searchData.AAA28 = ''
         this.searchData.AAC11N = ''
@@ -172,8 +172,12 @@ export default {
       if ([0, 1].includes(is_error)) {
         params.is_error = is_error
       }
+      let url = '/get_zhibiao_list'
       
-      this.$axios2.post('/get_zhibiao_list', params).then(res => {
+      if (this.$route.query.from === 'yypsIndex') {
+        url = '/get_zhibiao_list_v2'
+      }
+      this.$axios2.post(url, params).then(res => {
         this.tableData = res.data.data
         this.paginationData.total = res.data.count
       })

+ 2 - 1
src/views/yyps/index/index.vue

@@ -891,10 +891,11 @@ export default {
       let path
       if (this.$route.path === '/embedIndex-home') {
         path = '/embedIndex-caseIndexList'
+        this.$router.push({ path, query: { year: this.formInline.year, time, ruleId: Number(`${this.ruleId}`.slice(0, 2)), type: this.judgeNum } });
       } else {
         path = '/caseIndexList'
+        this.$router.push({ path, query: { year: this.formInline.year, time, ruleId: Number(`${this.ruleId}`.slice(0, 2)), type: this.judgeNum, from: 'yypsIndex' } });
       }
-      this.$router.push({ path, query: { year: this.formInline.year, time, ruleId: Number(`${this.ruleId}`.slice(0, 2)), type: this.judgeNum } });
     },
     // 菜单筛选
     filterNode(value, data) {