|
|
@@ -2317,7 +2317,7 @@
|
|
|
isCloseList[toolIndex].isClose == 0
|
|
|
"
|
|
|
>
|
|
|
- 收缩
|
|
|
+ 折叠
|
|
|
</div>
|
|
|
<div
|
|
|
class="corOpen"
|
|
|
@@ -2875,7 +2875,7 @@
|
|
|
isCloseList[toolIndex].isClose == 0
|
|
|
"
|
|
|
>
|
|
|
- 收缩
|
|
|
+ 折叠
|
|
|
</div>
|
|
|
<div
|
|
|
class="corOpen"
|
|
|
@@ -3032,7 +3032,7 @@
|
|
|
isCloseList[toolIndex].isClose == 0
|
|
|
"
|
|
|
>
|
|
|
- 收缩
|
|
|
+ 折叠
|
|
|
</div>
|
|
|
<div
|
|
|
class="corOpen"
|
|
|
@@ -3188,7 +3188,7 @@
|
|
|
isCloseList[toolIndex].isClose == 0
|
|
|
"
|
|
|
>
|
|
|
- 收缩
|
|
|
+ 折叠
|
|
|
</div>
|
|
|
<div
|
|
|
class="corOpen"
|
|
|
@@ -3498,7 +3498,7 @@
|
|
|
isCloseList[toolIndex].isClose == 0
|
|
|
"
|
|
|
>
|
|
|
- 收缩
|
|
|
+ 折叠
|
|
|
</div>
|
|
|
<div
|
|
|
class="corOpen"
|
|
|
@@ -3666,7 +3666,7 @@
|
|
|
isCloseList[toolIndex].isClose == 0
|
|
|
"
|
|
|
>
|
|
|
- 收缩
|
|
|
+ 折叠
|
|
|
</div>
|
|
|
<div
|
|
|
class="corOpen"
|
|
|
@@ -3761,7 +3761,7 @@
|
|
|
isCloseList[toolIndex].isClose == 0
|
|
|
"
|
|
|
>
|
|
|
- 收缩
|
|
|
+ 折叠
|
|
|
</div>
|
|
|
<div
|
|
|
class="corOpen"
|
|
|
@@ -3857,7 +3857,7 @@
|
|
|
isCloseList[toolIndex].isClose == 0
|
|
|
"
|
|
|
>
|
|
|
- 收缩
|
|
|
+ 折叠
|
|
|
</div>
|
|
|
<div
|
|
|
class="corOpen"
|
|
|
@@ -4151,7 +4151,7 @@
|
|
|
isCloseList[toolIndex].isClose == 0
|
|
|
"
|
|
|
>
|
|
|
- 收缩
|
|
|
+ 折叠
|
|
|
</div>
|
|
|
<div
|
|
|
class="corOpen"
|
|
|
@@ -4431,7 +4431,7 @@
|
|
|
isCloseList[toolIndex].isClose == 0
|
|
|
"
|
|
|
>
|
|
|
- 收缩
|
|
|
+ 折叠
|
|
|
</div>
|
|
|
<div
|
|
|
class="corOpen"
|
|
|
@@ -4711,7 +4711,7 @@
|
|
|
isCloseList[toolIndex].isClose == 0
|
|
|
"
|
|
|
>
|
|
|
- 收缩
|
|
|
+ 折叠
|
|
|
</div>
|
|
|
<div
|
|
|
class="corOpen"
|
|
|
@@ -4990,7 +4990,7 @@
|
|
|
isCloseList[toolIndex].isClose == 0
|
|
|
"
|
|
|
>
|
|
|
- 收缩
|
|
|
+ 折叠
|
|
|
</div>
|
|
|
<div
|
|
|
class="corOpen"
|
|
|
@@ -5270,7 +5270,7 @@
|
|
|
isCloseList[toolIndex].isClose == 0
|
|
|
"
|
|
|
>
|
|
|
- 收缩
|
|
|
+ 折叠
|
|
|
</div>
|
|
|
<div
|
|
|
class="corOpen"
|
|
|
@@ -5375,7 +5375,7 @@
|
|
|
isCloseList[toolIndex].isClose == 0
|
|
|
"
|
|
|
>
|
|
|
- 收缩
|
|
|
+ 折叠
|
|
|
</div>
|
|
|
<div
|
|
|
class="corOpen"
|
|
|
@@ -5575,7 +5575,7 @@
|
|
|
isCloseList[toolIndex].isClose == 0
|
|
|
"
|
|
|
>
|
|
|
- 收缩
|
|
|
+ 折叠
|
|
|
</div>
|
|
|
<div
|
|
|
class="corOpen"
|
|
|
@@ -5823,7 +5823,7 @@
|
|
|
isCloseList[toolIndex].isClose == 0
|
|
|
"
|
|
|
>
|
|
|
- 收缩
|
|
|
+ 折叠
|
|
|
</div>
|
|
|
<div
|
|
|
class="corOpen"
|
|
|
@@ -5906,7 +5906,7 @@
|
|
|
isCloseList[toolIndex].isClose == 0
|
|
|
"
|
|
|
>
|
|
|
- 收缩
|
|
|
+ 折叠
|
|
|
</div>
|
|
|
<div
|
|
|
class="corOpen"
|
|
|
@@ -6133,7 +6133,7 @@
|
|
|
isCloseList[toolIndex].isClose == 0
|
|
|
"
|
|
|
>
|
|
|
- 收缩
|
|
|
+ 折叠
|
|
|
</div>
|
|
|
<div
|
|
|
class="corOpen"
|
|
|
@@ -6733,7 +6733,7 @@
|
|
|
</div>
|
|
|
</div>
|
|
|
<div class="queTopClose" v-if="isClose == 1">
|
|
|
- 收缩
|
|
|
+ 折叠
|
|
|
<div class="openImg">
|
|
|
<img src="../assets/icon/newIcon/open.png" alt="" />
|
|
|
</div>
|
|
|
@@ -11250,7 +11250,7 @@
|
|
|
</div>
|
|
|
<div class="oldDetail">
|
|
|
<div>正文：</div>
|
|
|
- <div>{{ oldEnglishJson.engText }} </div>
|
|
|
+ <div v-html="oldEnglishJson.engText"></div>
|
|
|
</div>
|
|
|
</div>
|
|
|
</div>
|
|
|
@@ -11273,11 +11273,12 @@
|
|
|
</div>
|
|
|
</div>
|
|
|
<div class="oldBox" v-else-if="userMes[0].type == 1">
|
|
|
- <div class="oldMes" style="background: rgb(224 236 255);display: flex;flex-direction: row;flex-wrap: nowrap;align-items: center;overflow-x: auto;overflow-y: hidden;">
|
|
|
+ <div class="oldMes" style="background: rgb(224 236 255);display: flex;flex-direction: row;flex-wrap: nowrap;align-items: center;overflow-x: auto;overflow-y: hidden;" v-if="newEnglishList.length > 0">
|
|
|
<div v-if="isNoUserid" class="allName" :style="{minWidth: `calc(100% / ${engListLength})`,background: newEngIndex == -1 ? '#aacaff' : ''}" @click="setEngText(-1)" style="background: #aacaff;">{{ userMes[0].username }}</div>
|
|
|
<div v-for="(item,index) in newEnglishList" :key="index" class="allName" :style="{minWidth: `calc(100% / ${engListLength})`,background: index == newEngIndex ? '#aacaff' : ''}" @click="setEngText(index)">{{ item.username }}</div>
|
|
|
</div>
|
|
|
- <div class="oldText" v-if="newEngIndex == -1">
|
|
|
+ <div class="oldMes" style="background: #aacaff;" v-else>{{ userMes[0].username }}</div>
|
|
|
+ <div class="oldText" v-if="newEngIndex == -1 && isNoUserid == true">
|
|
|
<div class="detailBox">
|
|
|
<div class="oldDetail">
|
|
|
<div>标题：</div>
|
|
|
@@ -11291,16 +11292,32 @@
|
|
|
</div>
|
|
|
</div>
|
|
|
</div>
|
|
|
- <div class="oldText" v-else-if="newEngIndex > -1 && newEnglishList.length > 0">
|
|
|
+ <div class="oldText" v-else-if="newEngIndex == -1 && !newEnglishList.length">
|
|
|
<div class="detailBox">
|
|
|
<div class="oldDetail">
|
|
|
<div>标题：</div>
|
|
|
- <el-input v-model="JSON.parse(newEnglishList[newEngIndex].cWork).engTitle" />
|
|
|
+ <el-input v-model="newEnglishList.engTitle" />
|
|
|
</div>
|
|
|
<div class="oldDetail">
|
|
|
<div>正文：</div>
|
|
|
<el-input type="textarea"
|
|
|
:rows="10"
|
|
|
+ resize="none" v-model="newEnglishList.engText" />
|
|
|
+ </div>
|
|
|
+ </div>
|
|
|
+ </div>
|
|
|
+ <div class="oldText" v-else-if="newEngIndex > -1 && newEnglishList.length > 0">
|
|
|
+ <div class="detailBox">
|
|
|
+ <div class="oldDetail">
|
|
|
+ <div>标题：</div>
|
|
|
+ <div v-if="userMes[0].userid != newEnglishList[newEngIndex].correct" v-html="JSON.parse(newEnglishList[newEngIndex].cWork).engTitle"></div>
|
|
|
+ <el-input v-else v-model="JSON.parse(newEnglishList[newEngIndex].cWork).engTitle" />
|
|
|
+ </div>
|
|
|
+ <div class="oldDetail">
|
|
|
+ <div>正文：</div>
|
|
|
+ <div v-if="userMes[0].userid != newEnglishList[newEngIndex].correct" v-html="JSON.parse(newEnglishList[newEngIndex].cWork).engText"></div>
|
|
|
+ <el-input v-else type="textarea"
|
|
|
+ :rows="10"
|
|
|
resize="none" v-model="JSON.parse(newEnglishList[newEngIndex].cWork).engText" />
|
|
|
</div>
|
|
|
</div>
|
|
|
@@ -11738,7 +11755,7 @@ export default {
|
|
|
courseGroupStudentUid: [],
|
|
|
courseGroup: {},
|
|
|
isGroup: false,
|
|
|
- toolIndex: null,
|
|
|
+ // toolIndex: null,
|
|
|
tool: {},
|
|
|
isWorkTool: [
|
|
|
16, 32, 57, 4, 45, 15, 1, 3, 6, 7, 26, 41, 47, 48, 52, 50, 40,
|
|
|
@@ -16888,6 +16905,7 @@ export default {
|
|
|
.toolChoose[i].englishList;
|
|
|
this.oldEnglishJson = z;
|
|
|
this.engWid = id;
|
|
|
+ this.newEnglishList = { engTitle:"",engText:"" }
|
|
|
this.selectEngC(z);
|
|
|
}
|
|
|
// else if (t == 15) {
|
|
|
@@ -18623,7 +18641,7 @@ export default {
|
|
|
tool: this.toolindex,
|
|
|
wid: this.engWid,
|
|
|
c: this.userid,
|
|
|
- w: this.newEngIndex == -1 ? JSON.stringify(this.oldEnglishJson1) : JSON.stringify(this.newEnglishList),
|
|
|
+ w: (this.newEngIndex == -1 && this.isNoUserid == true) ? JSON.stringify(this.oldEnglishJson1) : JSON.stringify(this.newEnglishList),
|
|
|
};
|
|
|
this.ajax
|
|
|
.get(this.$store.state.api + "addEngC", params)
|
|
|
@@ -18688,12 +18706,14 @@ export default {
|
|
|
this.$forceUpdate();
|
|
|
setTimeout(() => {
|
|
|
this.topHeight = document.querySelectorAll(".engUpTop")[0].offsetHeight;
|
|
|
- if(this.isNoUserid == true){
|
|
|
- this.engListLength = this.newEnglishList.length + 1;
|
|
|
- this.newEngIndex = -1;
|
|
|
- }else{
|
|
|
- this.engListLength = this.newEnglishList.length;
|
|
|
- this.newEngIndex = 0;
|
|
|
+ if(this.newEnglishList.length > 0){
|
|
|
+ if(this.isNoUserid == true){
|
|
|
+ this.engListLength = this.newEnglishList.length + 1;
|
|
|
+ this.newEngIndex = -1;
|
|
|
+ }else{
|
|
|
+ this.engListLength = this.newEnglishList.length;
|
|
|
+ this.newEngIndex = 0;
|
|
|
+ }
|
|
|
}
|
|
|
}, 500);
|
|
|
|
|
|
@@ -19402,7 +19422,7 @@ export default {
|
|
|
|
|
|
.courseTitle {
|
|
|
width: 85%;
|
|
|
- margin: 10px auto;
|
|
|
+ margin: 10px auto 20px auto;
|
|
|
display: flex;
|
|
|
flex-direction: row;
|
|
|
align-items: center;
|
|
|
@@ -20402,7 +20422,6 @@ export default {
|
|
|
margin: 15px 0 0 25px;
|
|
|
display: flex;
|
|
|
position: relative;
|
|
|
- background: #f0f4fa;
|
|
|
padding: 18px 20px;
|
|
|
border-top-left-radius: 5px;
|
|
|
border-top-right-radius: 5px;
|
|
|
@@ -20492,7 +20511,6 @@ export default {
|
|
|
.worksBox {
|
|
|
margin: 0 0 10px 25px;
|
|
|
border-bottom: 1px solid #eeeeee;
|
|
|
- background: #f0f4fa;
|
|
|
padding: 18px 20px;
|
|
|
border-radius: 4px;
|
|
|
width: 90%;
|
zengyicheng