123

embed_applications/app/front/entry/index.ejs

@@ -23,7 +23,7 @@
 		<div>
 			<el-scrollbar class="page-component__scroll" style="marginTop:0; height: 100%;">
 				<div id="embedwarpper" style="minHeight:940px;">
-					<div style="width:100%;min-height: 900px;"><keep-alive>
+					<div style="width:100%;min-height: 900px;"><keep-alive exclude="/wins">
 						<router-view name="default" v-loading.fullscreen.lock="loading" element-loading-text="拼命加载中"
 							element-loading-spinner="el-icon-loading" element-loading-background="rgba(0, 0, 0, 0.8)">
 						</router-view></keep-alive>

embed_applications/app/front/vues/pages/winsresult/winsresult.html

@@ -23,8 +23,8 @@
                 {{name}}
             </div>
             <div class="winsresult-dialog-condition">
-                <div>商标长度: <span>{{requestObj.namenum}}个字</span></div>
-                <div>商标格式: <span>{{requestObj.structuretype}}</span></div>
+                <div>商标长度: <span>{{requestObj?requestObj.namenum:\'\'}}个字</span></div>
+                <div>商标格式: <span>{{requestObj?requestObj.structuretype:\'\'}}</span></div>
                 <div>商标行业: <span>{{industry}}</span></div>
             </div>
             <div class="winsresult-dialog-content">

embed_applications/app/front/vues/pages/winsresult/winsresult.js

@@ -15,22 +15,11 @@
             industry: '',
             bigType: null,
             ncl_list: null,
-            loading:false
+            loading: false
         }
     },
     created() {
-        try {
-            /* 初始化页面参数 */
-            if (this.$route.query.data) {
-                this.routerHistory = { path: '/wins', query: { data: this.$route.query.data } };
-                let data = JSON.parse(this.$route.query.data);
-                this.requestObj = data;
-                this.ncl_list = this.requestObj.ncl_list;
-                console.log(data, this.routerHistory, this.requestObj, "vvvvvvvvvvvvvvvvvvvvvvv");
-            }
-        } catch (e) {
-            console.log(e);
-        }
+
 
 
     },
@@ -115,33 +104,51 @@
             done();
         }
     },
-    mounted: function() {
+    activated(){
         try {
             /* 初始化页面参数 */
-            if (this.requestObj) {
-                console.log(this.requestObj, "!!!!!!!!!!!!!!!!!!!!!!!!1");
-                this.loading = true;
-                let data = Object.assign(this.requestObj, {});
-                this.type = this.requestObj.bigType.join();
-                this.industry = this.requestObj.industry[1];
-                this.$root.postReq(`/web/tmquery/toolCtl/getTmNameList`, data).then((d) => {
-                    this.loading = false;
-                    if (d.status == 0) {
-                        if (!d.data || d.data.length == 0) {
-                            this.$message('暂无数据');
-                        }
-                        this.countNameList = d.data;
-                        console.log(this.countNameList);
-                        this.paging();
+            console.log(this.$route.query.data, this.requestObj, "bbbbbbbbbbbbbbbbbbbbbbbb");
+            if (this.$route.query.data != JSON.stringify(this.requestObj)) {
+                this.routerHistory = { path: '/wins', query: { data: this.$route.query.data } };
+                let data = JSON.parse(this.$route.query.data);
+                this.requestObj = data;
+                this.ncl_list = this.requestObj.ncl_list;
+                console.log(data, this.routerHistory, this.requestObj, "vvvvvvvvvvvvvvvvvvvvvvv");
+                try {
+                    /* 初始化页面参数 */
+                    if (this.requestObj) {
+                        console.log(this.requestObj, "!!!!!!!!!!!!!!!!!!!!!!!!1");
+                        this.loading = true;
+                        let data = Object.assign(this.requestObj, {});
+                        this.type = this.requestObj.bigType.join();
+                        this.industry = this.requestObj.industry[1];
+                        this.$root.postReq(`/web/tmquery/toolCtl/getTmNameList`, data).then((d) => {
+                            this.loading = false;
+                            if (d.status == 0) {
+                                if (!d.data || d.data.length == 0) {
+                                    this.$message('暂无数据');
+                                }
+                                this.countNameList = d.data;
+                                console.log(this.countNameList);
+                                this.paging();
+                            }
+                        });
                     }
-                });
-            }
 
+                } catch (e) {
+                    console.log(e);
+                }
+            }
         } catch (e) {
             console.log(e);
         }
 
 
+    } ,
+    mounted: function() {
+
+
+