Merge branch 'ipop-web' of gitlab.gongsibao.com:jiangyong/zhichan into ipop-web

ipop-web/app/front/vues/pages/iframehtml/iframehtml.js

@@ -6,6 +6,7 @@
         }
     },
     mounted:function(){
+      console.log(this.$root.currentUser, '调用方法');
       var url = this.$router.history.current.query.url;
       if(url){
         url = decodeURIComponent(url);

ipop-web/app/front/vues/pages/patentanalysis/patentanalysis.html

@@ -30,6 +30,13 @@
                     <i :class="item.icon"></i>
                     <span slot="title">{{item.name}}</span>
                 </el-menu-item>
+                <el-submenu index="9">
+                    <template slot="title">
+                        <i class="el-icon-view"></i>
+                        <span>智能可视化</span>
+                    </template>
+                    <el-menu-item v-for="(item,index) in dimensionListObj1" :index="index + 10" :key="index + 10" ><i class="yuan"></i>{{item.name}}</el-menu-item>
+                </el-submenu>
             </el-menu>
         </div>
 
@@ -2234,6 +2241,7 @@
                 </div>
             </div>
             <div v-if="activeMenu==\'8\'" class="activeMenu8">
+                <div v-if="search">
                 <div v-if="echarts" style="min-width: 1200px;">
                     <div class="activeMenu8-title"><i class="el-icon-setting"></i>分析报告设置</div>
                     <div class="activeMenu8-main">
@@ -2280,10 +2288,17 @@
                     </div>
                 </div>
                 </div>
-            <div v-if="activeMenu==\'9\'">
-                <div>
+                <div v-else class="no-result" style="text-align:center;margin-top: 200px">
+                    <div class="zipImg"><span class="zipSpan" @click="tiaozhan"></span></div>
+                </div>
+            </div>
+            <div v-if="activeMenu >= \'10\'">
+                <div v-if="search">
                     <iframe id="bdIframe" :src="srcIframe" frameborder="0" width="100%" height="1000"></iframe>
                 </div>
+                <div v-else class="no-result" style="text-align:center;margin-top: 200px">
+                    <div class="zipImg"><span class="zipSpan" @click="tiaozhan"></span></div>
+                </div>
             </div>
         </div>
     </div>

ipop-web/app/front/vues/pages/patentanalysis/patentanalysis.js

@@ -560,14 +560,29 @@
                         icon: 'el-icon-tickets'
                     },
                     {
-                        name: "智能可视化",
+                        name: "智能报表",
+                        icon: 'el-icon-document'
+                    }
+                ],
+                dimensionListObj1:[
+                    {
+                        name: "主题分析",
+                        icon: 'el-icon-tickets'
+                    },
+                    {
+                        name: "演化分析",
                         icon: 'el-icon-view'
                     },
                     {
-                        name: "智能报表",
+                        name: "关联分析",
+                        icon: 'el-icon-document'
+                    },
+                    {
+                        name: "合著分析",
                         icon: 'el-icon-document'
                     }
                 ],
+                method: '',
                 dimensionList:[
                     {
                         name: "首页",
@@ -2846,7 +2861,9 @@
                 this.agentRank();
             }else if (this.activeMenu == "8") {
                 this.returnsPage();
-            }else if (this.activeMenu == "9") {
+            }else if (this.activeMenu >= "10") {
+                console.log(this.dimensionListObj1[key - 10].name);
+                this.method = this.dimensionListObj1[key - 10].name;
                 this.ezReportUploadData();
                 setTimeout(()=> {this.reinitIframe()}, 3000);
             }
@@ -7067,7 +7084,7 @@
             var params = { "uid": that.dataUid };
             const loadingbyc = this.$loading({
                 lock: true,
-                text: 'Loading',
+                text: '报告生成中...',
                 spinner: 'el-icon-loading',
                 background: 'rgba(0, 0, 0, 0.7)'
             });
@@ -7094,7 +7111,7 @@
         ezGetReport() {
             var that=this;
             console.log("--------分析可视化后------------");
-            var params = { "uid": that.dataUid, "type": 'html' };
+            var params = { "uid": that.dataUid, "type": 'html', method: this.method };
             this.$root.postReq("web/patentycCtl/ezGetReport",params).then(function (d) {
                 console.log("---------------------------------------------");
                 console.log(d);