Merge branch 'dev/v1.0.88_yf' of jianyu/web into feature/v1.0.88

apps/bigmember_pc/src/components/forecast/ForeCast.vue

@@ -1042,6 +1042,7 @@ export default {
       this.cur.group = item.s_grousp
       this.cur.fid = item.fid
       this.cur.entId = item.s_entId
+      this.checkedGroupId = item.s_grousp
     },
     // 企业情报监控 取消关注
     cancelFollow(item) {

apps/bigmember_pc/src/composables/quick-monitor/use/ent.js

@@ -201,10 +201,12 @@ function useEntQuickMonitorModel({ type, id, source }, options) {
    * @return {Promise<void>}
    */
   async function doAddFollow() {
-    console.log(loading.value, model.value.follow, 'follow')
-    if (loading.value)
-      return
-    loading.value = true
+    const eleLoading = that.$loading({
+      lock: true,
+      text: 'Loading',
+      spinner: 'el-icon-loading',
+      background: 'rgba(0, 0, 0, 0.7)'
+    })
     // 业务流程
     if (!model.value.follow) {
       // 先弹出选择分组弹框
@@ -229,7 +231,7 @@ function useEntQuickMonitorModel({ type, id, source }, options) {
           }
         })
         .finally(() => {
-          loading.value = false
+          eleLoading.close()
         })
     }
   }

apps/bigmember_pc/src/views/article-content/composables/useArticleUtil.js

@@ -5,12 +5,12 @@ export function doOpenArticlePage({ id }) {
   const link = router.resolve({
     name: 'article_detail',
     params: {
-      id: id,
+      id,
       content: 'content'
     }
   })
   window.open(
-    link.href.replace('/swordfish/page_big_pc', '') + '.html',
+    `${link.href.replace('/swordfish/page_big_pc', '')}.html`,
     '_blank'
   )
 }
@@ -18,8 +18,8 @@ export function doOpenArticlePage({ id }) {
 // 打开采购单位详情页
 export function doOpenBuyerPage({ name, query = {} }) {
   const link = router.resolve({
-    path: '/unit_portrayal/' + name,
-    query: query
+    path: `/unit_portrayal/${name}`,
+    query
   })
   window.open(link.href, '_blank')
 }
@@ -40,8 +40,8 @@ export function doOpenBuyerListPage() {
 // 打开中标企业详情页
 export function doOpenWinnerPage({ id, query = {} }) {
   const link = router.resolve({
-    path: '/ent_portrait/' + id,
-    query: query
+    path: `/ent_portrait/${id}`,
+    query
   })
   window.open(link.href, '_blank')
 }
@@ -77,7 +77,7 @@ export function doOpenProjectProgressListPage() {
 
 // 打开推送提醒设置
 export function doOpenPushSettingPage() {
-  window.open('/swordfish/page_big_pc/push_setting')
+  window.open('/page_workDesktop/work-bench/app/big/push_setting')
 }
 
 /**