Merge branch 'dev' of http://192.168.3.207:10080/jianyu/page_bigmember_pc into dev

src/components/forecast/ForLayout.vue

@@ -92,7 +92,7 @@ export default {
               // 联想跳转
               if (this.bidnum !== 0) {
                 // const result = data.data.list
-                const result = [data.data.list]
+                const result = [data.data]
                 this.$store.commit('forcast/setHistoryList', result)
                 this.$router.push({
                   path: '/ai_add',
@@ -111,7 +111,6 @@ export default {
       } else if (this.searchConfig.type === 'bidpolicy') {
         // 中标预测、投标决策分析列表
         getProjectList({ pName: data.text }).then(res => {
-          console.log(res)
           if (res.error_code === 0) {
             // 投标决策分析
             // 键盘Enter事件
@@ -122,7 +121,7 @@ export default {
               // 联想跳转
               const result = [data.data]
               this.$store.commit('forcast/setHistoryPolicyList', result)
-              this.$router.push(`/analysis_result/${data.data.s_id}/${data.data.sourceinfoid}`)
+              this.$router.push(`/analysis_result?ptid=${data.data.s_id}&sid=${data.data.sourceinfoid}`)
             } else {
               // 点击搜索按钮
               // const result = []

src/components/forecast/ForLimit.vue

@@ -119,7 +119,7 @@ export default {
   methods: {
     // 投标决策分析
     toPolicy () {
-      this.$router.push(`/analysis_result/${this.baseInfo.id}/${this.baseInfo.infoid}`)
+      this.$router.push(`/analysis_result?ptid=${this.baseInfo.id}&sid=${this.baseInfo.infoid}`)
     },
     // 判断省市
     getAreaInfo (name) {

src/components/forecast/ForeCast.vue

@@ -431,7 +431,7 @@ export default {
     goForcast (data) {
       const result = [data]
       this.$store.commit('forcast/setHistoryPolicyList', result)
-      this.$router.push(`/analysis_result/${data.s_id}/${data.sourceinfoid}`)
+      this.$router.push(`/analysis_result?ptid=${data.s_id}&sid=${data.sourceinfoid}`)
     },
     goViewEnt (id) {
       this.$router.push(`/ent_portrait/${id}`)

src/components/selector/BusinessScopeSelectorContent.vue

@@ -98,8 +98,10 @@ export default {
         this.bScopeList[0].selected = false
         item.selected = !item.selected
 
+        // 子项全部选中则全部按钮选中，子项如果一个没有被选中，则全部按钮被选中
         const { allSelected, allNotSelected } = this.checkAllSelectedState()
-        if (allSelected || allNotSelected) {
+        // if (allSelected || allNotSelected) {
+        if (allNotSelected) {
           this.setState()
         }
       }

src/router/routers.js

@@ -93,7 +93,7 @@ export default [
   },
   // 投标决策分析结果页
   {
-    path: '/analysis_result/:ptid/:sourceinfoid',
+    path: '/analysis_result',
     name: 'analysis_result',
     component: () => import('@/views/bid-policy/AnalysisResult.vue')
   },

src/views/bid-policy/AnalysisResult.vue

@@ -92,12 +92,15 @@ export default {
       },
       // 刚开始隐藏项目摘要和tab切换
       proShow: false,
-      ptid: this.$route.path.split('/')[this.$route.path.split('/').length - 2], // 项目加密id
-      sid: this.$route.path.split('/')[this.$route.path.split('/').length - 1] // 信息加密id
+      ptid: '', // 项目加密id
+      sid: '' // 信息加密id
     }
   },
   computed: {},
   created () {
+    const { ptid, sid } = this.$route.query
+    if (ptid) this.ptid = encodeURIComponent(ptid)
+    if (sid) this.sid = encodeURIComponent(sid)
     this.getBaseInfo()
   },
   mounted () {},
@@ -120,8 +123,8 @@ export default {
       if (res.error_code === 0 && res.data) {
         if (res.data.s_subscopeclass) {
           res.data.s_subscopeclass = this.initIndustryData(res.data.s_subscopeclass.split(','))
-          console.log(res.data.s_subscopeclass)
         }
+        this.ptid = res.data.id
         this.baseInfo = res.data
         this.getEntIsFollow(res.data.infoid)
       } else {
@@ -130,7 +133,6 @@ export default {
     },
     // 处理数据为行业选择页面所需格式
     initIndustryData (data) {
-      console.log(data)
       var arr = []
       var obj = {}
       if (data) {
@@ -184,10 +186,8 @@ export default {
     },
     // 关注项目
     entFollow () {
-      console.log()
       if (this.follow.type === 0) {
         addFollow({ sid: this.baseInfo.infoid }).then(res => {
-          console.log(res)
           if (res.data) {
             this.follow.classActive = 'icon_heart_red'
             this.follow.text = '已关注'
@@ -196,7 +196,6 @@ export default {
         })
       } else {
         cancelFollow({ sid: this.baseInfo.infoid }).then(res => {
-          console.log(res)
           if (res.data && res.data === 'success') {
             this.follow.classActive = 'icon_heart_gray'
             this.follow.text = '关注'
@@ -215,6 +214,7 @@ export default {
       // this.proShow = true
       if (item.scope.length === 0) {
         this.$message.error('采购内容不能为全部')
+        this.$refs.isChildData.isClick = false
         return
       }
       this.loading = true

src/views/project/ProjectInfo.vue

@@ -204,7 +204,7 @@ export default {
     },
     toPolicy () {
       const { sid, fid } = this
-      this.$router.push(`/analysis_result/${fid}/${sid}`)
+      this.$router.push(`/analysis_result?sid=${sid}`)
     },
     toUnitportrayal () {
       const { buyer } = this.projectInfo

src/views/reportData/pageWeek.vue

@@ -313,9 +313,18 @@ export default {
           } else {
             this.projectAmount.show = false
           }
-          this.nextweek_bidopen = res.data.nextweek_bidopen
-          this.follow_ent = res.data.follow_ent
-          this.follow_project = res.data.follow_project
+          // 下周开标提醒
+          if (res.data.nextweek_bidopen && res.data.nextweek_bidopen.length > 0) {
+            this.priority.nextweek_bidopen = res.data.nextweek_bidopen
+          }
+          // 重点关注企业
+          if (res.data.follow_ent && res.data.follow_ent.length > 0) {
+            this.priority.follow_ent = res.data.follow_ent
+          }
+          // 重点关注项目
+          if (res.data.follow_project && res.data.follow_project.length > 0) {
+            this.priority.follow_project = res.data.follow_project
+          }
         }
       })
     },