From 3efae02a275998bc3f8d8ed780fcf884da72683e Mon Sep 17 00:00:00 2001
From: zhangzengfei <zhangzengfei@iotlink.com>
Date: 星期四, 03 九月 2020 18:15:09 +0800
Subject: [PATCH] desktop: 应用修改为接口获取
---
src/pages/search/index/App.vue | 34 ++++++++++++----------------------
1 files changed, 12 insertions(+), 22 deletions(-)
diff --git a/src/pages/search/index/App.vue b/src/pages/search/index/App.vue
index afb18ec..4e50107 100644
--- a/src/pages/search/index/App.vue
+++ b/src/pages/search/index/App.vue
@@ -1,13 +1,13 @@
<template>
<div class="column">
- <div class="column-left" :style="`height:${screenHeight}px;`">
+ <div class="column-left">
<div class="resize-bar"></div>
<div class="resize-line"></div>
<div class="resize-save">
<left-nav :appName="'Search'" :height="screenHeight - 40"></left-nav>
</div>
</div>
- <div class="column-right" :style="`height:${screenHeight}px;`">
+ <div class="column-right">
<right-side />
</div>
<card-window></card-window>
@@ -18,7 +18,7 @@
import LeftNav from "@/components/LeftNav";
// import CameraVideo from "./components/Video.vue";
import RightSide from "./Searching"
-import CardWindow from "../components/cardWindow";
+import CardWindow from "@/components/cardWindow";
export default {
name: "SearchPage",
@@ -32,6 +32,10 @@
screenHeight: 0,
}
},
+ created() {
+ // this.parseUrl();
+
+ },
mounted() {
this.screenHeight = document.documentElement.clientHeight - 20;
window.onresize = () => {
@@ -40,25 +44,10 @@
})();
};
- this.parseUrl();
},
methods: {
parseUrl() {
- if (this.getUrlKey("showType")) {
- this.VideoPhotoData.uploadDiaplay = true;
- console.log("鍒璺宠繃鏉ョ殑浠ュ浘鎼滃浘");
- this.VideoPhotoData.picUrl = this.getUrlKey("picSmUrl");
- this.VideoPhotoData.uploadImg = this.getUrlKey("picSmUrl");
- this.VideoPhotoData.uploadType = true
- this.VideoPhotoData.compTargetId = this.getUrlKey("targetId")
- this.VideoPhotoData.compTargetType = this.getUrlKey("compType")
- this.VideoPhotoData.size = 30
- this.VideoPhotoData.compareTabs = ["esData"];
- this.VideoPhotoData.findPerson2(); // 鏌ユ壘姝や汉
- }
- },
- getUrlKey(name) {
- return decodeURIComponent((new RegExp('[?|&]' + name + '=' + '([^&;]+?)(&|#|;|$)').exec(location.href) || [, ""])[1].replace(/\+/g, '%20')) || null
+
}
}
};
@@ -67,16 +56,17 @@
<style lang="scss" scoped>
.column {
overflow: hidden;
+ min-width: 1399px;
+ height: 100%;
}
.column-left {
- height: inherit;
background-color: #fff;
position: relative;
float: left;
+ height: 100vh;
}
.column-right {
- height: 100%;
- padding: 16px;
+ height: 100vh;
background-color: #eee;
box-sizing: border-box;
overflow: hidden;
--
Gitblit v1.8.0