Merge branch 'develop' of http://163.228.141.122:3000/TEAMMODEL/TEAMModelOS into develop

TEAMModelOS/ClientApp/public/lang/en-US.js

@@ -1656,6 +1656,10 @@ const LANG_EN_US = {
             screenQues: 'Grab questions',
             lastPage: 'Prev page',
             nextPage: 'Next page',
+            switchImg: 'Switch image',
+            switchImgMsg: 'The question framed on the current page has not been saved, you need to save it and switch the image',
+            switchImgOK: 'Save and switch image',
+            switchImgCnacel: 'Cancel switching image',
         },
         secretTip1: 'Not public yet',
         secretTip2: 'Checking the box means that only the school administrators and I can see this exam file',

TEAMModelOS/ClientApp/public/lang/zh-CN.js

@@ -1655,6 +1655,10 @@ const LANG_ZH_CN = {
             screenQues: '框图取题',
             lastPage: '上一页',
             nextPage: '下一页',
+            switchImg: '切换图片',
+            switchImgMsg: '当前页面所框题目未保存，需保存后切换图片',
+            switchImgOK: '保存并切换图片',
+            switchImgCnacel: '取消切换图片',
         },
         secretTip1:'暂不公开',
         secretTip2:'勾选后保存的试卷仅有管理员及本人能看到',

TEAMModelOS/ClientApp/public/lang/zh-TW.js

@@ -1658,6 +1658,10 @@ const LANG_ZH_TW = {
             screenQues: '框圖取題',
             lastPage: '上一頁',
             nextPage: '下一頁',
+            switchImg: '切換圖片',
+            switchImgMsg: '目前頁面所框題目尚未儲存, 需儲存後切換圖片',
+            switchImgOK: '儲存並切換圖片',
+            switchImgCnacel: '取消切換圖片',
         },
         secretTip1: '暫不公開',
         secretTip2: '勾選後儲存的試卷僅有管理員及本人能看到',

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) {

TEAMModelOS/ClientApp/src/view/mgtPlatform/MgtPlatform.vue

@@ -20,7 +20,7 @@
                                     <Icon type="md-create" />
                                     {{$t('common.edit')}}
                                 </span>
-                                <span class="pf-action-btn" @click.stop="delSchoolPlatform(index)">
+                                <span class="pf-action-btn" @click.stop="delAreaPlatform(index)">
                                     <Icon type="md-trash" />
                                     {{$t('common.delete')}}
                                 </span>
@@ -231,15 +231,16 @@ export default {
             })
         },
         delSchoolPlatform(index) {
+            let platform = this.isArea ? {...this.areaPlatform} : {...this.schoolPlatform}
             this.$Modal.confirm({
                 title: this.$t('platform.delTitle'),
-                content: `${this.$t('platform.delContent')}${this.schoolPlatform.links[index].name}?`,
+                content: `${this.$t('platform.delContent')}${platform.links[index].name}?`,
                 onOk: () => {
-                    this.schoolPlatform.links.splice(index, 1)
+                    platform.links.splice(index, 1)
                     let params = {
                         schoolId: this.$store.state.userInfo.schoolCode,
                         opt: 'UpsertThird',
-                        third: [this.schoolPlatform]
+                        third: [platform]
                     }
                     this.$api.schoolSetting.upsertSchoolSetting(params).then(
                         res => {

TEAMModelOS/ClientApp/src/view/student-account/stuMgt/StuMgt.vue

@@ -895,6 +895,14 @@ export default {
         })
       }
       this.originTableColumns = this._.cloneDeep(this.tableColumns)
+      
+      // 25.01.03 #3735 C1143 学生管理--国际站默认取消电子学生证及监护人信息列展示
+      if(this.$store.state.config.srvAdr === 'Global') {
+        this.selectColumns = [false, false, false]
+        this.filterColumn('imei', this.selectColumns[2])
+        this.filterColumn('guardian', this.selectColumns[0])
+        this.filterColumn('guardianPhone', this.selectColumns[1])
+      }
     },
     handleFilterData(data) {
       console.log(data)