20240115 Fix

TEAMModelOS/ClientApp/src/common/BaseLayout.vue

@@ -134,6 +134,7 @@
 	export default {
 		data() {
 			return {
+				isQingYangArea:false,
 				version: "",
 				edition: "",
 				updateModal: false,
@@ -387,7 +388,7 @@
 					});
 			},
 			menuClick(menu) {
-				console.error(menu)
+				console.error(menu);
 				if (menu.router == "#") {
 					if (menu.to === "privSokrate") {
 						this.toPrivSokrate();
@@ -424,7 +425,7 @@
 				return ["collapse-icon", this.isCollapsed ? "rotate-icon" : ""];
 			},
 			// isDev(){
-			// 	return 
+			// 	return
 			// },
 			schoolStatusInfo() {
 				if (this.isCollapsed) {
@@ -455,8 +456,8 @@
 			isGlobalSite() {
 				return this.$store.state.config.srvAdr !== "China";
 			},
-			isQingYangArea() {
-				return sessionStorage.getItem("areaId") && sessionStorage.getItem("areaId") === "7a51072f-b329-4e74-99e0-ba0407ba8926";
+			curPeriod(){
+				return this.$store.state.user.curPeriod
 			},
 			/* 是否开启课堂记录管理开关 */
 			isOpenLessonRecord() {
@@ -719,42 +720,17 @@
 					? isZhiYinVersion
 						? this.zySchoolMenu
 						: [
-								//iot (10.20 应台湾要求 调整 顺序 1.iot 2.教学看板)
-								// {
-								// 	icon: "iconfont icon-wulianwang",
-								// 	name: this.$t("system.menu.iotBoard"),
-								// 	router: "/schooliot",
-								// 	tag: "",
-								// 	role: "admin",
-								// 	permission: "dashboard-read",
-								// 	menuName: "TeacherDashboard",
-								// 	child: [],
-                                //     //isShow: this.isGlobalSite
-								// 	isShow:true,
-								// },
-								// 教学看板（国际站单独）
-								// {
-								// 	icon: "iconfont icon-data-count",
-								// 	name: this.$t("system.menu.techDash"),
-								// 	router: "/researchDashboard",
-								// 	tag: "",
-								// 	role: "admin",
-								// 	permission: "dashboard-read",
-								// 	menuName: "TeacherDashboard",
-								// 	child: [],
-								// 	isShow: this.isGlobalSite,
-								// },
 								// 数据中心
 								{
 									icon: "iconfont icon-data-count",
-									name: this.$t('researchCenter.dashboard.dashCenter'),
+									name: this.$t("researchCenter.dashboard.dashCenter"),
 									router: "/dashCenter",
 									tag: "",
 									role: "admin",
 									permission: "dashboard-read",
 									menuName: "dashCenter",
 									child: [],
-									isShow: this.IES5Menu,
+									isShow: this.IES5Menu
 								},
 								// 学校管理
 								{
@@ -1164,7 +1140,7 @@
 									isShow: false,
 									child: [
 										// 校园风采
-										
+
 										{
 											icon: "iconfont icon-basic-setting",
 											name: this.$t("system.menu.judgeSettings"),
@@ -1179,7 +1155,7 @@
 										},
 										{
 											icon: "iconfont icon-basic-setting",
-											name: '评价管理',
+											name: "评价管理",
 											router: "/appraiseMgt",
 											tag: "",
 											role: "admin",
@@ -1187,7 +1163,7 @@
 											permission: "",
 											menuName: "appraiseMgt",
 											child: [],
-											isShow: window.location.host.includes("test.teammodel.cn") || this.$store.state.config.srvAdrType != 'product'
+											isShow: window.location.host.includes("test.teammodel.cn") || this.$store.state.config.srvAdrType != "product"
 										}
 									]
 								},
@@ -1247,7 +1223,7 @@
 									router: "#",
 									to: "schoolSokrate",
 									tag: "",
-									child:[],
+									child: [],
 									role: "admin",
 									permission: "research-read|research-upd",
 									menuName: "schoolSokrate",
@@ -1280,7 +1256,7 @@
 								// 活动报名
 								{
 									icon: "iconfont icon-yishu",
-									name: '活动平台',
+									name: "活动平台",
 									router: "/home/activityManage",
 									tag: "",
 									role: "admin",
@@ -1288,9 +1264,9 @@
 									child: [],
 									menuName: "activityManage",
 									// menuName: 'myCourse',
-									isShow: false,
-								},
-						  	]
+									isShow: false
+								}
+						  ]
 					: [];
 				return data;
 			},
@@ -1468,7 +1444,7 @@
 									// }
 								]
 							},
-							
+
 							// 个人研修
 							{
 								icon: "iconfont icon-train",
@@ -1565,8 +1541,7 @@
                 isShow: true
             }, */
 								]
-							},
-							
+							}
 					  ];
 				return data;
 			}
@@ -1621,7 +1596,13 @@
 				handler(n, o) {
 					this.getSystemLevel();
 				}
-			}
+			},
+			curPeriod:{
+				immediate: true,
+				handler(n,o){
+					this.isQingYangArea = sessionStorage.getItem("areaId") && sessionStorage.getItem("areaId") === "7a51072f-b329-4e74-99e0-ba0407ba8926";
+				}
+			},
 		}
 	};
 </script>

TEAMModelOS/ClientApp/src/view/art/AreaArt.vue

@@ -104,7 +104,7 @@
 						</div>
 					</div>
 				</div>
-        <div class="online-train-wrap">
+				<div class="online-train-wrap">
 					<h4 class="block-title">学校艺术特色素材数量统计</h4>
 					<div class="chart-data-wrap">
 						<ArtBar echartsId="artBar" :echartData="artBarData"></ArtBar>
@@ -169,12 +169,12 @@
 			SchoolComp,
 			OccupyCourse,
 			Award,
-      ArtBar,
+			ArtBar,
 			BackToTop
 		},
 		data() {
 			return {
-        artBarData:[],
+				artBarData: [],
 				dashSchoolCode: "",
 				modalTitle: "",
 				dashModal: false,
@@ -331,7 +331,7 @@
 						code: item.code,
 						musicPass: musicPass,
 						drawPass: drawPass,
-            picture:item.picture
+						picture: item.picture
 					};
 				});
 				return data;
@@ -610,19 +610,19 @@
 			},
 			onAcChange() {
 				this.getAreaArtAnalysis();
-        this.$api.elegant
+				this.$api.elegant
 					.findElegantStatistics({
 						scope: "area",
 						code: sessionStorage.getItem("areaId")
 					})
 					.then((res) => {
 						console.log(res);
-            this.artBarData = res.schoolDatas.map(school => {
-              return {
-                name:school.name,
-                count:school.items[1].count
-              }
-            })
+						this.artBarData = res.schoolDatas.map((school) => {
+							return {
+								name: school.name,
+								count: school.items.find(i => i.id === '艺术特色').count
+							};
+						});
 					});
 			},
 			getAreaSchoolList() {
@@ -748,8 +748,6 @@
 				this.modalTitle = school.name + " - 学生风采统计数据";
 				this.dashSchoolCode = school.code;
 				this.dashModal = true;
-
-				
 			},
 			backToTop() {
 				this.$refs["art-dasboard"].scrollTo(
@@ -832,7 +830,7 @@
 			align-items: center;
 			margin-right: 20px;
 			color: #2d8cf0;
-			border:1px solid #2d8cf0;
+			border: 1px solid #2d8cf0;
 			padding: 5px 10px;
 			border-radius: 5px;
 
@@ -880,7 +878,7 @@
 		background: #ffffff;
 		margin-top: 10px;
 		padding: 40px 20px;
-    border-radius: 10px;
+		border-radius: 10px;
 	}
 
 	.block-title {
@@ -962,7 +960,7 @@
 		width: 100%;
 		height: 100%;
 		background: #ededed;
-    // padding: 15px 20px;
+		// padding: 15px 20px;
 
 		.export-box {
 			position: absolute;

TEAMModelOS/ClientApp/src/view/elegant/BaseElegantCloud.vue

@@ -46,7 +46,9 @@
         watch: {
             echartData:{
                 handler(n,o){
-                    let keyCounts = this.echartsId === 'cloud1' ? n[1].keyCounts : n[0].keyCounts
+					let cloud1Index = n.findIndex(i => i.id === '艺术特色')
+					let cloud2Index = n.findIndex(i => i.id === '德育风采')
+                    let keyCounts = this.echartsId === 'cloud1' ? n[cloud1Index].keyCounts : n[cloud2Index].keyCounts
                     this.chartOption.series[0].data = keyCounts.map(i => {
                         return {
                             name: i.word,

TEAMModelOS/ClientApp/src/view/evaluation/components/BaseCreateChild.vue

@@ -68,7 +68,7 @@
 		</div>
 
 		<div class="save-wrap display-flex">
-			<Button v-if="!isPaperEnv" type="success" @click="getContent(exersicesType)" :loading="saveLoading">{{ $t('evaluation.newExercise.save') }}</Button>
+			<Button type="success" @click="getContent(exersicesType)" :loading="saveLoading">{{ $t('evaluation.newExercise.save') }}</Button>
 		</div>
 
 		<!-- 选择知识点弹窗 -->

TEAMModelOS/ClientApp/src/view/evaluation/components/BasePoints.vue

@@ -256,7 +256,7 @@ export default {
     },
 
     onSearchSchoolChange() {
-      this.schoolPointList = this.originSchoolList.filter(item => item.indexOf(this.searchSchoolPoint) > -1)
+      this.schoolPointList = this.originSchoolList.filter(item => item.toLowerCase().indexOf(this.searchSchoolPoint) > -1)
     },
   },
   mounted() {

TEAMModelOS/ClientApp/src/view/evaluation/components/BaseRepair.vue

@@ -418,7 +418,7 @@
 	}
 
 	.repair-wrap {
-		min-height: 400px;
+		min-height: 200px;
 		padding-bottom: 50px;
 		.image-viewer {
 			background-color: rgba(0, 0, 0, 0.8);

TEAMModelOS/ClientApp/src/view/knowledge-point/index/Index.vue

@@ -1007,13 +1007,13 @@ export default {
 
     // 搜索知识块输入框onchange事件
     onSearchBlockChange() {
-      this.blockList = this.originBlockList.filter(item => item.name.indexOf(this.searchBlock) > -1)
+      this.blockList = this.originBlockList.filter(item => item.name.toLowerCase().indexOf(this.searchBlock) > -1)
       if (this.blockList.length) this.handleBlockTap(0, this.blockList[0])
     },
 
     // 搜索知识点输入框onchange事件
     onSearchPointChange() {
-      this.pointList = this.originPointList.filter(item => item.indexOf(this.searchPoint) > -1)
+      this.pointList = this.originPointList.filter(item => item.toLowerCase().indexOf(this.searchPoint) > -1)
     },
 
     // 清空科目搜索框