Merge commit '18c0ae3d412ab1a585d0ce4cd26794c4cd34e16a' into gzb

# Conflicts:
#	index.html
#	sections/history.html

index.html

@@ -141,7 +141,7 @@
       id="userAddModal"
       tabindex="-1"
       role="dialog"
-      aria-labelledby="AddTitle"
+      aria-labelledby="addTitle"
     >
       <div class="modal-dialog" role="document">
         <div class="modal-content">
@@ -154,10 +154,10 @@
             >
               <span aria-hidden="true">&times;</span>
             </button>
-            <h4 class="modal-title" id="AddTitle">添加用户信息</h4>
+            <h4 class="modal-title" id="addTitle">添加用户信息</h4>
           </div>
           <div class="modal-body">
-            <form class="form-horizontal" id="UserAddForm">
+            <form class="form-horizontal" id="userAddForm">
               <div class="form-group">
                 <label for="usernameInput" class="col-sm-2 control-label"
                   >用户姓名</label
@@ -545,15 +545,15 @@
         });
         $("#userAddModal .add_save").on("click", function () {
           // 添加表单验证
-          $("#UserAddForm").bootstrapValidator({
+          $("#userAddForm").bootstrapValidator({
             // 默认的提示消息
             message: "请输入内容",
             // 表单框里右侧的icon
-            feedbackIcons: {
-              valid: "glyphicon glyphicon-ok",
-              invalid: "glyphicon glyphicon-remove",
-              validating: "glyphicon glyphicon-refresh"
-            },
+            // feedbackIcons: {
+            //   valid: "glyphicon glyphicon-ok",
+            //   invalid: "glyphicon glyphicon-remove",
+            //   validating: "glyphicon glyphicon-refresh",
+            // },
             fields: {
               username: {
                 validators: {
@@ -602,9 +602,9 @@
             }
           });
           //先校验，在调是否通过校验的方法
-          $("#UserAddForm").data("bootstrapValidator").validate();
+          $("#userAddForm").data("bootstrapValidator").validate();
           //校验表单是否通过
-          let flag = $("#UserAddForm").data("bootstrapValidator").isValid();
+          let flag = $("#userAddForm").data("bootstrapValidator").isValid();
           if (flag) {
             let _url = $.baseUrl + "user/save";
             $.ajax({
@@ -613,11 +613,11 @@
               dataType: "json",
               contentType: "application/json; charset=utf-8",
               data: JSON.stringify({
-                username: $("#UserAddForm #usernameInput").val(),
-                loginname: $("#UserAddForm #loginnameInput").val(),
-                loginpwd: $("#UserAddForm #loginpwdInput").val(),
+                username: $("#userAddForm #usernameInput").val(),
+                loginname: $("#userAddForm #loginnameInput").val(),
+                loginpwd: $("#userAddForm #loginpwdInput").val(),
                 createid: $.userInfo.userid,
-                userphone: $("#UserAddForm #userphoneInput").val()
+                userphone: $("#userAddForm #userphoneInput").val()
               }),
               success: function (data) {
                 if (data.code === 0) {
@@ -639,7 +639,6 @@
           $("#userModifyModal").modal("show");
           $.each(userSearch.list, function (_index, _userItem) {
             if (_userItem.userid === modify_userid) {
-              console.log("modify_userid", _userItem);
               $("#userModifyForm #m_usernameInput").val(_userItem.username);
               $("#userModifyForm #m_loginnameInput").val(_userItem.loginname);
               $("#userModifyForm #m_loginpwdInput").val(_userItem.loginpwd);
@@ -653,11 +652,11 @@
             // 默认的提示消息
             message: "请输入内容",
             // 表单框里右侧的icon
-            feedbackIcons: {
-              valid: "glyphicon glyphicon-ok",
-              invalid: "glyphicon glyphicon-remove",
-              validating: "glyphicon glyphicon-refresh"
-            },
+            // feedbackIcons: {
+            //   valid: "glyphicon glyphicon-ok",
+            //   invalid: "glyphicon glyphicon-remove",
+            //   validating: "glyphicon glyphicon-refresh",
+            // },
             fields: {
               username: {
                 validators: {
@@ -681,9 +680,9 @@
               },
               loginpwd: {
                 validators: {
-                  notEmpty: {
-                    message: "请输入登录密码"
-                  },
+                  // notEmpty: {
+                  //   message: "请输入登录密码",
+                  // },
                   stringLength: {
                     //长度限制
                     min: 6,

librarys/bootstrap@3.4.1/bootstrap-datepicker.zh-CN.min.js

@@ -0,0 +1 @@
+!function(a){a.fn.datepicker.dates["zh-CN"]={days:["星期日","星期一","星期二","星期三","星期四","星期五","星期六"],daysShort:["周日","周一","周二","周三","周四","周五","周六"],daysMin:["日","一","二","三","四","五","六"],months:["一月","二月","三月","四月","五月","六月","七月","八月","九月","十月","十一月","十二月"],monthsShort:["1月","2月","3月","4月","5月","6月","7月","8月","9月","10月","11月","12月"],today:"今天",monthsTitle:"选择月份",clear:"清除",format:"yyyy-mm-dd",titleFormat:"yyyy年mm月",weekStart:1}}(jQuery);

sections/history.html

@@ -39,7 +39,7 @@
       .header_left #dhyearPicker {
         margin-right: 16px;
       }
-      .header_left .history_radio {
+      .history_radio {
         cursor: pointer;
       }
       .header_left .searchBtn {
@@ -126,10 +126,223 @@
         <div class="page_next">&gt;</div> -->
       </div>
     </div>
-
+    <!-- 添加发展历程 -->
+    <div
+      class="modal fade"
+      id="historyAddModal"
+      tabindex="-1"
+      role="dialog"
+      aria-labelledby="addTitle"
+    >
+      <div class="modal-dialog" role="document">
+        <div class="modal-content">
+          <div class="modal-header">
+            <button
+              type="button"
+              class="close"
+              data-dismiss="modal"
+              aria-label="Close"
+            >
+              <span aria-hidden="true">&times;</span>
+            </button>
+            <h4 class="modal-title" id="addTitle">添加发展历程</h4>
+          </div>
+          <div class="modal-body">
+            <form class="form-horizontal" id="historyAddForm">
+              <div class="form-group">
+                <label class="col-sm-2 control-label">类型</label>
+                <div class="col-sm-10">
+                  <div class="radio-inline">
+                    <input
+                      id="add_0"
+                      class="history_radio"
+                      name="history_ltype"
+                      type="radio"
+                      value="1"
+                      checked
+                    />
+                    <label for="add_0" class="history_radio">中文</label>
+                  </div>
+                  <div class="radio-inline">
+                    <input
+                      id="add_1"
+                      class="history_radio"
+                      name="history_ltype"
+                      type="radio"
+                      value="2"
+                    />
+                    <label for="add_1" class="history_radio">英文</label>
+                  </div>
+                </div>
+              </div>
+              <div class="form-group">
+                <label for="addDhyearPicker" class="col-sm-2 control-label"
+                  >日期</label
+                >
+                <div class="col-sm-10">
+                  <div class="input-group date" id="addDhyearPicker">
+                    <input
+                      type="text"
+                      class="form-control"
+                      name="history_dhyear"
+                    />
+                    <span class="input-group-addon">
+                      <span class="glyphicon glyphicon-calendar"></span>
+                    </span>
+                  </div>
+                </div>
+              </div>
+              <div class="form-group">
+                <label for="contentInput" class="col-sm-2 control-label"
+                  >内容</label
+                >
+                <div class="col-sm-10">
+                  <textarea
+                    type="text"
+                    class="form-control"
+                    id="contentInput"
+                    name="history_content"
+                    placeholder="请输入内容"
+                  ></textarea>
+                </div>
+              </div>
+            </form>
+          </div>
+          <div class="modal-footer">
+            <div type="button" class="btn btn-default" data-dismiss="modal">
+              取消
+            </div>
+            <div type="button" class="btn btn-primary add_save">确定</div>
+          </div>
+        </div>
+      </div>
+    </div>
+    <!-- 修改发展历程 -->
+    <div
+      class="modal fade"
+      id="historyModifyModal"
+      tabindex="-1"
+      role="dialog"
+      aria-labelledby="modifyTitle"
+    >
+      <div class="modal-dialog" role="document">
+        <div class="modal-content">
+          <div class="modal-header">
+            <button
+              type="button"
+              class="close"
+              data-dismiss="modal"
+              aria-label="Close"
+            >
+              <span aria-hidden="true">&times;</span>
+            </button>
+            <h4 class="modal-title" id="modifyTitle">修改发展历程</h4>
+          </div>
+          <div class="modal-body">
+            <form class="form-horizontal" id="historyModifyForm">
+              <div class="form-group">
+                <label class="col-sm-2 control-label">类型</label>
+                <div class="col-sm-10">
+                  <div class="radio-inline">
+                    <input
+                      id="modify_0"
+                      class="history_radio"
+                      name="m_history_ltype"
+                      type="radio"
+                      value="1"
+                      checked
+                    />
+                    <label for="modify_0" class="history_radio">中文</label>
+                  </div>
+                  <div class="radio-inline">
+                    <input
+                      id="modify_1"
+                      class="history_radio"
+                      name="m_history_ltype"
+                      type="radio"
+                      value="2"
+                    />
+                    <label for="modify_1" class="history_radio">英文</label>
+                  </div>
+                </div>
+              </div>
+              <div class="form-group">
+                <label for="modifyDhyearPicker" class="col-sm-2 control-label"
+                  >日期</label
+                >
+                <div class="col-sm-10">
+                  <div class="input-group date" id="modifyDhyearPicker">
+                    <input
+                      type="text"
+                      class="form-control"
+                      name="m_history_dhyear"
+                    />
+                    <span class="input-group-addon">
+                      <span class="glyphicon glyphicon-calendar"></span>
+                    </span>
+                  </div>
+                </div>
+              </div>
+              <div class="form-group">
+                <label for="m_contentInput" class="col-sm-2 control-label"
+                  >内容</label
+                >
+                <div class="col-sm-10">
+                  <textarea
+                    type="text"
+                    class="form-control"
+                    id="m_contentInput"
+                    name="m_history_content"
+                    placeholder="请输入内容"
+                  ></textarea>
+                </div>
+              </div>
+            </form>
+          </div>
+          <div class="modal-footer">
+            <div type="button" class="btn btn-default" data-dismiss="modal">
+              取消
+            </div>
+            <div type="button" class="btn btn-primary modify_save">确定</div>
+          </div>
+        </div>
+      </div>
+    </div>
+    <!-- 删除发展历程弹窗 -->
+    <div
+      class="modal fade"
+      id="historyDelModal"
+      tabindex="-1"
+      role="dialog"
+      aria-labelledby="delTitle"
+    >
+      <div class="modal-dialog tip_modal" role="document">
+        <div class="modal-content">
+          <div class="modal-header">
+            <button
+              type="button"
+              class="close"
+              data-dismiss="modal"
+              aria-label="Close"
+            >
+              <span aria-hidden="true">&times;</span>
+            </button>
+            <h4 class="modal-title" id="delTitle">提示</h4>
+          </div>
+          <div class="modal-body">确定删除选中信息？</div>
+          <div class="modal-footer">
+            <div type="button" class="btn btn-default" data-dismiss="modal">
+              取消
+            </div>
+            <div type="button" class="btn btn-primary del_save">保存</div>
+          </div>
+        </div>
+      </div>
+    </div>
     <script src="../librarys/jquery@1.12.4/jquery.min.js"></script>
     <script src="../librarys/bootstrap@3.4.1/bootstrap.js"></script>
     <script src="../librarys/bootstrap@3.4.1/bootstrap-datepicker.js"></script>
+    <script src="../librarys/bootstrap@3.4.1/bootstrap-datepicker.zh-CN.min.js"></script>
     <script src="../librarys/bootstrapValidator@0.5.3/bootstrapValidator.js"></script>
     <script src="../utils/index.js"></script>
     <script>
@@ -214,6 +427,211 @@
             "&type=" +
             historySearch.type;
         });
+        $(".history_main .header_box .history_add_btn").click(function () {
+          $("#historyAddModal").modal("show");
+          $("#historyAddModal #addDhyearPicker")
+            .datepicker({
+              autoclose: true,
+              startView: 1,
+              maxViewMode: 2,
+              minViewMode: 1,
+              format: "yyyy-mm",
+              language: "zh-CN"
+            })
+            .datepicker("setDate", "now");
+        });
+        $("#historyAddModal .add_save").on("click", function () {
+          // 添加表单验证
+          $("#historyAddForm").bootstrapValidator({
+            // 默认的提示消息
+            message: "请输入内容",
+            // 表单框里右侧的icon
+            // feedbackIcons: {
+            //   valid: "glyphicon glyphicon-ok",
+            //   invalid: "glyphicon glyphicon-remove",
+            //   validating: "glyphicon glyphicon-refresh",
+            // },
+            fields: {
+              history_ltype: {
+                validators: {
+                  notEmpty: {
+                    message: "请选择类型"
+                  }
+                }
+              },
+              history_dhyear: {
+                validators: {
+                  notEmpty: {
+                    format: "YYYY-MM",
+                    message: "请选择日期"
+                  }
+                }
+              },
+              history_content: {
+                validators: {
+                  notEmpty: {
+                    message: "请输入内容"
+                  }
+                }
+              }
+            }
+          });
+          //先校验，在调是否通过校验的方法
+          $("#historyAddForm").data("bootstrapValidator").validate();
+          //校验表单是否通过
+          let flag = $("#historyAddForm").data("bootstrapValidator").isValid();
+          if (flag) {
+            let _url = $.baseUrl + "dh/save";
+            let _dhyear = $(
+              "#historyAddForm input[name='history_dhyear']"
+            ).val();
+            let _dhmonth = _dhyear && _dhyear.split("-")[1];
+            $.ajax({
+              type: "POST",
+              url: _url,
+              dataType: "json",
+              contentType: "application/json; charset=utf-8",
+              data: JSON.stringify({
+                dhyear: _dhyear && _dhyear.split("-")[0],
+                dhmonth: Number(_dhmonth) + "月",
+                content: $(
+                  "#historyAddForm textarea[name='history_content']"
+                ).val(),
+                ltype: $(
+                  "#historyAddForm input[name='history_ltype']:checked"
+                ).val(),
+                createid: $.userInfo.userid
+              }),
+              success: function (data) {
+                if (data.code === 0) {
+                  window.location.href =
+                    "/sections/history.html?page=1&dhyear=" +
+                    historySearch.dhyear +
+                    "&type=" +
+                    historySearch.type;
+                } else {
+                  alert(data.msg);
+                }
+              }
+            });
+          }
+        });
+        let modify_dhid = null;
+        $(".historyTableBody").on("click", ".modify_btn", function () {
+          modify_dhid = $(this).data("dhid");
+          $("#historyModifyModal").modal("show");
+          $.each(historySearch.list, function (_index, _historyItem) {
+            if (_historyItem.dhid === modify_dhid) {
+              $(
+                "#historyModifyForm input[name='m_history_ltype'][value='" +
+                  _historyItem.ltype +
+                  "']"
+              ).attr("checked", true);
+              let _monthStr =
+                _historyItem.dhyear && _historyItem.dhmonth
+                  ? _historyItem.dhmonth.split("月")[0]
+                  : "";
+              $("#historyModifyModal #modifyDhyearPicker")
+                .datepicker({
+                  autoclose: true,
+                  startView: 1,
+                  maxViewMode: 2,
+                  minViewMode: 1,
+                  format: "yyyy-mm",
+                  language: "zh-CN"
+                })
+                .datepicker(
+                  "setDate",
+                  _monthStr
+                    ? _historyItem.dhyear +
+                        "-" +
+                        (Number(_monthStr) < 9 ? "0" + _monthStr : _monthStr)
+                    : "now"
+                );
+              $("#historyModifyForm textarea[name='m_history_content']").val(
+                _historyItem.content
+              );
+            }
+          });
+        });
+        $("#historyModifyModal .modify_save").on("click", function () {
+          // 添加表单验证
+          $("#historyModifyForm").bootstrapValidator({
+            // 默认的提示消息
+            message: "请输入内容",
+            // 表单框里右侧的icon
+            // feedbackIcons: {
+            //   valid: "glyphicon glyphicon-ok",
+            //   invalid: "glyphicon glyphicon-remove",
+            //   validating: "glyphicon glyphicon-refresh",
+            // },
+            fields: {
+              history_ltype: {
+                validators: {
+                  notEmpty: {
+                    message: "请选择类型"
+                  }
+                }
+              },
+              history_dhyear: {
+                validators: {
+                  notEmpty: {
+                    format: "YYYY-MM",
+                    message: "请选择日期"
+                  }
+                }
+              },
+              history_content: {
+                validators: {
+                  notEmpty: {
+                    message: "请输入内容"
+                  }
+                }
+              }
+            }
+          });
+          //先校验，在调是否通过校验的方法
+          $("#historyModifyForm").data("bootstrapValidator").validate();
+          //校验表单是否通过
+          let flag = $("#historyModifyForm")
+            .data("bootstrapValidator")
+            .isValid();
+          if (flag) {
+            let _url = $.baseUrl + "dh/update";
+            let _dhyear = $(
+              "#historyModifyForm input[name='m_history_dhyear']"
+            ).val();
+            let _dhmonth = _dhyear && _dhyear.split("-")[1];
+            $.ajax({
+              type: "POST",
+              url: _url,
+              dataType: "json",
+              contentType: "application/json; charset=utf-8",
+              data: JSON.stringify({
+                dhid: modify_dhid,
+                dhyear: _dhyear && _dhyear.split("-")[0],
+                dhmonth: Number(_dhmonth) + "月",
+                content: $(
+                  "#historyModifyForm textarea[name='m_history_content']"
+                ).val(),
+                ltype: $(
+                  "#historyModifyForm input[name='m_history_ltype']:checked"
+                ).val()
+              }),
+              success: function (data) {
+                if (data.code === 0) {
+                  window.location.href =
+                    "/sections/history.html?page=1&dhyear=" +
+                    historySearch.dhyear +
+                    "&type=" +
+                    historySearch.type;
+                } else {
+                  alert(data.msg);
+                }
+              }
+            });
+          }
+        });
         // 获取用户列表
         function getHistoryList() {
           $.ajax({
@@ -271,28 +689,28 @@
           $(".historyTableBody").html(historyTableBodyHtml);
           let del_dhid = null;
           $(".historyTableBody").on("click", ".del_btn", function () {
-            $("#userDelModal").modal("show");
+            $("#historyDelModal").modal("show");
             del_dhid = $(this).data("dhid");
           });
-          $("#userDelModal .del_save").on("click", function () {
+          $("#historyDelModal .del_save").on("click", function () {
             $.ajax({
               type: "POST",
-              url: $.baseUrl + "user/del",
+              url: $.baseUrl + "dh/remove",
               dataType: "json",
               contentType: "application/json; charset=utf-8",
               data: JSON.stringify({
                 dhid: del_dhid
               }),
               success: function (data) {
-                $("#userDelModal").modal("hide");
+                $("#historyDelModal").modal("hide");
                 if (data.code === 0) {
                   window.location.href =
-                    "/index.html?page=" +
+                    "/sections/history.html?page=" +
                     historySearch.page +
-                    "&userstate=" +
-                    historySearch.userstate +
-                    "&username=" +
-                    historySearch.username;
+                    "&dhyear=" +
+                    historySearch.dhyear +
+                    "&type=" +
+                    historySearch.type;
                 } else {
                   alert(data.msg);
                 }
@@ -300,7 +718,76 @@
             });
           });
         }
-        function setPageList() {}
+        // 设置页码信息
+        function setPageList() {
+          let pageBoxHtml =
+            '<div class="page_prev ' +
+            (historySearch.page === 1 ? "disabled" : "") +
+            '">&lt;</div>';
+          for (
+            let _pageIndex = 0;
+            _pageIndex < Math.ceil(historySearch.total / historySearch.size);
+            _pageIndex++
+          ) {
+            pageBoxHtml +=
+              '<div data-page="' +
+              (_pageIndex + 1) +
+              '" class="page_num ' +
+              (_pageIndex + 1 === historySearch.page ? "selected" : "") +
+              '">' +
+              (_pageIndex + 1) +
+              "</div>";
+          }
+          pageBoxHtml +=
+            '<div class="page_next ' +
+            (historySearch.page ===
+            Math.ceil(historySearch.total / historySearch.size)
+              ? "disabled"
+              : "") +
+            '">&gt;</div>';
+          if (historySearch.total > 0) {
+            $(".history_page.page_box").html(pageBoxHtml);
+            $(".history_page.page_box").on("click", ".page_prev", function () {
+              if (historySearch.page > 1) {
+                historySearch.page--;
+                window.location.href =
+                  "/sections/history.html?page=" +
+                  historySearch.page +
+                  "&dhyear=" +
+                  historySearch.dhyear +
+                  "&type=" +
+                  historySearch.type;
+              }
+            });
+            $(".history_page.page_box").on("click", ".page_num", function () {
+              historySearch.page = $(this).data("page");
+              window.location.href =
+                "/sections/history.html?page=" +
+                historySearch.page +
+                "&dhyear=" +
+                historySearch.dhyear +
+                "&type=" +
+                historySearch.type;
+            });
+            $(".history_page.page_box").on("click", ".page_next", function () {
+              if (
+                historySearch.page <
+                Math.ceil(historySearch.total / historySearch.size)
+              ) {
+                historySearch.page++;
+                window.location.href =
+                  "/sections/history.html?page=" +
+                  historySearch.page +
+                  "&dhyear=" +
+                  historySearch.dhyear +
+                  "&type=" +
+                  historySearch.type;
+              }
+            });
+          } else {
+            $(".history_page.page_box").html("");
+          }
+        }
         getHistoryList();
       });
     </script>