oa

gn_oa_vip27/.idea/workspace.xml

@@ -10,242 +10,21 @@
   </component>
   <component name="ChangeListManager">
     <list default="true" id="fdadf229-95a2-4903-b472-eec1ea62a98e" name="Changes" comment="">
-      <change afterPath="$PROJECT_DIR$/src/main/java/com/sf/filter/CharacterEncodingFilter.java" afterDir="false" />
-      <change afterPath="$PROJECT_DIR$/src/main/java/com/sf/servlet/RoleAddServlet.java" afterDir="false" />
-      <change afterPath="$PROJECT_DIR$/src/main/java/com/sf/servlet/RoleJsonListServlet.java" afterDir="false" />
-      <change afterPath="$PROJECT_DIR$/src/main/java/com/sf/servlet/RoleToAddServlet.java" afterDir="false" />
-      <change afterPath="$PROJECT_DIR$/src/main/java/com/sf/servlet/RoleToListServlet.java" afterDir="false" />
-      <change afterPath="$PROJECT_DIR$/src/main/webapp/css/animate.css" afterDir="false" />
-      <change afterPath="$PROJECT_DIR$/src/main/webapp/css/bootstrap.min.css" afterDir="false" />
-      <change afterPath="$PROJECT_DIR$/src/main/webapp/css/materialdesignicons.min.css" afterDir="false" />
-      <change afterPath="$PROJECT_DIR$/src/main/webapp/css/style.min.css" afterDir="false" />
-      <change afterPath="$PROJECT_DIR$/src/main/webapp/fonts/materialdesignicons.eot" afterDir="false" />
-      <change afterPath="$PROJECT_DIR$/src/main/webapp/fonts/materialdesignicons.svg" afterDir="false" />
-      <change afterPath="$PROJECT_DIR$/src/main/webapp/fonts/materialdesignicons.ttf" afterDir="false" />
-      <change afterPath="$PROJECT_DIR$/src/main/webapp/fonts/materialdesignicons.woff" afterDir="false" />
-      <change afterPath="$PROJECT_DIR$/src/main/webapp/fonts/materialdesignicons.woff2" afterDir="false" />
-      <change afterPath="$PROJECT_DIR$/src/main/webapp/images/captcha.png" afterDir="false" />
-      <change afterPath="$PROJECT_DIR$/src/main/webapp/images/gallery/1.jpg" afterDir="false" />
-      <change afterPath="$PROJECT_DIR$/src/main/webapp/images/gallery/10.jpg" afterDir="false" />
-      <change afterPath="$PROJECT_DIR$/src/main/webapp/images/gallery/11.jpg" afterDir="false" />
-      <change afterPath="$PROJECT_DIR$/src/main/webapp/images/gallery/13.jpg" afterDir="false" />
-      <change afterPath="$PROJECT_DIR$/src/main/webapp/images/gallery/14.jpg" afterDir="false" />
-      <change afterPath="$PROJECT_DIR$/src/main/webapp/images/gallery/15.jpg" afterDir="false" />
-      <change afterPath="$PROJECT_DIR$/src/main/webapp/images/gallery/16.jpg" afterDir="false" />
-      <change afterPath="$PROJECT_DIR$/src/main/webapp/images/gallery/17.jpg" afterDir="false" />
-      <change afterPath="$PROJECT_DIR$/src/main/webapp/images/gallery/2.jpg" afterDir="false" />
-      <change afterPath="$PROJECT_DIR$/src/main/webapp/images/gallery/3.jpg" afterDir="false" />
-      <change afterPath="$PROJECT_DIR$/src/main/webapp/images/gallery/4.jpg" afterDir="false" />
-      <change afterPath="$PROJECT_DIR$/src/main/webapp/images/gallery/5.jpg" afterDir="false" />
-      <change afterPath="$PROJECT_DIR$/src/main/webapp/images/gallery/6.jpg" afterDir="false" />
-      <change afterPath="$PROJECT_DIR$/src/main/webapp/images/gallery/7.jpg" afterDir="false" />
-      <change afterPath="$PROJECT_DIR$/src/main/webapp/images/gallery/8.jpg" afterDir="false" />
-      <change afterPath="$PROJECT_DIR$/src/main/webapp/images/gallery/9.jpg" afterDir="false" />
-      <change afterPath="$PROJECT_DIR$/src/main/webapp/images/img-slide-1.jpg" afterDir="false" />
-      <change afterPath="$PROJECT_DIR$/src/main/webapp/images/img-slide-2.jpg" afterDir="false" />
-      <change afterPath="$PROJECT_DIR$/src/main/webapp/images/img-slide-3.jpg" afterDir="false" />
-      <change afterPath="$PROJECT_DIR$/src/main/webapp/images/img-slide-4.jpg" afterDir="false" />
-      <change afterPath="$PROJECT_DIR$/src/main/webapp/images/img-slide-5.jpg" afterDir="false" />
-      <change afterPath="$PROJECT_DIR$/src/main/webapp/images/logo-ico.png" afterDir="false" />
-      <change afterPath="$PROJECT_DIR$/src/main/webapp/images/logo-sidebar.png" afterDir="false" />
-      <change afterPath="$PROJECT_DIR$/src/main/webapp/images/logo.png" afterDir="false" />
-      <change afterPath="$PROJECT_DIR$/src/main/webapp/images/users/avatar.jpg" afterDir="false" />
-      <change afterPath="$PROJECT_DIR$/src/main/webapp/js/Chart.js" afterDir="false" />
-      <change afterPath="$PROJECT_DIR$/src/main/webapp/js/bootstrap-colorpicker/bootstrap-colorpicker.js" afterDir="false" />
-      <change afterPath="$PROJECT_DIR$/src/main/webapp/js/bootstrap-colorpicker/bootstrap-colorpicker.min.js" afterDir="false" />
-      <change afterPath="$PROJECT_DIR$/src/main/webapp/js/bootstrap-colorpicker/css/bootstrap-colorpicker.css" afterDir="false" />
-      <change afterPath="$PROJECT_DIR$/src/main/webapp/js/bootstrap-colorpicker/css/bootstrap-colorpicker.css.map" afterDir="false" />
-      <change afterPath="$PROJECT_DIR$/src/main/webapp/js/bootstrap-colorpicker/css/bootstrap-colorpicker.min.css" afterDir="false" />
-      <change afterPath="$PROJECT_DIR$/src/main/webapp/js/bootstrap-colorpicker/css/bootstrap-colorpicker.min.css.map" afterDir="false" />
-      <change afterPath="$PROJECT_DIR$/src/main/webapp/js/bootstrap-colorpicker/img/bootstrap-colorpicker/alpha-horizontal.png" afterDir="false" />
-      <change afterPath="$PROJECT_DIR$/src/main/webapp/js/bootstrap-colorpicker/img/bootstrap-colorpicker/alpha.png" afterDir="false" />
-      <change afterPath="$PROJECT_DIR$/src/main/webapp/js/bootstrap-colorpicker/img/bootstrap-colorpicker/hue-horizontal.png" afterDir="false" />
-      <change afterPath="$PROJECT_DIR$/src/main/webapp/js/bootstrap-colorpicker/img/bootstrap-colorpicker/hue.png" afterDir="false" />
-      <change afterPath="$PROJECT_DIR$/src/main/webapp/js/bootstrap-colorpicker/img/bootstrap-colorpicker/saturation.png" afterDir="false" />
-      <change afterPath="$PROJECT_DIR$/src/main/webapp/js/bootstrap-datepicker/bootstrap-datepicker.js" afterDir="false" />
-      <change afterPath="$PROJECT_DIR$/src/main/webapp/js/bootstrap-datepicker/bootstrap-datepicker.min.js" afterDir="false" />
-      <change afterPath="$PROJECT_DIR$/src/main/webapp/js/bootstrap-datepicker/bootstrap-datepicker3.css" afterDir="false" />
-      <change afterPath="$PROJECT_DIR$/src/main/webapp/js/bootstrap-datepicker/bootstrap-datepicker3.css.map" afterDir="false" />
-      <change afterPath="$PROJECT_DIR$/src/main/webapp/js/bootstrap-datepicker/bootstrap-datepicker3.min.css" afterDir="false" />
-      <change afterPath="$PROJECT_DIR$/src/main/webapp/js/bootstrap-datepicker/bootstrap-datepicker3.min.css.map" afterDir="false" />
-      <change afterPath="$PROJECT_DIR$/src/main/webapp/js/bootstrap-datepicker/locales/bootstrap-datepicker.ar.min.js" afterDir="false" />
-      <change afterPath="$PROJECT_DIR$/src/main/webapp/js/bootstrap-datepicker/locales/bootstrap-datepicker.az.min.js" afterDir="false" />
-      <change afterPath="$PROJECT_DIR$/src/main/webapp/js/bootstrap-datepicker/locales/bootstrap-datepicker.bg.min.js" afterDir="false" />
-      <change afterPath="$PROJECT_DIR$/src/main/webapp/js/bootstrap-datepicker/locales/bootstrap-datepicker.bs.min.js" afterDir="false" />
-      <change afterPath="$PROJECT_DIR$/src/main/webapp/js/bootstrap-datepicker/locales/bootstrap-datepicker.ca.min.js" afterDir="false" />
-      <change afterPath="$PROJECT_DIR$/src/main/webapp/js/bootstrap-datepicker/locales/bootstrap-datepicker.cs.min.js" afterDir="false" />
-      <change afterPath="$PROJECT_DIR$/src/main/webapp/js/bootstrap-datepicker/locales/bootstrap-datepicker.cy.min.js" afterDir="false" />
-      <change afterPath="$PROJECT_DIR$/src/main/webapp/js/bootstrap-datepicker/locales/bootstrap-datepicker.da.min.js" afterDir="false" />
-      <change afterPath="$PROJECT_DIR$/src/main/webapp/js/bootstrap-datepicker/locales/bootstrap-datepicker.de.min.js" afterDir="false" />
-      <change afterPath="$PROJECT_DIR$/src/main/webapp/js/bootstrap-datepicker/locales/bootstrap-datepicker.el.min.js" afterDir="false" />
-      <change afterPath="$PROJECT_DIR$/src/main/webapp/js/bootstrap-datepicker/locales/bootstrap-datepicker.en-AU.min.js" afterDir="false" />
-      <change afterPath="$PROJECT_DIR$/src/main/webapp/js/bootstrap-datepicker/locales/bootstrap-datepicker.en-GB.min.js" afterDir="false" />
-      <change afterPath="$PROJECT_DIR$/src/main/webapp/js/bootstrap-datepicker/locales/bootstrap-datepicker.eo.min.js" afterDir="false" />
-      <change afterPath="$PROJECT_DIR$/src/main/webapp/js/bootstrap-datepicker/locales/bootstrap-datepicker.es.min.js" afterDir="false" />
-      <change afterPath="$PROJECT_DIR$/src/main/webapp/js/bootstrap-datepicker/locales/bootstrap-datepicker.et.min.js" afterDir="false" />
-      <change afterPath="$PROJECT_DIR$/src/main/webapp/js/bootstrap-datepicker/locales/bootstrap-datepicker.eu.min.js" afterDir="false" />
-      <change afterPath="$PROJECT_DIR$/src/main/webapp/js/bootstrap-datepicker/locales/bootstrap-datepicker.fa.min.js" afterDir="false" />
-      <change afterPath="$PROJECT_DIR$/src/main/webapp/js/bootstrap-datepicker/locales/bootstrap-datepicker.fi.min.js" afterDir="false" />
-      <change afterPath="$PROJECT_DIR$/src/main/webapp/js/bootstrap-datepicker/locales/bootstrap-datepicker.fo.min.js" afterDir="false" />
-      <change afterPath="$PROJECT_DIR$/src/main/webapp/js/bootstrap-datepicker/locales/bootstrap-datepicker.fr-CH.min.js" afterDir="false" />
-      <change afterPath="$PROJECT_DIR$/src/main/webapp/js/bootstrap-datepicker/locales/bootstrap-datepicker.fr.min.js" afterDir="false" />
-      <change afterPath="$PROJECT_DIR$/src/main/webapp/js/bootstrap-datepicker/locales/bootstrap-datepicker.gl.min.js" afterDir="false" />
-      <change afterPath="$PROJECT_DIR$/src/main/webapp/js/bootstrap-datepicker/locales/bootstrap-datepicker.he.min.js" afterDir="false" />
-      <change afterPath="$PROJECT_DIR$/src/main/webapp/js/bootstrap-datepicker/locales/bootstrap-datepicker.hr.min.js" afterDir="false" />
-      <change afterPath="$PROJECT_DIR$/src/main/webapp/js/bootstrap-datepicker/locales/bootstrap-datepicker.hu.min.js" afterDir="false" />
-      <change afterPath="$PROJECT_DIR$/src/main/webapp/js/bootstrap-datepicker/locales/bootstrap-datepicker.hy.min.js" afterDir="false" />
-      <change afterPath="$PROJECT_DIR$/src/main/webapp/js/bootstrap-datepicker/locales/bootstrap-datepicker.id.min.js" afterDir="false" />
-      <change afterPath="$PROJECT_DIR$/src/main/webapp/js/bootstrap-datepicker/locales/bootstrap-datepicker.is.min.js" afterDir="false" />
-      <change afterPath="$PROJECT_DIR$/src/main/webapp/js/bootstrap-datepicker/locales/bootstrap-datepicker.it-CH.min.js" afterDir="false" />
-      <change afterPath="$PROJECT_DIR$/src/main/webapp/js/bootstrap-datepicker/locales/bootstrap-datepicker.it.min.js" afterDir="false" />
-      <change afterPath="$PROJECT_DIR$/src/main/webapp/js/bootstrap-datepicker/locales/bootstrap-datepicker.ja.min.js" afterDir="false" />
-      <change afterPath="$PROJECT_DIR$/src/main/webapp/js/bootstrap-datepicker/locales/bootstrap-datepicker.ka.min.js" afterDir="false" />
-      <change afterPath="$PROJECT_DIR$/src/main/webapp/js/bootstrap-datepicker/locales/bootstrap-datepicker.kh.min.js" afterDir="false" />
-      <change afterPath="$PROJECT_DIR$/src/main/webapp/js/bootstrap-datepicker/locales/bootstrap-datepicker.kk.min.js" afterDir="false" />
-      <change afterPath="$PROJECT_DIR$/src/main/webapp/js/bootstrap-datepicker/locales/bootstrap-datepicker.ko.min.js" afterDir="false" />
-      <change afterPath="$PROJECT_DIR$/src/main/webapp/js/bootstrap-datepicker/locales/bootstrap-datepicker.kr.min.js" afterDir="false" />
-      <change afterPath="$PROJECT_DIR$/src/main/webapp/js/bootstrap-datepicker/locales/bootstrap-datepicker.lt.min.js" afterDir="false" />
-      <change afterPath="$PROJECT_DIR$/src/main/webapp/js/bootstrap-datepicker/locales/bootstrap-datepicker.lv.min.js" afterDir="false" />
-      <change afterPath="$PROJECT_DIR$/src/main/webapp/js/bootstrap-datepicker/locales/bootstrap-datepicker.me.min.js" afterDir="false" />
-      <change afterPath="$PROJECT_DIR$/src/main/webapp/js/bootstrap-datepicker/locales/bootstrap-datepicker.mk.min.js" afterDir="false" />
-      <change afterPath="$PROJECT_DIR$/src/main/webapp/js/bootstrap-datepicker/locales/bootstrap-datepicker.mn.min.js" afterDir="false" />
-      <change afterPath="$PROJECT_DIR$/src/main/webapp/js/bootstrap-datepicker/locales/bootstrap-datepicker.ms.min.js" afterDir="false" />
-      <change afterPath="$PROJECT_DIR$/src/main/webapp/js/bootstrap-datepicker/locales/bootstrap-datepicker.nb.min.js" afterDir="false" />
-      <change afterPath="$PROJECT_DIR$/src/main/webapp/js/bootstrap-datepicker/locales/bootstrap-datepicker.nl-BE.min.js" afterDir="false" />
-      <change afterPath="$PROJECT_DIR$/src/main/webapp/js/bootstrap-datepicker/locales/bootstrap-datepicker.nl.min.js" afterDir="false" />
-      <change afterPath="$PROJECT_DIR$/src/main/webapp/js/bootstrap-datepicker/locales/bootstrap-datepicker.no.min.js" afterDir="false" />
-      <change afterPath="$PROJECT_DIR$/src/main/webapp/js/bootstrap-datepicker/locales/bootstrap-datepicker.pl.min.js" afterDir="false" />
-      <change afterPath="$PROJECT_DIR$/src/main/webapp/js/bootstrap-datepicker/locales/bootstrap-datepicker.pt-BR.min.js" afterDir="false" />
-      <change afterPath="$PROJECT_DIR$/src/main/webapp/js/bootstrap-datepicker/locales/bootstrap-datepicker.pt.min.js" afterDir="false" />
-      <change afterPath="$PROJECT_DIR$/src/main/webapp/js/bootstrap-datepicker/locales/bootstrap-datepicker.ro.min.js" afterDir="false" />
-      <change afterPath="$PROJECT_DIR$/src/main/webapp/js/bootstrap-datepicker/locales/bootstrap-datepicker.rs-latin.min.js" afterDir="false" />
-      <change afterPath="$PROJECT_DIR$/src/main/webapp/js/bootstrap-datepicker/locales/bootstrap-datepicker.rs.min.js" afterDir="false" />
-      <change afterPath="$PROJECT_DIR$/src/main/webapp/js/bootstrap-datepicker/locales/bootstrap-datepicker.ru.min.js" afterDir="false" />
-      <change afterPath="$PROJECT_DIR$/src/main/webapp/js/bootstrap-datepicker/locales/bootstrap-datepicker.sk.min.js" afterDir="false" />
-      <change afterPath="$PROJECT_DIR$/src/main/webapp/js/bootstrap-datepicker/locales/bootstrap-datepicker.sl.min.js" afterDir="false" />
-      <change afterPath="$PROJECT_DIR$/src/main/webapp/js/bootstrap-datepicker/locales/bootstrap-datepicker.sq.min.js" afterDir="false" />
-      <change afterPath="$PROJECT_DIR$/src/main/webapp/js/bootstrap-datepicker/locales/bootstrap-datepicker.sr-latin.min.js" afterDir="false" />
-      <change afterPath="$PROJECT_DIR$/src/main/webapp/js/bootstrap-datepicker/locales/bootstrap-datepicker.sr.min.js" afterDir="false" />
-      <change afterPath="$PROJECT_DIR$/src/main/webapp/js/bootstrap-datepicker/locales/bootstrap-datepicker.sv.min.js" afterDir="false" />
-      <change afterPath="$PROJECT_DIR$/src/main/webapp/js/bootstrap-datepicker/locales/bootstrap-datepicker.sw.min.js" afterDir="false" />
-      <change afterPath="$PROJECT_DIR$/src/main/webapp/js/bootstrap-datepicker/locales/bootstrap-datepicker.th.min.js" afterDir="false" />
-      <change afterPath="$PROJECT_DIR$/src/main/webapp/js/bootstrap-datepicker/locales/bootstrap-datepicker.tr.min.js" afterDir="false" />
-      <change afterPath="$PROJECT_DIR$/src/main/webapp/js/bootstrap-datepicker/locales/bootstrap-datepicker.uk.min.js" afterDir="false" />
-      <change afterPath="$PROJECT_DIR$/src/main/webapp/js/bootstrap-datepicker/locales/bootstrap-datepicker.vi.min.js" afterDir="false" />
-      <change afterPath="$PROJECT_DIR$/src/main/webapp/js/bootstrap-datepicker/locales/bootstrap-datepicker.zh-CN.min.js" afterDir="false" />
-      <change afterPath="$PROJECT_DIR$/src/main/webapp/js/bootstrap-datepicker/locales/bootstrap-datepicker.zh-TW.min.js" afterDir="false" />
-      <change afterPath="$PROJECT_DIR$/src/main/webapp/js/bootstrap-datetimepicker/bootstrap-datetimepicker.css" afterDir="false" />
-      <change afterPath="$PROJECT_DIR$/src/main/webapp/js/bootstrap-datetimepicker/bootstrap-datetimepicker.js" afterDir="false" />
-      <change afterPath="$PROJECT_DIR$/src/main/webapp/js/bootstrap-datetimepicker/bootstrap-datetimepicker.min.css" afterDir="false" />
-      <change afterPath="$PROJECT_DIR$/src/main/webapp/js/bootstrap-datetimepicker/bootstrap-datetimepicker.min.js" afterDir="false" />
-      <change afterPath="$PROJECT_DIR$/src/main/webapp/js/bootstrap-datetimepicker/locale/af.js" afterDir="false" />
-      <change afterPath="$PROJECT_DIR$/src/main/webapp/js/bootstrap-datetimepicker/locale/ar-ma.js" afterDir="false" />
-      <change afterPath="$PROJECT_DIR$/src/main/webapp/js/bootstrap-datetimepicker/locale/ar-sa.js" afterDir="false" />
-      <change afterPath="$PROJECT_DIR$/src/main/webapp/js/bootstrap-datetimepicker/locale/ar-tn.js" afterDir="false" />
-      <change afterPath="$PROJECT_DIR$/src/main/webapp/js/bootstrap-datetimepicker/locale/ar.js" afterDir="false" />
-      <change afterPath="$PROJECT_DIR$/src/main/webapp/js/bootstrap-datetimepicker/locale/az.js" afterDir="false" />
-      <change afterPath="$PROJECT_DIR$/src/main/webapp/js/bootstrap-datetimepicker/locale/be.js" afterDir="false" />
-      <change afterPath="$PROJECT_DIR$/src/main/webapp/js/bootstrap-datetimepicker/locale/bg.js" afterDir="false" />
-      <change afterPath="$PROJECT_DIR$/src/main/webapp/js/bootstrap-datetimepicker/locale/bn.js" afterDir="false" />
-      <change afterPath="$PROJECT_DIR$/src/main/webapp/js/bootstrap-datetimepicker/locale/bo.js" afterDir="false" />
-      <change afterPath="$PROJECT_DIR$/src/main/webapp/js/bootstrap-datetimepicker/locale/br.js" afterDir="false" />
-      <change afterPath="$PROJECT_DIR$/src/main/webapp/js/bootstrap-datetimepicker/locale/bs.js" afterDir="false" />
-      <change afterPath="$PROJECT_DIR$/src/main/webapp/js/bootstrap-datetimepicker/locale/ca.js" afterDir="false" />
-      <change afterPath="$PROJECT_DIR$/src/main/webapp/js/bootstrap-datetimepicker/locale/cs.js" afterDir="false" />
-      <change afterPath="$PROJECT_DIR$/src/main/webapp/js/bootstrap-datetimepicker/locale/cv.js" afterDir="false" />
-      <change afterPath="$PROJECT_DIR$/src/main/webapp/js/bootstrap-datetimepicker/locale/cy.js" afterDir="false" />
-      <change afterPath="$PROJECT_DIR$/src/main/webapp/js/bootstrap-datetimepicker/locale/da.js" afterDir="false" />
-      <change afterPath="$PROJECT_DIR$/src/main/webapp/js/bootstrap-datetimepicker/locale/de-at.js" afterDir="false" />
-      <change afterPath="$PROJECT_DIR$/src/main/webapp/js/bootstrap-datetimepicker/locale/de.js" afterDir="false" />
-      <change afterPath="$PROJECT_DIR$/src/main/webapp/js/bootstrap-datetimepicker/locale/el.js" afterDir="false" />
-      <change afterPath="$PROJECT_DIR$/src/main/webapp/js/bootstrap-datetimepicker/locale/en-au.js" afterDir="false" />
-      <change afterPath="$PROJECT_DIR$/src/main/webapp/js/bootstrap-datetimepicker/locale/en-ca.js" afterDir="false" />
-      <change afterPath="$PROJECT_DIR$/src/main/webapp/js/bootstrap-datetimepicker/locale/en-gb.js" afterDir="false" />
-      <change afterPath="$PROJECT_DIR$/src/main/webapp/js/bootstrap-datetimepicker/locale/eo.js" afterDir="false" />
-      <change afterPath="$PROJECT_DIR$/src/main/webapp/js/bootstrap-datetimepicker/locale/es.js" afterDir="false" />
-      <change afterPath="$PROJECT_DIR$/src/main/webapp/js/bootstrap-datetimepicker/locale/et.js" afterDir="false" />
-      <change afterPath="$PROJECT_DIR$/src/main/webapp/js/bootstrap-datetimepicker/locale/eu.js" afterDir="false" />
-      <change afterPath="$PROJECT_DIR$/src/main/webapp/js/bootstrap-datetimepicker/locale/fa.js" afterDir="false" />
-      <change afterPath="$PROJECT_DIR$/src/main/webapp/js/bootstrap-datetimepicker/locale/fi.js" afterDir="false" />
-      <change afterPath="$PROJECT_DIR$/src/main/webapp/js/bootstrap-datetimepicker/locale/fo.js" afterDir="false" />
-      <change afterPath="$PROJECT_DIR$/src/main/webapp/js/bootstrap-datetimepicker/locale/fr-ca.js" afterDir="false" />
-      <change afterPath="$PROJECT_DIR$/src/main/webapp/js/bootstrap-datetimepicker/locale/fr.js" afterDir="false" />
-      <change afterPath="$PROJECT_DIR$/src/main/webapp/js/bootstrap-datetimepicker/locale/fy.js" afterDir="false" />
-      <change afterPath="$PROJECT_DIR$/src/main/webapp/js/bootstrap-datetimepicker/locale/gl.js" afterDir="false" />
-      <change afterPath="$PROJECT_DIR$/src/main/webapp/js/bootstrap-datetimepicker/locale/he.js" afterDir="false" />
-      <change afterPath="$PROJECT_DIR$/src/main/webapp/js/bootstrap-datetimepicker/locale/hi.js" afterDir="false" />
-      <change afterPath="$PROJECT_DIR$/src/main/webapp/js/bootstrap-datetimepicker/locale/hr.js" afterDir="false" />
-      <change afterPath="$PROJECT_DIR$/src/main/webapp/js/bootstrap-datetimepicker/locale/hu.js" afterDir="false" />
-      <change afterPath="$PROJECT_DIR$/src/main/webapp/js/bootstrap-datetimepicker/locale/hy-am.js" afterDir="false" />
-      <change afterPath="$PROJECT_DIR$/src/main/webapp/js/bootstrap-datetimepicker/locale/id.js" afterDir="false" />
-      <change afterPath="$PROJECT_DIR$/src/main/webapp/js/bootstrap-datetimepicker/locale/is.js" afterDir="false" />
-      <change afterPath="$PROJECT_DIR$/src/main/webapp/js/bootstrap-datetimepicker/locale/it.js" afterDir="false" />
-      <change afterPath="$PROJECT_DIR$/src/main/webapp/js/bootstrap-datetimepicker/locale/ja.js" afterDir="false" />
-      <change afterPath="$PROJECT_DIR$/src/main/webapp/js/bootstrap-datetimepicker/locale/jv.js" afterDir="false" />
-      <change afterPath="$PROJECT_DIR$/src/main/webapp/js/bootstrap-datetimepicker/locale/ka.js" afterDir="false" />
-      <change afterPath="$PROJECT_DIR$/src/main/webapp/js/bootstrap-datetimepicker/locale/km.js" afterDir="false" />
-      <change afterPath="$PROJECT_DIR$/src/main/webapp/js/bootstrap-datetimepicker/locale/ko.js" afterDir="false" />
-      <change afterPath="$PROJECT_DIR$/src/main/webapp/js/bootstrap-datetimepicker/locale/lb.js" afterDir="false" />
-      <change afterPath="$PROJECT_DIR$/src/main/webapp/js/bootstrap-datetimepicker/locale/lt.js" afterDir="false" />
-      <change afterPath="$PROJECT_DIR$/src/main/webapp/js/bootstrap-datetimepicker/locale/lv.js" afterDir="false" />
-      <change afterPath="$PROJECT_DIR$/src/main/webapp/js/bootstrap-datetimepicker/locale/me.js" afterDir="false" />
-      <change afterPath="$PROJECT_DIR$/src/main/webapp/js/bootstrap-datetimepicker/locale/mk.js" afterDir="false" />
-      <change afterPath="$PROJECT_DIR$/src/main/webapp/js/bootstrap-datetimepicker/locale/ml.js" afterDir="false" />
-      <change afterPath="$PROJECT_DIR$/src/main/webapp/js/bootstrap-datetimepicker/locale/mr.js" afterDir="false" />
-      <change afterPath="$PROJECT_DIR$/src/main/webapp/js/bootstrap-datetimepicker/locale/ms-my.js" afterDir="false" />
-      <change afterPath="$PROJECT_DIR$/src/main/webapp/js/bootstrap-datetimepicker/locale/ms.js" afterDir="false" />
-      <change afterPath="$PROJECT_DIR$/src/main/webapp/js/bootstrap-datetimepicker/locale/my.js" afterDir="false" />
-      <change afterPath="$PROJECT_DIR$/src/main/webapp/js/bootstrap-datetimepicker/locale/nb.js" afterDir="false" />
-      <change afterPath="$PROJECT_DIR$/src/main/webapp/js/bootstrap-datetimepicker/locale/ne.js" afterDir="false" />
-      <change afterPath="$PROJECT_DIR$/src/main/webapp/js/bootstrap-datetimepicker/locale/nl.js" afterDir="false" />
-      <change afterPath="$PROJECT_DIR$/src/main/webapp/js/bootstrap-datetimepicker/locale/nn.js" afterDir="false" />
-      <change afterPath="$PROJECT_DIR$/src/main/webapp/js/bootstrap-datetimepicker/locale/pl.js" afterDir="false" />
-      <change afterPath="$PROJECT_DIR$/src/main/webapp/js/bootstrap-datetimepicker/locale/pt-br.js" afterDir="false" />
-      <change afterPath="$PROJECT_DIR$/src/main/webapp/js/bootstrap-datetimepicker/locale/pt.js" afterDir="false" />
-      <change afterPath="$PROJECT_DIR$/src/main/webapp/js/bootstrap-datetimepicker/locale/ro.js" afterDir="false" />
-      <change afterPath="$PROJECT_DIR$/src/main/webapp/js/bootstrap-datetimepicker/locale/ru.js" afterDir="false" />
-      <change afterPath="$PROJECT_DIR$/src/main/webapp/js/bootstrap-datetimepicker/locale/si.js" afterDir="false" />
-      <change afterPath="$PROJECT_DIR$/src/main/webapp/js/bootstrap-datetimepicker/locale/sk.js" afterDir="false" />
-      <change afterPath="$PROJECT_DIR$/src/main/webapp/js/bootstrap-datetimepicker/locale/sl.js" afterDir="false" />
-      <change afterPath="$PROJECT_DIR$/src/main/webapp/js/bootstrap-datetimepicker/locale/sq.js" afterDir="false" />
-      <change afterPath="$PROJECT_DIR$/src/main/webapp/js/bootstrap-datetimepicker/locale/sr-cyrl.js" afterDir="false" />
-      <change afterPath="$PROJECT_DIR$/src/main/webapp/js/bootstrap-datetimepicker/locale/sr.js" afterDir="false" />
-      <change afterPath="$PROJECT_DIR$/src/main/webapp/js/bootstrap-datetimepicker/locale/sv.js" afterDir="false" />
-      <change afterPath="$PROJECT_DIR$/src/main/webapp/js/bootstrap-datetimepicker/locale/ta.js" afterDir="false" />
-      <change afterPath="$PROJECT_DIR$/src/main/webapp/js/bootstrap-datetimepicker/locale/th.js" afterDir="false" />
-      <change afterPath="$PROJECT_DIR$/src/main/webapp/js/bootstrap-datetimepicker/locale/tl-ph.js" afterDir="false" />
-      <change afterPath="$PROJECT_DIR$/src/main/webapp/js/bootstrap-datetimepicker/locale/tr.js" afterDir="false" />
-      <change afterPath="$PROJECT_DIR$/src/main/webapp/js/bootstrap-datetimepicker/locale/tzl.js" afterDir="false" />
-      <change afterPath="$PROJECT_DIR$/src/main/webapp/js/bootstrap-datetimepicker/locale/tzm-latn.js" afterDir="false" />
-      <change afterPath="$PROJECT_DIR$/src/main/webapp/js/bootstrap-datetimepicker/locale/tzm.js" afterDir="false" />
-      <change afterPath="$PROJECT_DIR$/src/main/webapp/js/bootstrap-datetimepicker/locale/uk.js" afterDir="false" />
-      <change afterPath="$PROJECT_DIR$/src/main/webapp/js/bootstrap-datetimepicker/locale/uz.js" afterDir="false" />
-      <change afterPath="$PROJECT_DIR$/src/main/webapp/js/bootstrap-datetimepicker/locale/vi.js" afterDir="false" />
-      <change afterPath="$PROJECT_DIR$/src/main/webapp/js/bootstrap-datetimepicker/locale/zh-cn.js" afterDir="false" />
-      <change afterPath="$PROJECT_DIR$/src/main/webapp/js/bootstrap-datetimepicker/locale/zh-tw.js" afterDir="false" />
-      <change afterPath="$PROJECT_DIR$/src/main/webapp/js/bootstrap-datetimepicker/moment.min.js" afterDir="false" />
-      <change afterPath="$PROJECT_DIR$/src/main/webapp/js/bootstrap-notify.min.js" afterDir="false" />
-      <change afterPath="$PROJECT_DIR$/src/main/webapp/js/bootstrap.min.js" afterDir="false" />
-      <change afterPath="$PROJECT_DIR$/src/main/webapp/js/chosen.jquery.min.js" afterDir="false" />
-      <change afterPath="$PROJECT_DIR$/src/main/webapp/js/ion-rangeslider/ion.rangeSlider.min.css" afterDir="false" />
-      <change afterPath="$PROJECT_DIR$/src/main/webapp/js/ion-rangeslider/ion.rangeSlider.min.js" afterDir="false" />
-      <change afterPath="$PROJECT_DIR$/src/main/webapp/js/jconfirm/jquery-confirm.min.css" afterDir="false" />
-      <change afterPath="$PROJECT_DIR$/src/main/webapp/js/jconfirm/jquery-confirm.min.js" afterDir="false" />
-      <change afterPath="$PROJECT_DIR$/src/main/webapp/js/jquery-tags-input/jquery.tagsinput.min.css" afterDir="false" />
-      <change afterPath="$PROJECT_DIR$/src/main/webapp/js/jquery-tags-input/jquery.tagsinput.min.js" afterDir="false" />
-      <change afterPath="$PROJECT_DIR$/src/main/webapp/js/jquery.bootstrap.wizard.min.js" afterDir="false" />
-      <change afterPath="$PROJECT_DIR$/src/main/webapp/js/jquery.min.js" afterDir="false" />
-      <change afterPath="$PROJECT_DIR$/src/main/webapp/js/lightyear.js" afterDir="false" />
-      <change afterPath="$PROJECT_DIR$/src/main/webapp/js/main.min.js" afterDir="false" />
-      <change afterPath="$PROJECT_DIR$/src/main/webapp/js/perfect-scrollbar.min.js" afterDir="false" />
-      <change afterPath="$PROJECT_DIR$/src/main/webapp/menu.jsp" afterDir="false" />
-      <change afterPath="$PROJECT_DIR$/src/main/webapp/role_add.jsp" afterDir="false" />
-      <change afterPath="$PROJECT_DIR$/src/main/webapp/role_list.jsp" afterDir="false" />
-      <change afterPath="$PROJECT_DIR$/src/main/webapp/role_update.jsp" afterDir="false" />
+      <change afterPath="$PROJECT_DIR$/src/main/java/com/sf/servlet/RoleDeleteServlet.java" afterDir="false" />
+      <change afterPath="$PROJECT_DIR$/src/main/java/com/sf/servlet/RoleToUpdateServlet.java" afterDir="false" />
+      <change afterPath="$PROJECT_DIR$/src/main/java/com/sf/servlet/RoleUpdateServlet.java" afterDir="false" />
       <change beforePath="$PROJECT_DIR$/.idea/workspace.xml" beforeDir="false" afterPath="$PROJECT_DIR$/.idea/workspace.xml" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/main/java/com/sf/filter/CharacterEncodingFilter.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/sf/filter/CharacterEncodingFilter.java" afterDir="false" />
       <change beforePath="$PROJECT_DIR$/src/main/java/com/sf/service/impl/RoleServiceImpl.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/sf/service/impl/RoleServiceImpl.java" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/src/main/webapp/WEB-INF/web.xml" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/webapp/WEB-INF/web.xml" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/src/main/webapp/index.jsp" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/webapp/index.jsp" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/main/webapp/role_list.jsp" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/webapp/role_list.jsp" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/main/webapp/role_update.jsp" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/webapp/role_update.jsp" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/target/classes/com/sf/filter/CharacterEncodingFilter.class" beforeDir="false" afterPath="$PROJECT_DIR$/target/classes/com/sf/filter/CharacterEncodingFilter.class" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/target/classes/com/sf/service/impl/RoleServiceImpl.class" beforeDir="false" afterPath="$PROJECT_DIR$/target/classes/com/sf/service/impl/RoleServiceImpl.class" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/target/gn_oa_vip27.war" beforeDir="false" afterPath="$PROJECT_DIR$/target/gn_oa_vip27.war" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/target/gn_oa_vip27/WEB-INF/classes/com/sf/filter/CharacterEncodingFilter.class" beforeDir="false" afterPath="$PROJECT_DIR$/target/gn_oa_vip27/WEB-INF/classes/com/sf/filter/CharacterEncodingFilter.class" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/target/gn_oa_vip27/WEB-INF/classes/com/sf/service/impl/RoleServiceImpl.class" beforeDir="false" afterPath="$PROJECT_DIR$/target/gn_oa_vip27/WEB-INF/classes/com/sf/service/impl/RoleServiceImpl.class" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/target/gn_oa_vip27/role_list.jsp" beforeDir="false" afterPath="$PROJECT_DIR$/target/gn_oa_vip27/role_list.jsp" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/target/gn_oa_vip27/role_update.jsp" beforeDir="false" afterPath="$PROJECT_DIR$/target/gn_oa_vip27/role_update.jsp" afterDir="false" />
     </list>
     <option name="SHOW_DIALOG" value="false" />
     <option name="HIGHLIGHT_CONFLICTS" value="true" />
@@ -281,27 +60,28 @@
   <component name="ProjectViewState">
     <option name="showLibraryContents" value="true" />
   </component>
-  <component name="PropertiesComponent"><![CDATA[{
-  "keyToString": {
-    "RunOnceActivity.OpenProjectViewOnStart": "true",
-    "RunOnceActivity.ShowReadmeOnStart": "true",
-    "SHARE_PROJECT_CONFIGURATION_FILES": "true",
-    "WebServerToolWindowFactoryState": "false",
-    "last_opened_file_path": "D:/Program Files/IntelliJ IDEA 2019.3.3/VIPJAVA/gn_oa_vip27/src/main/webapp",
-    "node.js.detected.package.eslint": "true",
-    "node.js.detected.package.tslint": "true",
-    "node.js.selected.package.eslint": "(autodetect)",
-    "node.js.selected.package.tslint": "(autodetect)",
-    "project.structure.last.edited": "Modules",
-    "project.structure.proportion": "0.0",
-    "project.structure.side.proportion": "0.0",
-    "settings.editor.selected.configurable": "editor.preferences.fonts.default",
-    "vue.rearranger.settings.migration": "true"
+  <component name="PropertiesComponent">{
+  &quot;keyToString&quot;: {
+    &quot;RunOnceActivity.OpenProjectViewOnStart&quot;: &quot;true&quot;,
+    &quot;RunOnceActivity.ShowReadmeOnStart&quot;: &quot;true&quot;,
+    &quot;SHARE_PROJECT_CONFIGURATION_FILES&quot;: &quot;true&quot;,
+    &quot;WebServerToolWindowFactoryState&quot;: &quot;false&quot;,
+    &quot;last_opened_file_path&quot;: &quot;D:/Program Files/IntelliJ IDEA 2019.3.3/VIPJAVA/gn_oa_vip27/src/main/webapp&quot;,
+    &quot;node.js.detected.package.eslint&quot;: &quot;true&quot;,
+    &quot;node.js.detected.package.tslint&quot;: &quot;true&quot;,
+    &quot;node.js.selected.package.eslint&quot;: &quot;(autodetect)&quot;,
+    &quot;node.js.selected.package.tslint&quot;: &quot;(autodetect)&quot;,
+    &quot;project.structure.last.edited&quot;: &quot;Modules&quot;,
+    &quot;project.structure.proportion&quot;: &quot;0.0&quot;,
+    &quot;project.structure.side.proportion&quot;: &quot;0.0&quot;,
+    &quot;settings.editor.selected.configurable&quot;: &quot;editor.preferences.fonts.default&quot;,
+    &quot;vue.rearranger.settings.migration&quot;: &quot;true&quot;
   }
-}]]></component>
+}</component>
   <component name="RecentsManager">
     <key name="CopyFile.RECENT_KEYS">
       <recent name="D:\Program Files\IntelliJ IDEA 2019.3.3\VIPJAVA\gn_oa_vip27\src\main\webapp" />
+      <recent name="D:\Program Files\IntelliJ IDEA 2019.3.3\VIPJAVA\gn_oa_vip27\src\main\java\com\sf\servlet" />
       <recent name="D:\Program Files\IntelliJ IDEA 2019.3.3\VIPJAVA\gn_oa_vip27\src\main\resources" />
     </key>
   </component>
@@ -388,7 +168,10 @@
       <option name="presentableId" value="Default" />
       <updated>1700044489277</updated>
       <workItem from="1700044490943" duration="8247000" />
-      <workItem from="1700355237314" duration="21977000" />
+      <workItem from="1700355237314" duration="24623000" />
+      <workItem from="1700638607632" duration="4640000" />
+      <workItem from="1700643921651" duration="9794000" />
+      <workItem from="1700703381366" duration="27000" />
     </task>
     <servers />
   </component>

gn_oa_vip27/src/main/java/com/sf/filter/CharacterEncodingFilter.java

@@ -14,11 +14,9 @@ public class CharacterEncodingFilter implements Filter {
     public void doFilter(ServletRequest request, ServletResponse response, FilterChain chain) throws IOException, ServletException {
     request.setCharacterEncoding("utf-8");
     response.setCharacterEncoding("utf-8");
-    response.setContentType("text/html;charset=UTF-8");
 //    放行
         chain.doFilter(request,response);
     }
-
     @Override
     public void destroy() {
 

gn_oa_vip27/src/main/java/com/sf/service/impl/RoleServiceImpl.java

@@ -110,7 +110,7 @@ public class RoleServiceImpl implements RoleService {
         try {
             connection = JdbcUtil.getConnection();
             connection.setAutoCommit(false);
-            String sql = "SELECT role_name as roleName , status as status FROM role WHERE role_id = ?";
+            String sql = "SELECT role_id as roleId ,role_name as roleName , status as status FROM role WHERE role_id = ?";
             Role roleByRoleId = roleDao.getRoleByRoleId(connection, Role.class, sql, roleId);
             connection.commit();
             return roleByRoleId;

gn_oa_vip27/src/main/java/com/sf/servlet/RoleDeleteServlet.java

@@ -0,0 +1,31 @@
+package com.sf.servlet;
+
+import com.sf.service.RoleService;
+import com.sf.service.impl.RoleServiceImpl;
+
+import javax.servlet.*;
+import javax.servlet.http.*;
+import javax.servlet.annotation.*;
+import java.io.IOException;
+
+/**
+ * 这是角色删除的servlet
+ */
+@WebServlet(name = "RoleDeleteServlet", value = "/RoleDeleteServlet")
+public class RoleDeleteServlet extends HttpServlet {
+    private RoleService roleService = new RoleServiceImpl();
+    @Override
+    protected void doGet(HttpServletRequest request, HttpServletResponse response) throws ServletException, IOException {
+    doPost(request,response);
+    }
+
+    @Override
+    protected void doPost(HttpServletRequest request, HttpServletResponse response) throws ServletException, IOException {
+        //接受前端传过来的参数
+        String roleId = request.getParameter("roleId");
+        System.out.println("==========="+roleId);
+        roleService.deleteRoleByRoleId(Integer.parseInt(roleId));
+//        删除完成后需要重定向到列表页
+        response.sendRedirect("RoleToListServlet");
+    }
+}

gn_oa_vip27/src/main/java/com/sf/servlet/RoleToUpdateServlet.java

@@ -0,0 +1,33 @@
+package com.sf.servlet;
+
+import com.sf.entity.Role;
+import com.sf.service.RoleService;
+import com.sf.service.impl.RoleServiceImpl;
+
+import javax.servlet.*;
+import javax.servlet.http.*;
+import javax.servlet.annotation.*;
+import java.io.IOException;
+
+/**
+ * 跳转到更新页面
+ */
+@WebServlet(name = "RoleToUpdateServlet", value = "/RoleToUpdateServlet")
+public class RoleToUpdateServlet extends HttpServlet {
+    private RoleService roleService = new RoleServiceImpl();
+    @Override
+    protected void doGet(HttpServletRequest request, HttpServletResponse response) throws ServletException, IOException {
+    doPost(request,response);
+    }
+
+    @Override
+    protected void doPost(HttpServletRequest request, HttpServletResponse response) throws ServletException, IOException {
+///
+        String roleId = request.getParameter("roleId");
+//        根据roleId查询用户信息
+        Role role = roleService.getRoleByRoleId(Integer.parseInt(roleId));
+        request.setAttribute("role",role);
+//        转发到更新页面
+        request.getRequestDispatcher("/role_update.jsp").forward(request,response);
+    }
+}

gn_oa_vip27/src/main/java/com/sf/servlet/RoleUpdateServlet.java

@@ -0,0 +1,37 @@
+package com.sf.servlet;
+
+import com.sf.entity.Role;
+import com.sf.service.RoleService;
+import com.sf.service.impl.RoleServiceImpl;
+
+import javax.servlet.*;
+import javax.servlet.http.*;
+import javax.servlet.annotation.*;
+import java.io.IOException;
+
+/**
+ * 角色更新的servlet
+ */
+@WebServlet(name = "RoleUpdateServlet", value = "/RoleUpdateServlet")
+public class RoleUpdateServlet extends HttpServlet {
+    private RoleService roleService = new RoleServiceImpl();
+    @Override
+    protected void doGet(HttpServletRequest request, HttpServletResponse response) throws ServletException, IOException {
+        doPost(request,response);
+    }
+
+    @Override
+    protected void doPost(HttpServletRequest request, HttpServletResponse response) throws ServletException, IOException {
+//        获取到前端传过来的参数
+        String roleId = request.getParameter("roleId");
+        String roleName = request.getParameter("roleName");
+        String status = request.getParameter("status");
+        Role role = new Role();
+        role.setRoleId(Integer.parseInt(roleId));
+        role.setRoleName(roleName);
+        role.setStatus(status);
+        roleService.updateRole(role);
+//        更新完成后   回到列表页
+        response.sendRedirect("RoleToListServlet");
+    }
+}

gn_oa_vip27/src/main/webapp/role_list.jsp

@@ -1,137 +1,109 @@
-<%@ page contentType="text/html;charset=UTF-8" language="java" %>
+<%@ page language="java" contentType="text/html; charset=UTF-8"
+		 pageEncoding="UTF-8"%>
 <!DOCTYPE html>
 <html lang="zh">
 <head>
-    <meta charset="utf-8">
-    <meta name="viewport" content="width=device-width, initial-scale=1, maximum-scale=1, user-scalable=no" />
-    <title>首页 - 光年(角色列表)OA管理系统</title>
-    <link rel="icon" href="favicon.ico" type="image/ico">
-    <meta name="keywords" content="ukoko.cn">
-    <meta name="description" content="解决中小企业...">
-    <meta name="author" content="夜泊">
-    <link href="css/bootstrap.min.css" rel="stylesheet">
-    <link href="css/materialdesignicons.min.css" rel="stylesheet">
-    <link href="css/style.min.css" rel="stylesheet">
+	<meta charset="utf-8">
+	<meta name="viewport" content="width=device-width, initial-scale=1, maximum-scale=1, user-scalable=no" />
+	<title>首页 - 光年(角色列表)OA管理系统</title>
+	<link rel="icon" href="favicon.ico" type="image/ico">
+	<meta name="keywords" content="ukoko.cn">
+	<meta name="description" content="解决中小企业...">
+	<meta name="author" content="夜泊">
+	<link href="css/bootstrap.min.css" rel="stylesheet">
+	<link href="css/materialdesignicons.min.css" rel="stylesheet">
+	<link href="css/style.min.css" rel="stylesheet">
 </head>
 
 <body>
 <div class="lyear-layout-web">
-    <div class="lyear-layout-container">
-        <!--左侧导航-->
-        <aside class="lyear-layout-sidebar">
-
-            <!-- logo -->
-            <div id="logo" class="sidebar-header">
-                <a href="index.html"><img src="images/logo-sidebar.png" title="LightYear" alt="LightYear" /></a>
-            </div>
-            <div class="lyear-layout-sidebar-scroll">
-
-<%--                这是左侧导航栏的位置--%>
-                <jsp:include page="menu.jsp"></jsp:include>
-            </div>
-
-        </aside>
-        <!--End 左侧导航-->
-
-        <!--头部信息-->
-        <header class="lyear-layout-header">
-
-            <nav class="navbar navbar-default">
-                <div class="topbar">
-
-                    <div class="topbar-left">
-                        <div class="lyear-aside-toggler">
-                            <span class="lyear-toggler-bar"></span>
-                            <span class="lyear-toggler-bar"></span>
-                            <span class="lyear-toggler-bar"></span>
-                        </div>
-                        <span class="navbar-page-title"> 后台首页 </span>
-                    </div>
-
-                    <ul class="topbar-right">
-                        <li class="dropdown dropdown-profile">
-                            <a href="javascript:void(0)" data-toggle="dropdown">
-                                <img class="img-avatar img-avatar-48 m-r-10" src="images/users/avatar.jpg" alt="笔下光年" />
-                                <span>笔下光年 <span class="caret"></span></span>
-                            </a>
-                            <ul class="dropdown-menu dropdown-menu-right">
-                                <li> <a href="lyear_pages_profile.html"><i class="mdi mdi-account"></i> 个人信息</a> </li>
-                                <li> <a href="lyear_pages_edit_pwd.html"><i class="mdi mdi-lock-outline"></i> 修改密码</a> </li>
-                                <li class="divider"></li>
-                                <li> <a href="lyear_pages_login.html"><i class="mdi mdi-logout-variant"></i> 退出登录</a> </li>
-                            </ul>
-                        </li>
-                    </ul>
-
-                </div>
-            </nav>
-
-        </header>
-        <!--End 头部信息-->
-
-        <!--页面主要内容-->
-        <main class="lyear-layout-content">
-
-            <div class="container-fluid">
-                <!-- 内容区 -->
-                <div class="row">
-                    <div class="col-lg-12">
-                        <div class="card">
-                            <div class="table-responsive">
-                                <table class="table">
-                                    <thead>
-                                    <tr>
-                                        <th>序号</th>
-                                        <th>角色名称</th>
-                                        <th>有/无效</th>
-                                        <th colspan="2" class="text-center">操作</th>
-                                    </tr>
-                                    </thead>
-<%--                                    添加body 的id--%>
-                                    <tbody id="tbody">
-
-
-                                    </tbody>
-                                </table>
-                            </div>
-                        </div>
-                    </div>
-
-                </div>
-                <!-- 内容区结束 -->
-                <div class="row">
-                    <div class="col-lg-4 text-left">
-                        <a class="btn btn-info" href="RoleToAddServlet">添加角色</a>
-                    </div>
-                    <div class="col-lg-4 text-center">
-                        <nav>
-<%--                            在ul加以恶个id--%>
-                            <ul class="pagination" id="pageId">
-<%--                                <li>--%>
-<%--                                    <a href="#!">--%>
-<%--                                        <span><i class="mdi mdi-chevron-left"></i></span>--%>
-<%--                                    </a>--%>
-<%--                                </li>--%>
-<%--                                <li class="active"><a href="#">1</a></li>--%>
-<%--                                <li><a href="#!">2</a></li>--%>
-<%--                                <li><a href="#!">3</a></li>--%>
-<%--                                <li>--%>
-<%--                                    <a href="#!">--%>
-<%--                                        <span><i class="mdi mdi-chevron-right"></i></span>--%>
-<%--                                    </a>--%>
-<%--                                </li>--%>
-                            </ul>
-                        </nav>
-                    </div>
-                    <div class="col-lg-4 text-center">
-                        <a class="btn btn-info" href="#">导出Excel</a>
-                    </div>
-                </div>
-            </div>
-
-        </main>
-        <!--End 页面主要内容-->
-    </div>
+	<div class="lyear-layout-container">
+		<!--左侧导航-->
+		<aside class="lyear-layout-sidebar">
+
+			<!-- logo -->
+			<div id="logo" class="sidebar-header">
+				<a href="index.html"><img src="images/logo-sidebar.png" title="LightYear" alt="LightYear" /></a>
+			</div>
+			<div class="lyear-layout-sidebar-scroll">
+
+				<!-- 左侧菜单栏位置 -->
+				<jsp:include page="menu.jsp"></jsp:include>
+
+			</div>
+
+		</aside>
+		<!--End 左侧导航-->
+
+		<!--头部信息-->
+		<header class="lyear-layout-header">
+
+			<nav class="navbar navbar-default">
+				<div class="topbar">
+
+					<div class="topbar-left">
+						<div class="lyear-aside-toggler">
+							<span class="lyear-toggler-bar"></span>
+							<span class="lyear-toggler-bar"></span>
+							<span class="lyear-toggler-bar"></span>
+						</div>
+						<span class="navbar-page-title"> 后台首页 </span>
+					</div>
+
+				</div>
+			</nav>
+
+		</header>
+		<!--End 头部信息-->
+
+		<!--页面主要内容-->
+		<main class="lyear-layout-content">
+
+			<div class="container-fluid">
+				<!-- 内容区 -->
+				<div class="row">
+					<div class="col-lg-12">
+						<div class="card">
+							<div class="table-responsive">
+								<table class="table">
+									<thead>
+									<tr>
+										<th>序号</th>
+										<th>角色名称</th>
+										<th>有/无效</th>
+										<th colspan="2" class="text-center">操作</th>
+									</tr>
+									</thead>
+									<tbody id="tbody">
+
+									</tbody>
+								</table>
+							</div>
+						</div>
+					</div>
+
+				</div>
+				<!-- 内容区结束 -->
+				<div class="row">
+					<div class="col-lg-4 text-left">
+						<a class="btn btn-info" href="${pageContext.request.contextPath }/RoleToAddServlet">添加角色</a>
+					</div>
+					<div class="col-lg-4 text-center">
+						<nav>
+							<ul class="pagination" id="pageId">
+
+							</ul>
+						</nav>
+					</div>
+					<div class="col-lg-4 text-center">
+						<a class="btn btn-info" href="${pageContext.request.contextPath }/RoleExcelDownServlet">导出Excel</a>
+					</div>
+				</div>
+			</div>
+
+		</main>
+		<!--End 页面主要内容-->
+	</div>
 </div>
 
 <script type="text/javascript" src="js/jquery.min.js"></script>
@@ -139,84 +111,230 @@
 <script type="text/javascript" src="js/perfect-scrollbar.min.js"></script>
 <script type="text/javascript" src="js/main.min.js"></script>
 
-<%--json数据的展示--%>
+
 <script type="text/javascript">
-//获取数据
-    var pageNo=1;  //当前页
-    var pageSize=3; //页大小  页容量
-    var pageCount=0; //总记录数
-
-    $.getJSON("RoleJsonListServlet",{pageNo:pageNo,pageSize:pageSize},function (d){
-        //在控制台上打印数据
-        console.log(d)
-        pageNo=d.pageNo
-        pageCount=d.pageCount
-        var list =d.obj
-        var str = "";
-        for (var i = 0;i<list.length;i++){
-            str+= "    <tr>\n" +
-                "                                        <th>"+list[i].roleId+"</th>\n" +
-                "                                        <td>"+list[i].roleName+"</td>\n" +
-                "                                        <td>"+list[i].status+"</td>\n" +
-                "                                        <td class=\"text-right\">\n" +
-                "                                            <a onclick=\"if(confirm('是否删除')){return true;}else{return false;}\" class=\"btn btn-w-xs btn-round btn-info\" href=\"#\">删除</a>\n" +
-                "                                        </td>\n" +
-                "                                        <td class=\"text-left\">\n" +
-                "                                            <a class=\"btn btn-w-xs btn-round btn-info\" href=\"role_update.html\">更新</a>\n" +
-                "                                        </td>\n" +
-                "                                    </tr>"
-        }
-    //    将拼接好的字符串重新设置到内容区内
-        $("#tbody").html(str);
-        joinPage(pageNo,pageCount)
-    //    给当前页加样式
-        cssPage(pageNo,"pc");
-
-    });
-
-//生成分页标签
-function joinPage(pageNo,pageCount){
-    //添加上一页的标签
-    var str = "<li><a href=\"#!\"><span><i class=\"mdi mdi-chevron-left\"></i></span></a></li>"
-    if(pageCount<=3){
-        for (var i = 1; i<=pageCount;i++){
-            str+="<li><a class='pc' href=\"#!\">"+i+"</a></li>";
-        }
-    }else {
-        //总页数大于3
-        if(pageNo<=3){
-            for (var i = 1;i<=3;i++){
-                str+="<li><a class='pc' href=\"#!\">"+i+"</a></li>";
-            }
-        }else {
-            for (var i = pageNo-1;i<=pageNo+1;i++){
-                str+="<li><a class='pc' href=\"#!\">"+i+"</a></li>";
-            }
-        }
-    }
-//    添加下一页标签
-    str+="<li><a href=\"#!\"><span><i class=\"mdi mdi-chevron-right\"></i></span></a></li>";
-    $("#pageId").html(str)
-}
-
-//给选择的当前页加样式
-function cssPage(pageNo,css){
-//    通过类的选择器去获取当前页  pc
-    var pcs = $("."+css);
-    for (var i = 0 ;i<pcs.length;i++){
-    //    获取所有的dom对象
-       var pc = pcs[i];
-       if(pc.innerHTML==pageNo){ //如果当前相等，为当前的pc   加高亮
-          var ppc = $(pc).parent(); //li
-           ppc.addClass("active");
-       }
-    }
-}
 
+	var pageNo=1;//当前页
+	var pageSize=2;//页容量
+	var pageCount=0;//总页数
+
+	//首页数据获取
+	$.getJSON("RoleJsonListServlet",{pageNo:pageNo,pageSize:pageSize},function(d){
+		console.log("--->>>",d);
+
+		//初始化pageCount
+		pageCount=d.pageCount;
+		pageNo=d.pageNo;
+
+		//将当前页数据设置到DOM对象中
+		var list = d.obj;
+		var str="";
+		for(var i=0;i<list.length;i++){
+			str+="<tr>\r\n" +
+					"							<th>"+list[i].roleId+"</th>\r\n" +
+					"							<td>"+list[i].roleName+"</td>\r\n" +
+					"							<td>"+list[i].status+"</td>\r\n" +
+					"							<td class=\"text-right\">\r\n" +
+					"								<a onclick=\"if(confirm('是否删除')){return true;}else{return false;}\" class=\"btn btn-w-xs btn-round btn-info\" href=\"${pageContext.request.contextPath}/RoleDeleteServlet?roleId="+list[i].roleId+"\">删除</a>\r\n" +
+					"							</td>\r\n" +
+					"							<td class=\"text-left\">\r\n" +
+					"								<a class=\"btn btn-w-xs btn-round btn-info\" href=\"${pageContext.request.contextPath}/RoleToUpdateServlet?roleId="+list[i].roleId+"\">更新</a>\r\n" +
+					"							</td>\r\n" +
+					"						  </tr>";
+		}
+		//console.log(str);
+		//拼接好的字符串设置到tbody节点中
+		$("#tbody").html(str);
+
+		joinPage(pageNo,pageCount);
+		cssPage(pageNo,"pc");
+		bindEvent(pageNo,pageCount);
+	});
+
+
+	/* 绑定事件函数 */
+	function bindEvent(pageNo,pageCount){
+		/* 中间页事件绑定 */
+		var pcs = $(".pc");
+		for(var i=0;i<pcs.length;i++){
+			$(pcs[i]).click(function(){
+				//console.log(this);
+				//获取当前DOM对象的文本节点
+				var pText = this.innerHTML;
+				//console.log(parseInt(pText));
+				pageNo=parseInt(pText);
+
+				$.getJSON("RoleJsonListServlet",{pageNo:pageNo,pageSize:pageSize},function(d){
+					console.log("--->>>",d);
+
+					//初始化pageCount
+					pageCount=d.pageCount;
+					pageNo=d.pageNo;
+
+					//将当前页数据设置到DOM对象中
+					var list = d.obj;
+
+					var str="";
 
+					for(var i=0;i<list.length;i++){
+						str+="<tr>\r\n" +
+								"							<th>"+list[i].roleId+"</th>\r\n" +
+								"							<td>"+list[i].roleName+"</td>\r\n" +
+								"							<td>"+list[i].status+"</td>\r\n" +
+								"							<td class=\"text-right\">\r\n" +
+								"								<a onclick=\"if(confirm('是否删除')){return true;}else{return false;}\" class=\"btn btn-w-xs btn-round btn-info\" href=\"#\">删除</a>\r\n" +
+								"							</td>\r\n" +
+								"							<td class=\"text-left\">\r\n" +
+								"								<a class=\"btn btn-w-xs btn-round btn-info\" href=\"${pageContext.request.contextPath}/RoleToUpdateServlet?roleId="+list[i].roleId+"\">更新</a>\r\n" +
+								"							</td>\r\n" +
+								"						  </tr>";
+					}
+					//console.log(str);
+					//拼接好的字符串设置到tbody节点中
+					$("#tbody").html(str);
 
+					joinPage(pageNo,pageCount);
+					cssPage(pageNo,"pc");
+					bindEvent(pageNo,pageCount);
+				});
+			});
+		}
+
+
+		/* 绑定下一页事件 */
+		$("#nextId").click(function(){
+
+			if(pageNo>=pageCount){
+				alert("已经是最后一页");
+			}else{
+				pageNo=pageNo+1;
+
+				$.getJSON("RoleJsonListServlet",{pageNo:pageNo,pageSize:pageSize},function(d){
+					console.log("--->>>",d);
+
+					//初始化pageCount
+					pageCount=d.pageCount;
+					pageNo=d.pageNo;
+
+					//将当前页数据设置到DOM对象中
+					var list = d.obj;
+
+					var str="";
+
+					for(var i=0;i<list.length;i++){
+						str+="<tr>\r\n" +
+								"							<th>"+list[i].roleId+"</th>\r\n" +
+								"							<td>"+list[i].roleName+"</td>\r\n" +
+								"							<td>"+list[i].status+"</td>\r\n" +
+								"							<td class=\"text-right\">\r\n" +
+								"								<a onclick=\"if(confirm('是否删除')){return true;}else{return false;}\" class=\"btn btn-w-xs btn-round btn-info\" href=\"#\">删除</a>\r\n" +
+								"							</td>\r\n" +
+								"							<td class=\"text-left\">\r\n" +
+								"								<a class=\"btn btn-w-xs btn-round btn-info\" href=\"${pageContext.request.contextPath}/RoleToUpdateServlet?roleId="+list[i].roleId+"\">更新</a>\r\n" +
+								"							</td>\r\n" +
+								"						  </tr>";
+					}
+					//console.log(str);
+					//拼接好的字符串设置到tbody节点中
+					$("#tbody").html(str);
+
+					joinPage(pageNo,pageCount);
+					cssPage(pageNo,"pc");
+					bindEvent(pageNo,pageCount);
+				});
+			}
+
+		});
+
+		//给上一页绑定事件
+		$("#preId").click(function(){
+
+			if(pageNo<=1){
+				alert("已经是第一页");
+			}else{
+				pageNo=pageNo-1;
+
+				$.getJSON("RoleJsonListServlet",{pageNo:pageNo,pageSize:pageSize},function(d){
+					console.log("--->>>",d);
+
+					//初始化pageCount
+					pageCount=d.pageCount;
+					pageNo=d.pageNo;
+
+					//将当前页数据设置到DOM对象中
+					var list = d.obj;
+
+					var str="";
+
+					for(var i=0;i<list.length;i++){
+						str+="<tr>\r\n" +
+								"							<th>"+list[i].roleId+"</th>\r\n" +
+								"							<td>"+list[i].roleName+"</td>\r\n" +
+								"							<td>"+list[i].status+"</td>\r\n" +
+								"							<td class=\"text-right\">\r\n" +
+								"								<a onclick=\"if(confirm('是否删除')){return true;}else{return false;}\" class=\"btn btn-w-xs btn-round btn-info\" href=\"#\">删除</a>\r\n" +
+								"							</td>\r\n" +
+								"							<td class=\"text-left\">\r\n" +
+								"								<a class=\"btn btn-w-xs btn-round btn-info\" href=\"${pageContext.request.contextPath}/RoleToUpdateServlet?roleId="+list[i].roleId+"\">更新</a>\r\n" +
+								"							</td>\r\n" +
+								"						  </tr>";
+					}
+					//console.log(str);
+					//拼接好的字符串设置到tbody节点中
+					$("#tbody").html(str);
+
+					joinPage(pageNo,pageCount);
+					cssPage(pageNo,"pc");
+					bindEvent(pageNo,pageCount);
+				});
+			}
+
+		});
+
+
+	}
+
+
+	/* 生成分页标签的函数 */
+	function joinPage(pageNo,pageCount){
+		var str="<li id='preId'><a href=\"#!\"><span><i class=\"mdi mdi-chevron-left\"></i></span></a></li>";
+		//判断总页数是否大于3
+		if(pageCount<=3){
+			for(var i=1;i<=pageCount;i++){
+				str+="<li><a class='pc' href=\"#!\">"+i+"</a></li>";
+			}
+		}else{
+			//总页数如果大于3
+			if(pageNo<=3){
+				for(var i=1;i<=3;i++){
+					str+="<li><a class='pc' href=\"#!\">"+i+"</a></li>";
+				}
+			}else{
+				for(var i=pageNo-1;i<=pageNo;i++){
+					str+="<li><a class='pc' href=\"#!\">"+i+"</a></li>";
+				}
+			}
+		}
+		str+="<li id='nextId'><a href=\"#!\"><span><i class=\"mdi mdi-chevron-right\"></i></span></a></li>";
+
+		//设置到指定的DOM元素中
+		$("#pageId").html(str);
+	}
+
+	/* 当前页样式设置 */
+	function cssPage(pageNo,css){
+		var pcs = $("."+css);
+		for(var i=0;i<pcs.length;i++){
+			var pc =  pcs[i]; //DOM
+			if(pc.innerHTML==pageNo){ //如果相等说明当前pc为当前页的dom
+				var ppc = $(pc).parent(); //li
+				ppc.addClass("active"); //为指定的元素添加类名
+			}
+		}
+	}
 
 </script>
 
+
 </body>
 </html>

gn_oa_vip27/src/main/webapp/role_update.jsp

@@ -1,247 +1,111 @@
-<%@ page contentType="text/html;charset=UTF-8" language="java" %>
+<%@ page language="java" contentType="text/html; charset=UTF-8"
+    pageEncoding="UTF-8"%>
+<%@ taglib uri="http://java.sun.com/jsp/jstl/core" prefix="c" %>
 <!DOCTYPE html>
 <html lang="zh">
 <head>
-    <meta charset="utf-8">
-    <meta name="viewport" content="width=device-width, initial-scale=1, maximum-scale=1, user-scalable=no" />
-    <title>首页 - 光年(角色添加)OA管理系统</title>
-    <link rel="icon" href="favicon.ico" type="image/ico">
-    <meta name="keywords" content="LightYear,光年,后台模板,后台管理系统,光年HTML模板">
-    <meta name="description" content="LightYear是一个基于Bootstrap v3.3.7的后台管理系统的HTML模板。">
-    <meta name="author" content="yinqi">
-    <link href="css/bootstrap.min.css" rel="stylesheet">
-    <link href="css/materialdesignicons.min.css" rel="stylesheet">
-    <link href="css/style.min.css" rel="stylesheet">
+<meta charset="utf-8">
+<meta name="viewport" content="width=device-width, initial-scale=1, maximum-scale=1, user-scalable=no" />
+<title>首页 - 光年(角色更新)OA管理系统</title>
+<link rel="icon" href="favicon.ico" type="image/ico">
+<meta name="keywords" content="LightYear,光年,后台模板,后台管理系统,光年HTML模板">
+<meta name="description" content="LightYear是一个基于Bootstrap v3.3.7的后台管理系统的HTML模板。">
+<meta name="author" content="yinqi">
+<link href="css/bootstrap.min.css" rel="stylesheet">
+<link href="css/materialdesignicons.min.css" rel="stylesheet">
+<link href="css/style.min.css" rel="stylesheet">
 </head>
-
+  
 <body>
 <div class="lyear-layout-web">
-    <div class="lyear-layout-container">
-        <!--左侧导航-->
-        <aside class="lyear-layout-sidebar">
-
-            <!-- logo -->
-            <div id="logo" class="sidebar-header">
-                <a href="index.html"><img src="images/logo-sidebar.png" title="LightYear" alt="LightYear" /></a>
-            </div>
-            <div class="lyear-layout-sidebar-scroll">
-            <%--这是左侧导航栏位置--%>
-                <jsp:include page="menu.jsp"></jsp:include>
-            </div>
-
-        </aside>
-        <!--End 左侧导航-->
-
-        <!--头部信息-->
-        <header class="lyear-layout-header">
-
-            <nav class="navbar navbar-default">
-                <div class="topbar">
-
-                    <div class="topbar-left">
-                        <div class="lyear-aside-toggler">
-                            <span class="lyear-toggler-bar"></span>
-                            <span class="lyear-toggler-bar"></span>
-                            <span class="lyear-toggler-bar"></span>
-                        </div>
-                        <span class="navbar-page-title"> 后台首页 </span>
-                    </div>
-
-                    <ul class="topbar-right">
-                        <li class="dropdown dropdown-profile">
-                            <a href="javascript:void(0)" data-toggle="dropdown">
-                                <img class="img-avatar img-avatar-48 m-r-10" src="images/users/avatar.jpg" alt="笔下光年" />
-                                <span>笔下光年 <span class="caret"></span></span>
-                            </a>
-                            <ul class="dropdown-menu dropdown-menu-right">
-                                <li> <a href="lyear_pages_profile.html"><i class="mdi mdi-account"></i> 个人信息</a> </li>
-                                <li> <a href="lyear_pages_edit_pwd.html"><i class="mdi mdi-lock-outline"></i> 修改密码</a> </li>
-                                <li> <a href="javascript:void(0)"><i class="mdi mdi-delete"></i> 清空缓存</a></li>
-                                <li class="divider"></li>
-                                <li> <a href="lyear_pages_login.html"><i class="mdi mdi-logout-variant"></i> 退出登录</a> </li>
-                            </ul>
-                        </li>
-                        <!--切换主题配色-->
-                        <li class="dropdown dropdown-skin">
-                            <span data-toggle="dropdown" class="icon-palette"><i class="mdi mdi-palette"></i></span>
-                            <ul class="dropdown-menu dropdown-menu-right" data-stopPropagation="true">
-                                <li class="drop-title"><p>主题</p></li>
-                                <li class="drop-skin-li clearfix">
-                  <span class="inverse">
-                    <input type="radio" name="site_theme" value="default" id="site_theme_1" checked>
-                    <label for="site_theme_1"></label>
-                  </span>
-                                    <span>
-                    <input type="radio" name="site_theme" value="dark" id="site_theme_2">
-                    <label for="site_theme_2"></label>
-                  </span>
-                                    <span>
-                    <input type="radio" name="site_theme" value="translucent" id="site_theme_3">
-                    <label for="site_theme_3"></label>
-                  </span>
-                                </li>
-                                <li class="drop-title"><p>LOGO</p></li>
-                                <li class="drop-skin-li clearfix">
-                  <span class="inverse">
-                    <input type="radio" name="logo_bg" value="default" id="logo_bg_1" checked>
-                    <label for="logo_bg_1"></label>
-                  </span>
-                                    <span>
-                    <input type="radio" name="logo_bg" value="color_2" id="logo_bg_2">
-                    <label for="logo_bg_2"></label>
-                  </span>
-                                    <span>
-                    <input type="radio" name="logo_bg" value="color_3" id="logo_bg_3">
-                    <label for="logo_bg_3"></label>
-                  </span>
-                                    <span>
-                    <input type="radio" name="logo_bg" value="color_4" id="logo_bg_4">
-                    <label for="logo_bg_4"></label>
-                  </span>
-                                    <span>
-                    <input type="radio" name="logo_bg" value="color_5" id="logo_bg_5">
-                    <label for="logo_bg_5"></label>
-                  </span>
-                                    <span>
-                    <input type="radio" name="logo_bg" value="color_6" id="logo_bg_6">
-                    <label for="logo_bg_6"></label>
-                  </span>
-                                    <span>
-                    <input type="radio" name="logo_bg" value="color_7" id="logo_bg_7">
-                    <label for="logo_bg_7"></label>
-                  </span>
-                                    <span>
-                    <input type="radio" name="logo_bg" value="color_8" id="logo_bg_8">
-                    <label for="logo_bg_8"></label>
-                  </span>
-                                </li>
-                                <li class="drop-title"><p>头部</p></li>
-                                <li class="drop-skin-li clearfix">
-                  <span class="inverse">
-                    <input type="radio" name="header_bg" value="default" id="header_bg_1" checked>
-                    <label for="header_bg_1"></label>
-                  </span>
-                                    <span>
-                    <input type="radio" name="header_bg" value="color_2" id="header_bg_2">
-                    <label for="header_bg_2"></label>
-                  </span>
-                                    <span>
-                    <input type="radio" name="header_bg" value="color_3" id="header_bg_3">
-                    <label for="header_bg_3"></label>
-                  </span>
-                                    <span>
-                    <input type="radio" name="header_bg" value="color_4" id="header_bg_4">
-                    <label for="header_bg_4"></label>
-                  </span>
-                                    <span>
-                    <input type="radio" name="header_bg" value="color_5" id="header_bg_5">
-                    <label for="header_bg_5"></label>
-                  </span>
-                                    <span>
-                    <input type="radio" name="header_bg" value="color_6" id="header_bg_6">
-                    <label for="header_bg_6"></label>
-                  </span>
-                                    <span>
-                    <input type="radio" name="header_bg" value="color_7" id="header_bg_7">
-                    <label for="header_bg_7"></label>
-                  </span>
-                                    <span>
-                    <input type="radio" name="header_bg" value="color_8" id="header_bg_8">
-                    <label for="header_bg_8"></label>
-                  </span>
-                                </li>
-                                <li class="drop-title"><p>侧边栏</p></li>
-                                <li class="drop-skin-li clearfix">
-                  <span class="inverse">
-                    <input type="radio" name="sidebar_bg" value="default" id="sidebar_bg_1" checked>
-                    <label for="sidebar_bg_1"></label>
-                  </span>
-                                    <span>
-                    <input type="radio" name="sidebar_bg" value="color_2" id="sidebar_bg_2">
-                    <label for="sidebar_bg_2"></label>
-                  </span>
-                                    <span>
-                    <input type="radio" name="sidebar_bg" value="color_3" id="sidebar_bg_3">
-                    <label for="sidebar_bg_3"></label>
-                  </span>
-                                    <span>
-                    <input type="radio" name="sidebar_bg" value="color_4" id="sidebar_bg_4">
-                    <label for="sidebar_bg_4"></label>
-                  </span>
-                                    <span>
-                    <input type="radio" name="sidebar_bg" value="color_5" id="sidebar_bg_5">
-                    <label for="sidebar_bg_5"></label>
-                  </span>
-                                    <span>
-                    <input type="radio" name="sidebar_bg" value="color_6" id="sidebar_bg_6">
-                    <label for="sidebar_bg_6"></label>
-                  </span>
-                                    <span>
-                    <input type="radio" name="sidebar_bg" value="color_7" id="sidebar_bg_7">
-                    <label for="sidebar_bg_7"></label>
-                  </span>
-                                    <span>
-                    <input type="radio" name="sidebar_bg" value="color_8" id="sidebar_bg_8">
-                    <label for="sidebar_bg_8"></label>
-                  </span>
-                                </li>
-                            </ul>
-                        </li>
-                        <!--切换主题配色-->
-                    </ul>
-
-                </div>
-            </nav>
-
-        </header>
-        <!--End 头部信息-->
-
-        <!--页面主要内容-->
-        <main class="lyear-layout-content">
-
-            <div class="container-fluid">
-
-                <!-- 内容区 -->
-                <div class="col-lg-12">
-                    <div class="card">
-                        <div class="card-header text-center">
-                            更新角色
-                        </div>
-                        <div class="card-body">
-                            <form class="form-horizontal" action="role_list.html" method="get">
-                                <div class="form-group">
-                                    <label class="col-md-3 control-label" for="example-hf-role">角色名称</label>
-                                    <div class="col-md-7">
-                                        <input class="form-control" type="text" id="example-hf-role" name="roleName">
-                                    </div>
-                                </div>
-                                <div class="form-group">
-                                    <label class="col-md-3 control-label">是否有效</label>
-                                    <div class="col-md-7">
-                                        <label class="radio-inline" for="example-inline-radio1">
-                                            <input type="radio" id="example-inline-radio1" name="example-inline-radios" value="option1">
-                                            有效
-                                        </label>
-                                        <label class="radio-inline" for="example-inline-radio2">
-                                            <input type="radio" id="example-inline-radio2" name="example-inline-radios" value="option2">
-                                            无效
-                                        </label>
-                                    </div>
-                                </div>
-                                <div class="form-group">
-                                    <div class="col-md-9 col-md-offset-3">
-                                        <button class="btn btn-lg btn-info" type="submit">更新</button>
-                                    </div>
-                                </div>
-                            </form>
-                        </div>
-                    </div>
-                </div>
+  <div class="lyear-layout-container">
+    <!--左侧导航-->
+    <aside class="lyear-layout-sidebar">
+      
+      <!-- logo -->
+      <div id="logo" class="sidebar-header">
+        <a href="index.html"><img src="images/logo-sidebar.png" title="LightYear" alt="LightYear" /></a>
+      </div>
+      <div class="lyear-layout-sidebar-scroll">
+
+
+        <!-- 左侧菜单栏位置 -->
+      	<jsp:include page="menu.jsp"></jsp:include>
+        
+      </div>
+      
+    </aside>
+    <!--End 左侧导航-->
+    
+    <!--头部信息-->
+    <header class="lyear-layout-header">
+      
+      <nav class="navbar navbar-default">
+        <div class="topbar">
+          
+          <div class="topbar-left">
+            <div class="lyear-aside-toggler">
+              <span class="lyear-toggler-bar"></span>
+              <span class="lyear-toggler-bar"></span>
+              <span class="lyear-toggler-bar"></span>
             </div>
-
-        </main>
-        <!--End 页面主要内容-->
-    </div>
+            <span class="navbar-page-title"> 后台首页 </span>
+          </div>
+          
+<%--          <jsp:include page="user.jsp"></jsp:include>--%>
+          
+        </div>
+      </nav>
+      
+    </header>
+    <!--End 头部信息-->
+    
+    <!--页面主要内容-->
+    <main class="lyear-layout-content">
+      
+      <div class="container-fluid">
+       
+		<!-- 内容区 -->
+		<div class="col-lg-12">
+			<div class="card">
+				<div class="card-header text-center">
+					更新角色
+				</div>
+				<div class="card-body">
+					<form class="form-horizontal" action="RoleUpdateServlet" method="post">
+					  	<input type="hidden" name="roleId" value="${role.roleId }">
+					  <div class="form-group">
+						<label class="col-md-3 control-label" for="example-hf-role">角色名称</label>
+						<div class="col-md-7">
+						  <input class="form-control" type="text" id="example-hf-role" name="roleName" value="${role.roleName }">
+						</div>
+					  </div>
+					  <div class="form-group">
+						<label class="col-md-3 control-label">是否有效</label>
+						<div class="col-md-7">
+						  <label class="radio-inline" for="example-inline-radio1">
+						    <input type="radio" <c:if test="${role.status =='有效' }">checked</c:if>  id="example-inline-radio1" name="status" value="有效">
+						    有效
+						  </label>
+						  <label class="radio-inline" for="example-inline-radio2">
+						    <input type="radio" <c:if test="${role.status =='无效' }">checked</c:if> id="example-inline-radio2" name="status" value="无效">
+						    无效
+						  </label>
+						</div>
+					  </div>
+					  <div class="form-group">
+						<div class="col-md-9 col-md-offset-3">
+						  <button class="btn btn-lg btn-info" type="submit">更新</button>
+						</div>
+					  </div>
+					</form>
+				</div>
+			</div>
+		</div>
+      </div>
+    </main>
+    <!--End 页面主要内容-->
+  </div>
 </div>
 
 <script type="text/javascript" src="js/jquery.min.js"></script>
@@ -251,50 +115,5 @@
 
 <!--图表插件-->
 <script type="text/javascript" src="js/Chart.js"></script>
-<script type="text/javascript">
-    $(document).ready(function(e) {
-        var $dashChartBarsCnt  = jQuery( '.js-chartjs-bars' )[0].getContext( '2d' ),
-            $dashChartLinesCnt = jQuery( '.js-chartjs-lines' )[0].getContext( '2d' );
-
-        var $dashChartBarsData = {
-            labels: ['周一', '周二', '周三', '周四', '周五', '周六', '周日'],
-            datasets: [
-                {
-                    label: '注册用户',
-                    borderWidth: 1,
-                    borderColor: 'rgba(0,0,0,0)',
-                    backgroundColor: 'rgba(51,202,185,0.5)',
-                    hoverBackgroundColor: "rgba(51,202,185,0.7)",
-                    hoverBorderColor: "rgba(0,0,0,0)",
-                    data: [2500, 1500, 1200, 3200, 4800, 3500, 1500]
-                }
-            ]
-        };
-        var $dashChartLinesData = {
-            labels: ['2003', '2004', '2005', '2006', '2007', '2008', '2009', '2010', '2011', '2012', '2013', '2014'],
-            datasets: [
-                {
-                    label: '交易资金',
-                    data: [20, 25, 40, 30, 45, 40, 55, 40, 48, 40, 42, 50],
-                    borderColor: '#358ed7',
-                    backgroundColor: 'rgba(53, 142, 215, 0.175)',
-                    borderWidth: 1,
-                    fill: false,
-                    lineTension: 0.5
-                }
-            ]
-        };
-
-        new Chart($dashChartBarsCnt, {
-            type: 'bar',
-            data: $dashChartBarsData
-        });
-
-        var myLineChart = new Chart($dashChartLinesCnt, {
-            type: 'line',
-            data: $dashChartLinesData,
-        });
-    });
-</script>
 </body>
 </html>

gn_oa_vip27/target/gn_oa_vip27/role_list.jsp

@@ -1,137 +1,112 @@
-<%@ page contentType="text/html;charset=UTF-8" language="java" %>
+<%@ page language="java" contentType="text/html; charset=UTF-8"
+		 pageEncoding="UTF-8"%>
 <!DOCTYPE html>
 <html lang="zh">
 <head>
-    <meta charset="utf-8">
-    <meta name="viewport" content="width=device-width, initial-scale=1, maximum-scale=1, user-scalable=no" />
-    <title>首页 - 光年(角色列表)OA管理系统</title>
-    <link rel="icon" href="favicon.ico" type="image/ico">
-    <meta name="keywords" content="ukoko.cn">
-    <meta name="description" content="解决中小企业...">
-    <meta name="author" content="夜泊">
-    <link href="css/bootstrap.min.css" rel="stylesheet">
-    <link href="css/materialdesignicons.min.css" rel="stylesheet">
-    <link href="css/style.min.css" rel="stylesheet">
+	<meta charset="utf-8">
+	<meta name="viewport" content="width=device-width, initial-scale=1, maximum-scale=1, user-scalable=no" />
+	<title>首页 - 光年(角色列表)OA管理系统</title>
+	<link rel="icon" href="favicon.ico" type="image/ico">
+	<meta name="keywords" content="ukoko.cn">
+	<meta name="description" content="解决中小企业...">
+	<meta name="author" content="夜泊">
+	<link href="css/bootstrap.min.css" rel="stylesheet">
+	<link href="css/materialdesignicons.min.css" rel="stylesheet">
+	<link href="css/style.min.css" rel="stylesheet">
 </head>
 
 <body>
 <div class="lyear-layout-web">
-    <div class="lyear-layout-container">
-        <!--左侧导航-->
-        <aside class="lyear-layout-sidebar">
-
-            <!-- logo -->
-            <div id="logo" class="sidebar-header">
-                <a href="index.html"><img src="images/logo-sidebar.png" title="LightYear" alt="LightYear" /></a>
-            </div>
-            <div class="lyear-layout-sidebar-scroll">
-
-<%--                这是左侧导航栏的位置--%>
-                <jsp:include page="menu.jsp"></jsp:include>
-            </div>
-
-        </aside>
-        <!--End 左侧导航-->
-
-        <!--头部信息-->
-        <header class="lyear-layout-header">
-
-            <nav class="navbar navbar-default">
-                <div class="topbar">
-
-                    <div class="topbar-left">
-                        <div class="lyear-aside-toggler">
-                            <span class="lyear-toggler-bar"></span>
-                            <span class="lyear-toggler-bar"></span>
-                            <span class="lyear-toggler-bar"></span>
-                        </div>
-                        <span class="navbar-page-title"> 后台首页 </span>
-                    </div>
-
-                    <ul class="topbar-right">
-                        <li class="dropdown dropdown-profile">
-                            <a href="javascript:void(0)" data-toggle="dropdown">
-                                <img class="img-avatar img-avatar-48 m-r-10" src="images/users/avatar.jpg" alt="笔下光年" />
-                                <span>笔下光年 <span class="caret"></span></span>
-                            </a>
-                            <ul class="dropdown-menu dropdown-menu-right">
-                                <li> <a href="lyear_pages_profile.html"><i class="mdi mdi-account"></i> 个人信息</a> </li>
-                                <li> <a href="lyear_pages_edit_pwd.html"><i class="mdi mdi-lock-outline"></i> 修改密码</a> </li>
-                                <li class="divider"></li>
-                                <li> <a href="lyear_pages_login.html"><i class="mdi mdi-logout-variant"></i> 退出登录</a> </li>
-                            </ul>
-                        </li>
-                    </ul>
-
-                </div>
-            </nav>
-
-        </header>
-        <!--End 头部信息-->
-
-        <!--页面主要内容-->
-        <main class="lyear-layout-content">
-
-            <div class="container-fluid">
-                <!-- 内容区 -->
-                <div class="row">
-                    <div class="col-lg-12">
-                        <div class="card">
-                            <div class="table-responsive">
-                                <table class="table">
-                                    <thead>
-                                    <tr>
-                                        <th>序号</th>
-                                        <th>角色名称</th>
-                                        <th>有/无效</th>
-                                        <th colspan="2" class="text-center">操作</th>
-                                    </tr>
-                                    </thead>
-<%--                                    添加body 的id--%>
-                                    <tbody id="tbody">
-
-
-                                    </tbody>
-                                </table>
-                            </div>
-                        </div>
-                    </div>
-
-                </div>
-                <!-- 内容区结束 -->
-                <div class="row">
-                    <div class="col-lg-4 text-left">
-                        <a class="btn btn-info" href="RoleToAddServlet">添加角色</a>
-                    </div>
-                    <div class="col-lg-4 text-center">
-                        <nav>
-<%--                            在ul加以恶个id--%>
-                            <ul class="pagination" id="pageId">
-<%--                                <li>--%>
-<%--                                    <a href="#!">--%>
-<%--                                        <span><i class="mdi mdi-chevron-left"></i></span>--%>
-<%--                                    </a>--%>
-<%--                                </li>--%>
-<%--                                <li class="active"><a href="#">1</a></li>--%>
-<%--                                <li><a href="#!">2</a></li>--%>
-<%--                                <li><a href="#!">3</a></li>--%>
-<%--                                <li>--%>
-<%--                                    <a href="#!">--%>
-<%--                                        <span><i class="mdi mdi-chevron-right"></i></span>--%>
-<%--                                    </a>--%>
-<%--                                </li>--%>
-                            </ul>
-                        </nav>
-                    </div>
-                    <div class="col-lg-4 text-center">
-                        <a class="btn btn-info" href="#">导出Excel</a>
-                    </div>
-                </div>
-            </div>
-
-        </main>
-        <!--End 页面主要内容-->
-    </div>
+	<div class="lyear-layout-container">
+		<!--左侧导航-->
+		<aside class="lyear-layout-sidebar">
+
+			<!-- logo -->
+			<div id="logo" class="sidebar-header">
+				<a href="index.html"><img src="images/logo-sidebar.png" title="LightYear" alt="LightYear" /></a>
+			</div>
+			<div class="lyear-layout-sidebar-scroll">
+
+
+
+				<!-- 左侧菜单栏位置 -->
+				<jsp:include page="menu.jsp"></jsp:include>
+
+			</div>
+
+		</aside>
+		<!--End 左侧导航-->
+
+		<!--头部信息-->
+		<header class="lyear-layout-header">
+
+			<nav class="navbar navbar-default">
+				<div class="topbar">
+
+					<div class="topbar-left">
+						<div class="lyear-aside-toggler">
+							<span class="lyear-toggler-bar"></span>
+							<span class="lyear-toggler-bar"></span>
+							<span class="lyear-toggler-bar"></span>
+						</div>
+						<span class="navbar-page-title"> 后台首页 </span>
+					</div>
+
+
+				</div>
+			</nav>
+
+		</header>
+		<!--End 头部信息-->
+
+		<!--页面主要内容-->
+		<main class="lyear-layout-content">
+
+			<div class="container-fluid">
+				<!-- 内容区 -->
+				<div class="row">
+					<div class="col-lg-12">
+						<div class="card">
+							<div class="table-responsive">
+								<table class="table">
+									<thead>
+									<tr>
+										<th>序号</th>
+										<th>角色名称</th>
+										<th>有/无效</th>
+										<th colspan="2" class="text-center">操作</th>
+									</tr>
+									</thead>
+									<tbody id="tbody">
+
+									</tbody>
+								</table>
+							</div>
+						</div>
+					</div>
+
+				</div>
+				<!-- 内容区结束 -->
+				<div class="row">
+					<div class="col-lg-4 text-left">
+						<a class="btn btn-info" href="${pageContext.request.contextPath }/RoleToAddServlet">添加角色</a>
+					</div>
+					<div class="col-lg-4 text-center">
+						<nav>
+							<ul class="pagination" id="pageId">
+
+							</ul>
+						</nav>
+					</div>
+					<div class="col-lg-4 text-center">
+						<a class="btn btn-info" href="${pageContext.request.contextPath }/RoleExcelDownServlet">导出Excel</a>
+					</div>
+				</div>
+			</div>
+
+		</main>
+		<!--End 页面主要内容-->
+	</div>
 </div>
 
 <script type="text/javascript" src="js/jquery.min.js"></script>
@@ -139,83 +114,230 @@
 <script type="text/javascript" src="js/perfect-scrollbar.min.js"></script>
 <script type="text/javascript" src="js/main.min.js"></script>
 
-<%--json数据的展示--%>
+
 <script type="text/javascript">
-//获取数据
-    var pageNo=2;  //当前页
-    var pageSize=3; //页大小  页容量
-    var pageCount=0; //总记录数
-
-    $.getJSON("RoleJsonListServlet",{pageNo:pageNo,pageSize:pageSize},function (d){
-        //在控制台上打印数据
-        console.log(d)
-        pageNo=d.pageNo
-        pageCount=d.pageCount
-        var list =d.obj
-        var str = "";
-        for (var i = 0;i<list.length;i++){
-            str+= "    <tr>\n" +
-                "                                        <th>"+list[i].roleId+"</th>\n" +
-                "                                        <td>"+list[i].roleName+"</td>\n" +
-                "                                        <td>"+list[i].status+"</td>\n" +
-                "                                        <td class=\"text-right\">\n" +
-                "                                            <a onclick=\"if(confirm('是否删除')){return true;}else{return false;}\" class=\"btn btn-w-xs btn-round btn-info\" href=\"#\">删除</a>\n" +
-                "                                        </td>\n" +
-                "                                        <td class=\"text-left\">\n" +
-                "                                            <a class=\"btn btn-w-xs btn-round btn-info\" href=\"role_update.html\">更新</a>\n" +
-                "                                        </td>\n" +
-                "                                    </tr>"
-        }
-    //    将拼接好的字符串重新设置到内容区内
-        $("#tbody").html(str);
-        joinPage(pageNo,pageCount)
-    //    给当前页加样式
-        cssPage(pageNo,"pc");
-
-    });
-
-//生成分页标签
-function joinPage(pageNo,pageCount){
-    //添加上一页的标签
-    var str = "<li><a href=\"#!\"><span><i class=\"mdi mdi-chevron-left\"></i></span></a></li>"
-    if(pageCount<=3){
-        for (var i = 1; i<=pageCount;i++){
-            str+="<li><a class='pc' href=\"#!\">"+i+"</a></li>";
-        }
-    }else {
-        //总页数大于3
-        if(pageNo<=3){
-            for (var i = 1;i<=3;i++){
-                str+="<li><a class='pc' href=\"#!\">"+i+"</a></li>";
-            }
-        }else {
-            for (var i = pageNo-1;i<=pageNo+1;i++){
-                str+="<li><a class='pc' href=\"#!\">"+i+"</a></li>";
-            }
-        }
-    }
-//    添加下一页标签
-    str+="<li><a href=\"#!\"><span><i class=\"mdi mdi-chevron-right\"></i></span></a></li>";
-    $("#pageId").html(str)
-}
-
-//给选择的当前页加样式
-function cssPage(pageNo,css){
-//    通过类的选择器去获取当前页  pc
-    var pcs = $("."+css);
-    for (var i = 0 ;i<pcs.length;i++){
-    //    获取所有的dom对象
-       var pc = pcs[i];
-       if(pc.innerHTML==pageNo){ //如果当前相等，为当前的pc   加高亮
-          var ppc = $(pc).parent(); //li
-           ppc.addClass("active");
-       }
-    }
-}
 
+	var pageNo=1;//当前页
+	var pageSize=2;//页容量
+	var pageCount=0;//总页数
+
+	//首页数据获取
+	$.getJSON("RoleJsonListServlet",{pageNo:pageNo,pageSize:pageSize},function(d){
+		console.log("--->>>",d);
+
+		//初始化pageCount
+		pageCount=d.pageCount;
+		pageNo=d.pageNo;
+
+		//将当前页数据设置到DOM对象中
+		var list = d.obj;
+		var str="";
+		for(var i=0;i<list.length;i++){
+			str+="<tr>\r\n" +
+					"							<th>"+list[i].roleId+"</th>\r\n" +
+					"							<td>"+list[i].roleName+"</td>\r\n" +
+					"							<td>"+list[i].status+"</td>\r\n" +
+					"							<td class=\"text-right\">\r\n" +
+					"								<a onclick=\"if(confirm('是否删除')){return true;}else{return false;}\" class=\"btn btn-w-xs btn-round btn-info\" href=\"${pageContext.request.contextPath}/RoleDeleteServlet?roleId="+list[i].roleId+"\">删除</a>\r\n" +
+					"							</td>\r\n" +
+					"							<td class=\"text-left\">\r\n" +
+					"								<a class=\"btn btn-w-xs btn-round btn-info\" href=\"${pageContext.request.contextPath}/RoleToUpdateServlet?roleId="+list[i].roleId+"\">更新</a>\r\n" +
+					"							</td>\r\n" +
+					"						  </tr>";
+		}
+		//console.log(str);
+		//拼接好的字符串设置到tbody节点中
+		$("#tbody").html(str);
+
+		joinPage(pageNo,pageCount);
+		cssPage(pageNo,"pc");
+		bindEvent(pageNo,pageCount);
+	});
+
+
+	/* 绑定事件函数 */
+	function bindEvent(pageNo,pageCount){
+		/* 中间页事件绑定 */
+		var pcs = $(".pc");
+		for(var i=0;i<pcs.length;i++){
+			$(pcs[i]).click(function(){
+				//console.log(this);
+				//获取当前DOM对象的文本节点
+				var pText = this.innerHTML;
+				//console.log(parseInt(pText));
+				pageNo=parseInt(pText);
+
+				$.getJSON("RoleJsonListServlet",{pageNo:pageNo,pageSize:pageSize},function(d){
+					console.log("--->>>",d);
+
+					//初始化pageCount
+					pageCount=d.pageCount;
+					pageNo=d.pageNo;
+
+					//将当前页数据设置到DOM对象中
+					var list = d.obj;
 
+					var str="";
+
+					for(var i=0;i<list.length;i++){
+						str+="<tr>\r\n" +
+								"							<th>"+list[i].roleId+"</th>\r\n" +
+								"							<td>"+list[i].roleName+"</td>\r\n" +
+								"							<td>"+list[i].status+"</td>\r\n" +
+								"							<td class=\"text-right\">\r\n" +
+								"								<a onclick=\"if(confirm('是否删除')){return true;}else{return false;}\" class=\"btn btn-w-xs btn-round btn-info\" href=\"#\">删除</a>\r\n" +
+								"							</td>\r\n" +
+								"							<td class=\"text-left\">\r\n" +
+								"								<a class=\"btn btn-w-xs btn-round btn-info\" href=\"${pageContext.request.contextPath}/RoleToUpdateServlet?roleId="+list[i].roleId+"\">更新</a>\r\n" +
+								"							</td>\r\n" +
+								"						  </tr>";
+					}
+					//console.log(str);
+					//拼接好的字符串设置到tbody节点中
+					$("#tbody").html(str);
+
+					joinPage(pageNo,pageCount);
+					cssPage(pageNo,"pc");
+					bindEvent(pageNo,pageCount);
+				});
+			});
+		}
+
+
+		/* 绑定下一页事件 */
+		$("#nextId").click(function(){
+
+			if(pageNo>=pageCount){
+				alert("已经是最后一页");
+			}else{
+				pageNo=pageNo+1;
+
+				$.getJSON("RoleJsonListServlet",{pageNo:pageNo,pageSize:pageSize},function(d){
+					console.log("--->>>",d);
+
+					//初始化pageCount
+					pageCount=d.pageCount;
+					pageNo=d.pageNo;
+
+					//将当前页数据设置到DOM对象中
+					var list = d.obj;
+
+					var str="";
+
+					for(var i=0;i<list.length;i++){
+						str+="<tr>\r\n" +
+								"							<th>"+list[i].roleId+"</th>\r\n" +
+								"							<td>"+list[i].roleName+"</td>\r\n" +
+								"							<td>"+list[i].status+"</td>\r\n" +
+								"							<td class=\"text-right\">\r\n" +
+								"								<a onclick=\"if(confirm('是否删除')){return true;}else{return false;}\" class=\"btn btn-w-xs btn-round btn-info\" href=\"#\">删除</a>\r\n" +
+								"							</td>\r\n" +
+								"							<td class=\"text-left\">\r\n" +
+								"								<a class=\"btn btn-w-xs btn-round btn-info\" href=\"${pageContext.request.contextPath}/RoleToUpdateServlet?roleId="+list[i].roleId+"\">更新</a>\r\n" +
+								"							</td>\r\n" +
+								"						  </tr>";
+					}
+					//console.log(str);
+					//拼接好的字符串设置到tbody节点中
+					$("#tbody").html(str);
+
+					joinPage(pageNo,pageCount);
+					cssPage(pageNo,"pc");
+					bindEvent(pageNo,pageCount);
+				});
+			}
+
+		});
+
+		//给上一页绑定事件
+		$("#preId").click(function(){
+
+			if(pageNo<=1){
+				alert("已经是第一页");
+			}else{
+				pageNo=pageNo-1;
+
+				$.getJSON("RoleJsonListServlet",{pageNo:pageNo,pageSize:pageSize},function(d){
+					console.log("--->>>",d);
+
+					//初始化pageCount
+					pageCount=d.pageCount;
+					pageNo=d.pageNo;
+
+					//将当前页数据设置到DOM对象中
+					var list = d.obj;
+
+					var str="";
+
+					for(var i=0;i<list.length;i++){
+						str+="<tr>\r\n" +
+								"							<th>"+list[i].roleId+"</th>\r\n" +
+								"							<td>"+list[i].roleName+"</td>\r\n" +
+								"							<td>"+list[i].status+"</td>\r\n" +
+								"							<td class=\"text-right\">\r\n" +
+								"								<a onclick=\"if(confirm('是否删除')){return true;}else{return false;}\" class=\"btn btn-w-xs btn-round btn-info\" href=\"#\">删除</a>\r\n" +
+								"							</td>\r\n" +
+								"							<td class=\"text-left\">\r\n" +
+								"								<a class=\"btn btn-w-xs btn-round btn-info\" href=\"${pageContext.request.contextPath}/RoleToUpdateServlet?roleId="+list[i].roleId+"\">更新</a>\r\n" +
+								"							</td>\r\n" +
+								"						  </tr>";
+					}
+					//console.log(str);
+					//拼接好的字符串设置到tbody节点中
+					$("#tbody").html(str);
+
+					joinPage(pageNo,pageCount);
+					cssPage(pageNo,"pc");
+					bindEvent(pageNo,pageCount);
+				});
+			}
+
+		});
+
+
+	}
+
+
+	/* 生成分页标签的函数 */
+	function joinPage(pageNo,pageCount){
+		var str="<li id='preId'><a href=\"#!\"><span><i class=\"mdi mdi-chevron-left\"></i></span></a></li>";
+		//判断总页数是否大于3
+		if(pageCount<=3){
+			for(var i=1;i<=pageCount;i++){
+				str+="<li><a class='pc' href=\"#!\">"+i+"</a></li>";
+			}
+		}else{
+			//总页数如果大于3
+			if(pageNo<=3){
+				for(var i=1;i<=3;i++){
+					str+="<li><a class='pc' href=\"#!\">"+i+"</a></li>";
+				}
+			}else{
+				for(var i=pageNo-1;i<=pageNo;i++){
+					str+="<li><a class='pc' href=\"#!\">"+i+"</a></li>";
+				}
+			}
+		}
+		str+="<li id='nextId'><a href=\"#!\"><span><i class=\"mdi mdi-chevron-right\"></i></span></a></li>";
+
+		//设置到指定的DOM元素中
+		$("#pageId").html(str);
+	}
+
+	/* 当前页样式设置 */
+	function cssPage(pageNo,css){
+		var pcs = $("."+css);
+		for(var i=0;i<pcs.length;i++){
+			var pc =  pcs[i]; //DOM
+			if(pc.innerHTML==pageNo){ //如果相等说明当前pc为当前页的dom
+				var ppc = $(pc).parent(); //li
+				ppc.addClass("active"); //为指定的元素添加类名
+			}
+		}
+	}
 
 </script>
 
+
 </body>
 </html>

gn_oa_vip27/target/gn_oa_vip27/role_update.jsp

@@ -1,247 +1,111 @@
-<%@ page contentType="text/html;charset=UTF-8" language="java" %>
+<%@ page language="java" contentType="text/html; charset=UTF-8"
+    pageEncoding="UTF-8"%>
+<%@ taglib uri="http://java.sun.com/jsp/jstl/core" prefix="c" %>
 <!DOCTYPE html>
 <html lang="zh">
 <head>
-    <meta charset="utf-8">
-    <meta name="viewport" content="width=device-width, initial-scale=1, maximum-scale=1, user-scalable=no" />
-    <title>首页 - 光年(角色添加)OA管理系统</title>
-    <link rel="icon" href="favicon.ico" type="image/ico">
-    <meta name="keywords" content="LightYear,光年,后台模板,后台管理系统,光年HTML模板">
-    <meta name="description" content="LightYear是一个基于Bootstrap v3.3.7的后台管理系统的HTML模板。">
-    <meta name="author" content="yinqi">
-    <link href="css/bootstrap.min.css" rel="stylesheet">
-    <link href="css/materialdesignicons.min.css" rel="stylesheet">
-    <link href="css/style.min.css" rel="stylesheet">
+<meta charset="utf-8">
+<meta name="viewport" content="width=device-width, initial-scale=1, maximum-scale=1, user-scalable=no" />
+<title>首页 - 光年(角色更新)OA管理系统</title>
+<link rel="icon" href="favicon.ico" type="image/ico">
+<meta name="keywords" content="LightYear,光年,后台模板,后台管理系统,光年HTML模板">
+<meta name="description" content="LightYear是一个基于Bootstrap v3.3.7的后台管理系统的HTML模板。">
+<meta name="author" content="yinqi">
+<link href="css/bootstrap.min.css" rel="stylesheet">
+<link href="css/materialdesignicons.min.css" rel="stylesheet">
+<link href="css/style.min.css" rel="stylesheet">
 </head>
-
+  
 <body>
 <div class="lyear-layout-web">
-    <div class="lyear-layout-container">
-        <!--左侧导航-->
-        <aside class="lyear-layout-sidebar">
-
-            <!-- logo -->
-            <div id="logo" class="sidebar-header">
-                <a href="index.html"><img src="images/logo-sidebar.png" title="LightYear" alt="LightYear" /></a>
-            </div>
-            <div class="lyear-layout-sidebar-scroll">
-            <%--这是左侧导航栏位置--%>
-                <jsp:include page="menu.jsp"></jsp:include>
-            </div>
-
-        </aside>
-        <!--End 左侧导航-->
-
-        <!--头部信息-->
-        <header class="lyear-layout-header">
-
-            <nav class="navbar navbar-default">
-                <div class="topbar">
-
-                    <div class="topbar-left">
-                        <div class="lyear-aside-toggler">
-                            <span class="lyear-toggler-bar"></span>
-                            <span class="lyear-toggler-bar"></span>
-                            <span class="lyear-toggler-bar"></span>
-                        </div>
-                        <span class="navbar-page-title"> 后台首页 </span>
-                    </div>
-
-                    <ul class="topbar-right">
-                        <li class="dropdown dropdown-profile">
-                            <a href="javascript:void(0)" data-toggle="dropdown">
-                                <img class="img-avatar img-avatar-48 m-r-10" src="images/users/avatar.jpg" alt="笔下光年" />
-                                <span>笔下光年 <span class="caret"></span></span>
-                            </a>
-                            <ul class="dropdown-menu dropdown-menu-right">
-                                <li> <a href="lyear_pages_profile.html"><i class="mdi mdi-account"></i> 个人信息</a> </li>
-                                <li> <a href="lyear_pages_edit_pwd.html"><i class="mdi mdi-lock-outline"></i> 修改密码</a> </li>
-                                <li> <a href="javascript:void(0)"><i class="mdi mdi-delete"></i> 清空缓存</a></li>
-                                <li class="divider"></li>
-                                <li> <a href="lyear_pages_login.html"><i class="mdi mdi-logout-variant"></i> 退出登录</a> </li>
-                            </ul>
-                        </li>
-                        <!--切换主题配色-->
-                        <li class="dropdown dropdown-skin">
-                            <span data-toggle="dropdown" class="icon-palette"><i class="mdi mdi-palette"></i></span>
-                            <ul class="dropdown-menu dropdown-menu-right" data-stopPropagation="true">
-                                <li class="drop-title"><p>主题</p></li>
-                                <li class="drop-skin-li clearfix">
-                  <span class="inverse">
-                    <input type="radio" name="site_theme" value="default" id="site_theme_1" checked>
-                    <label for="site_theme_1"></label>
-                  </span>
-                                    <span>
-                    <input type="radio" name="site_theme" value="dark" id="site_theme_2">
-                    <label for="site_theme_2"></label>
-                  </span>
-                                    <span>
-                    <input type="radio" name="site_theme" value="translucent" id="site_theme_3">
-                    <label for="site_theme_3"></label>
-                  </span>
-                                </li>
-                                <li class="drop-title"><p>LOGO</p></li>
-                                <li class="drop-skin-li clearfix">
-                  <span class="inverse">
-                    <input type="radio" name="logo_bg" value="default" id="logo_bg_1" checked>
-                    <label for="logo_bg_1"></label>
-                  </span>
-                                    <span>
-                    <input type="radio" name="logo_bg" value="color_2" id="logo_bg_2">
-                    <label for="logo_bg_2"></label>
-                  </span>
-                                    <span>
-                    <input type="radio" name="logo_bg" value="color_3" id="logo_bg_3">
-                    <label for="logo_bg_3"></label>
-                  </span>
-                                    <span>
-                    <input type="radio" name="logo_bg" value="color_4" id="logo_bg_4">
-                    <label for="logo_bg_4"></label>
-                  </span>
-                                    <span>
-                    <input type="radio" name="logo_bg" value="color_5" id="logo_bg_5">
-                    <label for="logo_bg_5"></label>
-                  </span>
-                                    <span>
-                    <input type="radio" name="logo_bg" value="color_6" id="logo_bg_6">
-                    <label for="logo_bg_6"></label>
-                  </span>
-                                    <span>
-                    <input type="radio" name="logo_bg" value="color_7" id="logo_bg_7">
-                    <label for="logo_bg_7"></label>
-                  </span>
-                                    <span>
-                    <input type="radio" name="logo_bg" value="color_8" id="logo_bg_8">
-                    <label for="logo_bg_8"></label>
-                  </span>
-                                </li>
-                                <li class="drop-title"><p>头部</p></li>
-                                <li class="drop-skin-li clearfix">
-                  <span class="inverse">
-                    <input type="radio" name="header_bg" value="default" id="header_bg_1" checked>
-                    <label for="header_bg_1"></label>
-                  </span>
-                                    <span>
-                    <input type="radio" name="header_bg" value="color_2" id="header_bg_2">
-                    <label for="header_bg_2"></label>
-                  </span>
-                                    <span>
-                    <input type="radio" name="header_bg" value="color_3" id="header_bg_3">
-                    <label for="header_bg_3"></label>
-                  </span>
-                                    <span>
-                    <input type="radio" name="header_bg" value="color_4" id="header_bg_4">
-                    <label for="header_bg_4"></label>
-                  </span>
-                                    <span>
-                    <input type="radio" name="header_bg" value="color_5" id="header_bg_5">
-                    <label for="header_bg_5"></label>
-                  </span>
-                                    <span>
-                    <input type="radio" name="header_bg" value="color_6" id="header_bg_6">
-                    <label for="header_bg_6"></label>
-                  </span>
-                                    <span>
-                    <input type="radio" name="header_bg" value="color_7" id="header_bg_7">
-                    <label for="header_bg_7"></label>
-                  </span>
-                                    <span>
-                    <input type="radio" name="header_bg" value="color_8" id="header_bg_8">
-                    <label for="header_bg_8"></label>
-                  </span>
-                                </li>
-                                <li class="drop-title"><p>侧边栏</p></li>
-                                <li class="drop-skin-li clearfix">
-                  <span class="inverse">
-                    <input type="radio" name="sidebar_bg" value="default" id="sidebar_bg_1" checked>
-                    <label for="sidebar_bg_1"></label>
-                  </span>
-                                    <span>
-                    <input type="radio" name="sidebar_bg" value="color_2" id="sidebar_bg_2">
-                    <label for="sidebar_bg_2"></label>
-                  </span>
-                                    <span>
-                    <input type="radio" name="sidebar_bg" value="color_3" id="sidebar_bg_3">
-                    <label for="sidebar_bg_3"></label>
-                  </span>
-                                    <span>
-                    <input type="radio" name="sidebar_bg" value="color_4" id="sidebar_bg_4">
-                    <label for="sidebar_bg_4"></label>
-                  </span>
-                                    <span>
-                    <input type="radio" name="sidebar_bg" value="color_5" id="sidebar_bg_5">
-                    <label for="sidebar_bg_5"></label>
-                  </span>
-                                    <span>
-                    <input type="radio" name="sidebar_bg" value="color_6" id="sidebar_bg_6">
-                    <label for="sidebar_bg_6"></label>
-                  </span>
-                                    <span>
-                    <input type="radio" name="sidebar_bg" value="color_7" id="sidebar_bg_7">
-                    <label for="sidebar_bg_7"></label>
-                  </span>
-                                    <span>
-                    <input type="radio" name="sidebar_bg" value="color_8" id="sidebar_bg_8">
-                    <label for="sidebar_bg_8"></label>
-                  </span>
-                                </li>
-                            </ul>
-                        </li>
-                        <!--切换主题配色-->
-                    </ul>
-
-                </div>
-            </nav>
-
-        </header>
-        <!--End 头部信息-->
-
-        <!--页面主要内容-->
-        <main class="lyear-layout-content">
-
-            <div class="container-fluid">
-
-                <!-- 内容区 -->
-                <div class="col-lg-12">
-                    <div class="card">
-                        <div class="card-header text-center">
-                            更新角色
-                        </div>
-                        <div class="card-body">
-                            <form class="form-horizontal" action="role_list.html" method="get">
-                                <div class="form-group">
-                                    <label class="col-md-3 control-label" for="example-hf-role">角色名称</label>
-                                    <div class="col-md-7">
-                                        <input class="form-control" type="text" id="example-hf-role" name="roleName">
-                                    </div>
-                                </div>
-                                <div class="form-group">
-                                    <label class="col-md-3 control-label">是否有效</label>
-                                    <div class="col-md-7">
-                                        <label class="radio-inline" for="example-inline-radio1">
-                                            <input type="radio" id="example-inline-radio1" name="example-inline-radios" value="option1">
-                                            有效
-                                        </label>
-                                        <label class="radio-inline" for="example-inline-radio2">
-                                            <input type="radio" id="example-inline-radio2" name="example-inline-radios" value="option2">
-                                            无效
-                                        </label>
-                                    </div>
-                                </div>
-                                <div class="form-group">
-                                    <div class="col-md-9 col-md-offset-3">
-                                        <button class="btn btn-lg btn-info" type="submit">更新</button>
-                                    </div>
-                                </div>
-                            </form>
-                        </div>
-                    </div>
-                </div>
+  <div class="lyear-layout-container">
+    <!--左侧导航-->
+    <aside class="lyear-layout-sidebar">
+      
+      <!-- logo -->
+      <div id="logo" class="sidebar-header">
+        <a href="index.html"><img src="images/logo-sidebar.png" title="LightYear" alt="LightYear" /></a>
+      </div>
+      <div class="lyear-layout-sidebar-scroll">
+
+
+        <!-- 左侧菜单栏位置 -->
+      	<jsp:include page="menu.jsp"></jsp:include>
+        
+      </div>
+      
+    </aside>
+    <!--End 左侧导航-->
+    
+    <!--头部信息-->
+    <header class="lyear-layout-header">
+      
+      <nav class="navbar navbar-default">
+        <div class="topbar">
+          
+          <div class="topbar-left">
+            <div class="lyear-aside-toggler">
+              <span class="lyear-toggler-bar"></span>
+              <span class="lyear-toggler-bar"></span>
+              <span class="lyear-toggler-bar"></span>
             </div>
-
-        </main>
-        <!--End 页面主要内容-->
-    </div>
+            <span class="navbar-page-title"> 后台首页 </span>
+          </div>
+          
+<%--          <jsp:include page="user.jsp"></jsp:include>--%>
+          
+        </div>
+      </nav>
+      
+    </header>
+    <!--End 头部信息-->
+    
+    <!--页面主要内容-->
+    <main class="lyear-layout-content">
+      
+      <div class="container-fluid">
+       
+		<!-- 内容区 -->
+		<div class="col-lg-12">
+			<div class="card">
+				<div class="card-header text-center">
+					更新角色
+				</div>
+				<div class="card-body">
+					<form class="form-horizontal" action="RoleUpdateServlet" method="post">
+					  	<input type="hidden" name="roleId" value="${role.roleId }">
+					  <div class="form-group">
+						<label class="col-md-3 control-label" for="example-hf-role">角色名称</label>
+						<div class="col-md-7">
+						  <input class="form-control" type="text" id="example-hf-role" name="roleName" value="${role.roleName }">
+						</div>
+					  </div>
+					  <div class="form-group">
+						<label class="col-md-3 control-label">是否有效</label>
+						<div class="col-md-7">
+						  <label class="radio-inline" for="example-inline-radio1">
+						    <input type="radio" <c:if test="${role.status =='有效' }">checked</c:if>  id="example-inline-radio1" name="status" value="有效">
+						    有效
+						  </label>
+						  <label class="radio-inline" for="example-inline-radio2">
+						    <input type="radio" <c:if test="${role.status =='无效' }">checked</c:if> id="example-inline-radio2" name="status" value="无效">
+						    无效
+						  </label>
+						</div>
+					  </div>
+					  <div class="form-group">
+						<div class="col-md-9 col-md-offset-3">
+						  <button class="btn btn-lg btn-info" type="submit">更新</button>
+						</div>
+					  </div>
+					</form>
+				</div>
+			</div>
+		</div>
+      </div>
+    </main>
+    <!--End 页面主要内容-->
+  </div>
 </div>
 
 <script type="text/javascript" src="js/jquery.min.js"></script>
@@ -251,50 +115,5 @@
 
 <!--图表插件-->
 <script type="text/javascript" src="js/Chart.js"></script>
-<script type="text/javascript">
-    $(document).ready(function(e) {
-        var $dashChartBarsCnt  = jQuery( '.js-chartjs-bars' )[0].getContext( '2d' ),
-            $dashChartLinesCnt = jQuery( '.js-chartjs-lines' )[0].getContext( '2d' );
-
-        var $dashChartBarsData = {
-            labels: ['周一', '周二', '周三', '周四', '周五', '周六', '周日'],
-            datasets: [
-                {
-                    label: '注册用户',
-                    borderWidth: 1,
-                    borderColor: 'rgba(0,0,0,0)',
-                    backgroundColor: 'rgba(51,202,185,0.5)',
-                    hoverBackgroundColor: "rgba(51,202,185,0.7)",
-                    hoverBorderColor: "rgba(0,0,0,0)",
-                    data: [2500, 1500, 1200, 3200, 4800, 3500, 1500]
-                }
-            ]
-        };
-        var $dashChartLinesData = {
-            labels: ['2003', '2004', '2005', '2006', '2007', '2008', '2009', '2010', '2011', '2012', '2013', '2014'],
-            datasets: [
-                {
-                    label: '交易资金',
-                    data: [20, 25, 40, 30, 45, 40, 55, 40, 48, 40, 42, 50],
-                    borderColor: '#358ed7',
-                    backgroundColor: 'rgba(53, 142, 215, 0.175)',
-                    borderWidth: 1,
-                    fill: false,
-                    lineTension: 0.5
-                }
-            ]
-        };
-
-        new Chart($dashChartBarsCnt, {
-            type: 'bar',
-            data: $dashChartBarsData
-        });
-
-        var myLineChart = new Chart($dashChartLinesCnt, {
-            type: 'line',
-            data: $dashChartLinesData,
-        });
-    });
-</script>
 </body>
 </html>