切图组题 —— 切换图片时增加弹出框

TEAMModelOS/ClientApp/src/common/BaseQuickPaper.vue

@@ -1170,7 +1170,7 @@
 				this.markList = this._.cloneDeep(this.markListOld[this.markIndex]) || []
 				this.isScreenshot = true
 			},
-			saveMark() {
+			saveMark(isCanvasSave) {
 				let markList = this.$refs.markCanvasRef.cavList
 				// this.orderItemsArr = []
 				let arr = this.markListOld[this.markIndex].length && this.editQuesIndex === -1 ? markList.slice(this.markListOld[this.markIndex].length, markList.length) : [...markList]
@@ -1235,7 +1235,7 @@
 				} else {
 					this.markListOld.splice(this.markIndex, 1, this._.cloneDeep(markList))
 				}
-				this.editQuesIndex = -1
+				if(!isCanvasSave) this.editQuesIndex = -1
 			},
 			closeMark() {
 				// this.markList = [...this.markListOld]
@@ -1245,9 +1245,28 @@
 				this.$refs.markCanvasRef.delDraw(this.$refs.markCanvasRef.checkIndex, true)
 			},
 			changImg(type) {
-				this.markIndex = type === 'up' ? this.markIndex - 1 : this.markIndex + 1
-				if(this.editQuesIndex === -1) {
-					this.markList = this._.cloneDeep(this.markListOld[this.markIndex]) || []
+				if(this.editQuesIndex === -1 && this.$refs.markCanvasRef.cavList.length > this.markList.length) {
+					this.$Modal.confirm({
+						title: this.$t('evaluation.quickPaper.switchImg'),
+						content: this.$t('evaluation.quickPaper.switchImgMsg'),
+						okText: this.$t('evaluation.quickPaper.switchImgOK'),
+						cancelText: this.$t('evaluation.quickPaper.switchImgCnacel'),
+						onOk: () => {
+							this.saveMark(true)
+							this.markIndex = type === 'up' ? this.markIndex - 1 : this.markIndex + 1
+							if(this.editQuesIndex === -1) {
+								this.markList = this._.cloneDeep(this.markListOld[this.markIndex]) || []
+							}
+						},
+						onCancel: () => {
+							return;
+						}
+					});
+				} else {
+					this.markIndex = type === 'up' ? this.markIndex - 1 : this.markIndex + 1
+					if(this.editQuesIndex === -1) {
+						this.markList = this._.cloneDeep(this.markListOld[this.markIndex]) || []
+					}
 				}
 			},
 			editItemImg(info, index) {