lsc 1 yıl önce
ebeveyn
işleme
16dcdd5509

+ 1 - 1
dist/index.html

@@ -25,7 +25,7 @@
       height: 100%;
       width: 100%;
       background: #e6eaf0;
-    }</style><link href=./static/css/app.5313d09f1a13adbe83f39d9f36e7fb96.css rel=stylesheet></head><body><div id=app></div><script type=text/javascript src=./static/js/manifest.3512a67a6213c2df4180.js></script><script type=text/javascript src=./static/js/vendor.1b8e037bd3fbbd358d74.js></script><script type=text/javascript src=./static/js/app.69c867418a13eb0913aa.js></script></body></html><script>function stopSafari() {
+    }</style><link href=./static/css/app.946e92a413f5cdd329871c2165f370eb.css rel=stylesheet></head><body><div id=app></div><script type=text/javascript src=./static/js/manifest.3512a67a6213c2df4180.js></script><script type=text/javascript src=./static/js/vendor.1b8e037bd3fbbd358d74.js></script><script type=text/javascript src=./static/js/app.f5a1d7fb7b4bd63d79a6.js></script></body></html><script>function stopSafari() {
     //阻止safari浏览器双击放大功能
     let lastTouchEnd = 0  //更新手指弹起的时间
     document.documentElement.addEventListener("touchstart", function (event) {

Dosya farkı çok büyük olduğundan ihmal edildi
+ 0 - 0
dist/static/css/app.5313d09f1a13adbe83f39d9f36e7fb96.css


Dosya farkı çok büyük olduğundan ihmal edildi
+ 0 - 0
dist/static/css/app.5313d09f1a13adbe83f39d9f36e7fb96.css.map


Dosya farkı çok büyük olduğundan ihmal edildi
+ 0 - 0
dist/static/css/app.946e92a413f5cdd329871c2165f370eb.css


Dosya farkı çok büyük olduğundan ihmal edildi
+ 0 - 0
dist/static/css/app.946e92a413f5cdd329871c2165f370eb.css.map


BIN
dist/static/img/clickNo.b60abf0.png


BIN
dist/static/img/networkPanel.f86c203.png


Dosya farkı çok büyük olduğundan ihmal edildi
+ 0 - 0
dist/static/js/app.f5a1d7fb7b4bd63d79a6.js


Dosya farkı çok büyük olduğundan ihmal edildi
+ 0 - 0
dist/static/js/app.f5a1d7fb7b4bd63d79a6.js.map


Dosya farkı çok büyük olduğundan ihmal edildi
+ 0 - 0
dist/static/js/manifest.3512a67a6213c2df4180.js.map


BIN
src/assets/icon/conSentences/clickNo.png


BIN
src/assets/icon/secondToolList/networkPanel.png


+ 0 - 0
dist/static/img/networkPanel.e06ca1d.png → src/assets/icon/secondToolList/networkPanel2.png


+ 136 - 25
src/components/pages/addCourse.vue

@@ -2492,8 +2492,8 @@
       </span>
     </el-dialog>
     <el-dialog title="创建问卷" :visible.sync="dialogVisible5" :append-to-body="true" width="800px"
-      :before-close="handleClose" class="dialog_diy">
-      <div>
+      :before-close="(done)=>{closePan(4)}" class="dialog_diy fullStyle">
+      <div style="height:100%">
         <div class="a_add_title" style="
             display: flex;
             flex-direction: row;
@@ -2503,7 +2503,7 @@
           <!-- <div style="margin-right: 20px; font-size: 20px">标题:</div> -->
           <el-input v-model="askJson.askTitle" placeholder="请输入标题" style="width: 400px"></el-input>
         </div>
-        <div class="a_addBox">
+        <div class="a_addBox" style="height:calc(100% - 50px)">
           <!-- <div style="font-size: 16px; color: #c7c7c7">请输入题目内容</div> -->
           <div class="a_add_box" v-for="(item1, index1) in askJson.askCount" :key="index1">
             <div class="a_add_checkType">
@@ -2565,13 +2565,13 @@
         </div>
       </div>
       <span slot="footer" class="dialog-footer">
-        <el-button @click="dialogVisible5 = false">取 消</el-button>
+        <el-button @click="closePan(4)">取 消</el-button>
         <el-button type="primary" @click="addAsk">确 定</el-button>
       </span>
     </el-dialog>
     <el-dialog title="创建选择题" :visible.sync="dialogVisibleChoice" :append-to-body="true" width="800px"
-      :before-close="handleClose" class="dialog_diy">
-      <div>
+      :before-close="(done)=>{closePan(45)}" class="dialog_diy fullStyle">
+      <div style="height:100%">
         <!-- <div class="a_add_title" style="
             display: flex;
             flex-direction: row;
@@ -2581,7 +2581,7 @@
           <div style="margin-right: 20px; font-size: 20px">标题:</div>
           <el-input v-model="testJson.testTitle" placeholder="请输入标题" style="width: 400px"></el-input>
         </div> -->
-        <div class="a_addBox">
+        <div class="a_addBox" style="height:100%">
           <div style="font-size: 16px; color: #c7c7c7;display: flex;align-items: center;">
             <!-- 请输入题目内容 -->
             <button class="c_pub_button_add pub_btn_paste_img" @click="pasteOption" style="margin-left: 10px"
@@ -2746,7 +2746,7 @@
         </div>
       </div>
       <span slot="footer" class="dialog-footer">
-        <el-button @click="dialogVisibleChoice = false">取 消</el-button>
+        <el-button @click="closePan(45)">取 消</el-button>
         <el-button type="primary" @click="addTest">确 定</el-button>
       </span>
     </el-dialog>
@@ -2911,7 +2911,7 @@
       </span>
     </el-dialog>
     <el-dialog title="添加问答" :visible.sync="dialogVisible8" :append-to-body="true" width="500px"
-      :before-close="handleClose" class="dialog_diy">
+    :before-close="(done)=>{closePan(15)}" class="dialog_diy">
       <div>
         <div class="a_add_title" style="
             display: flex;
@@ -2926,7 +2926,7 @@
         </div>
       </div>
       <span slot="footer" class="dialog-footer">
-        <el-button @click="dialogVisible8 = false">取 消</el-button>
+        <el-button @click="closePan(15)">取 消</el-button>
         <el-button type="primary" @click="addAnswer">确 定</el-button>
       </span>
     </el-dialog>
@@ -3027,8 +3027,8 @@
       </span>
     </el-dialog>
     <el-dialog title="选择匹配" :visible.sync="dialogVisibleSelect" :append-to-body="true" width="800px"
-      :before-close="handleClose" class="dialog_diy dialog_diy3">
-      <div v-if="selectJson">
+      :before-close="(done)=>{closePan(41)}" class="dialog_diy dialog_diy3 fullStyle">
+      <div v-if="selectJson" style="height:100%">
         <div class="select_box1" v-if="selectSteps == 1">
           <div class="select_box1_img">
             <div class="select_box1_title">
@@ -3064,7 +3064,7 @@
             </div>
           </div>
         </div>
-        <div v-if="selectSteps == 2">
+        <div v-if="selectSteps == 2" style="height:100%">
           <div class="select_box2">
             <div class="select_box2_title">设置每道题目的正确选项</div>
             <div class="select_box2_box">
@@ -3124,10 +3124,10 @@
         <el-button type="primary" @click="addRateAnswer">确 定</el-button>
       </span>
     </el-dialog>
-    <el-dialog title="连词成句设置" :visible.sync="dialogVisibleSentence" :append-to-body="true" width="1000px"
-      :before-close="handleClose" class="dialog_diy dialog_diy3">
-      <div>
-        <div class="sentenBox">
+    <el-dialog title="排序设置" :visible.sync="dialogVisibleSentence" :append-to-body="true" width="1000px"
+      :before-close="(done)=>{closePan(47)}" class="dialog_diy dialog_diy3 fullStyle">
+      <div style="height: 100%;">
+        <div class="sentenBox" style="height: 100%;">
           <div class="addSen" @click="addSt">添加题目</div>
           <div v-for="(st, stIndex) in sentenceList" :key="stIndex" class="sentenContent">
             <div class="sentenTopBox">
@@ -3173,13 +3173,16 @@
                 <div class="card" v-if="st.rightAnswer.length == 0">
                   <img src="../../assets/icon/conSentences/noAnswer.png" alt="" />
                 </div>
+                <div class="card" v-else>
+                  <img src="../../assets/icon/conSentences/clickNo.png" alt="" />
+                </div>
               </div>
             </div>
           </div>
         </div>
       </div>
       <span slot="footer" class="dialog-footer">
-        <el-button @click="dialogVisibleSentence = false">取 消</el-button>
+        <el-button @click="closePan(47)">取 消</el-button>
         <el-button type="primary" @click="addSentenceTool">确 定</el-button>
       </span>
     </el-dialog>
@@ -3431,6 +3434,7 @@ export default {
       lineTitle: "",
       sysPic: [],
       sentenceList: [{ sentenceTitle: "", addSentence: [], rightAnswer: [] }],
+      sentenceList2:[],
       isPushTitleList: [],
       lineCount: 0,
       lineType: 0,
@@ -3515,8 +3519,11 @@ export default {
         askTitle: "",
         askJson: [{ askstitle: "", askItem: 1, checkList: [] }],
       },
+      askJson2:{},
       testJson: {},
+      testJson2: {},
       selectJson: {},
+      selectJson2: {},
       rateJson: [],
       unitJson2: [],
       unitJson3: [],
@@ -3594,6 +3601,7 @@ export default {
       toolIndex: 0,
       cidType: 0,
       answerQ: "",
+      answerQ2: "",
       grade: [],
       grade2: [],
       courseUserid: "",
@@ -3908,6 +3916,73 @@ export default {
     handleClose(done) {
       done();
     },
+    closePan(tool){
+      if(tool == 15){
+        if(JSON.stringify(this.answerQ) == JSON.stringify(this.answerQ2)){
+          this.dialogVisible8 = false
+        }else{
+          this.closeConfirm(tool);
+        }
+      }else if(tool == 4){
+        if(JSON.stringify(this.askJson) == JSON.stringify(this.askJson2)){
+          this.dialogVisible5 = false
+        }else{
+          this.closeConfirm(tool);
+        }
+      }else if(tool == 45){
+        if(JSON.stringify(this.testJson) == JSON.stringify(this.testJson2)){
+          this.dialogVisibleChoice = false
+        }else{
+          this.closeConfirm(tool);
+        }
+      }else if(tool == 41){
+        if(JSON.stringify(this.selectJson) == JSON.stringify(this.selectJson2)){
+          this.dialogVisibleSelect = false
+        }else{
+          this.closeConfirm(tool);
+        }
+      }else if(tool == 47){
+        if(JSON.stringify(this.sentenceList) == JSON.stringify(this.sentenceList2)){
+          this.dialogVisibleSentence = false
+        }else{
+          this.closeConfirm(tool);
+        }
+      }
+    },
+    closeConfirm(tool){
+      this
+        .$confirm("是否保存?", "提示", {
+          confirmButtonText: "保存",
+          cancelButtonText: "不保存",
+          type: "warning",
+        })
+        .then(() => {
+          if(tool == 15){
+            this.addAnswer();
+          }else if(tool == 4){
+            this.addAsk();
+          }else if(tool == 45){
+            this.addTest();
+          }else if(tool == 41){
+            this.addSelectAnswer();
+          }else if(tool == 47){
+            this.addSentenceTool();
+          }
+        })
+        .catch(() => {
+          if(tool == 15){
+            this.dialogVisible8 = false;
+          }else if(tool == 4){
+            this.dialogVisible5 = false;
+          }else if(tool == 45){
+            this.dialogVisibleChoice = false;
+          }else if(tool == 41){
+            this.dialogVisibleSelect = false;
+          }else if(tool == 47){
+            this.dialogVisibleSentence = false;
+          }
+        });
+    },
     imgChange2(i, j) {
       var _tmp = this.testJson.testJson[i].checkList[j];
       this.noneBtnImg = _tmp.length >= 1;
@@ -6143,6 +6218,7 @@ export default {
             )
           );
         }
+        this.askJson2 = JSON.parse(JSON.stringify(this.askJson))
         this.dialogVisible5 = true;
       } else if (i == 45) {
         if (
@@ -6174,6 +6250,7 @@ export default {
           this.testJson = testJson;
         }
 
+        this.testJson2 = JSON.parse(JSON.stringify(this.testJson));
         this.dialogVisibleChoice = true;
       } else if (i == 47) {
         if (
@@ -6193,6 +6270,7 @@ export default {
           ];
           this.sentenceList = sentenceList;
         }
+        this.sentenceList2 = JSON.parse(JSON.stringify(this.sentenceList));
         this.dialogVisibleSentence = true;
       } else if (i == 48) {
         if (
@@ -6316,6 +6394,7 @@ export default {
             )
           )
           : "";
+        this.answerQ2 = JSON.parse(JSON.stringify(this.answerQ))
         this.dialogVisible8 = true;
       } else if (i == 40) {
         this.rateJson = this.unitJson[this.unitIndex].chapterInfo[0].taskJson[
@@ -6357,6 +6436,7 @@ export default {
           )
           : { url: "", select: [], answer: [] };
         this.selectSteps = 1;
+        this.selectJson2 = JSON.parse(JSON.stringify(this.selectJson))
         this.dialogVisibleSelect = true;
       } else if (i == 3) {
         window.parent.postMessage(
@@ -10154,7 +10234,7 @@ ol {
   margin: 10px 0;
   background: #fff;
   padding: 15px;
-  max-height: 600px;
+  /* max-height: 600px; */
   overflow: auto;
 }
 
@@ -11174,7 +11254,9 @@ ol {
   cursor: pointer;
 }
 
-.select_box1 {}
+.select_box1 {
+  height: 100%;
+}
 
 .select_box1_img {
   background: #fff;
@@ -11208,9 +11290,13 @@ ol {
   border-radius: 5px;
   padding: 15px;
   box-sizing: border-box;
+  height: calc(100% - 200px);
+  overflow: auto;
 }
 
-.select_box2 {}
+.select_box2 {
+  height:100%;
+}
 
 .select_box2_title {
   background: #fff;
@@ -11222,7 +11308,7 @@ ol {
 
 .select_box2_box {
   display: flex;
-  height: 500px;
+  height: calc(100% - 30px);
 }
 
 .select_box2_img {
@@ -11465,6 +11551,10 @@ ol {
   margin: 0 auto;
 }
 
+.rightCardList{
+  display: flex;
+  flex-wrap: wrap;
+}
 .cardBox {
   display: flex;
   flex-direction: row;
@@ -11515,7 +11605,8 @@ ol {
 }
 
 .rightCardBox {
-  margin: 10px 0 0 10px;
+  width: 99%;
+  margin: 10px auto 0;
 }
 
 .rightCardBox>div:nth-child(1) {
@@ -11529,7 +11620,7 @@ ol {
   align-items: center;
   border-bottom: 3px solid #b4c3d3;
   padding: 0 0 5px 0;
-  margin-right: 10px;
+  /* margin-right: 10px; */
 }
 
 .cardCss>div:nth-child(2) {
@@ -11912,4 +12003,24 @@ ol {
 .moveBtn2 .chapter_upload_down::after{
   width: 10px;
   height: 10px;
-}</style>
+}
+
+.fullStyle >>> .el-dialog__body {
+  height: calc(100% - 125px)!important;
+  box-sizing: border-box;
+}
+
+.fullStyle >>> .el-dialog{
+  width: 100% !important;
+  max-width: 100% !important;
+  height: 100% !important;
+  margin: 0 !important;
+}
+
+.fullStyle {
+  width: 100% !important;
+  max-width: 100% !important;
+  height: 100% !important;
+  margin: 0 auto !important;
+}
+</style>

+ 135 - 25
src/components/pages/easy/addCourse.vue

@@ -3432,8 +3432,8 @@
       </span>
     </el-dialog>
     <el-dialog title="创建问卷" :visible.sync="dialogVisible5" :append-to-body="true" width="800px"
-      :before-close="handleClose" class="dialog_diy">
-      <div>
+      :before-close="(done)=>{closePan(4)}" class="dialog_diy fullStyle">
+      <div style="height:100%">
         <div class="a_add_title" style="
             display: flex;
             flex-direction: row;
@@ -3443,7 +3443,7 @@
           <!-- <div style="margin-right: 20px; font-size: 20px">标题:</div> -->
           <el-input v-model="askJson.askTitle" placeholder="请输入标题" style="width: 400px"></el-input>
         </div>
-        <div class="a_addBox">
+        <div class="a_addBox" style="height:calc(100% - 50px)">
           <!-- <div style="font-size: 16px; color: #c7c7c7">请输入题目内容</div> -->
           <div class="a_add_box" v-for="(item1, index1) in askJson.askCount" :key="index1">
             <div class="a_add_checkType">
@@ -3504,13 +3504,13 @@
         </div>
       </div>
       <span slot="footer" class="dialog-footer">
-        <el-button @click="dialogVisible5 = false">取 消</el-button>
+        <el-button @click="closePan(4)">取 消</el-button>
         <el-button type="primary" @click="addAsk">确 定</el-button>
       </span>
     </el-dialog>
     <el-dialog title="创建选择题" :visible.sync="dialogVisibleChoice" :append-to-body="true" width="800px"
-      :before-close="handleClose" class="dialog_diy">
-      <div>
+      :before-close="(done)=>{closePan(45)}" class="dialog_diy fullStyle">
+      <div style="height:100%">
         <!-- <div class="a_add_title" style="
             display: flex;
             flex-direction: row;
@@ -3520,7 +3520,7 @@
           <div style="margin-right: 20px; font-size: 20px">标题:</div>
           <el-input v-model="testJson.testTitle" placeholder="请输入标题" style="width: 400px"></el-input>
         </div> -->
-        <div class="a_addBox">
+        <div class="a_addBox" style="height:100%">
           <div style="font-size: 16px; color: #c7c7c7;display: flex;align-items: center;">
             <!-- 请输入题目内容 -->
             <button class="c_pub_button_add pub_btn_paste_img" @click="pasteOption" style="margin-left: 10px" v-if="isPasteChoice">智能粘贴</button>
@@ -3682,7 +3682,7 @@
         </div>
       </div>
       <span slot="footer" class="dialog-footer">
-        <el-button @click="dialogVisibleChoice = false">取 消</el-button>
+        <el-button @click="closePan(45)">取 消</el-button>
         <el-button type="primary" @click="addTest">确 定</el-button>
       </span>
     </el-dialog>
@@ -3848,7 +3848,7 @@
       </span>
     </el-dialog>
     <el-dialog title="添加问答" :visible.sync="dialogVisible8" :append-to-body="true" width="500px"
-      :before-close="handleClose" class="dialog_diy">
+      :before-close="(done)=>{closePan(15)}" class="dialog_diy">
       <div>
         <div class="a_add_title" style="
             display: flex;
@@ -3862,7 +3862,7 @@
         </div>
       </div>
       <span slot="footer" class="dialog-footer">
-        <el-button @click="dialogVisible8 = false">取 消</el-button>
+        <el-button @click="closePan(15)">取 消</el-button>
         <el-button type="primary" @click="addAnswer">确 定</el-button>
       </span>
     </el-dialog>
@@ -3965,8 +3965,8 @@
       </span>
     </el-dialog>
     <el-dialog title="选择匹配" :visible.sync="dialogVisibleSelect" :append-to-body="true" width="800px"
-      :before-close="handleClose" class="dialog_diy dialog_diy3">
-      <div v-if="selectJson">
+      :before-close="(done)=>{closePan(41)}" class="dialog_diy dialog_diy3 fullStyle">
+      <div v-if="selectJson" style="height:100%">
         <div class="select_box1" v-if="selectSteps == 1">
           <div class="select_box1_img">
             <div class="select_box1_title">
@@ -4002,7 +4002,7 @@
             </div>
           </div>
         </div>
-        <div v-if="selectSteps == 2">
+        <div v-if="selectSteps == 2" style="height:100%">
           <div class="select_box2">
             <div class="select_box2_title">设置每道题目的正确选项</div>
             <div class="select_box2_box">
@@ -4062,10 +4062,10 @@
         <el-button type="primary" @click="addRateAnswer">确 定</el-button>
       </span>
     </el-dialog>
-    <el-dialog title="连词成句设置" :visible.sync="dialogVisibleSentence" :append-to-body="true" width="1000px"
-      :before-close="handleClose" class="dialog_diy dialog_diy3">
-      <div>
-        <div class="sentenBox">
+    <el-dialog title="排序设置" :visible.sync="dialogVisibleSentence" :append-to-body="true" width="1000px"
+      :before-close="(done)=>{closePan(47)}" class="dialog_diy dialog_diy3 fullStyle">
+      <div style="height: 100%;">
+        <div class="sentenBox" style="height: 100%;">
           <div class="addSen" @click="addSt">添加题目</div>
           <div v-for="(st, stIndex) in sentenceList" :key="stIndex" class="sentenContent">
             <div class="sentenTopBox">
@@ -4111,13 +4111,16 @@
                 <div class="card" v-if="st.rightAnswer.length == 0">
                   <img src="../../../assets/icon/conSentences/noAnswer.png" alt="" />
                 </div>
+                <div class="card" v-else>
+                  <img src="../../../assets/icon/conSentences/clickNo.png" alt="" />
+                </div>
               </div>
             </div>
           </div>
         </div>
       </div>
       <span slot="footer" class="dialog-footer">
-        <el-button @click="dialogVisibleSentence = false">取 消</el-button>
+        <el-button @click="closePan(47)">取 消</el-button>
         <el-button type="primary" @click="addSentenceTool">确 定</el-button>
       </span>
     </el-dialog>
@@ -4344,6 +4347,7 @@ export default {
       lineTitle: "",
       sysPic: [],
       sentenceList: [{ sentenceTitle: "", addSentence: [], rightAnswer: [] }],
+      sentenceList2:[],
       isPushTitleList: [],
       lineCount: 0,
       lineType: 0,
@@ -4426,8 +4430,11 @@ export default {
         askTitle: "",
         askJson: [{ askstitle: "", askItem: 1, checkList: [] }],
       },
+      askJson2:{},
       testJson: {},
+      testJson2: {},
       selectJson: {},
+      selectJson2: {},
       rateJson: [],
       unitJson2: [],
       unitJson: [
@@ -4504,6 +4511,7 @@ export default {
       toolIndex: 0,
       cidType: 0,
       answerQ: "",
+      answerQ2: "",
       grade: [],
       grade2: [],
       courseUserid: "",
@@ -4794,6 +4802,73 @@ export default {
     handleClose(done) {
       done();
     },
+    closePan(tool){
+      if(tool == 15){
+        if(JSON.stringify(this.answerQ) == JSON.stringify(this.answerQ2)){
+          this.dialogVisible8 = false
+        }else{
+          this.closeConfirm(tool);
+        }
+      }else if(tool == 4){
+        if(JSON.stringify(this.askJson) == JSON.stringify(this.askJson2)){
+          this.dialogVisible5 = false
+        }else{
+          this.closeConfirm(tool);
+        }
+      }else if(tool == 45){
+        if(JSON.stringify(this.testJson) == JSON.stringify(this.testJson2)){
+          this.dialogVisibleChoice = false
+        }else{
+          this.closeConfirm(tool);
+        }
+      }else if(tool == 41){
+        if(JSON.stringify(this.selectJson) == JSON.stringify(this.selectJson2)){
+          this.dialogVisibleSelect = false
+        }else{
+          this.closeConfirm(tool);
+        }
+      }else if(tool == 47){
+        if(JSON.stringify(this.sentenceList) == JSON.stringify(this.sentenceList2)){
+          this.dialogVisibleSentence = false
+        }else{
+          this.closeConfirm(tool);
+        }
+      }
+    },
+    closeConfirm(tool){
+      this
+        .$confirm("是否保存?", "提示", {
+          confirmButtonText: "保存",
+          cancelButtonText: "不保存",
+          type: "warning",
+        })
+        .then(() => {
+          if(tool == 15){
+            this.addAnswer();
+          }else if(tool == 4){
+            this.addAsk();
+          }else if(tool == 45){
+            this.addTest();
+          }else if(tool == 41){
+            this.addSelectAnswer();
+          }else if(tool == 47){
+            this.addSentenceTool();
+          }
+        })
+        .catch(() => {
+          if(tool == 15){
+            this.dialogVisible8 = false;
+          }else if(tool == 4){
+            this.dialogVisible5 = false;
+          }else if(tool == 45){
+            this.dialogVisibleChoice = false;
+          }else if(tool == 41){
+            this.dialogVisibleSelect = false;
+          }else if(tool == 47){
+            this.dialogVisibleSentence = false;
+          }
+        });
+    },
     imgChange2(i, j) {
       var _tmp = this.testJson.testJson[i].checkList[j];
       this.noneBtnImg = _tmp.length >= 1;
@@ -6857,6 +6932,7 @@ export default {
             )
           );
         }
+        this.askJson2 = JSON.parse(JSON.stringify(this.askJson))
         this.dialogVisible5 = true;
       } else if (i == 45) {
         if (
@@ -6887,7 +6963,7 @@ export default {
           };
           this.testJson = testJson;
         }
-
+        this.testJson2 = JSON.parse(JSON.stringify(this.testJson));
         this.dialogVisibleChoice = true;
       } else if (i == 47) {
         if (
@@ -6907,6 +6983,7 @@ export default {
           ];
           this.sentenceList = sentenceList;
         }
+        this.sentenceList2 = JSON.parse(JSON.stringify(this.sentenceList));
         this.dialogVisibleSentence = true;
       } else if (i == 48) {
         if (
@@ -7030,6 +7107,7 @@ export default {
             )
           )
           : "";
+        this.answerQ2 = JSON.parse(JSON.stringify(this.answerQ))
         this.dialogVisible8 = true;
       } else if (i == 40) {
         this.rateJson = this.unitJson[this.unitIndex].chapterInfo[0].taskJson[
@@ -7071,6 +7149,7 @@ export default {
           )
           : { url: "", select: [], answer: [] };
         this.selectSteps = 1;
+        this.selectJson2 = JSON.parse(JSON.stringify(this.selectJson))
         this.dialogVisibleSelect = true;
       } else if (i == 3) {
         if (!this.cid) {
@@ -10780,7 +10859,7 @@ ol {
   margin: 10px 0;
   background: #fff;
   padding: 15px;
-  max-height: 600px;
+  /* max-height: 600px; */
   overflow: auto;
 }
 
@@ -11772,7 +11851,9 @@ ol {
   cursor: pointer;
 }
 
-.select_box1 {}
+.select_box1 {
+  height: 100%;
+}
 
 .select_box1_img {
   background: #fff;
@@ -11806,9 +11887,13 @@ ol {
   border-radius: 5px;
   padding: 15px;
   box-sizing: border-box;
+  height: calc(100% - 200px);
+  overflow: auto;
 }
 
-.select_box2 {}
+.select_box2 {
+  height: 100%;
+}
 
 .select_box2_title {
   background: #fff;
@@ -11820,7 +11905,7 @@ ol {
 
 .select_box2_box {
   display: flex;
-  height: 500px;
+  height: calc(100% - 30px);
 }
 
 .select_box2_img {
@@ -12058,6 +12143,11 @@ ol {
   margin: 0 auto;
 }
 
+.rightCardList{
+  display: flex;
+  flex-wrap: wrap;
+}
+
 .cardBox {
   display: flex;
   flex-direction: row;
@@ -12108,7 +12198,8 @@ ol {
 }
 
 .rightCardBox {
-  margin: 10px 0 0 10px;
+  width: 98%;
+  margin: 10px auto 0;
 }
 
 .rightCardBox>div:nth-child(1) {
@@ -12122,7 +12213,7 @@ ol {
   align-items: center;
   border-bottom: 3px solid #b4c3d3;
   padding: 0 0 5px 0;
-  margin-right: 10px;
+  /* margin-right: 10px; */
 }
 
 .cardCss>div:nth-child(2) {
@@ -12481,4 +12572,23 @@ ol {
   width: 10px;
   height: 10px;
 }
+
+.fullStyle >>> .el-dialog__body {
+  height: calc(100% - 125px)!important;
+  box-sizing: border-box;
+}
+
+.fullStyle >>> .el-dialog{
+  width: 100% !important;
+  max-width: 100% !important;
+  height: 100% !important;
+  margin: 0 !important;
+}
+
+.fullStyle {
+  width: 100% !important;
+  max-width: 100% !important;
+  height: 100% !important;
+  margin: 0 auto !important;
+}
 </style>

+ 138 - 26
src/components/pages/task/addCourse.vue

@@ -5495,10 +5495,10 @@
       :visible.sync="dialogVisible5"
       :append-to-body="true"
       width="800px"
-      :before-close="handleClose"
-      class="dialog_diy"
+      :before-close="(done)=>{closePan(4)}"
+      class="dialog_diy fullStyle"
     >
-      <div>
+      <div style="height:100%">
         <div
           class="a_add_title"
           style="
@@ -5515,7 +5515,7 @@
             style="width: 400px"
           ></el-input>
         </div>
-        <div class="a_addBox">
+        <div class="a_addBox" style="height:calc(100% - 50px)">
           <!-- <div style="font-size: 16px; color: #c7c7c7">请输入题目内容</div> -->
           <div
             class="a_add_box"
@@ -5604,7 +5604,7 @@
         </div>
       </div>
       <span slot="footer" class="dialog-footer">
-        <el-button @click="dialogVisible5 = false">取 消</el-button>
+        <el-button @click="closePan(4)">取 消</el-button>
         <el-button type="primary" @click="addAsk">确 定</el-button>
       </span>
     </el-dialog>
@@ -5613,10 +5613,10 @@
       :visible.sync="dialogVisibleChoice"
       :append-to-body="true"
       width="800px"
-      :before-close="handleClose"
-      class="dialog_diy"
+      :before-close="(done)=>{closePan(45)}"
+      class="dialog_diy fullStyle"
     >
-      <div>
+      <div style="height:100%">
         <!-- <div class="a_add_title" style="
             display: flex;
             flex-direction: row;
@@ -5626,7 +5626,7 @@
           <div style="margin-right: 20px; font-size: 20px">标题:</div>
           <el-input v-model="testJson.testTitle" placeholder="请输入标题" style="width: 400px"></el-input>
         </div> -->
-        <div class="a_addBox">
+        <div class="a_addBox" style="height:100%">
           <div style="font-size: 16px; color: #c7c7c7;display: flex;align-items: center;">
             <!-- 请输入题目内容 -->
             <button class="c_pub_button_add pub_btn_paste_img" @click="pasteOption" style="margin-left: 10px" v-if="isPasteChoice">智能粘贴</button>
@@ -5873,7 +5873,7 @@
         </div>
       </div>
       <span slot="footer" class="dialog-footer">
-        <el-button @click="dialogVisibleChoice = false">取 消</el-button>
+        <el-button @click="closePan(45)">取 消</el-button>
         <el-button type="primary" @click="addTest">确 定</el-button>
       </span>
     </el-dialog>
@@ -6154,7 +6154,7 @@
       :visible.sync="dialogVisible8"
       :append-to-body="true"
       width="500px"
-      :before-close="handleClose"
+      :before-close="(done)=>{closePan(15)}"
       class="dialog_diy"
     >
       <div>
@@ -6176,7 +6176,7 @@
         </div>
       </div>
       <span slot="footer" class="dialog-footer">
-        <el-button @click="dialogVisible8 = false">取 消</el-button>
+        <el-button @click="closePan(15)">取 消</el-button>
         <el-button type="primary" @click="addAnswer">确 定</el-button>
       </span>
     </el-dialog>
@@ -6325,10 +6325,10 @@
       :visible.sync="dialogVisibleSelect"
       :append-to-body="true"
       width="800px"
-      :before-close="handleClose"
-      class="dialog_diy dialog_diy3"
+      :before-close="(done)=>{closePan(41)}"
+      class="dialog_diy dialog_diy3 fullStyle"
     >
-      <div v-if="selectJson">
+      <div v-if="selectJson" style="height:100%">
         <div class="select_box1" v-if="selectSteps == 1">
           <div class="select_box1_img">
             <div class="select_box1_title">
@@ -6390,7 +6390,7 @@
             </div>
           </div>
         </div>
-        <div v-if="selectSteps == 2">
+        <div v-if="selectSteps == 2" style="height:100%">
           <div class="select_box2">
             <div class="select_box2_title">设置每道题目的正确选项</div>
             <div class="select_box2_box">
@@ -6502,15 +6502,15 @@
       </span>
     </el-dialog>
     <el-dialog
-      title="连词成句设置"
+      title="排序设置"
       :visible.sync="dialogVisibleSentence"
       :append-to-body="true"
       width="1000px"
-      :before-close="handleClose"
-      class="dialog_diy dialog_diy3"
+      :before-close="(done)=>{closePan(47)}"
+      class="dialog_diy dialog_diy3 fullStyle"
     >
-      <div>
-        <div class="sentenBox">
+      <div style="height: 100%;">
+        <div class="sentenBox" style="height: 100%;">
           <div class="addSen" @click="addSt">添加题目</div>
           <div
             v-for="(st, stIndex) in sentenceList"
@@ -6597,13 +6597,19 @@
                     alt=""
                   />
                 </div>
+                <div class="card" v-else>
+                  <img
+                    src="../../../assets/icon/conSentences/clickNo.png"
+                    alt=""
+                  />
+                </div>
               </div>
             </div>
           </div>
         </div>
       </div>
       <span slot="footer" class="dialog-footer">
-        <el-button @click="dialogVisibleSentence = false">取 消</el-button>
+        <el-button @click="closePan(47)">取 消</el-button>
         <el-button type="primary" @click="addSentenceTool">确 定</el-button>
       </span>
     </el-dialog>
@@ -6900,6 +6906,7 @@ export default {
       lineTitle: "",
       sysPic: [],
       sentenceList: [{ sentenceTitle: "", addSentence: [], rightAnswer: [] }],
+      sentenceList2:[],
       isPushTitleList: [],
       lineCount: 0,
       lineType: 0,
@@ -6982,8 +6989,11 @@ export default {
         askTitle: "",
         askJson: [{ askstitle: "", askItem: 1, checkList: [] }],
       },
+      askJson2:{},
       testJson: {},
+      testJson2: {},
       selectJson: {},
+      selectJson2: {},
       rateJson: [],
       unitJson2: [],
       unitJson: [
@@ -7060,6 +7070,7 @@ export default {
       toolIndex: 0,
       cidType: 0,
       answerQ: "",
+      answerQ2: "",
       grade: [],
       grade2: [],
       courseUserid: "",
@@ -7350,6 +7361,73 @@ export default {
     handleClose(done) {
       done();
     },
+    closePan(tool){
+      if(tool == 15){
+        if(JSON.stringify(this.answerQ) == JSON.stringify(this.answerQ2)){
+          this.dialogVisible8 = false
+        }else{
+          this.closeConfirm(tool);
+        }
+      }else if(tool == 4){
+        if(JSON.stringify(this.askJson) == JSON.stringify(this.askJson2)){
+          this.dialogVisible5 = false
+        }else{
+          this.closeConfirm(tool);
+        }
+      }else if(tool == 45){
+        if(JSON.stringify(this.testJson) == JSON.stringify(this.testJson2)){
+          this.dialogVisibleChoice = false
+        }else{
+          this.closeConfirm(tool);
+        }
+      }else if(tool == 41){
+        if(JSON.stringify(this.selectJson) == JSON.stringify(this.selectJson2)){
+          this.dialogVisibleSelect = false
+        }else{
+          this.closeConfirm(tool);
+        }
+      }else if(tool == 47){
+        if(JSON.stringify(this.sentenceList) == JSON.stringify(this.sentenceList2)){
+          this.dialogVisibleSentence = false
+        }else{
+          this.closeConfirm(tool);
+        }
+      }
+    },
+    closeConfirm(tool){
+      this
+        .$confirm("是否保存?", "提示", {
+          confirmButtonText: "保存",
+          cancelButtonText: "不保存",
+          type: "warning",
+        })
+        .then(() => {
+          if(tool == 15){
+            this.addAnswer();
+          }else if(tool == 4){
+            this.addAsk();
+          }else if(tool == 45){
+            this.addTest();
+          }else if(tool == 41){
+            this.addSelectAnswer();
+          }else if(tool == 47){
+            this.addSentenceTool();
+          }
+        })
+        .catch(() => {
+          if(tool == 15){
+            this.dialogVisible8 = false;
+          }else if(tool == 4){
+            this.dialogVisible5 = false;
+          }else if(tool == 45){
+            this.dialogVisibleChoice = false;
+          }else if(tool == 41){
+            this.dialogVisibleSelect = false;
+          }else if(tool == 47){
+            this.dialogVisibleSentence = false;
+          }
+        });
+    },
     imgChange2(i, j) {
       var _tmp = this.testJson.testJson[i].checkList[j];
       this.noneBtnImg = _tmp.length >= 1;
@@ -9399,6 +9477,7 @@ export default {
             )
           );
         }
+        this.askJson2 = JSON.parse(JSON.stringify(this.askJson))
         this.dialogVisible5 = true;
       } else if (i == 45) {
         if (
@@ -9430,6 +9509,7 @@ export default {
           this.testJson = testJson;
         }
 
+        this.testJson2 = JSON.parse(JSON.stringify(this.testJson));
         this.dialogVisibleChoice = true;
       } else if (i == 47) {
         if (
@@ -9449,6 +9529,7 @@ export default {
           ];
           this.sentenceList = sentenceList;
         }
+        this.sentenceList2 = JSON.parse(JSON.stringify(this.sentenceList));
         this.dialogVisibleSentence = true;
       } else if (i == 48) {
         if (
@@ -9572,6 +9653,7 @@ export default {
               )
             )
           : "";
+        this.answerQ2 = JSON.parse(JSON.stringify(this.answerQ))
         this.dialogVisible8 = true;
       } else if (i == 40) {
         this.rateJson = this.unitJson[this.unitIndex].chapterInfo[0].taskJson[
@@ -9613,6 +9695,7 @@ export default {
             )
           : { url: "", select: [], answer: [] };
         this.selectSteps = 1;
+        this.selectJson2 = JSON.parse(JSON.stringify(this.selectJson))
         this.dialogVisibleSelect = true;
       } else if (i == 3) {
         if (!this.cid) {
@@ -13292,7 +13375,7 @@ ol {
   margin: 10px 0;
   background: #fff;
   padding: 15px;
-  max-height: 600px;
+  /* max-height: 600px; */
   overflow: auto;
 }
 
@@ -14286,6 +14369,7 @@ ol {
 }
 
 .select_box1 {
+  height: 100%;
 }
 
 .select_box1_img {
@@ -14321,9 +14405,12 @@ ol {
   border-radius: 5px;
   padding: 15px;
   box-sizing: border-box;
+  height: calc(100% - 200px);
+  overflow: auto;
 }
 
 .select_box2 {
+  height: 100%;
 }
 
 .select_box2_title {
@@ -14336,7 +14423,7 @@ ol {
 
 .select_box2_box {
   display: flex;
-  height: 500px;
+  height: calc(100% - 30px);
 }
 
 .select_box2_img {
@@ -14576,6 +14663,11 @@ ol {
   margin: 0 auto;
 }
 
+.rightCardList{
+  display: flex;
+  flex-wrap: wrap;
+}
+
 .cardBox {
   display: flex;
   flex-direction: row;
@@ -14626,7 +14718,8 @@ ol {
 }
 
 .rightCardBox {
-  margin: 10px 0 0 10px;
+  width: 98%;
+  margin: 10px auto 0;
 }
 
 .rightCardBox > div:nth-child(1) {
@@ -14640,7 +14733,7 @@ ol {
   align-items: center;
   border-bottom: 3px solid #b4c3d3;
   padding: 0 0 5px 0;
-  margin-right: 10px;
+  /* margin-right: 10px; */
 }
 
 .cardCss > div:nth-child(2) {
@@ -15000,4 +15093,23 @@ ol {
   width: 10px;
   height: 10px;
 }
+
+.fullStyle >>> .el-dialog__body {
+  height: calc(100% - 125px)!important;
+  box-sizing: border-box;
+}
+
+.fullStyle >>> .el-dialog{
+  width: 100% !important;
+  max-width: 100% !important;
+  height: 100% !important;
+  margin: 0 !important;
+}
+
+.fullStyle {
+  width: 100% !important;
+  max-width: 100% !important;
+  height: 100% !important;
+  margin: 0 auto !important;
+}
 </style>

Bu fark içinde çok fazla dosya değişikliği olduğu için bazı dosyalar gösterilmiyor