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

ipop-web/app/front/entry/public/js/index.js

@@ -313,9 +313,15 @@ axios.get("/vue/comp/base").then(function(res){
           }else if(v== "高级检索"){
           }else if(v== "高级检索"){
             this.typeHome = false;
             this.typeHome = false;
             this.pushx({name:"/patentadvancedsearch",title:"高级检索"})
             this.pushx({name:"/patentadvancedsearch",title:"高级检索"})
+          }else if(v== "专利检索"){
+            this.typeHome = false;
+            this.pushx({name:"/patentsimplesearch",title:"专利检索"})
           }else if(v== "智能检索"){
           }else if(v== "智能检索"){
             this.typeHome = false;
             this.typeHome = false;
             this.pushx({name:"/patentsimplesearch",title:"智能检索"})
             this.pushx({name:"/patentsimplesearch",title:"智能检索"})
+          }else if(v== "智能分析"){
+            this.typeHome = false;
+            this.pushx({name:"/patentanalysis",title:"智能分析"})
           }else if(v== "智能估价"){
           }else if(v== "智能估价"){
             this.typeHome = false;
             this.typeHome = false;
             this.loadingHome = true;
             this.loadingHome = true;

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

@@ -120,4 +120,20 @@
 }
 }
 .returnsPage > span {
 .returnsPage > span {
     cursor: pointer;
     cursor: pointer;
+}
+.zipImg {
+    display: inline-block;
+    position: relative;
+    width: 356px;
+    height: 232px;
+    background: url('https://gsb-zc.oss-cn-beijing.aliyuncs.com//zc_39961594794942854202015143542854微信图片_20200715134452.png') no-repeat;
+    background-size: 100% 100%;
+}
+.zipSpan {
+    width: 77px;
+    height: 26px;
+    position: absolute;
+    bottom: 28px;
+    right: 21px;
+    cursor: pointer;
 }
 }
\ No newline at end of file

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

@@ -555,6 +555,9 @@
                     },
                     },
                     {
                     {
                         name: "生成报告",
                         name: "生成报告",
+                    },
+                    {
+                        name: "分析可视化",
                     }
                     }
                 ],
                 ],
                 activeMenu: 0,
                 activeMenu: 0,
@@ -2091,18 +2094,34 @@
             }
             }
         },
         },
     mounted: function() {
     mounted: function() {
-        
+          window.onresize = function(){
+            this.changeMobsfIframe()
+          }
     },
     },
     created: function() {
     created: function() {
+        console.log('wslhd');
         this.echartsArr = [];
         this.echartsArr = [];
         console.log(localStorage.getItem("patentyc_patentanalysis"));
         console.log(localStorage.getItem("patentyc_patentanalysis"));
-        var object=JSON.parse(localStorage.getItem("patentyc_patentanalysis"));
-        this.search = this.$router.history.current.query.search;
+        var object=JSON.parse(localStorage.getItem("patentyc_patentanalysis")) || '';
+        this.search = this.$router.history.current.query.search || '';
         this.obj=object;
         this.obj=object;
         console.log(this.search);
         console.log(this.search);
         console.log(this.obj);
         console.log(this.obj);
     },
     },
     methods: {
     methods: {
+        changeMobsfIframe(){
+            const mobsf = document.getElementById('midFraim');
+            const deviceWidth = document.body.clientWidth;
+            const deviceHeight = document.body.clientHeight;
+            console.log(mobsf,'????????????????????');
+            mobsf.height = (Number(deviceHeight)-0) + 'px'; 
+        },
+        tiaozhan() {
+            this.$root.pushx({
+                name:"/patentsimplesearch",
+                title:"专利检索"
+            });
+        },
         btnPrintClick () {
         btnPrintClick () {
             $('.returnsPage').css('display','none');
             $('.returnsPage').css('display','none');
             let targetDom = $("#ddd");
             let targetDom = $("#ddd");
@@ -2740,6 +2759,8 @@
                 this.agentRank();
                 this.agentRank();
             }else if (this.activeMenu == "8") {
             }else if (this.activeMenu == "8") {
                 this.returnsPage();
                 this.returnsPage();
+            }else if (this.activeMenu == "9") {
+                this.changeMobsfIframe();
             }
             }
         },
         },
         /*同一纬度下不同角度的分析切换 */
         /*同一纬度下不同角度的分析切换 */

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

@@ -274,7 +274,7 @@
   </div>
   </div>
   <div v-if="!a">
   <div v-if="!a">
     <div v-if="datalist2.length==0" class="no-result" style="text-align: center;">
     <div v-if="datalist2.length==0" class="no-result" style="text-align: center;">
-        <img src="imgs/patentlogo.png" style="width:300px"/>
+        <img src="/imgs/home/logos.png" style="width:300px"/>
         <div class="no-result-row1">暂无查出您想要的信息~</div>
         <div class="no-result-row1">暂无查出您想要的信息~</div>
         <div class="no-result-row1">请输入关键词或选择检索数据范围进行检索！</div>
         <div class="no-result-row1">请输入关键词或选择检索数据范围进行检索！</div>
     </div>
     </div>