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 | 104 +++++++++++++++++++++++++++++----------------------
1 files changed, 59 insertions(+), 45 deletions(-)
diff --git a/src/pages/search/index/Searching.vue b/src/pages/search/index/Searching.vue
index 4e23f14..b9a16a0 100644
--- a/src/pages/search/index/Searching.vue
+++ b/src/pages/search/index/Searching.vue
@@ -94,7 +94,7 @@
></el-option>
</el-select>
</p>
- <p class="p-date" style="width:19%">
+ <p class="p-date" style="width:19%;vertical-align: top;">
<el-date-picker
size="mini"
v-model="searchTime"
@@ -120,29 +120,16 @@
<b class="clear-searching" @click="clearSearch">閲嶇疆</b>
</p>
</div>
- <div ref="mid" style="height:calc(100% - 72px)">
- <!-- <div id="searchMid" class="mid" ref="scrollContain" v-if="!VideoPhotoData.uploadDiaplay">
- <Card
- :class="item.activeObject.id === VideoPhotoData.activeCard ? 'my-active-card' : ''"
- v-for="(item, index) in VideoPhotoData.cards"
- :key="index + 'a'"
- :outHeight="'155px'"
- :outWidth="cardWidth"
- :data="item"
- :showType="showType"
- @detailsClick="getDetails($event, index)"
- @addToBase="toAdd"
- ></Card>
- </div>-->
- <div id="searchMid" class="mid">
- <div class="left-selection" v-if="VideoPhotoData.uploadDiaplay">
- <upload-img ref="uploadImg" @labelDisabled="disabled"></upload-img>
- </div>
- <div
- class="right-section"
- ref="scrollContain"
- :style="VideoPhotoData.uploadDiaplay ? 'calc(100% - 315px)' : 'width:100%'"
- >
+ <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">
<Card
v-for="(item, index) in VideoPhotoData.cards"
:class="item.activeObject.id === VideoPhotoData.activeCard ? 'my-active-card' : ''"
@@ -154,10 +141,21 @@
@detailsClick="getDetails($event, index)"
@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>
+ </div>
</div>
</div>
</div>
- <div class="foot">
+ <!-- <div class="foot">
<el-pagination
:current-page="VideoPhotoData.page"
@current-change="changePages"
@@ -167,10 +165,10 @@
layout="total, sizes, prev, pager, next, jumper"
:total="VideoPhotoData.total"
></el-pagination>
- </div>
+ </div>-->
</div>
</div>
- <!-- <hsc-window-style-metal class="windown-model">
+ <hsc-window-style-metal class="windown-model">
<hsc-window
v-for="(item, index) in CardList.addBaseList"
:closeButton="true"
@@ -231,7 +229,7 @@
</div>
</div>
</hsc-window>
- </hsc-window-style-metal>-->
+ </hsc-window-style-metal>
</div>
</template>
@@ -301,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();
@@ -532,6 +537,7 @@
this.VideoPhotoData.activeCard = obj.activeObject.id;
},
toAdd(item) {
+ debugger
this.CardList.addBaseList.push(item)
},
handleClose(done) {
@@ -701,6 +707,9 @@
fn.then(_ => {
this.AuthData.closeLoad();
})
+ },
+ getUrlKey(name) {
+ return decodeURIComponent((new RegExp('[?|&]' + name + '=' + '([^&;]+?)(&|#|;|$)').exec(location.href) || [, ""])[1].replace(/\+/g, '%20')) || null
}
}
};
@@ -735,7 +744,7 @@
color: rgba(0, 0, 0, 0.78) !important;
}
.searching-right-content {
- height: calc(100% - 135px);
+ height: calc(100% - 80px);
width: 100%;
box-sizing: border-box;
.top {
@@ -772,9 +781,9 @@
}
}
.mid {
- width: 100%;
- height: 100%;
- padding: 10px;
+ //width: 100%;
+ //height: 100%;
+ padding: 5px;
overflow: auto;
position: relative;
.my-card {
@@ -787,8 +796,8 @@
overflow: hidden;
width: 100%;
height: 80px;
- line-height: 80px;
- padding-top: 24px;
+ //line-height: 80px;
+ padding-top: 20px;
padding-right: 24px;
box-sizing: border-box;
text-align: right;
@@ -877,7 +886,15 @@
}
</style>
<style lang="scss" scoped>
+.left-selection {
+ width: 300px;
+ height: 100%;
+ float: left;
+ margin-right: 15px;
+}
#searchMid {
+ height: 100%;
+ box-sizing: border-box;
.el-loading-mask {
.el-loading-spinner {
width: 100%;
@@ -887,16 +904,13 @@
}
}
}
- .left-selection {
- width: 300px;
- height: 100%;
- float: left;
- margin-right: 15px;
- }
+
.right-section {
//width: calc(100% - 315px);
height: 100%;
- float: left;
+ padding-bottom: 20px;
+ box-sizing: border-box;
+ //float: left;
overflow: auto;
position: relative;
}
--
Gitblit v1.8.0