psycho 6 anni fa
parent
commit
3f3c94f2c9

+ 22 - 22
TEAMModelOS.SmartClass/ClientApp/static/lessonDetails.json

@@ -216,80 +216,80 @@
   "views": [
     {
       "liveCount": 28,
-      "school": "成都市高新区钱清中学",
-      "schoolName": "成都市高新区钱清中学",
+      "school": "成都高新区西芯小学",
+      "schoolName": "成都高新区西芯小学",
       "schoolNo": "11AFC704D0A5FE66E050A8C027277C89",
       "videoCount": 5,
       "viewCount": 33
     },
     {
       "liveCount": 25,
-      "school": "成都市高新区平水镇中学",
-      "schoolName": "成都市高新区平水镇中学",
+      "school": "四川省成都高新区实验小学",
+      "schoolName": "四川省成都高新区实验小学",
       "schoolNo": "3133005946",
       "videoCount": 0,
       "viewCount": 25
     },
     {
       "liveCount": 1,
-      "school": "高新区教师发展中心",
-      "schoolName": "高新区教师发展中心",
+      "school": "成都高新区锦城小学",
+      "schoolName": "成都高新区锦城小学",
       "schoolNo": "11AFC704CA3EFE66E050A8C027277C89",
       "videoCount": 6,
       "viewCount": 7
     },
     {
       "liveCount": 5,
-      "school": "成都市高新区齐贤镇中学",
-      "schoolName": "成都市高新区齐贤中学",
+      "school": "成都高新区锦晖小学",
+      "schoolName": "成都高新区锦晖小学",
       "schoolNo": "3133005938",
       "videoCount": 0,
       "viewCount": 5
     },
     {
       "liveCount": 3,
-      "school": "成都市高新区齐贤镇中心小学陶里校区",
-      "schoolName": "成都市高新区齐贤中心小学陶里校区",
+      "school": "成都高新区中和小学",
+      "schoolName": "成都高新区中和小学",
       "schoolNo": "2133006421",
       "videoCount": 2,
       "viewCount": 5
     },
     {
       "liveCount": 0,
-      "school": "成都市高新区钱清镇中学",
-      "schoolName": "成都市高新区钱清镇中学",
+      "school": "成都高新区庆安小学",
+      "schoolName": "成都高新区庆安小学",
       "schoolNo": "3133005936",
       "videoCount": 4,
       "viewCount": 4
     },
     {
       "liveCount": 0,
-      "school": "成都市高新区齐贤镇中心小学",
-      "schoolName": "成都市高新区齐贤中心小学",
+      "school": "成都高新区益州小学",
+      "schoolName": "成都高新区益州小学",
       "schoolNo": "2133006415",
       "videoCount": 3,
       "viewCount": 3
     },
     {
       "liveCount": 0,
-      "school": "成都市高新区越崎中学",
-      "schoolName": "成都市高新区越崎中学",
+      "school": "成都高新区益民学校",
+      "schoolName": "成都高新区益民学校",
       "schoolNo": "3433005812",
       "videoCount": 2,
       "viewCount": 2
     },
     {
       "liveCount": 0,
-      "school": "成都市高新区华甫中学",
-      "schoolName": "成都市高新区华甫中学",
+      "school": "成都高新区新光小学",
+      "schoolName": "成都高新区新光小学",
       "schoolNo": "3133005928",
       "videoCount": 1,
       "viewCount": 1
     },
     {
       "liveCount": 1,
-      "school": "成都市高新区秋瑾小学金三角校区",
-      "schoolName": "成都市高新区秋瑾小学金三角校区",
+      "school": "成都高新区利民学校",
+      "schoolName": "成都高新区利民学校",
       "schoolNo": "2133006434",
       "videoCount": 0,
       "viewCount": 1
@@ -299,8 +299,8 @@
     {
       "employeeName": "刘彬",
       "employeeNo": "a1e4165d47704fd0b19416a91375b8fd",
-      "employeeSchool": "柯桥微课中学",
-      "employeeSchoolName": "柯桥微课中学",
+      "employeeSchool": "成都高新区东华育才学校",
+      "employeeSchoolName": "成都高新区东华育才学校",
       "employeeSchoolNo": "126d15f2d1474cf4b4774ca083d45cf9",
       "id": 224,
       "parentCategoryId": 9,

File diff suppressed because it is too large
+ 2 - 2
TEAMModelOS.SmartClass/ClientApp/static/noticeDetails.json


+ 13 - 13
TEAMModelOS.SmartClass/ClientApp/static/noticeList.json

@@ -10,11 +10,11 @@
       "id": 125,
       "next": false,
       "noticeTypeId": 1,
-      "noticeTypeName": "天天展示",
+      "noticeTypeName": "展示",
       "prev": false,
       "startTime": "2019-04-28",
       "status": 1,
-      "title": "2019年柯桥区天天智慧课堂5月份排课安排表",
+      "title": "2019年高新区智慧课堂5月份排课安排表",
       "viewCount": 8
     },
     {
@@ -27,7 +27,7 @@
       "prev": false,
       "startTime": "2019-04-22",
       "status": 1,
-      "title": "柯桥区教师在2019年全国中小学互动课堂课例比赛中再创佳绩",
+      "title": "高新区教师在2019年全国中小学互动课堂课例比赛中再创佳绩",
       "viewCount": 6
     },
     {
@@ -36,11 +36,11 @@
       "id": 123,
       "next": false,
       "noticeTypeId": 1,
-      "noticeTypeName": "天天展示",
+      "noticeTypeName": "展示",
       "prev": false,
       "startTime": "2019-04-18",
       "status": 1,
-      "title": "关于公布2019年柯桥区天天智慧课堂3月份优课评比结果的通知",
+      "title": "关于公布2019年高新区智慧课堂3月份优课评比结果的通知",
       "viewCount": 2
     },
     {
@@ -53,7 +53,7 @@
       "prev": false,
       "startTime": "2019-04-16",
       "status": 1,
-      "title": "2019年柯桥区智慧课堂第二次研讨活动在实验中学举行",
+      "title": "2019年高新区智慧课堂第二次研讨活动在实验中学举行",
       "viewCount": 0
     },
     {
@@ -66,7 +66,7 @@
       "prev": false,
       "startTime": "2019-04-11",
       "status": 1,
-      "title": "关于开展2019年柯桥区智慧课堂第二次研讨活动的通知",
+      "title": "关于开展2019年高新区智慧课堂第二次研讨活动的通知",
       "viewCount": 1
     },
     {
@@ -75,11 +75,11 @@
       "id": 120,
       "next": false,
       "noticeTypeId": 1,
-      "noticeTypeName": "天天展示",
+      "noticeTypeName": "展示",
       "prev": false,
       "startTime": "2019-04-01",
       "status": 1,
-      "title": "2019年柯桥区天天智慧课堂4月份排课安排表",
+      "title": "2019年高新区智慧课堂4月份排课安排表",
       "viewCount": 1
     },
     {
@@ -92,7 +92,7 @@
       "prev": false,
       "startTime": "2019-04-16",
       "status": 1,
-      "title": "2019年柯桥区智慧课堂第二次研讨活动在实验中学举行",
+      "title": "2019年高新区智慧课堂第二次研讨活动在实验中学举行",
       "viewCount": 0
     },
     {
@@ -105,7 +105,7 @@
       "prev": false,
       "startTime": "2019-04-11",
       "status": 1,
-      "title": "关于开展2019年柯桥区智慧课堂第二次研讨活动的通知",
+      "title": "关于开展2019年高新区智慧课堂第二次研讨活动的通知",
       "viewCount": 1
     },
     {
@@ -114,11 +114,11 @@
       "id": 120,
       "next": false,
       "noticeTypeId": 1,
-      "noticeTypeName": "天天展示",
+      "noticeTypeName": "展示",
       "prev": false,
       "startTime": "2019-04-01",
       "status": 1,
-      "title": "2019年柯桥区天天智慧课堂4月份排课安排表",
+      "title": "2019年高新区智慧课堂4月份排课安排表",
       "viewCount": 1
     }
 

+ 27 - 27
TEAMModelOS.SmartClass/ClientApp/static/observationList.json

@@ -28,9 +28,9 @@
       "gradeName": "九年级",
       "id": 176,
       "mainActivityId": 27,
-      "mainActivityName": "2018年柯桥区天天智慧课堂十佳优质课展示",
+      "mainActivityName": "2018年高新区智慧课堂十佳优质课展示",
       "school": null,
-      "schoolName": "柯桥区教师发展中心",
+      "schoolName": "高新区教师发展中心",
       "schoolNo": "11AFC704CA3EFE66E050A8C027277C89",
       "speaker": "徐益敏",
       "startTime": {
@@ -47,7 +47,7 @@
       },
       "timeTip": "2018.12.14 10:00 - 12.14 10:47",
       "viewActivityId": 350,
-      "viewActivityName": "2018年柯桥区天天智慧课堂十佳优质课展示"
+      "viewActivityName": "2018年高新区智慧课堂十佳优质课展示"
     },
     {
       "activityStatus": 2,
@@ -73,9 +73,9 @@
       "gradeName": "九年级",
       "id": 175,
       "mainActivityId": 27,
-      "mainActivityName": "2018年柯桥区天天智慧课堂十佳优质课展示",
+      "mainActivityName": "2018年高新区智慧课堂十佳优质课展示",
       "school": null,
-      "schoolName": "柯桥区教师发展中心",
+      "schoolName": "高新区教师发展中心",
       "schoolNo": "11AFC704CA3EFE66E050A8C027277C89",
       "speaker": "喻远鑫",
       "startTime": {
@@ -92,7 +92,7 @@
       },
       "timeTip": "2018.12.13 09:00 - 12.13 09:48",
       "viewActivityId": 351,
-      "viewActivityName": "2018年柯桥区天天智慧课堂十佳优质课展示"
+      "viewActivityName": "2018年高新区智慧课堂十佳优质课展示"
     },
     {
       "activityStatus": 2,
@@ -118,9 +118,9 @@
       "gradeName": "五年级",
       "id": 174,
       "mainActivityId": 27,
-      "mainActivityName": "2018年柯桥区天天智慧课堂十佳优质课展示",
+      "mainActivityName": "2018年高新区智慧课堂十佳优质课展示",
       "school": null,
-      "schoolName": "柯桥区教师发展中心",
+      "schoolName": "高新区教师发展中心",
       "schoolNo": "11AFC704CA3EFE66E050A8C027277C89",
       "speaker": "王淼燕",
       "startTime": {
@@ -137,7 +137,7 @@
       },
       "timeTip": "2018.11.14 09:15 - 11.14 10:00",
       "viewActivityId": 352,
-      "viewActivityName": "2018年柯桥区天天智慧课堂十佳优质课展示"
+      "viewActivityName": "2018年高新区智慧课堂十佳优质课展示"
     },
     {
       "activityStatus": 2,
@@ -163,9 +163,9 @@
       "gradeName": "三年级",
       "id": 173,
       "mainActivityId": 27,
-      "mainActivityName": "2018年柯桥区天天智慧课堂十佳优质课展示",
+      "mainActivityName": "2018年高新区智慧课堂十佳优质课展示",
       "school": null,
-      "schoolName": "柯桥区教师发展中心",
+      "schoolName": "高新区教师发展中心",
       "schoolNo": "11AFC704CA3EFE66E050A8C027277C89",
       "speaker": "李甜",
       "startTime": {
@@ -182,7 +182,7 @@
       },
       "timeTip": "2018.09.14 10:00 - 09.14 11:00",
       "viewActivityId": 354,
-      "viewActivityName": "2018年柯桥区天天智慧课堂十佳优质课展示"
+      "viewActivityName": "2018年高新区智慧课堂十佳优质课展示"
     },
     {
       "activityStatus": 2,
@@ -208,9 +208,9 @@
       "gradeName": "二年级",
       "id": 172,
       "mainActivityId": 27,
-      "mainActivityName": "2018年柯桥区天天智慧课堂十佳优质课展示",
+      "mainActivityName": "2018年高新区智慧课堂十佳优质课展示",
       "school": null,
-      "schoolName": "柯桥区教师发展中心",
+      "schoolName": "高新区教师发展中心",
       "schoolNo": "11AFC704CA3EFE66E050A8C027277C89",
       "speaker": "赵霞",
       "startTime": {
@@ -227,7 +227,7 @@
       },
       "timeTip": "2018.06.08 09:00 - 06.08 10:00",
       "viewActivityId": 355,
-      "viewActivityName": "2018年柯桥区天天智慧课堂十佳优质课展示"
+      "viewActivityName": "2018年高新区智慧课堂十佳优质课展示"
     },
     {
       "activityStatus": 2,
@@ -253,9 +253,9 @@
       "gradeName": "一年级",
       "id": 171,
       "mainActivityId": 27,
-      "mainActivityName": "2018年柯桥区天天智慧课堂十佳优质课展示",
+      "mainActivityName": "2018年高新区智慧课堂十佳优质课展示",
       "school": null,
-      "schoolName": "柯桥区教师发展中心",
+      "schoolName": "高新区教师发展中心",
       "schoolNo": "11AFC704CA3EFE66E050A8C027277C89",
       "speaker": "钱亚丽",
       "startTime": {
@@ -272,7 +272,7 @@
       },
       "timeTip": "2018.05.08 10:00 - 05.08 10:49",
       "viewActivityId": 356,
-      "viewActivityName": "2018年柯桥区天天智慧课堂十佳优质课展示"
+      "viewActivityName": "2018年高新区智慧课堂十佳优质课展示"
     },
     {
       "activityStatus": 2,
@@ -298,9 +298,9 @@
       "gradeName": "九年级",
       "id": 166,
       "mainActivityId": 27,
-      "mainActivityName": "2018年柯桥区天天智慧课堂十佳优质课展示",
+      "mainActivityName": "2018年高新区智慧课堂十佳优质课展示",
       "school": null,
-      "schoolName": "柯桥区教师发展中心",
+      "schoolName": "高新区教师发展中心",
       "schoolNo": "11AFC704CA3EFE66E050A8C027277C89",
       "speaker": "余旭红",
       "startTime": {
@@ -317,7 +317,7 @@
       },
       "timeTip": "2018.05.03 10:00 - 05.03 10:46",
       "viewActivityId": 349,
-      "viewActivityName": "2018年柯桥区天天智慧课堂十佳优质课展示"
+      "viewActivityName": "2018年高新区智慧课堂十佳优质课展示"
     },
     {
       "activityStatus": 2,
@@ -343,9 +343,9 @@
       "gradeName": "五年级",
       "id": 170,
       "mainActivityId": 27,
-      "mainActivityName": "2018年柯桥区天天智慧课堂十佳优质课展示",
+      "mainActivityName": "2018年高新区智慧课堂十佳优质课展示",
       "school": null,
-      "schoolName": "柯桥区教师发展中心",
+      "schoolName": "高新区教师发展中心",
       "schoolNo": "11AFC704CA3EFE66E050A8C027277C89",
       "speaker": "潘旖",
       "startTime": {
@@ -362,7 +362,7 @@
       },
       "timeTip": "2018.04.09 09:00 - 04.09 09:50",
       "viewActivityId": 357,
-      "viewActivityName": "2018年柯桥区天天智慧课堂十佳优质课展示"
+      "viewActivityName": "2018年高新区智慧课堂十佳优质课展示"
     },
     {
       "activityStatus": 2,
@@ -388,9 +388,9 @@
       "gradeName": "八年级",
       "id": 169,
       "mainActivityId": 27,
-      "mainActivityName": "2018年柯桥区天天智慧课堂十佳优质课展示",
+      "mainActivityName": "2018年高新区智慧课堂十佳优质课展示",
       "school": null,
-      "schoolName": "柯桥区教师发展中心",
+      "schoolName": "高新区教师发展中心",
       "schoolNo": "11AFC704CA3EFE66E050A8C027277C89",
       "speaker": "王珂慧",
       "startTime": {
@@ -407,7 +407,7 @@
       },
       "timeTip": "2018.03.23 10:00 - 03.23 10:40",
       "viewActivityId": 358,
-      "viewActivityName": "2018年柯桥区天天智慧课堂十佳优质课展示"
+      "viewActivityName": "2018年高新区智慧课堂十佳优质课展示"
     }
   ],
   "message": null,

+ 1 - 1
TEAMModelOS.SmartClass/ClientApp/view/smart-class/NoticeDetails.vue

@@ -2,7 +2,7 @@
   <div class="details-container">
     <div class="notice-header">
       <p class="title">
-      <span class="content-title">关于开展2019年柯桥区智慧课堂第二次研讨活动的通知</span></p>
+      <span class="content-title">关于开展2019年高新区智慧课堂第二次研讨活动的通知</span></p>
       <p class="sub">2019-04-11&nbsp;&nbsp;&nbsp;月月研讨&nbsp;&nbsp;&nbsp;点击量:0</p>
     </div>
     <div class="content" v-html="noticeContent">

+ 1 - 1
TEAMModelOS.SmartClass/ClientApp/view/smart-class/notice.vue

@@ -19,7 +19,7 @@
     <div class="right-box center-col">
       <p class="title">{{typeName}}</p>
       <Table :columns="newColumns" :data="noticeList" @on-row-click="rowClick" no-data-text="暂无数据"></Table>
-      <Page :total="noticeList.length" show-elevator show-total />
+      <Page :total="noticeList.length" show-elevator show-total  v-show="noticeList.length > 0"/>
     </div>
   </div>