Sfoglia il codice sorgente

Merge branch 'dev/v1.0.51_zsy' of jianyu/web into feature/v1.0.51

zhangsiya 1 anno fa
parent
commit
661963ccff

+ 1 - 1
apps/bigmember_pc/src/views/download-pdf/entReport.vue

@@ -101,7 +101,7 @@
         <h1>二、企业中标分析</h1>
         <h1>二、企业中标分析</h1>
         <div class="analyse-condition">
         <div class="analyse-condition">
           <p>定制条件:</p>
           <p>定制条件:</p>
-          <p><span>√</span>关键词:{{ analysisCondition.match || '-'}} <span v-if="analysisCondition.match">(模糊,包含其中1个关键词即可)</span></p>
+          <p><span>√</span>关键词:{{ analysisCondition.match || '-'}} <span v-if="analysisCondition.match">{{ analysisCondition.exactMatch === '1' ? '(精准,同时包含所有关键词)' : '(模糊,包含其中1个关键词即可)'}}</span></p>
           <p><span>√</span>搜索范围:{{ analysisCondition.matchRange | formatSelectType}}</p>
           <p><span>√</span>搜索范围:{{ analysisCondition.matchRange | formatSelectType}}</p>
           <p><span>√</span>项目地区:{{analysisCondition.area || '-'}}</p>
           <p><span>√</span>项目地区:{{analysisCondition.area || '-'}}</p>
           <p><span>√</span>行业:{{ analysisCondition.scopeClass ? getFormatIndustry(analysisCondition.scopeClass) : '-'}}</p>
           <p><span>√</span>行业:{{ analysisCondition.scopeClass ? getFormatIndustry(analysisCondition.scopeClass) : '-'}}</p>

+ 1 - 1
apps/bigmember_pc/src/views/download-pdf/propReport.vue

@@ -96,7 +96,7 @@
         <h1>一、采购分析</h1>
         <h1>一、采购分析</h1>
         <div class="analyse-condition">
         <div class="analyse-condition">
           <p>定制条件:</p>
           <p>定制条件:</p>
-          <p><span>√</span>关键词:{{ analysisCondition.match || '-'}} <span v-if="analysisCondition.match">(模糊,包含其中1个关键词即可)</span></p>
+          <p><span>√</span>关键词:{{ analysisCondition.match || '-'}} <span v-if="analysisCondition.match">{{  analysisCondition.exactMatch === '1' ? '(精准,同时包含所有关键词)' : '(模糊,包含其中1个关键词即可)' }}</span></p>
           <p><span>√</span>搜索范围:{{ analysisCondition.matchRange | formatSelectType}}</p>
           <p><span>√</span>搜索范围:{{ analysisCondition.matchRange | formatSelectType}}</p>
           <p><span>√</span>项目地区:{{analysisCondition.area || '-'}}</p>
           <p><span>√</span>项目地区:{{analysisCondition.area || '-'}}</p>
           <p><span>√</span>行业:{{ analysisCondition.scopeClass ? getFormatIndustry(analysisCondition.scopeClass) : '-'}}</p>
           <p><span>√</span>行业:{{ analysisCondition.scopeClass ? getFormatIndustry(analysisCondition.scopeClass) : '-'}}</p>

+ 2 - 2
apps/bigmember_pc/src/views/reportDownload/record.vue

@@ -152,7 +152,7 @@
                   </div>
                   </div>
                   <div v-if="scope.row.match">
                   <div v-if="scope.row.match">
                     <span>关键词:</span>
                     <span>关键词:</span>
-                    <span>{{ scope.row.match }}</span>
+                    <span>{{ scope.row.match + (scope.row.exactMatch === '1' ? '(精准)': '(模糊)')}}</span>
                   </div>
                   </div>
                   <div v-if="scope.row.matchRange">
                   <div v-if="scope.row.matchRange">
                     <span>搜索范围:</span
                     <span>搜索范围:</span
@@ -188,7 +188,7 @@
                     </div>
                     </div>
                     <div class="ellipsis-1" v-if="scope.row.match" >
                     <div class="ellipsis-1" v-if="scope.row.match" >
                       <span>关键词:</span>
                       <span>关键词:</span>
-                      <span>{{ scope.row.match  + '(模糊)'}}</span>
+                      <span>{{ scope.row.match  + (scope.row.exactMatch === '1' ? '(精准)': '(模糊)')}}</span>
                     </div>
                     </div>
                     <div class="ellipsis-1" v-if="scope.row.matchRange">
                     <div class="ellipsis-1" v-if="scope.row.matchRange">
                     <span>搜索范围:</span
                     <span>搜索范围:</span