Merge branch 'dev' into feature-yf

src/components/common/ContentLayout.vue

@@ -6,12 +6,12 @@
     <div class="content-right ad-container" :class="{ nothing: adShow }">
       <slot name="right">
         <slot name="right-top"></slot>
-        <div class="ad-list">
+        <div class="ad-list" :id="(adCodeMap[routerName] || routerName)">
           <div
             class="ad-item-container"
             v-for="(item, index) in adList"
             :key="index">
-            <a :href="item.s_link" target="_blank" :id="routerName + '-' + index">
+            <a :href="item.s_link" target="_blank" :id="(adCodeMap[routerName] || routerName) + '-' + index">
               <img :src="item.s_pic" />
             </a>
           </div>

src/components/forecast/ForeCast.vue

@@ -155,7 +155,7 @@
         </div>
       </li>
     </ul>
-    <Empty v-if="showEmpty&&potenCode!==2" :tip="getTipText"></Empty>
+    <Empty v-if="showEmpty&&potenCode!=2" :tip="getTipText"></Empty>
     <Empty v-else-if="showEmpty&&potenCode==2">
       <div name="default">
         <div class="poten_tip">暂未设置订阅关键词，无法进行预测</div>

src/store/forcast.js

@@ -1,11 +1,10 @@
 import { defaultLocalPageData } from '@/utils/'
-import cookies from 'vue-cookies'
 export default {
   namespaced: true,
   state: () => ({
     // 中标企业预测
     list: [],
-    historyList: defaultLocalPageData(`bigmember-BID_DATA-${cookies.get('SESSIONID')}`, []),
+    historyList: defaultLocalPageData(`bigmember-BID_DATA-${localStorage.getItem('BIGMEMBER_PC')}`, []),
     // 中标企业预测-详情页基本信息列表
     detailBaseList: defaultLocalPageData('BIG_AI_LIST_PC', []),
     // 投标决策分析
@@ -19,7 +18,7 @@ export default {
     // 中标预测次数
     bidForeCastNum: 0,
     // 获取sessionid
-    sessionID: cookies.get('SESSIONID')
+    sessionID: localStorage.getItem('BIGMEMBER_PC')
   }),
   mutations: {
     // 中标企业预测

src/views/SubPush.vue

@@ -5,7 +5,9 @@
         <TimeSelector  @onChange="changeTime" selectorType="line">
           <div slot="header">选择时间：</div>
         </TimeSelector>
-        <AreaSelector @onChange="changeArea" ref="areaSelector" selectorType="line"></AreaSelector>
+        <AreaSelector @onChange="changeArea" ref="areaSelector" selectorType="line">
+          <div slot="header">选择区域：</div>
+        </AreaSelector>
       </div>
       <push-list :filters="filters" class="m-24" ref="pushList" :showMore="false"></push-list>
     </div>

src/views/bid-forecast/BidForecastLimit.vue

@@ -21,7 +21,7 @@
           </div>
           <div class="bid_abs_base">
             <span class="base_label">地区招标代理机构：</span>
-            <span class="base_main">{{baseInfo.agency || '--'}}</span>
+            <span class="base_main">{{resquestData.agency || '--'}}</span>
           </div>
         </div>
       </div>
@@ -46,6 +46,7 @@
       width="30%"
       center
       :show-close="false"
+      :close-on-click-modal="false"
       custom-class="perfect_dialog"
       >
       <span>项目<span style="color:#2CB7CA">{{baseInfo.projectname}}</span>已完成招标，您可直接查看项目信息。</span>
@@ -294,13 +295,19 @@ export default {
     },
     setSure () {
       this.iscomplete = false
-      const routeUrl = this.$router.resolve({
+      this.$router.replace({
         path: '/pro_follow_detail',
         query: {
           sid: this.baseInfo.infoid
         }
       })
-      return window.open(routeUrl.href, '_blank')
+      // const routeUrl = this.$router.resolve({
+      //   path: '/pro_follow_detail',
+      //   query: {
+      //     sid: this.baseInfo.infoid
+      //   }
+      // })
+      // return window.open(routeUrl.href, '_blank')
     }
   }
 }

src/views/bid-policy/AnalysisResult.vue

@@ -131,7 +131,7 @@ export default {
         if (res.data.area && Object.keys(res.data.area).length > 0) {
           console.log(res.data.area[Object.keys(res.data.area)])
           if (res.data.area[Object.keys(res.data.area)].length > 0) {
-            this.areaStr = Object.keys(res.data.area) + '省' + res.data.area[Object.keys(res.data.area)][0]
+            this.areaStr = Object.keys(res.data.area) + '' + res.data.area[Object.keys(res.data.area)][0]
           } else {
             this.areaStr = Object.keys(res.data.area)
           }
@@ -231,15 +231,16 @@ export default {
         return
       }
       this.loading = true
+      console.log(item.industry + '')
       const data = {
         appVersion: '',
         area: item.area,
         buyer: this.baseInfo.buyer,
         buyerClass: item.buyer,
         buyerContent: item.scope,
-        industry: item.industry,
-        maxPrice: Number(item.range.minPrice),
-        minPrice: Number(item.range.maxPrice),
+        industry: item.industry + '',
+        maxPrice: Number(item.range.maxPrice),
+        minPrice: Number(item.range.minPrice),
         mobileModel: '',
         pid: this.baseInfo.id,
         pname: this.baseInfo.projectname,

src/views/portrayal/components/EntChart.vue

@@ -19,7 +19,7 @@
     </div>
     <!-- 各类客户平均折扣率 -->
     <div v-if="rateFb.show">
-      <div class="chart-title">月度中标金额统计</div>
+      <div class="chart-title">各类客户平均折扣率</div>
       <line-chart id="rateFb" :options="rateFb.options" :datas="rateFb.data"></line-chart>
       <div class="chart-tips">注：平均折扣率=(全部项目预算-全部中标金额)/全部项目预算，是指价格减让部分与原价的比率，仅统计预算和中标金额同时存在的项目。</div>
     </div>

src/views/portrayal/components/EntForm.vue

@@ -35,8 +35,8 @@ export default {
           return
         }
         this.$emit('entname', data.entName)
-        data.operStart = dateFormatter(data.operStart, 'yyyy-MM-dd')
-        data.operEnd = dateFormatter(data.operStart, 'yyyy-MM-dd')
+        data.operStart = dateFormatter(data.operStart * 1000, 'yyyy-MM-dd')
+        data.operEnd = dateFormatter(data.operEnd * 1000, 'yyyy-MM-dd')
         this.content = [
           {
             label: '法定代表人',

src/views/potential-for/PotenSimilar.vue

@@ -22,7 +22,7 @@
               </div>
               <div class="poten_unit poten_margin">
                 <span class="unit_label poten_label">预测线索：</span>
-                <a traget="_blank" v-if="dataInfo && dataInfo.jyhref" :href="dataInfo.jyhref" class="unit_name poten_name">{{dataInfo.title}}</a>
+                <a target="_blank" v-if="dataInfo && dataInfo.jyhref" :href="dataInfo.jyhref" class="unit_name poten_name">{{dataInfo.title}}</a>
               </div>
             </div>
             <div class="poten_tips">预测说明：潜在项目预测基于对历史招标信息统计分析，仅供参考</div>
@@ -113,7 +113,10 @@ export default {
     },
     // 查看采购单位画像
     goViewPur () {
-      this.$router.push('/unit_portrayal/' + this.dataInfo.buyer)
+      const routeUrl = this.$router.resolve({
+        path: '/unit_portrayal/' + this.dataInfo.buyer
+      })
+      return window.open(routeUrl.href, '_blank')
     }
   }
 }

src/views/potential-for/PotenTial.vue

@@ -46,23 +46,16 @@ export default {
       window.scrollTo(0, 0)
       getPotenList({ pageNum: p }).then(res => {
         if (res.error_code === 0) {
-          if (res.data.code === 1) {
-            this.potenObj.code = 1
-          } else if (res.data.code === 2) {
-            // 您设置的订阅关键词无法进行预测
-            this.potenObj.code = 2
-          } else {
-            if (res.data.list && res.data.list.length && res.data.list.length > 0) {
-              res.data.list.forEach(function (v, i) {
-                v.createtime = v.createtime.replace(/-/g, '/')
-              })
-              let tempTotal = res.data.count
-              if (p !== 1) {
-                tempTotal = this.potenObj.count
-              }
-              this.potenObj = res.data
-              this.potenObj.count = tempTotal
+          if (res.data.list && res.data.list.length && res.data.list.length > 0) {
+            res.data.list.forEach(function (v, i) {
+              v.createtime = v.createtime.replace(/-/g, '/')
+            })
+            let tempTotal = res.data.count
+            if (p !== 1) {
+              tempTotal = this.potenObj.count
             }
+            this.potenObj = res.data
+            this.potenObj.count = tempTotal
           }
         }
         this.$refs.myList.potenInitData(this.potenObj)

src/views/reportData/pageMonth.vue

@@ -282,7 +282,7 @@ export default {
   },
   computed: {
     getQueryTime () {
-      const paramsDate = this.$route.query.start
+      const paramsDate = this.$route.query.end
       if (paramsDate) {
         const paramsData = {
           year: dateFormatter(paramsDate * 1000, 'yyyy'),
@@ -344,7 +344,7 @@ export default {
             } else {
               item.pushtime = ''
             }
-            if (dateFormatter(item.startdate * 1000, 'yyyyMM') === time) {
+            if (dateFormatter(item.enddate * 1000, 'yyyyMM') === time) {
               resultStatus = true
               that.isWeekIndex = index
               console.log(time)

src/views/reportData/pageWeek.vue

@@ -11,7 +11,7 @@
                 <div class="reoprt_time">
                   <span class="week_text">周</span>
                   <span class="week_days">{{dateFormatter(item.startdate * 1000, 'MM月dd日')}}-{{dateFormatter(item.enddate * 1000, 'MM月dd日')}}</span>
-                  <span class="red_point" v-if="item.unread !== 1" ref="weekitempoint"></span>
+                  <span class="red_point" v-if="item.unread === 1" ref="weekitempoint"></span>
                 </div>
                 <div class="repot_gettime">{{item.pushtime}}</div>
               </div>
@@ -190,7 +190,7 @@ export default {
   },
   computed: {
     getQueryTime () {
-      const paramsDate = this.$route.query.start
+      const paramsDate = this.$route.query.end
       if (paramsDate) {
         const paramsData = {
           year: dateFormatter(paramsDate * 1000, 'yyyy'),
@@ -234,7 +234,7 @@ export default {
               queryData.start = this.getQueryTime.start
               queryData.end = this.getQueryTime.end
               this.weekList.forEach((v, index) => {
-                if (String(v.startdate) === queryData.start) {
+                if (String(v.enddate) === queryData.end) {
                   this.isWeekIndex = index
                 }
               })
@@ -258,6 +258,7 @@ export default {
     },
     // 选择周报
     selectWeek (index, item) {
+      item.unread = 0
       if (this.$refs.weekitempoint && this.$refs.weekitempoint.length > 0) {
         // this.$refs.weekitempoint[index].style.display = 'none'
       }