|
|
@@ -135,7 +135,7 @@
|
|
|
<div style="padding: 0 0 0 20px; display: flex">
|
|
|
<div class="course_left">
|
|
|
<div class="stepsBottom2">
|
|
|
- <div class="navBottom">
|
|
|
+ <div class="navBottom" :style="{height:heightPx}">
|
|
|
<div class="navTask" :class="{
|
|
|
isNavTask:
|
|
|
isClickColor > 0 && isClickColor == tIndex + 1,
|
|
|
@@ -3920,7 +3920,7 @@
|
|
|
<div class="spanName">选择系统文件</div>
|
|
|
</div>
|
|
|
<div>
|
|
|
- <el-button @click="searchImage" v-if="isSysPic2 == false">选择网络文件</el-button>
|
|
|
+ <el-button @click="searchImageValue = '',searchImage()" v-if="isSysPic2 == false">选择网络文件</el-button>
|
|
|
<div class="isSysPic" v-if="isSysPic2 == true && cover.length > 0">
|
|
|
<img :src="cover[0].url" alt="" />
|
|
|
<div class="deletePic" @click="deleteSysPic">
|
|
|
@@ -3961,22 +3961,22 @@
|
|
|
<img :src="sys.poster" alt="" @click="chooseSysPic(sys.poster)" />
|
|
|
</div>
|
|
|
</div>
|
|
|
- <span slot="footer" class="dialog-footer">
|
|
|
- <el-button @click="sysPicVisible = false">取 消</el-button>
|
|
|
- <el-button type="primary">确 定</el-button>
|
|
|
- </span>
|
|
|
</el-dialog>
|
|
|
<el-dialog title="选择网络文件" :visible.sync="sysPicVisible2" :append-to-body="true" width="710px"
|
|
|
:before-close="handleClose" class="dialog_diy">
|
|
|
- <div class="sysPicBox" v-loading="imageloading">
|
|
|
- <div v-for="(sys, sysIndex) in imageList" :key="sysIndex" class="sysPic">
|
|
|
- <img :src="sys.url" alt="" @click="chooseSysPic2(sys.url)" />
|
|
|
+ <div>
|
|
|
+ <div class="people_top_right" style="position: relative;">
|
|
|
+ <el-input style="height: 100%" placeholder="搜索图片关键字" v-model="searchImageValue" @keyup.enter.native="searchImage()"></el-input>
|
|
|
+ <div class="search_img" @click="searchImage" style="right: 10px;">
|
|
|
+ <img src="../../../assets/icon/search.png" alt />
|
|
|
+ </div>
|
|
|
+ </div>
|
|
|
+ <div class="sysPicBox" v-loading="imageloading">
|
|
|
+ <div v-for="(sys, sysIndex) in imageList" :key="sysIndex" class="sysPic">
|
|
|
+ <img :src="sys.url" alt="" @click="chooseSysPic2(sys.url)" />
|
|
|
+ </div>
|
|
|
</div>
|
|
|
</div>
|
|
|
- <span slot="footer" class="dialog-footer">
|
|
|
- <el-button @click="sysPicVisible2 = false">取 消</el-button>
|
|
|
- <el-button type="primary">确 定</el-button>
|
|
|
- </span>
|
|
|
</el-dialog>
|
|
|
<el-dialog title="选择匹配" :visible.sync="dialogVisibleSelect" :append-to-body="true" width="800px"
|
|
|
:before-close="(done)=>{closePan(41)}" class="dialog_diy dialog_diy3 fullStyle">
|
|
|
@@ -4553,7 +4553,9 @@ export default {
|
|
|
isPasteChoice:false,
|
|
|
sysPicVisible2: false,
|
|
|
imageloading: false,
|
|
|
+ searchImageValue:"",
|
|
|
imageList: [],
|
|
|
+ heightPx:'100%'
|
|
|
};
|
|
|
},
|
|
|
directives: {
|
|
|
@@ -4777,7 +4779,8 @@ export default {
|
|
|
let stepsBottom2 = $(".stepsBottom2")[0].clientHeight;
|
|
|
// let client = $(".course_left")[0].clientHeight - stepsBottom2
|
|
|
let client = $(".course_left")[0].clientHeight - stepsBottom2;
|
|
|
- let top = $(".rightBox")[0].scrollTop - 300 - stepsBottom2;
|
|
|
+ let maxheight = $('.whiteBg')[0].offsetHeight +$('.whiteBg')[1].offsetHeight +$('.whiteBg')[2].offsetHeight + 120
|
|
|
+ let top = $(".rightBox")[0].scrollTop - maxheight;
|
|
|
// if (top < client) {
|
|
|
// $('.stepsBottom2')[0].style.position = 'absolute'
|
|
|
// $('.stepsBottom2')[0].style.top = 0 + 'px'
|
|
|
@@ -4787,10 +4790,19 @@ export default {
|
|
|
let top = $(".rightBox")[0].offsetTop;
|
|
|
$(".stepsBottom2")[0].style.position = "fixed";
|
|
|
$(".stepsBottom2")[0].style.top = top + "px";
|
|
|
+ this.heightPx = $(".rightBox")[0].offsetHeight - 40 + 'px'
|
|
|
// $('.stepsBottom2')[0].style.top = top + 'px'
|
|
|
} else {
|
|
|
$(".stepsBottom2")[0].style.position = "absolute";
|
|
|
$(".stepsBottom2")[0].style.top = "0px";
|
|
|
+ this.heightPx = $(".basic_box2")[0].offsetHeight - 50 + 'px'
|
|
|
+ }
|
|
|
+
|
|
|
+ const clientHeight = $(".rightBox")[0].clientHeight;
|
|
|
+ const scrollTop = $(".rightBox")[0].scrollTop;
|
|
|
+ const scrollHeight = $(".rightBox")[0].scrollHeight;
|
|
|
+ if ((clientHeight + scrollTop > (scrollHeight-10)) && (top > 0)) {
|
|
|
+ this.heightPx = $(".rightBox")[0].offsetHeight - 130 + 'px'
|
|
|
}
|
|
|
},
|
|
|
handleCheckAllChange(val) {
|
|
|
@@ -9307,7 +9319,7 @@ export default {
|
|
|
_this.ajax.post('https://gpt.cocorobo.cn/search', {
|
|
|
page: 1,
|
|
|
pageSize: 21,
|
|
|
- keywords: '',
|
|
|
+ keywords: this.searchImageValue,
|
|
|
category: 'unsplash',
|
|
|
isNeedTranslate: true
|
|
|
}).then(function (response) {
|
|
|
@@ -9415,6 +9427,7 @@ export default {
|
|
|
this.$nextTick(() => {
|
|
|
//监听这个dom的scroll事件
|
|
|
$(".rightBox")[0].addEventListener("scroll", this.scrollChange);
|
|
|
+ this.heightPx = $(".rightBox")[0].offsetHeight + 'px'
|
|
|
});
|
|
|
},
|
|
|
};
|
|
|
@@ -12327,7 +12340,7 @@ ol {
|
|
|
|
|
|
.navBottom {
|
|
|
background: #F0F4FA;
|
|
|
- height: 65vh;
|
|
|
+ height: calc(100vh - 210px);
|
|
|
overflow: auto;
|
|
|
}
|
|
|
|
