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

front/src/views/mynoticeView/components/NoticeList.vue

@@ -232,35 +232,53 @@ const tabTypeObj = {
 
 // 会议室后台
 const goPage = (item) => {
-  let typeText = typeObj[item.type];
+  if (item.jumpUrl && item.type !== 12) {
-  if (typeText) {
+    let typeText = typeObj[item.type];
+    console.log('item------------>', item);
     console.log('typeText类型------------>', typeText);
-    // 是后台，跳转到后台相关页面
+    // "http://192.168.124.236:9796/#/personalCenter?tabTypeName=能力申请"
-    if (typeText.indexOf('后台') !== -1) {
+    let _url = item.jumpUrl && item.jumpUrl.split('#')
-      let _applyState = item.applyState
+    let openType = '_self';
-      let _page = pageObj[typeText][_applyState]
+    // 如果是跳转到后台管理，重新打开页面
-      window.open(window.SITE_CONFIG.backUrl + `/#/${_page}`)
+    if (typeText && typeText.indexOf('后台') !== -1) {
-    } else if (typeText.indexOf('前台') !== -1) {
+      openType = '_blank'
-      if (typeText == '会议室前台') {
+    } else {
-        router.push({
+      if (_url[1] && _url[1].indexOf('personalCenter') !== -1) {
-          path: '/DetailsPageconetent',
-          query: {
-            select: '基础设施',
-            formPage: 'noticePage'
-          },
-        })
-      } else {
         window.sessionStorage.setItem('type', JSON.stringify('apply'))
-        router.push({
-          path: '/personalCenter',
-          query: {
-            tabTypeName: tabTypeObj[typeText] || '能力申请',
-          }
-        })
       }
-
     }
+    window.open(item.jumpUrl, openType)
+    
   }
+  return;
+  // if (typeText) {
+  //   console.log('typeText类型------------>', typeText);
+  //   // 是后台，跳转到后台相关页面
+  //   if (typeText.indexOf('后台') !== -1) {
+  //     let _applyState = item.applyState
+  //     let _page = pageObj[typeText][_applyState]
+  //     window.open(window.SITE_CONFIG.backUrl + `/#/${_page}`)
+  //   } else if (typeText.indexOf('前台') !== -1) {
+  //     if (typeText == '会议室前台') {
+  //       router.push({
+  //         path: '/DetailsPageconetent',
+  //         query: {
+  //           select: '基础设施',
+  //           formPage: 'noticePage'
+  //         },
+  //       })
+  //     } else {
+  //       window.sessionStorage.setItem('type', JSON.stringify('apply'))
+  //       router.push({
+  //         path: '/personalCenter',
+  //         query: {
+  //           tabTypeName: tabTypeObj[typeText] || '能力申请',
+  //         }
+  //       })
+  //     }
+
+  //   }
+  // }
 }
 
 // 更改消息状态