|
|
@@ -133,7 +133,7 @@
|
|
|
<div
|
|
|
class="m-m-fi-imageItem"
|
|
|
@click.stop="addImage()"
|
|
|
- style="max-width:32%;"
|
|
|
+ style="max-width:60%;"
|
|
|
v-if="
|
|
|
imageList.fileList1 &&
|
|
|
imageList.fileList1.length +
|
|
|
@@ -170,7 +170,7 @@
|
|
|
<div class="m-m-formImage" v-loading="uploadVideoLoading">
|
|
|
<div
|
|
|
class="m-m-fi-imageItem"
|
|
|
- style="max-width:33%;"
|
|
|
+ style="max-width:60%;"
|
|
|
v-if="!imageList.videoList.length==0"
|
|
|
v-for="(item, index) in imageList.videoList?imageList.videoList:[]"
|
|
|
:key="index"
|
|
|
@@ -188,7 +188,7 @@
|
|
|
<div
|
|
|
class="m-m-fi-imageItem"
|
|
|
@click.stop="addVideo()"
|
|
|
- style="max-width:33%;"
|
|
|
+ style="max-width:60%;"
|
|
|
v-if="(((imageList.videoList&&imageList.videoList.length<=0) || !imageList.videoList) && !progressData.uploadVideo)"
|
|
|
>
|
|
|
<img
|
|
|
@@ -209,7 +209,7 @@
|
|
|
|
|
|
<div
|
|
|
class="m-m-fi-imageItem"
|
|
|
- style="max-width:33%;border-radius: 8px;overflow: hidden;"
|
|
|
+ style="max-width:60%;border-radius: 8px;overflow: hidden;"
|
|
|
v-if="progressData.uploadVideo && !imageList.videoList.length""
|
|
|
>
|
|
|
<el-image
|
|
|
@@ -228,8 +228,7 @@
|
|
|
<!-- <div class="m-m-fi-btn" >添加课堂图片</div> -->
|
|
|
</div>
|
|
|
</div>
|
|
|
- </div>
|
|
|
- <div class="nephogramArea">
|
|
|
+ <!-- <div class="nephogramArea"> -->
|
|
|
<div class="fl_nephogram">
|
|
|
<div class="imgTit">
|
|
|
<span>词云图</span>
|
|
|
@@ -249,7 +248,7 @@
|
|
|
class="m-m-fi-nephogramItem"
|
|
|
v-loading="uploadNephogramLoading"
|
|
|
@click.stop="addNephogram()"
|
|
|
- style="width:23.5%;max-height: 100px;"
|
|
|
+ style="width:60%;max-height: 100px;"
|
|
|
v-if="((imageList.NephogramList&&imageList.NephogramList.length<=0) || !imageList.NephogramList)"
|
|
|
>
|
|
|
<img
|
|
|
@@ -269,8 +268,11 @@
|
|
|
</div>
|
|
|
</div>
|
|
|
</div>
|
|
|
- </div>
|
|
|
+ <!-- </div> -->
|
|
|
+ </div>
|
|
|
+
|
|
|
</div>
|
|
|
+
|
|
|
</div>
|
|
|
<previewVideoDialog ref="previewVideoDialogRef"/>
|
|
|
</div>
|
|
|
@@ -576,11 +578,11 @@ ${_workText}
|
|
|
// sizeRange: [12, 60],
|
|
|
rotationRange: [-90, 90],
|
|
|
rotationStep: 45,
|
|
|
- gridSize: 12,
|
|
|
- autoSize: {
|
|
|
- enable: true,
|
|
|
- minSize: 12,
|
|
|
- },
|
|
|
+ // gridSize: 12,
|
|
|
+ // autoSize: {
|
|
|
+ // enable: true,
|
|
|
+ // minSize: 12,
|
|
|
+ // },
|
|
|
// textStyle: {
|
|
|
// color: function () {
|
|
|
// var colors = [
|
|
|
@@ -897,22 +899,23 @@ ${_workText}
|
|
|
}
|
|
|
|
|
|
.fl_video{
|
|
|
- width: 48.4%;
|
|
|
+ width: 21.8%;
|
|
|
margin-left: 1.6%;
|
|
|
height: auto;
|
|
|
|
|
|
}
|
|
|
|
|
|
.nephogramArea{
|
|
|
- width: 100%;
|
|
|
+ width: 20%;
|
|
|
height: auto;
|
|
|
}
|
|
|
|
|
|
.fl_nephogram{
|
|
|
- width: 50%;
|
|
|
+ width: 20%;
|
|
|
/* margin-left: 1.5%; */
|
|
|
height: auto;
|
|
|
- margin-top: -2%;
|
|
|
+ margin-left: 1%;
|
|
|
+ /* margin-top: -2%; */
|
|
|
}
|
|
|
|
|
|
|
|
|
@@ -954,11 +957,11 @@ ${_workText}
|
|
|
}
|
|
|
|
|
|
.m-m-fi-nephogramItem{
|
|
|
- width: auto;
|
|
|
- height: auto;
|
|
|
+ width: 140px;
|
|
|
+ height: 100px;
|
|
|
background-color: rgba(238, 238, 238, 1);
|
|
|
- width: 100%;
|
|
|
- height: 250px;
|
|
|
+ min-width: 140px;
|
|
|
+ min-height: 100px;
|
|
|
margin-right: 1%;
|
|
|
display: flex;
|
|
|
justify-content: center;
|
