-
入校车辆
+
+
![]()
+
出校车辆
+
-
出校车辆
+
+
![]()
+
出校车辆
+
@@ -134,10 +140,10 @@
@import "../../../assets/scss/style";
.school-safe-car-access-style {
width: 100%;
- height: 570px !important;
+ height: 610px !important;
.car-access-content-style {
width: 100%;
- height: 535px;
+ height: 555px;
display: flex;
flex-direction: column;
.part-one-style {
@@ -156,6 +162,19 @@
align-items: center;
padding: 0 20px;
color: $color-default-bright;
+ .img-style{
+ width: 50%;
+ height: 40px;
+ display: flex;
+ align-items: center;
+ img{
+ width: 40px;
+ height: 40px;
+ }
+ .title-style{
+ margin-left: 10px;
+ }
+ }
.num-style {
font-size: 20px;
}
@@ -167,7 +186,7 @@
}
.part-three-style{
width: 100%;
- height: 260px;
+ height: 280px;
margin-top: 5px;
display: flex;
.access-list-top-style{
diff --git a/src/views/screenAdaptation/pages/safeCenter/safeCenter/equipmentOperation.vue b/src/views/screenAdaptation/pages/safeCenter/safeCenter/equipmentOperation.vue
index 4b3ba00..070c144 100644
--- a/src/views/screenAdaptation/pages/safeCenter/safeCenter/equipmentOperation.vue
+++ b/src/views/screenAdaptation/pages/safeCenter/safeCenter/equipmentOperation.vue
@@ -84,10 +84,10 @@
@import "../../../assets/scss/style";
.school-safe-equipment-operation-style{
width: 100%;
- height: 570px !important;
+ height: 610px !important;
.equipment-operation-content-style{
width: 100%;
- height: 535px;
+ height: 555px;
display: flex;
flex-direction: column;
.part-one-style{
@@ -143,7 +143,7 @@
justify-content: flex-start;
.row-left-style {
width: 100px;
- height: 30px;
+ height: 40px;
transform: skewX(-45deg);
background-image: linear-gradient(#01386e, #125d8c);
color: $color-default-bright;
@@ -155,8 +155,8 @@
position: absolute;
left: -25px;
top: 0;
- height: 30px;
- width: 40px;
+ height: 40px;
+ width: 50px;
transform: skewX(45deg);
background-image: linear-gradient(#01386e, #125d8c);
}
@@ -169,7 +169,7 @@
}
.row-right-style {
width: 100px;
- height: 30px;
+ height: 40px;
transform: skewX(-45deg);
background-image: linear-gradient(#806f44, #40424d);
color: #d5c433;
@@ -186,19 +186,19 @@
}
.title-after {
position: absolute;
- right: -15px;
+ right: -20px;
top: 0;
- height: 30px;
- width: 40px;
+ height: 40px;
+ width: 50px;
transform: skewX(45deg);
background-image: linear-gradient(#806f44, #40424d);
}
}
.row-percent-style{
- height: 30px;
- line-height: 30px;
+ height: 40px;
+ line-height: 40px;
color: #d5c433;
- margin-left: 20px;
+ margin-left: 30px;
}
}
}
diff --git a/src/views/screenAdaptation/pages/safeCenter/safeCenter/personAccess.vue b/src/views/screenAdaptation/pages/safeCenter/safeCenter/personAccess.vue
index 6462e48..61dafc9 100644
--- a/src/views/screenAdaptation/pages/safeCenter/safeCenter/personAccess.vue
+++ b/src/views/screenAdaptation/pages/safeCenter/safeCenter/personAccess.vue
@@ -46,10 +46,10 @@
@import "../../../assets/scss/style";
.school-safe-person-access-style{
width: 100%;
- height: 260px !important;
+ height: 220px !important;
.person-access-content-style{
width: 100%;
- height: 225px;
+ height: 195px;
display: flex;
.access-left-content-style{
width: 180px;
diff --git a/src/views/screenAdaptation/pages/safeCenter/safeCenter/schoolMonitor.vue b/src/views/screenAdaptation/pages/safeCenter/safeCenter/schoolMonitor.vue
index c1fe5fd..1599880 100644
--- a/src/views/screenAdaptation/pages/safeCenter/safeCenter/schoolMonitor.vue
+++ b/src/views/screenAdaptation/pages/safeCenter/safeCenter/schoolMonitor.vue
@@ -30,7 +30,11 @@
:class="'class-item-style' + (tag.classId === currentClassId?' current-class-style':'')"
>
-
{{ tag.className }}
+
+
+ ![]()
+
+ {{ tag.className }}
diff --git a/src/views/screenAdaptation/pages/safeCenter/safeCenter/schoolSafe.vue b/src/views/screenAdaptation/pages/safeCenter/safeCenter/schoolSafe.vue
index a09f33a..a04a0ac 100644
--- a/src/views/screenAdaptation/pages/safeCenter/safeCenter/schoolSafe.vue
+++ b/src/views/screenAdaptation/pages/safeCenter/safeCenter/schoolSafe.vue
@@ -46,10 +46,10 @@
@import "../../../assets/scss/style";
.school-safe-box-style {
width: 100%;
- height: 260px !important;
+ height: 220px !important;
.school-safe-content-style {
width: 100%;
- height: 225px;
+ height: 195px;
display: flex;
justify-content: space-between;
.item-style {
diff --git a/src/views/screenAdaptation/pages/studentAdminCenter/studentAdminCenter/studentOverview.vue b/src/views/screenAdaptation/pages/studentAdminCenter/studentAdminCenter/studentOverview.vue
index e904b24..3027e33 100644
--- a/src/views/screenAdaptation/pages/studentAdminCenter/studentAdminCenter/studentOverview.vue
+++ b/src/views/screenAdaptation/pages/studentAdminCenter/studentAdminCenter/studentOverview.vue
@@ -121,9 +121,9 @@
{id:6,stageName:"六年级",personNum:"270",boyNum:"128",girlNum:"142",classNum:"5"},
],
middleArr:[
- {id:1,stageName:"一年级",personNum:"429",boyNum:"207",girlNum:"222",classNum:"6"},
- {id:2,stageName:"二年级",personNum:"360",boyNum:"210",girlNum:"150",classNum:"6"},
- {id:3,stageName:"三年级",personNum:"401",boyNum:"206",girlNum:"195",classNum:"6"},
+ {id:1,stageName:"一年级",personNum:"429",boyNum:"207",girlNum:"222",classNum:"8"},
+ {id:2,stageName:"二年级",personNum:"360",boyNum:"210",girlNum:"150",classNum:"9"},
+ {id:3,stageName:"三年级",personNum:"401",boyNum:"206",girlNum:"195",classNum:"8"},
],
}
},
diff --git a/src/views/screenAdaptation/pages/teacherAdminCenter/teacherAdminCenter/overViewAge.vue b/src/views/screenAdaptation/pages/teacherAdminCenter/teacherAdminCenter/overViewAge.vue
index 673cd6c..a6518d7 100644
--- a/src/views/screenAdaptation/pages/teacherAdminCenter/teacherAdminCenter/overViewAge.vue
+++ b/src/views/screenAdaptation/pages/teacherAdminCenter/teacherAdminCenter/overViewAge.vue
@@ -46,8 +46,8 @@
stageId:0,
middleArr:[
{id:1,stageName:"全校",personNum:"246",boyNum:"133",girlNum:"110"},
- {id:2,stageName:"小学部",personNum:"47",boyNum:"76",girlNum:"15"},
- {id:3,stageName:"初中部",personNum:"34",boyNum:"28",girlNum:"44"},
+ {id:2,stageName:"小学部",personNum:"134",boyNum:"76",girlNum:"56"},
+ {id:3,stageName:"初中部",personNum:"112",boyNum:"57",girlNum:"54"},
],
}
},
diff --git a/src/views/screenAdaptation/pages/teacherAdminCenter/teacherAdminCenter/overViewHonor.vue b/src/views/screenAdaptation/pages/teacherAdminCenter/teacherAdminCenter/overViewHonor.vue
index ef135d0..7a13fe9 100644
--- a/src/views/screenAdaptation/pages/teacherAdminCenter/teacherAdminCenter/overViewHonor.vue
+++ b/src/views/screenAdaptation/pages/teacherAdminCenter/teacherAdminCenter/overViewHonor.vue
@@ -22,7 +22,7 @@
return {
columns: [
{
- title: '',
+ title: '学段',
dataIndex: 'index',
key: 'index',
align: "center",
diff --git a/src/views/screenAdaptation/pages/teacherAdminCenter/teacherAdminCenter/overViewTitle.vue b/src/views/screenAdaptation/pages/teacherAdminCenter/teacherAdminCenter/overViewTitle.vue
index 8b2a015..4b9a80b 100644
--- a/src/views/screenAdaptation/pages/teacherAdminCenter/teacherAdminCenter/overViewTitle.vue
+++ b/src/views/screenAdaptation/pages/teacherAdminCenter/teacherAdminCenter/overViewTitle.vue
@@ -144,6 +144,7 @@
.num-style{
width: 200px;
height: 20px;
+ line-height: 20px;
background-color: #0c4a7b;
text-align: center;
color: #efff41;
diff --git a/src/views/screenAdaptation/pages/teacherAdminCenter/teacherAdminCenter/teacherAttendance.vue b/src/views/screenAdaptation/pages/teacherAdminCenter/teacherAdminCenter/teacherAttendance.vue
index 209b9c7..60f2a37 100644
--- a/src/views/screenAdaptation/pages/teacherAdminCenter/teacherAdminCenter/teacherAttendance.vue
+++ b/src/views/screenAdaptation/pages/teacherAdminCenter/teacherAdminCenter/teacherAttendance.vue
@@ -112,7 +112,7 @@
.box-center-style{
position: absolute;
display: flex;
- font-size: 12px;
+ font-size: 16px;
color: #1890ff;
flex-direction: column;
justify-content: center;
diff --git a/src/views/screenAdaptation/router/guards.js b/src/views/screenAdaptation/router/guards.js
index d533aee..6b62213 100644
--- a/src/views/screenAdaptation/router/guards.js
+++ b/src/views/screenAdaptation/router/guards.js
@@ -11,6 +11,10 @@ const whiteList = ['/','/threeDimensionalSchool','/dynamic','/traditional']
*/
const loginGuard = (to, from, next, options) => {
let toPath = to.path;
+ console.log(toPath)
+
+
+
if(whiteList.indexOf(toPath) !== -1){
//白名单 放行
next();
@@ -23,6 +27,22 @@ const loginGuard = (to, from, next, options) => {
const hasToken = getToken();
//localStorage和cookie均校验
if (hasToken && user && user.personId) {
+ if(toPath === "/teachingCenter"){
+ //跳转教学中心
+ window.location.href="https://cloud.edusoa.com/DataCenter/TeachCenter.html";
+ return;
+ }
+ if(toPath === "/resourcesCenter"){
+ //跳转教学中心
+ window.location.href="https://cloud.edusoa.com/DataCenter/ResourceCenter.html";
+ return;
+ }
+ if(toPath === "/monitorCenter/information"){
+ //跳转教学中心
+ window.location.href="https://cloud.edusoa.com/DataCenter/DataCenter.html";
+ return;
+ }
+
//如果cookie中有登录信息，且路由为login则跳转到根路由
// 加载动态路由
// loadRoutes(options);