Kaynağa Gözat

学校设置多语言完善&&BaseFilter注释&&分页后的关闭详情

OnePsycho 4 yıl önce
ebeveyn
işleme
36e17b10bc

+ 5 - 5
TEAMModelOS/ClientApp/src/common/BaseAreaPicker.vue

@@ -38,12 +38,12 @@
 </script>
 <style>
 	.distpicker-address-wrapper select {
-		background-color: #575757;
-		color: #cacaca;
+		background-color: #575757 !important;
+		color: #cacaca !important;
 		margin: 5px 0;
-		font-size: 14px;
-		height: 35px;
-		border: 0;
+		font-size: 14px !important;
+		height: 35px !important;
+		border: 0 !important;
 		display: inline-block;
 		position: relative;
 		outline: none;

+ 16 - 0
TEAMModelOS/ClientApp/src/locale/lang/zh-CN/settings.js

@@ -75,4 +75,20 @@ export default {
 	copyModal2: "复制失败",
 	openModal1: "应用列表获取失败",
 	openModal2: "api列表获取失败",
+	applyForm:{
+		name:'学校名称',
+		id:'学校简码',
+		code:'学校代码',
+		address:'学校位置',
+		cellphone:'联系方式',
+		content:'备注信息',
+		place1:'选择学校所在地区',
+		place2:'请输入学校详细地址',
+		place3:'请输入您的手机号,邮箱等联系方式',
+		place4:'可填写您的备注信息',
+		submit:'提交申请',
+		submitSuc:'已成功提交申请!',
+		errTip1:'请选择正确的地区!',
+		errTip2:'请将信息填写完整!'
+	}
 }

+ 1 - 1
TEAMModelOS/ClientApp/src/locale/lang/zh-CN/totalAnalysis.js

@@ -38,7 +38,7 @@ export default {
 	condition8: '发布年份',
     // totalIndex.vue
     ti_title1: '基本数据统计',
-    ti_title2: '评测数据统计',
+    ti_title2: '学情分析',
     ti_title3: '学科对比统计',
     ti_title4: '年级优生率统计',
     ti_title5: '评测列表数据',

+ 1 - 1
TEAMModelOS/ClientApp/src/locale/lang/zh-TW/evaluation.js

@@ -2,7 +2,7 @@ export default {
 	index: {
 		item: '試題',
 		paper: '試卷',
-		addExercise: '新建題',
+		addExercise: '新建題',
 		openAll: '全部展開',
 		collapseAll: '全部折疊',
 		autoCreate: '智慧組卷',

+ 23 - 7
TEAMModelOS/ClientApp/src/locale/lang/zh-TW/settings.js

@@ -12,10 +12,10 @@ export default {
 	menuTips: '選擇左側Menu在網站載入時的預設顯示模式',
 	menuOpen: '預設展開顯示',
 	menuClose: '預設關閉顯示',
-	logoSetting:'Logo顯示設定',
-	logoTips:'選擇是否隱藏左上角平臺Logo',
-	logoOpen:'預設顯示',
-	logoHide:'預設隱藏',
+	logoSetting: 'Logo顯示設定',
+	logoTips: '選擇是否隱藏左上角平臺Logo',
+	logoOpen: '預設顯示',
+	logoHide: '預設隱藏',
 	defaultSchool: '預設學校',
 	curSchool: '當前學校',
 	courseNum: '課程數',
@@ -24,8 +24,8 @@ export default {
 	requestStatus: '送出加入邀請',
 	goSchool: '前往學校',
 	agreeJoin: '同意加入',
-	cancelAdd:'拒絕加入',
-	undoJoin:'撤銷申請',
+	cancelAdd: '拒絕加入',
+	undoJoin: '撤銷申請',
 	requestJoin: '申請加入',
 	inputSearch: '輸入要檢索的學校名稱',
 	modalTip1: '注意',
@@ -37,7 +37,7 @@ export default {
 	columnTool: '操作',
 	modalTip4: '溫馨提示',
 	modalTip5: '確認加入',
-	modalTip6:'確認取消加入',
+	modalTip6: '確認取消加入',
 	submitSucTips: '提交成功',
 	submitFailTips: '操作失敗',
 	joinSucTips: '加入成功!',
@@ -57,4 +57,20 @@ export default {
 	apiMethod: '請求方法',
 	openKeep: '保存平臺',
 	unedit: '取消編輯',
+	applyForm: {
+		name: '學校名稱',
+		id: '學校簡碼',
+		code: '學校程式碼',
+		address: '學校位置',
+		cellphone: '聯繫方式',
+		content: '備註資訊',
+		place1: '選擇學校所在地區',
+		place2: '請輸入學校詳細地址',
+		place3: '請輸入您的手機號,郵箱等聯繫方式',
+		place4: '可填寫您的備註資訊',
+		submit: '提交申請',
+		submitSuc: '已成功提交申請!',
+		errTip1: '請選擇正確的地區!',
+		errTip2: '請將資訊填寫完整!'
+	}
 }

+ 1 - 1
TEAMModelOS/ClientApp/src/locale/lang/zh-TW/totalAnalysis.js

@@ -39,7 +39,7 @@ export default {
 
 	// totalIndex.vue
 	ti_title1: '基本資料統計',
-	ti_title2: '評量資料統計',
+	ti_title2: '學情分析',
 	ti_title3: '學科比較統計',
 	ti_title4: '年級優生率統計',
 	ti_title5: '評量清單數據',

+ 3 - 3
TEAMModelOS/ClientApp/src/static/countries.js

@@ -386,7 +386,7 @@ export default [
     },
     {
         "en": "Hongkong",
-        "cn": "香港",
+        "cn": "香港特别行政区",
         "code": "+852"
     },
     {
@@ -531,7 +531,7 @@ export default [
     },
     {
         "en": "Macao",
-        "cn": "澳门",
+        "cn": "澳门特别行政区",
         "code": "+853"
     },
     {
@@ -871,7 +871,7 @@ export default [
     },
     {
         "en": "Taiwan",
-        "cn": "台湾",
+        "cn": "台湾",
         "code": "+886"
     },
     {

+ 2 - 1
TEAMModelOS/ClientApp/src/view/evaluation/bank/ExerciseList.vue

@@ -556,8 +556,9 @@
 					this.exerciseList = await this.$evTools.getFullItem(simpleList);
 					this.currentPage = page;
 					this.pageScrollTo(0);
+					this.onHandleToggle(true)
 				} catch (e) {
-					console.log(e);
+					this.$Message.error('Blob Error : ' + e)
 				}
 			},
 

+ 3 - 3
TEAMModelOS/ClientApp/src/view/evaluation/components/BaseFilter.vue

@@ -11,21 +11,21 @@
 		<div class="filter-item" v-show="(isShowSchoolBank || (filterOrigin === schoolCode)) &&  hasSchool">
 					<span class="filter-title">{{$t('evaluation.filter.period')}}:</span>
 					<RadioGroup v-model="filterPeriod" type="button" @on-change="filterPeriodChange">
-						<Radio v-for="(item, index) in periodList" :key="index" :label="index">{{ item.name }}<span class="filter-count"></span></Radio>
+						<Radio v-for="(item, index) in periodList" :key="index" :label="index">{{ item.name }}<span class="filter-count">({{ filterCounts.periodCountArr.length ? filterCounts.periodCountArr[index] : 0 }})</span></Radio>
 					</RadioGroup>
 				</div>
 				<div class="filter-item" v-show="(isShowSchoolBank || (filterOrigin === schoolCode)) &&  hasSchool">
 					<span class="filter-title">{{$t('evaluation.filter.grade')}}:</span>
 					<CheckboxGroup v-model="filterGrade" border @on-change="filterGradeChange">
 						<Checkbox lable="all">{{$t('evaluation.filter.all')}}</Checkbox>
-						<Checkbox v-for="(item, index) in gradeList" :key="index" :label="index">{{ item }}<span class="filter-count"></span></Checkbox>
+						<Checkbox v-for="(item, index) in gradeList" :key="index" :label="index">{{ item }}<span class="filter-count">({{ filterCounts.gradeCountArr.length ? filterCounts.gradeCountArr[index] : 0 }})</span></Checkbox>
 					</CheckboxGroup>
 				</div>
 				<div class="filter-item" v-show="(isShowSchoolBank || (filterOrigin === schoolCode)) &&  hasSchool">
 					<span class="filter-title">{{$t('evaluation.filter.subject')}}:</span>
 					<CheckboxGroup v-model="filterSubject" border @on-change="filterSubjectChange">
 						<Checkbox lable="all">{{$t('evaluation.filter.all')}}</Checkbox>
-						<Checkbox v-for="(item, index) in subjectList" :key="index" :label="item.id">{{ item.name }}<span class="filter-count"></span></Checkbox>
+						<Checkbox v-for="(item, index) in subjectList" :key="index" :label="item.id">{{ item.name }}<span class="filter-count">({{ filterCounts.subjectCountArr.length ? filterCounts.subjectCountArr[index] : 0 }})</span></Checkbox>
 					</CheckboxGroup>
 				</div>
 		<div class="filter-item">

+ 21 - 21
TEAMModelOS/ClientApp/src/view/settings/BaseApplyForm.vue

@@ -1,8 +1,8 @@
 <template>
 	<div>
 		<Form ref="applyForm" :model="applyForm" :rules="ruleValidate" label-position="top" class="apply-form">
-			<FormItem label="学校名称" prop="name">
-				<Input v-model="applyForm.name" placeholder="请输入学校名称..."></Input>
+			<FormItem :label="$t('settings.applyForm.name')" prop="name">
+				<Input v-model="applyForm.name" :placeholder="$t('settings.applyForm.place1')"></Input>
 			</FormItem>
 			<!-- <FormItem label="学校简码" prop="id">
 				<Input v-model="applyForm.id"></Input>
@@ -10,21 +10,20 @@
 			<FormItem label="学校代码" prop="code">
 				<Input v-model="applyForm.code"></Input>
 			</FormItem> -->
-			<FormItem label="学校位置">
-				<!-- <Input v-model="applyForm.region"></Input> -->
+			<FormItem :label="$t('settings.applyForm.address')">
 				<BaseAreaPicker ref="areaPicker" v-if="isChinaSite"></BaseAreaPicker>
 				<div class="country-select" v-if="!isChinaSite">
-					<Select v-model="curCountry" filterable placeholder="选择国家或地区">
+					<Select v-model="curCountry" filterable placeholder="选择学校所在地区">
 						<Option v-for="(country,index) in countryArr" :value="country.cn" :key="index" >{{ country.cn }}</Option>
 					</Select>
 				</div>
-				<Input type="textarea" :autosize="{minRows: 3,maxRows: 5}" v-model="applyForm.address" placeholder="请输入学校详细地址"></Input>
+				<Input type="textarea" :autosize="{minRows: 3,maxRows: 5}" v-model="applyForm.address" :placeholder="$t('settings.applyForm.place2')"></Input>
 			</FormItem>
-			<FormItem label="联系方式" prop="cellphone">
-				<Input v-model="applyForm.cellphone" placeholder="请输入您的手机号,邮箱等联系方式..."></Input>
+			<FormItem :label="$t('settings.applyForm.cellphone')" prop="cellphone">
+				<Input v-model="applyForm.cellphone" :placeholder="$t('settings.applyForm.place3')"></Input>
 			</FormItem>
-			<FormItem label="备注信息" prop="content">
-				<Input type="textarea" :autosize="{minRows: 3,maxRows: 5}" v-model="applyForm.content" placeholder="可填写您的备注信息..."></Input>
+			<FormItem :label="$t('settings.applyForm.content')" prop="content">
+				<Input type="textarea" :autosize="{minRows: 3,maxRows: 5}" v-model="applyForm.content" :placeholder="$t('settings.applyForm.place4')"></Input>
 			</FormItem>
 			<!-- <FormItem label="学校图标">
 				<Upload v-if="!isPreview" ref="upload" :show-upload-list="false" :on-success="handleSuccess"
@@ -43,7 +42,7 @@
 				</div>
 			</FormItem> -->
 		</Form>
-		<Button style="background-color: #168794;width: 90%;margin-left: 5%;" @click="onSubmit" :loading="isBtnLoading">提交申请</Button>
+		<Button style="background-color: #168794;width: 90%;margin-left: 5%;" @click="onSubmit" :loading="isBtnLoading">{{ $t('settings.applyForm.submit') }}</Button>
 	</div>
 </template>
 
@@ -117,18 +116,19 @@
 								if(!res.error){
 									setTimeout(()=> {
 										this.isBtnLoading = false
-										this.$parent.applyModal = false
-										this.$Message.success('已成功提交申请!')
+										this.$emit('applySuc')
+										this.$Message.success(this.$t('settings.applyForm.submitSuc'))
 									},1000)
 								}
 							}).catch(err => {
 								this.$Message.error(err)
+								this.isBtnLoading = false
 							})
 						}else{
-							this.$Message.error('请选择正确的省市区!');
+							this.$Message.error(this.$t('settings.applyForm.errTip1'));
 						}
 					} else {
-						this.$Message.error('请将信息填写完整!');
+						this.$Message.error(this.$t('settings.applyForm.errTip2'));
 					}
 				})
 			},
@@ -137,12 +137,12 @@
 				this.applyForm.picture = res.url
 				this.isPreview = true
 			},
-			handleFormatError(file) {
-				this.$Message.error('上传文件格式只能是jpg、jpeg、png!')
-			},
-			handleMaxSize(file) {
-				this.$Message.error('上传文件大小不能超过10M!')
-			},
+			// handleFormatError(file) {
+			// 	this.$Message.error('上传文件格式只能是jpg、jpeg、png!')
+			// },
+			// handleMaxSize(file) {
+			// 	this.$Message.error('上传文件大小不能超过10M!')
+			// },
 			handleBeforeUpload() {
 
 			}

+ 1 - 1
TEAMModelOS/ClientApp/src/view/settings/SchoolMgmt.vue

@@ -117,7 +117,7 @@
 
 		<Modal v-model="applyModal" class-name="go-school-modal" footer-hide width="500">
 			<span class="apply-title">申请建立学校</span>
-			<BaseApplyForm></BaseApplyForm>
+			<BaseApplyForm @applySuc="applyModal = false"></BaseApplyForm>
 		</Modal>
 
 	</div>