Merge branch 'hi-ucs-dev' of http://15.2.21.221:3000/wuhongjian/hi-ucs into hi-ucs-dev

back/src/views/modules/myAgent/demo/competency-application.vue

@@ -92,12 +92,13 @@
 <script>
 // 引入工作流公共方法
 import processModule from '@/mixins/process-module'
+import mixinViewModule from '@/mixins/view-module'
 import debounce from 'lodash/debounce'
 import qs from 'qs'
 import RenProcessDetail from '@/components/ren-process-detail/src/ren-process-detail'
 export default {
   // 注入公共方法
-  mixins: [processModule],
+  mixins: [mixinViewModule, processModule],
   data () {
     return {
       dialogVisible: false,
@@ -313,7 +314,35 @@ export default {
           })
         })
       }
+      this.tabRemoveHandle(data)
+      // this.getDataList(data)
     }, 1000, { leading: true, trailing: false }),
+    tabRemoveHandle (tabName) {
+      console.log(tabName, 'aaaaaaaaaaaaaaaaaaaaaaaaaaaaaa')
+      if (tabName === 'home') {
+        return false
+      }
+      this.$store.state.contentTabs = this.$store.state.contentTabs.filter(
+        (item) => item.name !== tabName
+      )
+      if (this.$store.state.contentTabs.length <= 0) {
+        this.$store.state.sidebarMenuActiveName =
+          this.$store.state.contentTabsActiveName = 'home'
+        return false
+      }
+      // 当前选中tab被删除
+      if (tabName === this.$store.state.contentTabsActiveName) {
+        const tab =
+          this.$store.state.contentTabs[
+            this.$store.state.contentTabs.length - 1
+          ]
+        this.$router.push({
+          name: /^iframe_.+/.test(tab.name) ? 'iframe' : tab.name,
+          params: { ...tab.params },
+          query: { ...tab.query }
+        })
+      }
+    },
     // 启动流程出错回调
     startProcessErrorCallback (data) {
       console.log(data)

front/src/views/home/DetailsPageconetent.vue

@@ -1141,6 +1141,9 @@
         console.log('paramsGetResources', paramsGetResources)
       })
       mybus.on('changeSelcted', () => {
+        // 添加申购车后，返回第一页
+        paramsGetResources.pageNum = 1
+        currentPage.value = 1
         getAppResources()
       })
       mybus.on('changeInfo', (info) => {
@@ -1161,6 +1164,9 @@
         getAppResources()
       })
       mybus.on('changeCondition', (condition) => {
+        // 回到第一页，分页页码为1
+        paramsGetResources.pageNum = 1
+        currentPage.value = 1
         //  orderField: 'total' total 综合 visits 访问量 applyCount 申请量 score 评分  collectCount 收藏量
         // orderType: 'ASC'  ASC 升序  DESC 降序
         paramsGetResources.orderField = condition.orderField