From 4d01adb93fb82fcf1c17fb2e58dc1d62ead5a65d Mon Sep 17 00:00:00 2001 From: ZHONG <1160551247@qq.com> Date: Thu, 11 Jun 2020 11:05:15 +0800 Subject: [PATCH 1/5] create branch --- analysis/clazzCount.html | 67 +++++++++++++++++++++++++++++++++++ analysis/watchVideoCount.html | 67 +++++++++++++++++++++++++++++++++++ evaluation/pollItem.html | 67 +++++++++++++++++++++++++++++++++++ evaluation/pollTemplate.html | 67 +++++++++++++++++++++++++++++++++++ evaluation/teacherPoll.html | 67 +++++++++++++++++++++++++++++++++++ 5 files changed, 335 insertions(+) create mode 100644 analysis/clazzCount.html create mode 100644 analysis/watchVideoCount.html create mode 100644 evaluation/pollItem.html create mode 100644 evaluation/pollTemplate.html create mode 100644 evaluation/teacherPoll.html diff --git a/analysis/clazzCount.html b/analysis/clazzCount.html new file mode 100644 index 0000000..0b88a21 --- /dev/null +++ b/analysis/clazzCount.html @@ -0,0 +1,67 @@ + + + + + + + + + + H+ 后台主题UI框架 - 空白页 + + + + + + + + + + + + +
+
+

标题

+
    +
  1. + 主页 +
    2. +
  2. + 包屑导航 +
    3. +
+
+
+
+ 活动区域 +
+
+
+ +
+
+
+
+

这里是页面内容

+ +
+ 您可以在这里添加栅格，参考首页及其他页面完成不同的布局 +
打开主页 +
+
+
+
+
+ + + + + + + + + + + + diff --git a/analysis/watchVideoCount.html b/analysis/watchVideoCount.html new file mode 100644 index 0000000..54ab00d --- /dev/null +++ b/analysis/watchVideoCount.html @@ -0,0 +1,67 @@ + + + + + + + + + + H+ 后台主题UI框架 - 空白页 + + + + + + + + + + + + +
+
+

标题

+
    +
  1. + 主页 +
    2. +
  2. + 包屑导航 +
    3. +
+
+
+
+ 活动区域 +
+
+
+ +
+
+
+
+

这里是页面内容

+ +
+ 您可以在这里添加栅格，参考首页及其他页面完成不同的布局 +
打开主页 +
+
+
+
+
+ + + + + + + + + + + + diff --git a/evaluation/pollItem.html b/evaluation/pollItem.html new file mode 100644 index 0000000..18a3af6 --- /dev/null +++ b/evaluation/pollItem.html @@ -0,0 +1,67 @@ + + + + + + + + + + H+ 后台主题UI框架 - 空白页 + + + + + + + + + + + + +
+
+

标题

+
    +
  1. + 主页 +
    2. +
  2. + 包屑导航 +
    3. +
+
+
+
+ 活动区域 +
+
+
+ +
+
+
+
+

这里是页面内容

+ +
+ 您可以在这里添加栅格，参考首页及其他页面完成不同的布局 +
打开主页 +
+
+
+
+
+ + + + + + + + + + + + diff --git a/evaluation/pollTemplate.html b/evaluation/pollTemplate.html new file mode 100644 index 0000000..18a3af6 --- /dev/null +++ b/evaluation/pollTemplate.html @@ -0,0 +1,67 @@ + + + + + + + + + + H+ 后台主题UI框架 - 空白页 + + + + + + + + + + + + +
+
+

标题

+
    +
  1. + 主页 +
    2. +
  2. + 包屑导航 +
    3. +
+
+
+
+ 活动区域 +
+
+
+ +
+
+
+
+

这里是页面内容

+ +
+ 您可以在这里添加栅格，参考首页及其他页面完成不同的布局 +
打开主页 +
+
+
+
+
+ + + + + + + + + + + + diff --git a/evaluation/teacherPoll.html b/evaluation/teacherPoll.html new file mode 100644 index 0000000..18a3af6 --- /dev/null +++ b/evaluation/teacherPoll.html @@ -0,0 +1,67 @@ + + + + + + + + + + H+ 后台主题UI框架 - 空白页 + + + + + + + + + + + + +
+
+

标题

+
    +
  1. + 主页 +
    2. +
  2. + 包屑导航 +
    3. +
+
+
+
+ 活动区域 +
+
+
+ +
+
+
+
+

这里是页面内容

+ +
+ 您可以在这里添加栅格，参考首页及其他页面完成不同的布局 +
打开主页 +
+
+
+
+
+ + + + + + + + + + + + -- Gitee From b92b0539f26f508756c7b9898757627b847003c2 Mon Sep 17 00:00:00 2001 From: ZHONG <1160551247@qq.com> Date: Thu, 11 Jun 2020 15:46:32 +0800 Subject: [PATCH 2/5] update --- analysis/clazzCount.html | 16 ++--- analysis/watchVideoCount.html | 18 +++--- data.json | 68 ++++++++++++++++++++ evaluation/pollItem.html | 114 +++++++++++++++++++++++++--------- evaluation/pollTemplate.html | 16 ++--- evaluation/teacherPoll.html | 16 ++--- 6 files changed, 184 insertions(+), 64 deletions(-) create mode 100644 data.json diff --git a/analysis/clazzCount.html b/analysis/clazzCount.html index 0b88a21..d9d767a 100644 --- a/analysis/clazzCount.html +++ b/analysis/clazzCount.html @@ -11,11 +11,11 @@ - - + + - - + + @@ -25,7 +25,7 @@

标题

  1. - 主页 + 主页
  2. 包屑导航 @@ -55,11 +55,11 @@ - - + + - + diff --git a/analysis/watchVideoCount.html b/analysis/watchVideoCount.html index 54ab00d..5342557 100644 --- a/analysis/watchVideoCount.html +++ b/analysis/watchVideoCount.html @@ -11,11 +11,11 @@ - - + + - - + + @@ -25,7 +25,7 @@

    标题

    1. - 主页 + 主页
    2. 包屑导航 @@ -34,7 +34,7 @@
      - 活动区域 + 活动区域
      @@ -55,11 +55,11 @@ - - + + - + diff --git a/data.json b/data.json new file mode 100644 index 0000000..a7eb9b2 --- /dev/null +++ b/data.json @@ -0,0 +1,68 @@ +[ + { + "id":1, + "content":"教师是否按照课程大纲来授课，并且是否有缺课", + "time": "2018-08-10", + "boolean": "启用" + }, + { + "id":2, + "content":"教师是否按照课程大纲来授课", + "time": "2017-08-10", + "boolean": "启用" + }, + { + "id":2, + "content":"严格要求学生，其言传身教有助于学生治学与做人", + "time": "2013-04-10", + "boolean": "启用" + }, + { + "id":2, + "content":"讲师是否有及时对学员的反馈做出积极、正确的回应", + "time": "2019-03-10", + "boolean": "启用" + }, + { + "id":2, + "content":"教师是否按照课程大纲来授课", + "time": "2017-09-10", + "boolean": "启用" + }, + { + "id":2, + "content":"严格要求学生，其言传身教有助于学生治学与做人", + "time": "2019-09-10", + "boolean": "启用" + }, + { + "id":2, + "content":"讲师是否有及时对学员的反馈做出积极、正确的回应", + "time": "2020-03-10", + "boolean": "启用" + }, + { + "id":2, + "content":"教师是否按照课程大纲来授课", + "time": "2019-08-10", + "boolean": "启用" + }, + { + "id":2, + "content":"严格要求学生，其言传身教有助于学生治学与做人", + "time": "2019-01-10", + "boolean": "启用" + }, + { + "id":2, + "content":"讲师是否有及时对学员的反馈做出积极、正确的回应", + "time": "2019-08-10", + "boolean": "启用" + }, + { + "id":2, + "content":"严格要求学生，其言传身教有助于学生治学与做人", + "time": "2018-08-10", + "boolean": "启用" + } +] \ No newline at end of file diff --git a/evaluation/pollItem.html b/evaluation/pollItem.html index 18a3af6..a8d9ee2 100644 --- a/evaluation/pollItem.html +++ b/evaluation/pollItem.html @@ -1,5 +1,5 @@ - + @@ -7,60 +7,112 @@ - H+ 后台主题UI框架 - 空白页 + H+ 智慧教育平台 - 考评管理 - - - - - + + + + + + -
      -
      -

      标题

      -
        -
      1. - 主页 -
        2. -
      2. - 包屑导航 -
        3. -
      -
      -
      -
      - 活动区域 +
      +
      + +
      +
      +
      +
      + +
      +
      -
      +
      -

      这里是页面内容

      -
      - 您可以在这里添加栅格，参考首页及其他页面完成不同的布局 -
      打开主页 -
      + - - + + - + + + + + diff --git a/evaluation/pollTemplate.html b/evaluation/pollTemplate.html index 18a3af6..7b64650 100644 --- a/evaluation/pollTemplate.html +++ b/evaluation/pollTemplate.html @@ -11,11 +11,11 @@ - - + + - - + + @@ -25,7 +25,7 @@

      标题

      1. - 主页 + 主页
      2. 包屑导航 @@ -55,11 +55,11 @@
      - - + + - + diff --git a/evaluation/teacherPoll.html b/evaluation/teacherPoll.html index 18a3af6..7b64650 100644 --- a/evaluation/teacherPoll.html +++ b/evaluation/teacherPoll.html @@ -11,11 +11,11 @@ - - + + - - + + @@ -25,7 +25,7 @@

      标题

      1. - 主页 + 主页
      2. 包屑导航 @@ -55,11 +55,11 @@
      - - + + - + -- Gitee From 78840c55dc8a6ad440874f3358576cedc6a1d158 Mon Sep 17 00:00:00 2001 From: ZHONG <1160551247@qq.com> Date: Thu, 11 Jun 2020 18:11:46 +0800 Subject: [PATCH 3/5] update pollitem.html --- data.json => static/json/data.json | 3 --- static/json/t_data.json | 30 ++++++++++++++++++++++++++ templates/evaluation/pollItem.html | 2 +- templates/evaluation/pollTemplate.html | 2 +- 4 files changed, 32 insertions(+), 5 deletions(-) rename data.json => static/json/data.json (99%) create mode 100644 static/json/t_data.json diff --git a/data.json b/static/json/data.json similarity index 99% rename from data.json rename to static/json/data.json index 9a455f7..ebab335 100644 --- a/data.json +++ b/static/json/data.json @@ -64,8 +64,5 @@ "content":"严格要求学生，其言传身教有助于学生治学与做人", "time": "2018-08-10", "boolean": "启用" - }, - { - } ] diff --git a/static/json/t_data.json b/static/json/t_data.json new file mode 100644 index 0000000..948a4a4 --- /dev/null +++ b/static/json/t_data.json @@ -0,0 +1,30 @@ +[ + { + "t_id": 1, + "name": "这是一个考评模板名称", + "t_boolean": "启用" + }, + { + "t_id": 2, + "name": "这是一个考评模板名称", + "t_boolean": "启用" + }, + { + "t_id": 3, + "name": "这是一个考评模板名称", + "t_boolean": "启用" + }, + { + "t_id": 4, + "name": "这是一个考评模板名称", + "t_boolean": "启用" + }, + { + "t_id": 5, + "name": "这是一个考评模板名称", + "t_boolean": "启用" + } +] + + + diff --git a/templates/evaluation/pollItem.html b/templates/evaluation/pollItem.html index 76bdb99..ced4ddb 100644 --- a/templates/evaluation/pollItem.html +++ b/templates/evaluation/pollItem.html @@ -98,7 +98,7 @@ -- Gitee From 6fd6427ea5ee1ca523aefad29e4b83497db5c1fd Mon Sep 17 00:00:00 2001 From: ZHONG <1160551247@qq.com> Date: Fri, 12 Jun 2020 08:54:30 +0800 Subject: [PATCH 5/5] =?UTF-8?q?=E6=9B=B4=E6=96=B0=E4=BA=86=E9=A1=B5?= =?UTF-8?q?=E9=9D=A2?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- static/json/t_data.json | 38 ++++- templates/data1.json | 31 ++++ templates/evaluation/pollItem.html | 41 ++++- templates/evaluation/pollTemplate.html | 121 ++++++++++++-- templates/evaluation/teacherPoll.html | 16 +- templates/table_demo.html | 210 +++++++++++++++++++++++++ 6 files changed, 431 insertions(+), 26 deletions(-) create mode 100644 templates/data1.json create mode 100644 templates/table_demo.html diff --git a/static/json/t_data.json b/static/json/t_data.json index 948a4a4..e8c0982 100644 --- a/static/json/t_data.json +++ b/static/json/t_data.json @@ -23,7 +23,43 @@ "t_id": 5, "name": "这是一个考评模板名称", "t_boolean": "启用" - } + },{ + "t_id": 6, + "name": "这是一个考评模板名称", + "t_boolean": "启用" +},{ + "t_id": 7, + "name": "这是一个考评模板名称", + "t_boolean": "启用" +},{ + "t_id": 8, + "name": "这是一个考评模板名称", + "t_boolean": "启用" +},{ + "t_id": 9, + "name": "这是一个考评模板名称", + "t_boolean": "启用" +},{ + "t_id": 10, + "name": "这是一个考评模板名称", + "t_boolean": "启用" +},{ + "t_id": 11, + "name": "这是一个考评模板名称", + "t_boolean": "启用" +},{ + "t_id": 12, + "name": "这是一个考评模板名称", + "t_boolean": "启用" +},{ + "t_id": 13, + "name": "这是一个考评模板名称", + "t_boolean": "启用" +},{ + "t_id": 14, + "name": "这是一个考评模板名称", + "t_boolean": "启用" +} ] diff --git a/templates/data1.json b/templates/data1.json new file mode 100644 index 0000000..12bca44 --- /dev/null +++ b/templates/data1.json @@ -0,0 +1,31 @@ +[ + { + "id": 1, + "name": "jack", + "age": 18, + "gender": "男" + }, + { + "id": 2, + "name": "ann", + "age": 20, + "gender": "女" + }, + { + "id": 3, + "name": "smith", + "age": 17, + "gender": "男" + }, + { + "id": 4, + "name": "peter", + "age": 21, + "gender": "男" + },{ + "id": 5, + "name": "solo", + "age": 23, + "gender": "男" +} +] \ No newline at end of file diff --git a/templates/evaluation/pollItem.html b/templates/evaluation/pollItem.html index a86d725..d7595aa 100644 --- a/templates/evaluation/pollItem.html +++ b/templates/evaluation/pollItem.html @@ -86,6 +86,40 @@
      + + + @@ -101,13 +135,17 @@ url: '../../static/json/data.json', // 表格数据来源 toolbar : '#toolbar', // 工具按钮用哪个容器 pagination : true, + cache:false, sortable : true, //是否启用排序 sortOrder : "asc", // 排序方式 sidePagination : "client", // 分页方式：client客户端分页，server服务端分页（*） pageNumber: 1, pageSize:10, + pageList: [10, 25, 50, 100], search:true, + strictSearch: false, //查询时是否严格匹配, true表示严格匹配，false表示模糊匹配 showRefresh:true, + uniqueId: "ID", //每一行的唯一标识，一般为主键列 columns: [{ field: 'checked', checkbox: true, @@ -137,7 +175,7 @@ formatter: function (value, row, index) { // var sid_code = base64encode(row.sid + ''); // sid 加密处理 // alert(sid_code); - return '' + + return '' + ' ' + '' + '' + @@ -152,7 +190,6 @@ }, 'click a[title=修改]': function (e, value, row, index) { // e.preventDefault(); - alert('click change button'); }, } }] diff --git a/templates/evaluation/pollTemplate.html b/templates/evaluation/pollTemplate.html index ae3a7f4..1e2c003 100644 --- a/templates/evaluation/pollTemplate.html +++ b/templates/evaluation/pollTemplate.html @@ -34,7 +34,7 @@ 添加
      - 删除 + 删除
      @@ -63,20 +63,85 @@
      - +
      - +
      -
      +
      +
      + +
      + +
      +
      +
      +
      + + +
      +
      + + + +