Browse Source

Merge branch 'master' of http://106.12.23.251:10080/CDHABOOK/TEAMModelOS

zhousheng 6 years ago
parent
commit
4693533223

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


+ 12 - 12
TEAMModelOS.SmartClass/ClientApp/static/attachmentsList.json

@@ -7,8 +7,8 @@
     "list": [
       {
         "activityId": 40,
-        "activityName": "2019年高新区天天智慧课堂 5月份 优课评比",
-        "fileName": "高新区天天智慧课堂教学设计表.docx",
+        "activityName": "2019年高新区智慧课堂 5月份 优课评比",
+        "fileName": "高新区智慧课堂教学设计表.docx",
         "fileNameHash": "73.docx",
         "fileNameUri": "/upload/activity/attachment/73/73.docx?_=1557313944956",
         "fileSize": 21981,
@@ -24,8 +24,8 @@
       },
       {
         "activityId": 40,
-        "activityName": "2019年高新区天天智慧课堂 5月份 优课评比",
-        "fileName": "高新区天天智慧课堂教学反思表.docx",
+        "activityName": "2019年高新区智慧课堂 5月份 优课评比",
+        "fileName": "高新区智慧课堂教学反思表.docx",
         "fileNameHash": "74.docx",
         "fileNameUri": "/upload/activity/attachment/74/74.docx?_=1557313944957",
         "fileSize": 21772,
@@ -41,8 +41,8 @@
       },
       {
         "activityId": 40,
-        "activityName": "2019年高新区天天智慧课堂 5月份 优课评比",
-        "fileName": "天天智慧课堂课例封面(模版).ppt",
+        "activityName": "2019年高新区智慧课堂 5月份 优课评比",
+        "fileName": "智慧课堂课例封面(模版).ppt",
         "fileNameHash": "75.ppt",
         "fileNameUri": "/upload/activity/attachment/75/75.ppt?_=1557313944957",
         "fileSize": 55808,
@@ -58,8 +58,8 @@
       },
       {
         "activityId": 40,
-        "activityName": "2019年高新区天天智慧课堂 5月份 优课评比",
-        "fileName": "天天智慧课堂评课封面(模版).ppt",
+        "activityName": "2019年高新区智慧课堂 5月份 优课评比",
+        "fileName": "智慧课堂评课封面(模版).ppt",
         "fileNameHash": "76.ppt",
         "fileNameUri": "/upload/activity/attachment/76/76.ppt?_=1557313944957",
         "fileSize": 45568,
@@ -75,8 +75,8 @@
       },
       {
         "activityId": 40,
-        "activityName": "2019年高新区天天智慧课堂 5月份 优课评比",
-        "fileName": "高新区天天智慧课堂课例评选指标.xls",
+        "activityName": "2019年高新区智慧课堂 5月份 优课评比",
+        "fileName": "高新区智慧课堂课例评选指标.xls",
         "fileNameHash": "77.xls",
         "fileNameUri": "/upload/activity/attachment/77/77.xls?_=1557313944957",
         "fileSize": 27648,
@@ -92,8 +92,8 @@
       },
       {
         "activityId": 40,
-        "activityName": "2019年高新区天天智慧课堂 5月份 优课评比",
-        "fileName": "2019年高新区天天智慧课堂5月份排课安排表.docx",
+        "activityName": "2019年高新区智慧课堂 5月份 优课评比",
+        "fileName": "2019年高新区智慧课堂5月份排课安排表.docx",
         "fileNameHash": "78.docx",
         "fileNameUri": "/upload/activity/attachment/78/78.docx?_=1557313944957",
         "fileSize": 25472,

+ 3 - 3
TEAMModelOS.SmartClass/ClientApp/static/indexNoticeList.json

@@ -38,7 +38,7 @@
       },
       "startTimeTip": "2019-04-28",
       "status": 1,
-      "title": "2019年高新区天天智慧课堂5月份排课安排表",
+      "title": "2019年高新区智慧课堂5月份排课安排表",
       "viewCount": 4
     },
     {
@@ -112,7 +112,7 @@
       },
       "startTimeTip": "2019-04-18",
       "status": 1,
-      "title": "关于公布2019年高新区天天智慧课堂3月份优课评比结果的通知",
+      "title": "关于公布2019年高新区智慧课堂3月份优课评比结果的通知",
       "viewCount": 2
     },
     {
@@ -223,7 +223,7 @@
       },
       "startTimeTip": "2019-04-01",
       "status": 1,
-      "title": "2019年高新区天天智慧课堂4月份排课安排表",
+      "title": "2019年高新区智慧课堂4月份排课安排表",
       "viewCount": 0
     }
   ],

+ 24 - 24
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,
@@ -340,7 +340,7 @@
         "year": 118
       },
       "viewActivityId": 351,
-      "viewActivityName": "2018年高新区天天智慧课堂十佳优质课展示",
+      "viewActivityName": "2018年高新区智慧课堂十佳优质课展示",
       "viewActivitySpeaker": "喻远鑫",
       "viewActivityStartTime": {
         "date": 13,
@@ -400,7 +400,7 @@
         "year": 118
       },
       "viewActivityId": 351,
-      "viewActivityName": "2018年高新区天天智慧课堂十佳优质课展示",
+      "viewActivityName": "2018年高新区智慧课堂十佳优质课展示",
       "viewActivitySpeaker": "喻远鑫",
       "viewActivityStartTime": {
         "date": 13,

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,

+ 19 - 19
TEAMModelOS.SmartClass/ClientApp/static/pastAcList.json

@@ -16,7 +16,7 @@
         "banner": "1920-560.png",
         "bannerHash": "37.png",
         "bannerUri": "/upload/activity/banner/37/37.png?_=1557912462417",
-        "cover": "天天智慧课堂3月.jpg",
+        "cover": "智慧课堂3月.jpg",
         "coverHash": "37.jpg",
         "coverUri": "/upload/activity/cover/37/37.jpg?_=1557912462417",
         "employeeName": "楼宽",
@@ -26,10 +26,10 @@
         "hideAttachmentAfterEnd": false,
         "hideAwardAfterEnd": false,
         "id": 37,
-        "name": "2019年柯桥区天天智慧课堂 3月份 优课评比",
+        "name": "2019年高新区智慧课堂 3月份 优课评比",
         "nameMaxLength": null,
         "numberOfProduction": 1,
-        "organizer": "柯桥区教师发展中心",
+        "organizer": "高新区教师发展中心",
         "publicity": false,
         "reviewEndTime": {
           "date": 6,
@@ -108,10 +108,10 @@
         "hideAttachmentAfterEnd": false,
         "hideAwardAfterEnd": false,
         "id": 16,
-        "name": "2018年柯桥区天天智慧课堂 12月份 优课评比",
+        "name": "2018年高新区智慧课堂 12月份 优课评比",
         "nameMaxLength": null,
         "numberOfProduction": 1,
-        "organizer": "柯桥区教师发展中心",
+        "organizer": "高新区教师发展中心",
         "publicity": false,
         "reviewEndTime": {
           "date": 16,
@@ -190,10 +190,10 @@
         "hideAttachmentAfterEnd": false,
         "hideAwardAfterEnd": false,
         "id": 23,
-        "name": "2018年柯桥区天天智慧课堂十佳优质课评比活动课例评比",
+        "name": "2018年高新区智慧课堂十佳优质课评比活动课例评比",
         "nameMaxLength": null,
         "numberOfProduction": 1,
-        "organizer": "柯桥区教师发展中心",
+        "organizer": "高新区教师发展中心",
         "publicity": false,
         "reviewEndTime": {
           "date": 2,
@@ -272,10 +272,10 @@
         "hideAttachmentAfterEnd": false,
         "hideAwardAfterEnd": true,
         "id": 15,
-        "name": "2018年柯桥区天天智慧课堂 11月份 优课评比",
+        "name": "2018年高新区智慧课堂 11月份 优课评比",
         "nameMaxLength": null,
         "numberOfProduction": 1,
-        "organizer": "柯桥区教师发展中心",
+        "organizer": "高新区教师发展中心",
         "publicity": false,
         "reviewEndTime": {
           "date": 3,
@@ -354,10 +354,10 @@
         "hideAttachmentAfterEnd": false,
         "hideAwardAfterEnd": false,
         "id": 24,
-        "name": "2018年柯桥区“第四届智慧课堂教学实践观摩活动”课例征集",
+        "name": "2018年高新区“第四届智慧课堂教学实践观摩活动”课例征集",
         "nameMaxLength": null,
         "numberOfProduction": 1,
-        "organizer": "柯桥区教师发展中心",
+        "organizer": "高新区教师发展中心",
         "publicity": false,
         "reviewEndTime": {
           "date": 20,
@@ -436,10 +436,10 @@
         "hideAttachmentAfterEnd": false,
         "hideAwardAfterEnd": false,
         "id": 14,
-        "name": "2018年柯桥区天天智慧课堂 10月份 优课评比",
+        "name": "2018年高新区智慧课堂 10月份 优课评比",
         "nameMaxLength": null,
         "numberOfProduction": 1,
-        "organizer": "柯桥区教师发展中心",
+        "organizer": "高新区教师发展中心",
         "publicity": false,
         "reviewEndTime": {
           "date": 24,
@@ -518,10 +518,10 @@
         "hideAttachmentAfterEnd": false,
         "hideAwardAfterEnd": false,
         "id": 22,
-        "name": "2018年下柯桥区创新实验室(学科教室)视频课例评比活动",
+        "name": "2018年下高新区创新实验室(学科教室)视频课例评比活动",
         "nameMaxLength": null,
         "numberOfProduction": 1,
-        "organizer": "柯桥区教师发展中心",
+        "organizer": "高新区教师发展中心",
         "publicity": false,
         "reviewEndTime": {
           "date": 18,
@@ -600,10 +600,10 @@
         "hideAttachmentAfterEnd": false,
         "hideAwardAfterEnd": false,
         "id": 12,
-        "name": "2018年柯桥区天天智慧课堂 9月份 优课评比",
+        "name": "2018年高新区智慧课堂 9月份 优课评比",
         "nameMaxLength": null,
         "numberOfProduction": 1,
-        "organizer": "柯桥区教师发展中心",
+        "organizer": "高新区教师发展中心",
         "publicity": false,
         "reviewEndTime": {
           "date": 16,
@@ -682,10 +682,10 @@
         "hideAttachmentAfterEnd": true,
         "hideAwardAfterEnd": true,
         "id": 13,
-        "name": "2018年“柯桥区智慧课堂研究者联盟”校级研究课题展示交流",
+        "name": "2018年“高新区智慧课堂研究者联盟”校级研究课题展示交流",
         "nameMaxLength": null,
         "numberOfProduction": 1,
-        "organizer": "柯桥区教师发展中心",
+        "organizer": "高新区教师发展中心",
         "publicity": false,
         "reviewEndTime": {
           "date": 31,

+ 12 - 12
TEAMModelOS.SmartClass/ClientApp/static/reviewAcList.json

@@ -16,7 +16,7 @@
         "banner": "优课评比banner.jpg",
         "bannerHash": "40.jpg",
         "bannerUri": "/upload/activity/banner/40/40.jpg?_=1557301765646",
-        "cover": "天天智慧课堂5月.jpg",
+        "cover": "智慧课堂5月.jpg",
         "coverHash": "40.jpg",
         "coverUri": "/upload/activity/cover/40/40.jpg?_=1557301765646",
         "employeeName": "楼宽",
@@ -26,10 +26,10 @@
         "hideAttachmentAfterEnd": false,
         "hideAwardAfterEnd": false,
         "id": 40,
-        "name": "2019年柯桥区天天智慧课堂 5月份 优课评比",
+        "name": "2019年高新区智慧课堂 5月份 优课评比",
         "nameMaxLength": null,
         "numberOfProduction": 1,
-        "organizer": "柯桥区教师发展中心",
+        "organizer": "高新区教师发展中心",
         "publicity": false,
         "reviewEndTime": {
           "date": 8,
@@ -98,7 +98,7 @@
         "banner": "优课评比banner.jpg",
         "bannerHash": "39.jpg",
         "bannerUri": "/upload/activity/banner/39/39.jpg?_=1557301765647",
-        "cover": "天天智慧课堂4月.jpg",
+        "cover": "智慧课堂4月.jpg",
         "coverHash": "39.jpg",
         "coverUri": "/upload/activity/cover/39/39.jpg?_=1557301765647",
         "employeeName": "楼宽",
@@ -108,10 +108,10 @@
         "hideAttachmentAfterEnd": false,
         "hideAwardAfterEnd": false,
         "id": 39,
-        "name": "2019年柯桥区天天智慧课堂 4月份 优课评比",
+        "name": "2019年高新区智慧课堂 4月份 优课评比",
         "nameMaxLength": null,
         "numberOfProduction": 1,
-        "organizer": "柯桥区教师发展中心",
+        "organizer": "高新区教师发展中心",
         "publicity": false,
         "reviewEndTime": {
           "date": 10,
@@ -180,7 +180,7 @@
         "banner": "优课评比banner.jpg",
         "bannerHash": "39.jpg",
         "bannerUri": "/upload/activity/banner/39/39.jpg?_=1557301765647",
-        "cover": "天天智慧课堂4月.jpg",
+        "cover": "智慧课堂4月.jpg",
         "coverHash": "39.jpg",
         "coverUri": "/upload/activity/cover/39/39.jpg?_=1557301765647",
         "employeeName": "楼宽",
@@ -190,10 +190,10 @@
         "hideAttachmentAfterEnd": false,
         "hideAwardAfterEnd": false,
         "id": 39,
-        "name": "2019年柯桥区天天智慧课堂 4月份 优课评比",
+        "name": "2019年高新区智慧课堂 4月份 优课评比",
         "nameMaxLength": null,
         "numberOfProduction": 1,
-        "organizer": "柯桥区教师发展中心",
+        "organizer": "高新区教师发展中心",
         "publicity": false,
         "reviewEndTime": {
           "date": 10,
@@ -262,7 +262,7 @@
         "banner": "优课评比banner.jpg",
         "bannerHash": "39.jpg",
         "bannerUri": "/upload/activity/banner/39/39.jpg?_=1557301765647",
-        "cover": "天天智慧课堂4月.jpg",
+        "cover": "智慧课堂4月.jpg",
         "coverHash": "39.jpg",
         "coverUri": "/upload/activity/cover/39/39.jpg?_=1557301765647",
         "employeeName": "楼宽",
@@ -272,10 +272,10 @@
         "hideAttachmentAfterEnd": false,
         "hideAwardAfterEnd": false,
         "id": 39,
-        "name": "2019年柯桥区天天智慧课堂 4月份 优课评比",
+        "name": "2019年高新区智慧课堂 4月份 优课评比",
         "nameMaxLength": null,
         "numberOfProduction": 1,
-        "organizer": "柯桥区教师发展中心",
+        "organizer": "高新区教师发展中心",
         "publicity": false,
         "reviewEndTime": {
           "date": 10,

+ 1 - 2
TEAMModelOS.SmartClass/ClientApp/view/app.vue

@@ -34,7 +34,7 @@
   html, body, #app {
     height: 100% !important;
     user-select: none;
-    background:rgb(248,248,248);
+    background:rgb(241,242,243);
   }
 
   .main-content {
@@ -45,7 +45,6 @@
     display: flex;
     flex-direction: column;
     align-items: center;
-    background:rgb(248,248,248);
   }
   .content {
     width:100%;

+ 2 - 2
TEAMModelOS.SmartClass/ClientApp/view/smart-class/ActivityDetails.vue

@@ -10,7 +10,7 @@
           </div>
           <div class="activity-brief-right">
             <div class="activity-brief-title">
-              <span>2019年柯桥区天天智慧课堂 5月份 优课评比 </span>
+              <span>2019年高新区智慧课堂 5月份 优课评比 </span>
               <span class="status" style="background: rgb(19, 206, 102);">筹备阶段</span>
               <!--<Button type="primary" size="large">参加活动</Button>-->
             </div>
@@ -20,7 +20,7 @@
                 <div class="items"><p class="item">征集中</p> <span class="tips">作品数量</span></div>
               </div>
               <div class="brief-info-left">
-                <div class="items"><p class="item">柯桥区教师发展中心</p> <span class="tips">主办方</span></div>
+                <div class="items"><p class="item">高新区教师发展中心</p> <span class="tips">主办方</span></div>
                 <div class="items"><p class="item2">0天 0小时 0分</p> <span class="tips">距离报名开始时间</span></div>
               </div>
 

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

@@ -178,7 +178,7 @@
   }
 
   .main-content {
-    background: rgb(248,248,248) !important;
+    background: rgb(241,242,243) !important;
   }
 
   .container {

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

@@ -34,6 +34,7 @@
   html, body, #app {
     height: 100% !important;
     user-select: none;
+    background: rgb(241,242,243);
   }
 
   .main-content {
@@ -44,7 +45,6 @@
     display: flex;
     flex-direction: column;
     align-items: center;
-    background: rgb(248,248,248);
   }
 
   .content {

+ 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/ReviewActivity.vue

@@ -72,7 +72,7 @@
   }
 
   .main-content {
-    background: rgb(248,248,248) !important;
+    background: rgb(241,242,243) !important;
   }
 
   .container {

+ 6 - 6
TEAMModelOS.SmartClass/ClientApp/view/smart-class/RewardDetails.vue

@@ -7,7 +7,7 @@
           </div>
           <div class="activity-brief-right">
             <div class="activity-brief-title">
-              <span>2019年柯桥区天天智慧课堂 5月份 优课评比 </span>
+              <span>2019年高新区智慧课堂 5月份 优课评比 </span>
               <span class="status" style="background: rgb(182, 182, 182);">活动结束</span>
             </div>
             <div class="activity-brief-info center-row">
@@ -16,7 +16,7 @@
                 <div class="items"><p class="item">20</p> <span class="tips">数量</span></div>
               </div>
               <div class="brief-info-left">
-                <div class="items"><p class="item">柯桥区教师发展中心</p> <span class="tips">主办方</span></div>
+                <div class="items"><p class="item">高新区教师发展中心</p> <span class="tips">主办方</span></div>
               </div>
 
             </div>
@@ -97,7 +97,7 @@
         rewardSettings: [
           {
             "activityId": 16,
-            "activityName": "2018年柯桥区天天智慧课堂 12月份 优课评比",
+            "activityName": "2018年高新区智慧课堂 12月份 优课评比",
             "applyCount": 20,
             "id": 46,
             "name": "月冠军",
@@ -108,7 +108,7 @@
           },
           {
             "activityId": 16,
-            "activityName": "2018年柯桥区天天智慧课堂 12月份 优课评比",
+            "activityName": "2018年高新区智慧课堂 12月份 优课评比",
             "applyCount": 20,
             "id": 47,
             "name": "月亚军",
@@ -119,7 +119,7 @@
           },
           {
             "activityId": 16,
-            "activityName": "2018年柯桥区天天智慧课堂 12月份 优课评比",
+            "activityName": "2018年高新区智慧课堂 12月份 优课评比",
             "applyCount": 20,
             "id": 48,
             "name": "月季军",
@@ -130,7 +130,7 @@
           },
           {
             "activityId": 16,
-            "activityName": "2018年柯桥区天天智慧课堂 12月份 优课评比",
+            "activityName": "2018年高新区智慧课堂 12月份 优课评比",
             "applyCount": 20,
             "id": 49,
             "name": "优课",

+ 4 - 4
TEAMModelOS.SmartClass/ClientApp/view/smart-class/index.vue

@@ -4,7 +4,7 @@
       <img src="http://ttkt.sxedu.org:70/upload/setting/banner/0/0.png?_=1557198699301" />
     </div>
 
-    <div class="container notice-wrap">
+    <div class="activity-container notice-wrap">
       <div class="header-line">
         <h3>通知公告</h3>
         <span>NOTICE</span>
@@ -26,7 +26,7 @@
     </div>
 
     <div class="home-activity">
-      <div class="container">
+      <div class="activity-container">
         <div class="header-line">
           <h3>评审活动</h3> <span>ACTIVITY</span> <div class="more">
             <a class="view-more" @click="goActivity">查看更多</a> <span class="count">
@@ -52,7 +52,7 @@
     </div>
 
     <div class="home-activity">
-      <div class="container">
+      <div class="activity-container">
         <div class="header-line">
           <h3>往届回顾</h3> <span>REVIEW</span> <div class="more">
             <a href="./activity.html" class="view-more">查看更多</a>
@@ -127,7 +127,7 @@
     user-select: none;
   }
 
-  .container {
+  .activity-container {
     width: 1200px;
     margin: 0 auto;
   }

+ 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>
 

+ 2 - 1
TEAMModelOS.SmartClass/Views/Shared/_Layout.cshtml

@@ -5,8 +5,9 @@
     <meta charset="utf-8" />
     <meta name="viewport" content="width=device-width, initial-scale=1.0" />
     <title>@ViewData["Title"]智慧课堂管理平台</title>
-    <link rel="stylesheet" href="~/dist/style.css" asp-append-version="true" />
+    @*<link rel="stylesheet" href="~/dist/style.css" asp-append-version="true" />*@
     <link rel="icon" type="image/x-icon" class="js-site-favicon" href="https://account.habookaclass.biz/dist/6854ccd21afb6b1f994e1556c2360dd8.ico">
+    <link rel="stylesheet" href="~/dist/style.css" >
     @*<link rel="stylesheet" href="~/dist/vendor.css" asp-append-version="true" />
         <environment names="Staging,Production">
             <link rel="stylesheet" href="~/dist/site.css" asp-append-version="true" />

File diff suppressed because it is too large
+ 1 - 1
TEAMModelOS.SmartTeach/ClientApp/common/footer.vue