From 5dc36d1e0ea55358eb5b7273943897a75403993c Mon Sep 17 00:00:00 2001
From: hanbaoshan <hanbaoshan@aiotlink.com>
Date: 星期四, 13 八月 2020 17:26:09 +0800
Subject: [PATCH] 修复底库分页全屏不显示,场景编辑可选参数默认选中第一个operator,表单必填项红星对齐方式修改
---
src/pages/search/index/Searching.vue | 62 +++++++++++++++++--------------
1 files changed, 34 insertions(+), 28 deletions(-)
diff --git a/src/pages/search/index/Searching.vue b/src/pages/search/index/Searching.vue
index 9c7a8c6..b9a16a0 100644
--- a/src/pages/search/index/Searching.vue
+++ b/src/pages/search/index/Searching.vue
@@ -122,16 +122,14 @@
</div>
<div ref="mid" style="height:calc(100% - 50px);">
<div class="left-selection" v-if="VideoPhotoData.uploadDiaplay">
- <upload-img ref="uploadImg" @labelDisabled="disabled"></upload-img>
- </div>
- <div id="searchMid" class="mid" :style="{width: VideoPhotoData.uploadDiaplay ? 'calc(100% - 315px)' : '100%'}">
-
- <div
- class="right-section"
-
- ref="scrollContain"
-
- >
+ <upload-img ref="uploadImg" @labelDisabled="disabled"></upload-img>
+ </div>
+ <div
+ id="searchMid"
+ class="mid"
+ :style="{width: VideoPhotoData.uploadDiaplay ? 'calc(100% - 315px)' : '100%'}"
+ >
+ <div class="right-section" ref="scrollContain">
<Card
v-for="(item, index) in VideoPhotoData.cards"
:class="item.activeObject.id === VideoPhotoData.activeCard ? 'my-active-card' : ''"
@@ -144,20 +142,18 @@
@addToBase="toAdd"
></Card>
<div class="foot">
- <el-pagination
- :current-page="VideoPhotoData.page"
- @current-change="changePages"
- @size-change="sizeChange"
- :page-sizes="VideoPhotoData.pageSizeOption"
- :page-size="VideoPhotoData.size"
- layout="total, sizes, prev, pager, next, jumper"
- :total="VideoPhotoData.total"
- ></el-pagination>
+ <el-pagination
+ :current-page="VideoPhotoData.page"
+ @current-change="changePages"
+ @size-change="sizeChange"
+ :page-sizes="VideoPhotoData.pageSizeOption"
+ :page-size="VideoPhotoData.size"
+ layout="total, sizes, prev, pager, next, jumper"
+ :total="VideoPhotoData.total"
+ ></el-pagination>
+ </div>
</div>
- </div>
-
</div>
-
</div>
<!-- <div class="foot">
<el-pagination
@@ -169,7 +165,7 @@
layout="total, sizes, prev, pager, next, jumper"
:total="VideoPhotoData.total"
></el-pagination>
- </div> -->
+ </div>-->
</div>
</div>
<hsc-window-style-metal class="windown-model">
@@ -303,10 +299,17 @@
// 鏆傛椂鍏抽棴璺宠浆 20200730
// if (this.$route.query.showType === "findByPic") {
- if (this.VideoPhotoData.uploadDiaplay) {
- // this.$nextTick(() => {
- // this.$refs.uploadImg.rightSectionDisplay = true;
- // });
+ 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(); // 鏌ユ壘姝や汉
} else {
this.searchTime = this.getDateInit();
this.VideoPhotoData.searchTime = this.getDateInit();
@@ -704,6 +707,9 @@
fn.then(_ => {
this.AuthData.closeLoad();
})
+ },
+ getUrlKey(name) {
+ return decodeURIComponent((new RegExp('[?|&]' + name + '=' + '([^&;]+?)(&|#|;|$)').exec(location.href) || [, ""])[1].replace(/\+/g, '%20')) || null
}
}
};
@@ -898,7 +904,7 @@
}
}
}
-
+
.right-section {
//width: calc(100% - 315px);
height: 100%;
--
Gitblit v1.8.0